Merge pull request #510 from connection-2023/feature/#501

Feat(#501): fcm message body->data

src/chats/services/chats.service.ts

@@ -66,7 +66,6 @@ export class ChatsService {
       );
 
     await this.notificationService.sendPushNotification(
-      receiver,
       pushNotificationMessage,
     );
 

src/common/interface/common-interface.ts

@@ -95,6 +95,6 @@ export interface IPaginationOptions {
 }
 
 export interface IPushNotificationMessage {
-  notification: { title: string; body: string; chatRoomId?: string };
+  data: { title: string; body: string; chatRoomId?: string };
   token: string;
 }

src/notification/services/notification.service.ts

@@ -52,7 +52,7 @@ export class NotificationService {
         description,
       );
 
-      await this.sendPushNotification(target, message);
+      await this.sendPushNotification(message);
 
       const onlineMap =
         await this.notificationRepository.getOnlineMapWithTargetId(target);
@@ -175,10 +175,7 @@ export class NotificationService {
     await this.notificationRepository.deleteNotification(notificationId);
   }
 
-  async sendPushNotification(
-    target: INotificationTarget,
-    message: IPushNotificationMessage,
-  ) {
+  async sendPushNotification(message: IPushNotificationMessage) {
     const response = await admin.messaging().send(message);
 
     this.logger.log(response);
@@ -313,7 +310,7 @@ export class NotificationService {
     const userDeviceToken = await this.getUserDeviceToken(userId);
 
     return {
-      notification: { title, body, chatRoomId },
+      data: { title, body, chatRoomId },
       token: userDeviceToken.deviceToken,
     };
   }