From 5131b765b44f088f1356fc797534b6a347ddb1f2 Mon Sep 17 00:00:00 2001
From: yeseong0412 <yeseong0412@dgsw.hs.kr>
Date: Sat, 19 Oct 2024 15:48:38 +0900
Subject: [PATCH] =?UTF-8?q?Fix=20::=20FCM=20=ED=8C=8C=EC=9D=BC=20=ED=98=B9?=
 =?UTF-8?q?=EC=9D=80=20=EC=82=AC=EC=A7=84=20=EB=B3=B4=EB=82=BC=EB=95=8C=20?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=95=8C=EB=A6=BC=EC=97=90=20=EC=95=88?=
 =?UTF-8?q?=EB=8B=B4=EA=B8=B0=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/application/service/message/MessageServiceImpl.kt | 2 +-
 .../kotlin/com/seugi/api/global/infra/fcm/FCMService.kt    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/seugi/api/domain/chat/application/service/message/MessageServiceImpl.kt b/src/main/kotlin/com/seugi/api/domain/chat/application/service/message/MessageServiceImpl.kt
index 08cd3d1f9..3ab2fbc06 100644
--- a/src/main/kotlin/com/seugi/api/domain/chat/application/service/message/MessageServiceImpl.kt
+++ b/src/main/kotlin/com/seugi/api/domain/chat/application/service/message/MessageServiceImpl.kt
@@ -53,7 +53,7 @@ class MessageServiceImpl(
 
     private fun sendAlarm(message: Message, userId: Long) {
         fcmService.sendChatAlarm(
-            message = message.message,
+            message = message,
             chatRoomId = message.chatRoomId,
             userId = userId
         )
diff --git a/src/main/kotlin/com/seugi/api/global/infra/fcm/FCMService.kt b/src/main/kotlin/com/seugi/api/global/infra/fcm/FCMService.kt
index 3d981c7e0..4d3f96939 100644
--- a/src/main/kotlin/com/seugi/api/global/infra/fcm/FCMService.kt
+++ b/src/main/kotlin/com/seugi/api/global/infra/fcm/FCMService.kt
@@ -3,6 +3,7 @@ package com.seugi.api.global.infra.fcm
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.Message
 import com.google.firebase.messaging.Notification
+import com.seugi.api.domain.chat.domain.chat.model.Type
 import com.seugi.api.domain.chat.domain.room.ChatRoomEntity
 import com.seugi.api.domain.chat.domain.room.ChatRoomRepository
 import com.seugi.api.domain.chat.exception.ChatErrorCode
@@ -66,17 +67,17 @@ class FCMService(
             .orElseThrow { CustomException(ChatErrorCode.CHAT_ROOM_NOT_FOUND) }
     }
 
-    fun sendChatAlarm(message: String, chatRoomId: String, userId: Long) {
+    fun sendChatAlarm(message: com.seugi.api.domain.chat.domain.chat.model.Message, chatRoomId: String, userId: Long) {
 
         val room = findChatRoomById(chatRoomId)
 
         val sendMember = getMember(userId)
 
-        if (message.isEmpty()) return
+        if (message.message.isEmpty()) return
 
         val notification = buildNotification(
             title = room.chatName.ifEmpty { "1대1 채팅" },
-            body = "${sendMember.name.value} : $message",
+            body = "${sendMember.name.value} : ${if (message.type == Type.FILE) "파일을 보냈습니다." else if (message.type == Type.IMG) "사진을 보냈습니다." else message.message}",
             imageUrl = getAlarmImage(workspace = null, type = FCMEnums.CHAT, member = sendMember)
         )