novuhq · rifont · Nov 12, 2024 · Nov 7, 2024 · Nov 7, 2024 · Nov 8, 2024
diff --git a/apps/api/src/app/inbox/usecases/update-preferences/update-preferences.usecase.ts b/apps/api/src/app/inbox/usecases/update-preferences/update-preferences.usecase.ts
@@ -8,8 +8,9 @@
  UpsertPreferences,
   UpsertSubscriberWorkflowPreferencesCommand,
   UpsertSubscriberGlobalPreferencesCommand,
   InstrumentUsecase,
+  Instrument,
 } from '@novu/application-generic';
 import {
   NotificationTemplateEntity,
  NotificationTemplateRepository,
@@ -18,8 +19,8 @@
  SubscriberPreferenceEntity,
  SubscriberPreferenceRepository,
  SubscriberRepository,
 } from '@novu/dal';
 import { IPreferenceChannels, WorkflowPreferences, WorkflowPreferencesPartial } from '@novu/shared';
 import { ApiException } from '../../../shared/exceptions/api.exception';
 import { AnalyticsEventsEnum } from '../../utils';
 import { InboxPreference } from '../../utils/types';
@@ -33,11 +34,11 @@
    private subscriberRepository: SubscriberRepository,
    private analyticsService: AnalyticsService,
    private getSubscriberGlobalPreference: GetSubscriberGlobalPreference,
    private getSubscriberTemplatePreferenceUsecase: GetSubscriberTemplatePreference,
    private upsertPreferences: UpsertPreferences
  ) {}

  @InstrumentUsecase()
  async execute(command: UpdatePreferencesCommand): Promise<InboxPreference> {
    const subscriber = await this.subscriberRepository.findBySubscriberId(command.environmentId, command.subscriberId);
    if (!subscriber) throw new NotFoundException(`Subscriber with id: ${command.subscriberId} is not found`);
@@ -55,10 +56,8 @@
       }
     }
 
-    const userPreference: SubscriberPreferenceEntity | null = await this.subscriberPreferenceRepository.findOne(
-      this.commonQuery(command, subscriber)
-    );
-    if (!userPreference) {
+    const subscriberPreference = await this.findPreference(command, subscriber);
+    if (!subscriberPreference) {
       await this.createUserPreference(command, subscriber);
     } else {
       await this.updateUserPreference(command, subscriber);
@@ -67,6 +66,7 @@
     return await this.findPreference(command, subscriber);
   }
 
+  @Instrument()
   private async createUserPreference(command: UpdatePreferencesCommand, subscriber: SubscriberEntity): Promise<void> {
     const channelPreferences: IPreferenceChannels = this.buildPreferenceChannels(command);
 
@@ -94,6 +94,7 @@
     });
   }
 
+  @Instrument()
   private async updateUserPreference(command: UpdatePreferencesCommand, subscriber: SubscriberEntity): Promise<void> {
     const channelPreferences: IPreferenceChannels = this.buildPreferenceChannels(command);
 
@@ -136,6 +137,7 @@
     };
   }
 
+  @Instrument()
   private async findPreference(
     command: UpdatePreferencesCommand,
     subscriber: SubscriberEntity
@@ -146,7 +148,7 @@
        throw new NotFoundException(`Workflow with id: ${command.workflowId} is not found`);
      }

      const { preference } = await this.getSubscriberTemplatePreferenceUsecase.execute(
        GetSubscriberTemplatePreferenceCommand.create({
          organizationId: command.organizationId,
          subscriberId: command.subscriberId,
@@ -198,6 +200,7 @@
   /**
    * Strangler pattern to migrate to V2 preferences.
    */
+  @Instrument()
   private async storePreferencesV2(item: {
     channels: IPreferenceChannels;
     organizationId: string;

diff --git a/apps/api/src/app/subscribers/e2e/update-global-preference.e2e.ts b/apps/api/src/app/subscribers/e2e/update-global-preference.e2e.ts
@@ -1,5 +1,5 @@
 import { ChannelTypeEnum } from '@novu/shared';
 import { UserSession } from '@novu/testing';
 import { expect } from 'chai';

 import { updateGlobalPreferences } from './helpers';
@@ -77,7 +77,14 @@
     expect(response.data.data.preference.channels).to.eql({});
   });
 
-  it('should update user global preference and disable the flag for the future channels update', async function () {
+  it('should unset all preferences when the preferences object is empty', async function () {
+    const response = await updateGlobalPreferences({}, session);
+
+    expect(response.data.data.preference.channels).to.eql({});
+  });
+
+  // `enabled` flag is not used anymore. The presence of a preference object means that the subscriber has enabled notifications.
+  it.skip('should update user global preference and disable the flag for the future channels update', async function () {
     const disablePreferenceData = {
       enabled: false,
     };

diff --git a/apps/api/src/app/subscribers/e2e/update-preference.e2e.ts b/apps/api/src/app/subscribers/e2e/update-preference.e2e.ts
@@ -1,4 +1,4 @@
 import { UserSession } from '@novu/testing';
 import { expect } from 'chai';
 import { NotificationTemplateEntity } from '@novu/dal';
 import {
@@ -83,7 +83,7 @@
       expect(response.status).to.eql(404);
       expect(response.data).to.have.include({
         statusCode: 404,
-        message: 'Template with id 63cc6e0b561e0a609f223e27 is not found',
+        message: 'Workflow with id: 63cc6e0b561e0a609f223e27 is not found',
         error: 'Not Found',
       });
     }
@@ -148,7 +148,8 @@
     });
   });
 
-  it('should update user preference and disable the flag for the future general notification template preference', async function () {
+  // `enabled` flag is not used anymore. The presence of a preference object means that the subscriber has enabled notifications.
+  it.skip('should update user preference and disable the flag for the future general notification template preference', async function () {
     const initialPreferences = (await getPreference(session)).data.data[0];
     expect(initialPreferences.preference.enabled).to.eql(true);
     expect(initialPreferences.preference.channels).to.eql({
@@ -186,7 +187,8 @@
     });
   });
 
-  it('should update user preference and enable the flag for the future general notification template preference', async function () {
+  // `enabled` flag is not used anymore. The presence of a preference object means that the subscriber has enabled notifications.
+  it.skip('should update user preference and enable the flag for the future general notification template preference', async function () {
     const initialPreferences = (await getPreference(session)).data.data[0];
     expect(initialPreferences.preference.enabled).to.eql(true);
     expect(initialPreferences.preference.channels).to.eql({

diff --git a/apps/api/src/app/subscribers/subscribers.controller.ts b/apps/api/src/app/subscribers/subscribers.controller.ts
@@ -7,6 +7,7 @@ import {
   Get,
   HttpCode,
   HttpStatus,
+  NotFoundException,
   Param,
   Patch,
   Post,
@@ -29,6 +30,8 @@ import {
   ApiRateLimitCostEnum,
   ButtonTypeEnum,
   ChatProviderIdEnum,
+  IPreferenceChannels,
+  TriggerTypeEnum,
   UserSessionData,
 } from '@novu/shared';
 import { MessageEntity, PreferenceLevelEnum } from '@novu/dal';
@@ -50,8 +53,6 @@ import { GetSubscribers, GetSubscribersCommand } from './usecases/get-subscriber
 import { GetSubscriber, GetSubscriberCommand } from './usecases/get-subscriber';
 import { GetPreferencesByLevelCommand } from './usecases/get-preferences-by-level/get-preferences-by-level.command';
 import { GetPreferencesByLevel } from './usecases/get-preferences-by-level/get-preferences-by-level.usecase';
-import { UpdatePreference } from './usecases/update-preference/update-preference.usecase';
-import { UpdateSubscriberPreferenceCommand } from './usecases/update-subscriber-preference';
 import { UpdateSubscriberPreferenceResponseDto } from '../widgets/dtos/update-subscriber-preference-response.dto';
 import { UpdateSubscriberPreferenceRequestDto } from '../widgets/dtos/update-subscriber-preference-request.dto';
 import { MessageResponseDto } from '../widgets/dtos/message-response.dto';
@@ -90,10 +91,6 @@ import { MarkAllMessagesAs } from '../widgets/usecases/mark-all-messages-as/mark
 import { MarkAllMessageAsRequestDto } from './dtos/mark-all-messages-as-request.dto';
 import { BulkCreateSubscribers } from './usecases/bulk-create-subscribers/bulk-create-subscribers.usecase';
 import { BulkCreateSubscribersCommand } from './usecases/bulk-create-subscribers';
-import {
-  UpdateSubscriberGlobalPreferences,
-  UpdateSubscriberGlobalPreferencesCommand,
-} from './usecases/update-subscriber-global-preferences';
 import { GetSubscriberPreferencesByLevelParams } from './params';
 import { ThrottlerCategory, ThrottlerCost } from '../rate-limiting/guards';
 import { MessageMarkAsRequestDto } from '../widgets/dtos/mark-as-request.dto';
@@ -102,6 +99,8 @@ import { MarkMessageAsByMark } from '../widgets/usecases/mark-message-as-by-mark
 import { FeedResponseDto } from '../widgets/dtos/feeds-response.dto';
 import { UserAuthentication } from '../shared/framework/swagger/api.key.security';
 import { SdkGroupName, SdkMethodName, SdkUsePagination } from '../shared/framework/swagger/sdk.decorators';
+import { UpdatePreferences } from '../inbox/usecases/update-preferences/update-preferences.usecase';
+import { UpdatePreferencesCommand } from '../inbox/usecases/update-preferences/update-preferences.command';
 
 @ThrottlerCategory(ApiRateLimitCategoryEnum.CONFIGURATION)
 @ApiCommonResponses()
@@ -117,8 +116,7 @@ export class SubscribersController {
     private getSubscriberUseCase: GetSubscriber,
     private getSubscribersUsecase: GetSubscribers,
     private getPreferenceUsecase: GetPreferencesByLevel,
-    private updatePreferenceUsecase: UpdatePreference,
-    private updateGlobalPreferenceUsecase: UpdateSubscriberGlobalPreferences,
+    private updatePreferencesUsecase: UpdatePreferences,
     private getNotificationsFeedUsecase: GetNotificationsFeed,
     private getFeedCountUsecase: GetFeedCount,
     private markMessageAsUsecase: MarkMessageAs,
@@ -465,16 +463,37 @@ export class SubscribersController {
     @Param('parameter') templateId: string,
     @Body() body: UpdateSubscriberPreferenceRequestDto
   ): Promise<UpdateSubscriberPreferenceResponseDto> {
-    const command = UpdateSubscriberPreferenceCommand.create({
-      organizationId: user.organizationId,
-      subscriberId,
-      environmentId: user.environmentId,
-      templateId,
-      ...(typeof body.enabled === 'boolean' && { enabled: body.enabled }),
-      ...(body.channel && { channel: body.channel }),
-    });
+    const result = await this.updatePreferencesUsecase.execute(
+      UpdatePreferencesCommand.create({
+        environmentId: user.environmentId,
+        organizationId: user.organizationId,
+        subscriberId,
+        workflowId: templateId,
+        level: PreferenceLevelEnum.TEMPLATE,
+        ...(body.channel && { [body.channel.type]: body.channel.enabled }),
+      })
+    );
 
-    return await this.updatePreferenceUsecase.execute(command);
+    if (!result.workflow) throw new NotFoundException('Workflow not found');
+
+    return {
+      preference: {
+        channels: result.channels,
+        enabled: result.enabled,
+      },
+      template: {
+        _id: result.workflow.id,
+        name: result.workflow.name,
+        critical: result.workflow.critical,
+        triggers: [
+          {
+            identifier: result.workflow.identifier,
+            type: TriggerTypeEnum.EVENT,
+            variables: [],
+          },
+        ],
+      },
+    };
   }
 
   @Patch('/:subscriberId/preferences')
@@ -490,16 +509,29 @@ export class SubscribersController {
     @UserSession() user: UserSessionData,
     @Param('subscriberId') subscriberId: string,
     @Body() body: UpdateSubscriberGlobalPreferencesRequestDto
-  ) {
-    const command = UpdateSubscriberGlobalPreferencesCommand.create({
-      organizationId: user.organizationId,
-      subscriberId,
-      environmentId: user.environmentId,
-      enabled: body.enabled,
-      preferences: body.preferences,
-    });
+  ): Promise<Omit<UpdateSubscriberPreferenceResponseDto, 'template'>> {
+    const channels = body.preferences?.reduce((acc, curr) => {
+      acc[curr.type] = curr.enabled;
+
+      return acc;
+    }, {} as IPreferenceChannels);
+
+    const result = await this.updatePreferencesUsecase.execute(
+      UpdatePreferencesCommand.create({
+        environmentId: user.environmentId,
+        organizationId: user.organizationId,
+        subscriberId,
+        level: PreferenceLevelEnum.GLOBAL,
+        ...channels,
+      })
+    );
 
-    return await this.updateGlobalPreferenceUsecase.execute(command);
+    return {
+      preference: {
+        channels: result.channels,
+        enabled: result.enabled,
+      },
+    };
   }
 
   @ExternalApiAccessible()

diff --git a/apps/api/src/app/subscribers/subscribers.module.ts b/apps/api/src/app/subscribers/subscribers.module.ts
@@ -1,7 +1,5 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TerminusModule } from '@nestjs/terminus';
-import { GetPreferences, UpsertPreferences } from '@novu/application-generic';
-import { PreferencesRepository } from '@novu/dal';
 import { AuthModule } from '../auth/auth.module';
 import { SharedModule } from '../shared/shared.module';
 import { WidgetsModule } from '../widgets/widgets.module';

diff --git a/apps/api/src/app/subscribers/usecases/index.ts b/apps/api/src/app/subscribers/usecases/index.ts
@@ -12,17 +12,15 @@ import { GetSubscriber } from './get-subscriber';
 import { GetPreferencesByLevel } from './get-preferences-by-level/get-preferences-by-level.usecase';
 import { RemoveSubscriber } from './remove-subscriber';
 import { SearchByExternalSubscriberIds } from './search-by-external-subscriber-ids';
-import { UpdatePreference } from './update-preference/update-preference.usecase';
-import { UpdateSubscriberPreference } from './update-subscriber-preference';
 import { UpdateSubscriberOnlineFlag } from './update-subscriber-online-flag';
 import { ChatOauth } from './chat-oauth/chat-oauth.usecase';
 import { ChatOauthCallback } from './chat-oauth-callback/chat-oauth-callback.usecase';
 import { DeleteSubscriberCredentials } from './delete-subscriber-credentials/delete-subscriber-credentials.usecase';
 import { BulkCreateSubscribers } from './bulk-create-subscribers/bulk-create-subscribers.usecase';
-import { UpdateSubscriberGlobalPreferences } from './update-subscriber-global-preferences';
 import { CreateIntegration } from '../../integrations/usecases/create-integration/create-integration.usecase';
 import { CheckIntegration } from '../../integrations/usecases/check-integration/check-integration.usecase';
 import { CheckIntegrationEMail } from '../../integrations/usecases/check-integration/check-integration-email.usecase';
+import { UpdatePreferences } from '../../inbox/usecases/update-preferences/update-preferences.usecase';
 
 export {
   SearchByExternalSubscriberIds,
@@ -38,18 +36,16 @@ export const USE_CASES = [
   GetPreferencesByLevel,
   RemoveSubscriber,
   SearchByExternalSubscriberIds,
-  UpdatePreference,
   UpdateSubscriber,
   UpdateSubscriberChannel,
-  UpdateSubscriberPreference,
   UpdateSubscriberOnlineFlag,
   ChatOauthCallback,
   ChatOauth,
   DeleteSubscriberCredentials,
   BulkCreateSubscribers,
-  UpdateSubscriberGlobalPreferences,
   GetSubscriberGlobalPreference,
   CreateIntegration,
   CheckIntegration,
   CheckIntegrationEMail,
+  UpdatePreferences,
 ];
diff --git a/apps/api/src/app/subscribers/usecases/update-preference/update-preference.command.ts b/apps/api/src/app/subscribers/usecases/update-preference/update-preference.command.ts
diff --git a/apps/api/src/app/subscribers/usecases/update-preference/update-preference.usecase.ts b/apps/api/src/app/subscribers/usecases/update-preference/update-preference.usecase.ts
diff --git a/apps/api/src/app/subscribers/usecases/update-subscriber-global-preferences/index.ts b/apps/api/src/app/subscribers/usecases/update-subscriber-global-preferences/index.ts
diff --git a/...ases/update-subscriber-global-preferences/update-subscriber-global-preferences.command.ts b/...ases/update-subscriber-global-preferences/update-subscriber-global-preferences.command.ts