From 3e8476431d8eae620cdc8cad4493765d54ba00c3 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 11 Jan 2024 03:50:54 +0900
Subject: [PATCH] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20message=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=20-=20null=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/co/vividnext/sodalive/fcm/FcmEvent.kt     | 16 +++++++++-------
 .../sodalive/member/MemberRepository.kt          |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
index 32a1236..833a825 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
@@ -186,13 +186,15 @@ class FcmSendListener(
             FcmEventType.SEND_MESSAGE -> {
                 val response = memberRepository.getMessageRecipientPushToken(messageId = fcmEvent.messageId!!)
 
-                pushService.send(
-                    tokens = listOf(response.pushToken),
-                    title = fcmEvent.title,
-                    message = fcmEvent.message,
-                    container = response.container,
-                    messageId = fcmEvent.messageId
-                )
+                if (response != null) {
+                    pushService.send(
+                        tokens = listOf(response.pushToken),
+                        title = fcmEvent.title,
+                        message = fcmEvent.message,
+                        container = response.container,
+                        messageId = fcmEvent.messageId
+                    )
+                }
             }
 
             FcmEventType.CHANGE_NOTICE -> {
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
index 1c6094c..214e1b9 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -45,7 +45,7 @@ interface MemberQueryRepository {
         container: String
     ): List<List<String>>
 
-    fun getMessageRecipientPushToken(messageId: Long): GetMessageRecipientPushTokenResponse
+    fun getMessageRecipientPushToken(messageId: Long): GetMessageRecipientPushTokenResponse?
     fun getIndividualRecipientPushTokens(recipients: List<Long>, isAuth: Boolean?): Map<String, List<List<String>>>
     fun getChangeNicknamePrice(memberId: Long): GetChangeNicknamePriceResponse
     fun getMemberByEmail(email: String): Member?
@@ -259,7 +259,7 @@ class MemberQueryRepositoryImpl(
             .chunked(500)
     }
 
-    override fun getMessageRecipientPushToken(messageId: Long): GetMessageRecipientPushTokenResponse {
+    override fun getMessageRecipientPushToken(messageId: Long): GetMessageRecipientPushTokenResponse? {
         return queryFactory
             .select(
                 QGetMessageRecipientPushTokenResponse(