Merge pull request #3169 from jayavardhan3112/next

fix: Update Subscribers API allowing null
novuhq · Jun 16, 2023 · a17b1e6 · a17b1e6
2 parents c78b8d1 + 6668344
commit a17b1e6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/apps/api/src/app/subscribers/dtos/update-subscriber-request.dto.ts b/apps/api/src/app/subscribers/dtos/update-subscriber-request.dto.ts
@@ -1,11 +1,13 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEmail, IsLocale, IsOptional, IsString } from 'class-validator';
 import { SubscriberCustomData } from '@novu/shared';
+import { Transform } from 'class-transformer';
 
 export class UpdateSubscriberRequestDto {
   @ApiProperty()
-  @IsEmail()
+  @Transform((params) => (params.value === '' ? null : params.value))
   @IsOptional()
+  @IsEmail()
   email?: string;
 
   @ApiProperty()

diff --git a/packages/application-generic/src/usecases/update-subscriber/update-subscriber.command.ts b/packages/application-generic/src/usecases/update-subscriber/update-subscriber.command.ts
@@ -1,6 +1,7 @@
 import { IsEmail, IsLocale, IsOptional, IsString } from 'class-validator';
 import { SubscriberEntity } from '@novu/dal';
 import { SubscriberCustomData } from '@novu/shared';
+import { Transform } from 'class-transformer';
 
 import { EnvironmentCommand } from '../../commands/project.command';
 
@@ -14,6 +15,7 @@ export class UpdateSubscriberCommand extends EnvironmentCommand {
   @IsOptional()
   lastName?: string;
 
+  @Transform((params) => (params.value === '' ? null : params.value))
   @IsOptional()
   @IsEmail()
   email?: string;

diff --git a/packages/application-generic/src/usecases/update-subscriber/update-subscriber.usecase.ts b/packages/application-generic/src/usecases/update-subscriber/update-subscriber.usecase.ts
@@ -32,9 +32,7 @@ export class UpdateSubscriber {
     }
 
     const updatePayload: Partial<SubscriberEntity> = {};
-    if (command.email != null) {
-      updatePayload.email = command.email;
-    }
+    updatePayload.email = command.email;
 
     if (command.phone != null) {
       updatePayload.phone = command.phone;
@@ -78,7 +76,9 @@ export class UpdateSubscriber {
         _environmentId: command.environmentId,
         _id: foundSubscriber._id,
       },
-      { $set: updatePayload }
+      {
+        $set: updatePayload,
+      }
     );
 
     return {

diff --git a/packages/application-generic/src/utils/subscriber.ts b/packages/application-generic/src/utils/subscriber.ts
@@ -7,7 +7,8 @@ export function subscriberNeedUpdate(
 ): boolean {
   return (
     !!(
-      subscriberPayload?.email && subscriber?.email !== subscriberPayload?.email
+      subscriber?.email !== undefined &&
+      subscriber?.email !== subscriberPayload?.email
     ) ||
     !!(
       subscriberPayload?.firstName &&