From 896246d9edc7ec644c493ccc8e40b86073f5e86a Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Fri, 1 Sep 2023 17:13:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C=20=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt    | 10 ++++------
 .../co/vividnext/sodalive/live/room/LiveRoomService.kt |  3 ++-
 2 files changed, 6 insertions(+), 7 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 ad25846..bd8d174 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
@@ -19,6 +19,7 @@ class FcmEvent(
     val message: String,
     val container: String = "",
     val recipients: List<Long> = listOf(),
+    val recipientsMap: Map<String, List<List<String>>>? = null,
     val isAuth: Boolean = false,
     val roomId: Long? = null,
     val contentId: Long? = null,
@@ -133,12 +134,9 @@ class FcmSendListener(
             }
 
             FcmEventType.CANCEL_LIVE -> {
-                if (fcmEvent.roomId != null) {
-                    val pushTokenList = memberRepository.getPushTokenFromReservationList(fcmEvent.roomId)
-
-                    val iosPushTokens = pushTokenList["ios"]
-                    val aosPushToken = pushTokenList["aos"]
-
+                if (fcmEvent.recipientsMap != null) {
+                    val iosPushTokens = fcmEvent.recipientsMap["ios"]
+                    val aosPushToken = fcmEvent.recipientsMap["aos"]
                     if (iosPushTokens != null) {
                         for (tokens in iosPushTokens) {
                             pushService.send(
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
index 647377a..576cdc7 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -474,6 +474,7 @@ class LiveRoomService(
             }
         }
 
+        val pushTokenListMap = memberRepository.getPushTokenFromReservationList(request.roomId)
         reservationRepository.cancelReservation(roomId = room.id!!)
 
         applicationEventPublisher.publishEvent(
@@ -481,7 +482,7 @@ class LiveRoomService(
                 type = FcmEventType.CANCEL_LIVE,
                 title = room.member!!.nickname,
                 message = "라이브 취소 : ${room.title}",
-                roomId = request.roomId
+                recipientsMap = pushTokenListMap
             )
         )
     }