feat(providers): improve expo response management and multi device token

novuhq · Oct 12, 2023 · 612e10d · 612e10d
1 parent f3de39a
commit 612e10d
Show file tree

Hide file tree

Showing 5 changed files with 280 additions and 115 deletions.
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts
@@ -26,6 +26,7 @@ import {
   SelectIntegration,
   CompileTemplate,
   CompileTemplateCommand,
+  IPushHandler,
   PushFactory,
   GetNovuProviderCredentials,
 } from '@novu/application-generic';
@@ -43,6 +44,8 @@ const LOG_CONTEXT = 'SendMessagePush';
 export class SendMessagePush extends SendMessageBase {
   channelType = ChannelTypeEnum.PUSH;
 
+  private pushFactory;
+
   constructor(
     protected subscriberRepository: SubscriberRepository,
     protected messageRepository: MessageRepository,
@@ -62,6 +65,8 @@ export class SendMessagePush extends SendMessageBase {
       selectIntegration,
       getNovuProviderCredentials
     );
+
+    this.pushFactory = new PushFactory();
   }
 
   @InstrumentUsecase()
@@ -148,21 +153,26 @@ export class SendMessagePush extends SendMessageBase {
       await this.sendSelectedIntegrationExecution(command.job, integration);
 
       const overrides = command.overrides[integration.providerId] || {};
-
-      const result = await this.sendMessage(
-        subscriber,
-        integration,
-        deviceTokens,
-        title,
-        content,
-        command,
-        command.payload,
-        overrides,
-        stepData
-      );
-
-      if (!result) {
-        integrationsWithErrors++;
+      const target = (overrides as { deviceTokens?: string[] }).deviceTokens || deviceTokens;
+
+      const message = await this.createMessage(command, integration, title, content, target, overrides);
+
+      for (const deviceToken of target) {
+        const result = await this.sendMessage(
+          command,
+          message,
+          subscriber,
+          integration,
+          deviceToken,
+          title,
+          content,
+          overrides,
+          stepData
+        );
+
+        if (!result) {
+          integrationsWithErrors++;
+        }
       }
     }
 
@@ -273,59 +283,24 @@ export class SendMessagePush extends SendMessageBase {
   }
 
   private async sendMessage(
+    command: SendMessageCommand,
+    message: MessageEntity,
     subscriber: IPushOptions['subscriber'],
     integration: IntegrationEntity,
-    target: string[],
+    deviceToken: string,
     title: string,
     content: string,
-    command: SendMessageCommand,
-    payload: object,
     overrides: object,
     step: IPushOptions['step']
   ): Promise<boolean> {
-    const message: MessageEntity = await this.messageRepository.create({
-      _notificationId: command.notificationId,
-      _environmentId: command.environmentId,
-      _organizationId: command.organizationId,
-      _subscriberId: command._subscriberId,
-      _templateId: command._templateId,
-      _messageTemplateId: command.step?.template?._id,
-      channel: ChannelTypeEnum.PUSH,
-      transactionId: command.transactionId,
-      deviceTokens: target,
-      content: this.storeContent() ? content : null,
-      title,
-      payload: payload as never,
-      overrides: overrides as never,
-      providerId: integration.providerId,
-      _jobId: command.jobId,
-    });
-
-    await this.createExecutionDetails.execute(
-      CreateExecutionDetailsCommand.create({
-        ...CreateExecutionDetailsCommand.getDetailsFromJob(command.job),
-        detail: `${DetailEnum.MESSAGE_CREATED}: ${integration.providerId}`,
-        source: ExecutionDetailsSourceEnum.INTERNAL,
-        status: ExecutionDetailsStatusEnum.PENDING,
-        messageId: message._id,
-        isTest: false,
-        isRetry: false,
-        raw: this.storeContent() ? JSON.stringify(content) : null,
-      })
-    );
-
     try {
-      const pushFactory = new PushFactory();
-      const pushHandler = pushFactory.getHandler(integration);
-      if (!pushHandler) {
-        throw new PlatformException(`Push handler for provider ${integration.providerId} is  not found`);
-      }
+      const pushHandler = this.getIntegrationHandler(integration);
 
       const result = await pushHandler.send({
-        target: (overrides as { deviceTokens?: string[] }).deviceTokens || target,
+        target: [deviceToken],
         title,
         content,
-        payload,
+        payload: command.payload,
         overrides,
         subscriber,
         step,
@@ -340,7 +315,7 @@ export class SendMessagePush extends SendMessageBase {
           status: ExecutionDetailsStatusEnum.SUCCESS,
           isTest: false,
           isRetry: false,
-          raw: JSON.stringify(result),
+          raw: JSON.stringify({ result, deviceToken }),
         })
       );
 
@@ -363,4 +338,57 @@ export class SendMessagePush extends SendMessageBase {
       return false;
     }
   }
+
+  private async createMessage(
+    command: SendMessageCommand,
+    integration: IntegrationEntity,
+    title: string,
+    content: string,
+    deviceTokens: string[],
+    overrides: object
+  ): Promise<MessageEntity> {
+    const message = await this.messageRepository.create({
+      _notificationId: command.notificationId,
+      _environmentId: command.environmentId,
+      _organizationId: command.organizationId,
+      _subscriberId: command._subscriberId,
+      _templateId: command._templateId,
+      _messageTemplateId: command.step?.template?._id,
+      channel: ChannelTypeEnum.PUSH,
+      transactionId: command.transactionId,
+      deviceTokens,
+      content: this.storeContent() ? content : null,
+      title,
+      payload: command.payload as never,
+      overrides: overrides as never,
+      providerId: integration.providerId,
+      _jobId: command.jobId,
+    });
+
+    await this.createExecutionDetails.execute(
+      CreateExecutionDetailsCommand.create({
+        ...CreateExecutionDetailsCommand.getDetailsFromJob(command.job),
+        detail: `${DetailEnum.MESSAGE_CREATED}: ${integration.providerId}`,
+        source: ExecutionDetailsSourceEnum.INTERNAL,
+        status: ExecutionDetailsStatusEnum.PENDING,
+        messageId: message._id,
+        isTest: false,
+        isRetry: false,
+        raw: this.storeContent() ? JSON.stringify(content) : null,
+      })
+    );
+
+    return message;
+  }
+
+  private getIntegrationHandler(integration): IPushHandler {
+    const pushHandler = this.pushFactory.getHandler(integration);
+
+    if (!pushHandler) {
+      const message = `Push handler for provider ${integration.providerId} is  not found`;
+      throw new PlatformException(message);
+    }
+
+    return pushHandler;
+  }
 }
diff --git a/packages/application-generic/src/factories/index.ts b/packages/application-generic/src/factories/index.ts
@@ -2,5 +2,6 @@ export * from './chat/chat.factory';
 export * from './sms/sms.factory';
 export * from './mail/mail.factory';
 export * from './push/push.factory';
+export * from './push/interfaces/push.handler.interface';
 export * from './sms/interfaces';
 export * from './mail/interfaces/send.handler.interface';
diff --git a/packages/application-generic/src/factories/push/push.factory.ts b/packages/application-generic/src/factories/push/push.factory.ts
@@ -17,7 +17,7 @@ export class PushFactory implements IPushFactory {
     new PushWebhookHandler(),
   ];
 
-  getHandler(integration: IntegrationEntity) {
+  getHandler(integration: IntegrationEntity): IPushHandler {
     const handler =
       this.handlers.find((handlerItem) =>
         handlerItem.canHandle(integration.providerId, integration.channel)