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 = listOf(), + val recipientsMap: Map>>? = 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 ) ) }