feat(fcm): enhance chat notifications

Tutortoise · Dec 6, 2024 · 7bce685 · 7bce685
1 parent 1982676
commit 7bce685
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/common/fcm.service.ts b/src/common/fcm.service.ts
@@ -20,6 +20,7 @@ export class FCMService {
   async sendChatNotification(
     recipientId: string,
     senderName: string,
+    senderId: string,
     message: { content: string; type: MessageType },
     roomId: string,
   ): Promise<void> {
@@ -35,12 +36,16 @@ export class FCMService {
 
     const notificationMessage = {
       notification: {
-        title: `New message from ${senderName}`,
+        title: `New message from ${senderName || "Unknown User"}`,
         body: truncatedPreview,
       },
       data: {
         type: "chat_message",
         roomId,
+        senderName: senderName || "Unknown User",
+        senderId: senderId || "",
+        content: truncatedPreview,
+        title: `New message from ${senderName || "Unknown User"}`,
         click_action: "FLUTTER_NOTIFICATION_CLICK",
       },
       tokens,

diff --git a/src/module/chat/chat.repository.ts b/src/module/chat/chat.repository.ts
@@ -101,7 +101,9 @@ export class ChatRepository {
       .select({
         room: chatRooms,
         learnerName: learners.name,
+        learnerId: learners.id,
         tutorName: tutors.name,
+        tutorId: tutors.id,
         lastMessage: sql<{ content: string; type: MessageType }>`
         (SELECT json_build_object(
           'content', content,

diff --git a/src/module/chat/chat.service.ts b/src/module/chat/chat.service.ts
@@ -118,6 +118,7 @@ export class ChatService {
       this.deps.fcmService.sendChatNotification(
         recipientId,
         senderName,
+        senderId,
         message,
         roomId,
       );