feat(subscribe): add possibility to filter tasks by tenant

Related to CAM-9415
camunda · Oct 15, 2018 · 74e9233 · 74e9233
1 parent 6f5bdc8
commit 74e9233
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/docs/Client.md b/docs/Client.md
@@ -69,6 +69,8 @@ The currently supported options are:
 | processDefinitionIdIn  | A value which allows to filter tasks based on process definition ids         | string |          |                                                       |
 | processDefinitionKey  | A value which allows to filter tasks based on process definition key         | string |          |                                                       |
 | processDefinitionKeyIn  | A value which allows to filter tasks based on process definition keys         | string |          |                                                       |
+| withoutTenantId  | A value which allows to filter tasks based on tenant ids         | string |          |                                                       |
+| tenantIdIn   | A value which allows to filter tasks without tenant id                              | boolean |         |                                                       |
 
 
 ### About topic subscriptions

diff --git a/lib/Client.js b/lib/Client.js
@@ -154,7 +154,9 @@ class Client extends events {
           processDefinitionId,
           processDefinitionIdIn,
           processDefinitionKey,
-          processDefinitionKeyIn
+          processDefinitionKeyIn,
+          tenantIdIn,
+          withoutTenantId
         }
       ]) => {
         let topic = { topicName, lockDuration };
@@ -183,6 +185,14 @@ class Client extends events {
           topic.processDefinitionKeyIn = processDefinitionKeyIn;
         }
 
+        if (!isUndefinedOrNull(tenantIdIn)) {
+          topic.tenantIdIn = tenantIdIn;
+        }
+
+        if (!isUndefinedOrNull(withoutTenantId)) {
+          topic.withoutTenantId = withoutTenantId;
+        }
+
         return topic;
       }
     );

diff --git a/lib/Client.test.js b/lib/Client.test.js
@@ -128,7 +128,9 @@ describe("Client", () => {
         processDefinitionId: "processId",
         processDefinitionIdIn: ["processId", "processId2"],
         processDefinitionKey: "processKey",
-        processDefinitionKeyIn: ["processKey", "processKey2"]
+        processDefinitionKeyIn: ["processKey", "processKey2"],
+        tenantIdIn: ["tenantId"],
+        withoutTenantId: true
       };
     });
 
@@ -224,6 +226,30 @@ describe("Client", () => {
       );
     });
 
+    test("should subscribe to topic based on tenantIdIn ", () => {
+      // given
+      const footopicSubscription = client.subscribe(
+        "foo",
+        customConfig,
+        fooWork
+      );
+      // then
+      expect(footopicSubscription.tenantIdIn).toBe(customConfig.tenantIdIn);
+    });
+
+    test("should subscribe to topic based on withoutTenantId ", () => {
+      // given
+      const footopicSubscription = client.subscribe(
+        "foo",
+        customConfig,
+        fooWork
+      );
+      // then
+      expect(footopicSubscription.withoutTenantId).toBe(
+        customConfig.withoutTenantId
+      );
+    });
+
     test("should call the API with the custom configs", () => {
       // given
       const fetchAnLockSpy = jest.spyOn(client.engineService, "fetchAndLock");

diff --git a/lib/__snapshots__/Client.test.js.snap b/lib/__snapshots__/Client.test.js.snap
@@ -38,11 +38,15 @@ Array [
           "processKey",
           "processKey2",
         ],
+        "tenantIdIn": Array [
+          "tenantId",
+        ],
         "topicName": "foo",
         "variables": Array [
           "fooVariable",
           "barVariable",
         ],
+        "withoutTenantId": true,
       },
     ],
   },