diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/service/UserCreatorChatService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/service/UserCreatorChatService.kt index 41b656ac..c1d6206c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/service/UserCreatorChatService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/service/UserCreatorChatService.kt @@ -4,6 +4,7 @@ import com.amazonaws.services.s3.model.ObjectMetadata import com.fasterxml.jackson.databind.ObjectMapper import kr.co.vividnext.sodalive.aws.s3.S3Uploader import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.fcm.FcmDeepLinkValue import kr.co.vividnext.sodalive.fcm.FcmEvent import kr.co.vividnext.sodalive.fcm.FcmEventType import kr.co.vividnext.sodalive.fcm.notification.PushNotificationCategory @@ -223,9 +224,8 @@ class UserCreatorChatService( senderMemberId = sender.id, args = listOf(sender.nickname), recipients = listOf(opponent.id!!), - roomId = message.chatRoom.id, - messageId = message.id, - chatType = USER_CREATOR_CHAT_TYPE + deepLinkValue = FcmDeepLinkValue.CHAT, + deepLinkId = message.chatRoom.id ) ) } @@ -287,8 +287,4 @@ class UserCreatorChatService( val senderParticipant: UserCreatorChatParticipant, val opponentParticipant: UserCreatorChatParticipant ) - - companion object { - private const val USER_CREATOR_CHAT_TYPE = "USER_CREATOR" - } } diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/UserCreatorChatServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/UserCreatorChatServiceTest.kt index 4caba97c..0464b044 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/UserCreatorChatServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/usercreatorchat/UserCreatorChatServiceTest.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.v2.usercreatorchat import com.amazonaws.services.s3.model.ObjectMetadata import com.fasterxml.jackson.databind.ObjectMapper import kr.co.vividnext.sodalive.aws.s3.S3Uploader +import kr.co.vividnext.sodalive.fcm.FcmDeepLinkValue import kr.co.vividnext.sodalive.fcm.FcmEvent import kr.co.vividnext.sodalive.fcm.FcmEventType import kr.co.vividnext.sodalive.member.Member @@ -195,9 +196,11 @@ class UserCreatorChatServiceTest { Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture()) assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type) assertEquals(listOf(2L), eventCaptor.value.recipients) - assertEquals(10L, eventCaptor.value.roomId) - assertEquals(204L, eventCaptor.value.messageId) - assertEquals("USER_CREATOR", eventCaptor.value.chatType) + assertEquals(null, eventCaptor.value.roomId) + assertEquals(null, eventCaptor.value.messageId) + assertEquals(null, eventCaptor.value.chatType) + assertEquals(FcmDeepLinkValue.CHAT, eventCaptor.value.deepLinkValue) + assertEquals(10L, eventCaptor.value.deepLinkId) Mockito.verifyNoInteractions(roomMessageBroker) } @@ -255,9 +258,11 @@ class UserCreatorChatServiceTest { Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture()) assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type) assertEquals(listOf(2L), eventCaptor.value.recipients) - assertEquals(10L, eventCaptor.value.roomId) - assertEquals(206L, eventCaptor.value.messageId) - assertEquals("USER_CREATOR", eventCaptor.value.chatType) + assertEquals(null, eventCaptor.value.roomId) + assertEquals(null, eventCaptor.value.messageId) + assertEquals(null, eventCaptor.value.chatType) + assertEquals(FcmDeepLinkValue.CHAT, eventCaptor.value.deepLinkValue) + assertEquals(10L, eventCaptor.value.deepLinkId) Mockito.verifyNoInteractions(roomMessageBroker) }