fix: filter tasks by Organization ID (#287)

Author: bednar

CHANGELOG.md

@@ -6,6 +6,9 @@ Changed type of `Duration.magnitude` from `int?` to `long?`.
 ### Features
 1. [#282](https://github.com/influxdata/influxdb-client-csharp/pull/282): Add support for AggregateWindow function [LINQ]
 
+### Bug Fixes
+1. [#287](https://github.com/influxdata/influxdb-client-csharp/pull/287): Filter tasks by Organization ID
+
 ## 3.3.0 [2022-02-04]
 
 ### Bug Fixes

Client.Test/ItTasksApiTest.cs

@@ -262,7 +262,6 @@ public async Task FindTasks()
         }
 
         [Test]
-        [Ignore("https://github.com/influxdata/influxdb/issues/13577")]
         public async Task FindTasksAfterSpecifiedId()
         {
             var task1 = await _tasksApi.CreateTaskCronAsync(GenerateName("it task"), TaskFlux, "0 2 * * *", _organization);
@@ -275,44 +274,33 @@ public async Task FindTasksAfterSpecifiedId()
         }
 
         [Test]
-        [Ignore("https://github.com/influxdata/influxdb/issues/11491")]
-        //_token
         public async Task FindTasksByOrganization()
         {
-            var taskOrg = await Client.GetOrganizationsApi().CreateOrganizationAsync(GenerateName("Task user"));
-            var authorization = await AddAuthorization(taskOrg);
-
-            Client.Dispose();
-            Client = InfluxDBClientFactory.Create(InfluxDbUrl, authorization.Token);
-            _tasksApi = Client.GetTasksApi();
-
-            var count = (await _tasksApi.FindTasksByOrganizationAsync(taskOrg)).Count;
-            Assert.AreEqual(0, count);
-
-            await _tasksApi.CreateTaskCronAsync(GenerateName("it task"), TaskFlux, "0 2 * * *", taskOrg);
-
-            var tasks = await _tasksApi.FindTasksByOrganizationAsync(taskOrg);
+            var count = (await _tasksApi.FindTasksByOrganizationAsync(_organization)).Count;
+            Assert.GreaterOrEqual(count, 0);
 
-            Assert.AreEqual(1, tasks.Count);
+            await _tasksApi.CreateTaskCronAsync(GenerateName("it task"), TaskFlux, "0 2 * * *", _organization);
 
-            (await _tasksApi.FindTasksAsync()).ForEach(async task => await _tasksApi.DeleteTaskAsync(task));
+            var tasks = await _tasksApi.FindTasksByOrganizationAsync(_organization);
+            Assert.AreEqual(count + 1, tasks.Count);
         }
 
         [Test]
-        //_token
-        [Ignore("set user password -> https://github.com/influxdata/influxdb/issues/11590")]
         public async Task FindTasksByUser()
         {
-            var taskUser = await Client.GetUsersApi().CreateUserAsync(GenerateName("Task user"));
+            Client.Dispose();
+            Client = InfluxDBClientFactory.Create(InfluxDbUrl, "my-user", "my-password".ToCharArray());
+            _tasksApi = Client.GetTasksApi();
+            
+            var user = (await Client.GetUsersApi().FindUsersAsync(name:"my-user"))[0];
 
-            var count = (await _tasksApi.FindTasksByUserAsync(taskUser)).Count;
-            Assert.AreEqual(0, count);
+            var count = (await _tasksApi.FindTasksByUserAsync(user)).Count;
+            Assert.GreaterOrEqual(count, 0);
 
             await _tasksApi.CreateTaskCronAsync(GenerateName("it task"), TaskFlux, "0 2 * * *", _organization);
 
-            var tasks = await _tasksApi.FindTasksByUserAsync(taskUser);
-
-            Assert.AreEqual(1, tasks.Count);
+            var tasks = await _tasksApi.FindTasksByUserAsync(user);
+            Assert.AreEqual(count + 1, tasks.Count);
         }
 
         [Test]

Client/TasksApi.cs

@@ -314,7 +314,8 @@ public Task<List<TaskType>> FindTasksByOrganizationIdAsync(string orgId)
         /// <returns>A list of tasks</returns>
         public async Task<List<TaskType>> FindTasksAsync(string afterId = null, string userId = null, string orgId = null)
         {
-            var response = await _service.GetTasksAsync(null, null, afterId, userId, orgId).ConfigureAwait(false);
+            var response = await _service.GetTasksAsync(after: afterId, user: userId, orgID: orgId)
+                .ConfigureAwait(false);
             return response._Tasks;
         }