fix(api, application-generic): Filter with supplied tags when fetch…

…ing subscriber preferences (#6991)
novuhq · Nov 13, 2024 · 01858f5 · 01858f5
1 parent 20ff94c
commit 01858f5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/apps/api/src/app/inbox/e2e/get-preferences.e2e.ts b/apps/api/src/app/inbox/e2e/get-preferences.e2e.ts
@@ -60,6 +60,7 @@ describe('Get all preferences - /inbox/preferences (GET)', function () {
   it('should allow filtering preferences by tags', async function () {
     const newsletterTag = 'newsletter';
     const securityTag = 'security';
+    const marketingTag = 'marketing';
     await session.createTemplate({
       noFeedId: true,
       tags: [newsletterTag],
@@ -68,6 +69,14 @@ describe('Get all preferences - /inbox/preferences (GET)', function () {
       noFeedId: true,
       tags: [securityTag],
     });
+    await session.createTemplate({
+      noFeedId: true,
+      tags: [marketingTag],
+    });
+    await session.createTemplate({
+      noFeedId: true,
+      tags: [],
+    });
 
     const response = await session.testAgent
       .get(`/v1/inbox/preferences?tags[]=${newsletterTag}&tags[]=${securityTag}`)

diff --git a/apps/api/src/app/inbox/usecases/get-inbox-preferences/get-inbox-preferences.spec.ts b/apps/api/src/app/inbox/usecases/get-inbox-preferences/get-inbox-preferences.spec.ts
@@ -129,6 +129,7 @@ describe('GetInboxPreferences', () => {
         environmentId: command.environmentId,
         subscriberId: command.subscriberId,
         organizationId: command.organizationId,
+        tags: undefined,
       })
     );
 
@@ -216,6 +217,7 @@ describe('GetInboxPreferences', () => {
         environmentId: command.environmentId,
         subscriberId: command.subscriberId,
         organizationId: command.organizationId,
+        tags: command.tags,
       })
     );
 

diff --git a/apps/api/src/app/inbox/usecases/get-inbox-preferences/get-inbox-preferences.usecase.ts b/apps/api/src/app/inbox/usecases/get-inbox-preferences/get-inbox-preferences.usecase.ts
@@ -40,6 +40,7 @@ export class GetInboxPreferences {
         environmentId: command.environmentId,
         subscriberId: command.subscriberId,
         organizationId: command.organizationId,
+        tags: command.tags,
       })
     );
     const workflowPreferences = subscriberWorkflowPreferences.map((subscriberWorkflowPreference) => {

diff --git a/...ation-generic/src/usecases/get-subscriber-preference/get-subscriber-preference.command.ts b/...ation-generic/src/usecases/get-subscriber-preference/get-subscriber-preference.command.ts
@@ -1,3 +1,9 @@
+import { IsArray, IsOptional, IsString } from 'class-validator';
 import { EnvironmentWithSubscriber } from '../../commands/project.command';
 
-export class GetSubscriberPreferenceCommand extends EnvironmentWithSubscriber {}
+export class GetSubscriberPreferenceCommand extends EnvironmentWithSubscriber {
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  tags?: string[];
+}
diff --git a/...ation-generic/src/usecases/get-subscriber-preference/get-subscriber-preference.usecase.ts b/...ation-generic/src/usecases/get-subscriber-preference/get-subscriber-preference.usecase.ts
@@ -40,6 +40,7 @@ export class GetSubscriberPreference {
       {
         organizationId: command.organizationId,
         environmentId: command.environmentId,
+        tags: command.tags,
       },
     );