From 27c66db47a83fda427ad416ca8c6e0164909733c Mon Sep 17 00:00:00 2001 From: Klaus Date: Sun, 12 Jul 2026 19:15:08 +0900 Subject: [PATCH] =?UTF-8?q?fix(chat):=20DM=20=ED=91=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=A0=9C=EB=AA=A9=20=ED=82=A4=EB=A5=BC=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/i18n/SodaMessageSource.kt | 5 +++++ .../v2/usercreatorchat/service/UserCreatorChatService.kt | 7 ++++++- .../v2/usercreatorchat/UserCreatorChatServiceTest.kt | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/i18n/SodaMessageSource.kt b/src/main/kotlin/kr/co/vividnext/sodalive/i18n/SodaMessageSource.kt index f8bdaaaf..7907600b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/i18n/SodaMessageSource.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/i18n/SodaMessageSource.kt @@ -1175,6 +1175,11 @@ class SodaMessageSource { Lang.EN to "You have received a DM from %s.", Lang.JA to "%sからDMが届きました。" ), + "message.fcm.dm_title" to mapOf( + Lang.KO to "DM", + Lang.EN to "DM", + Lang.JA to "DM" + ), "message.fcm.voice_received" to mapOf( Lang.KO to "%s님으로 부터 음성메시지가 도착했습니다.", Lang.EN to "You have received a voice message from %s.", 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 db688b1a..7150767c 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 @@ -226,11 +226,16 @@ class UserCreatorChatService( } else { "message.fcm.dm_received" } + val titleKey = if (messageKey == "message.fcm.dm_received") { + "message.fcm.dm_title" + } else { + "message.fcm.title" + } applicationEventPublisher.publishEvent( FcmEvent( type = FcmEventType.INDIVIDUAL, category = PushNotificationCategory.MESSAGE, - titleKey = "message.fcm.title", + titleKey = titleKey, messageKey = messageKey, senderMemberId = sender.id, args = listOf(sender.nickname), 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 997fbd94..fd564faa 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 @@ -198,6 +198,7 @@ class UserCreatorChatServiceTest { Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture()) assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type) assertEquals("message.fcm.dm_received", eventCaptor.value.messageKey) + assertEquals("message.fcm.dm_title", eventCaptor.value.titleKey) assertEquals(listOf(2L), eventCaptor.value.recipients) assertEquals(null, eventCaptor.value.roomId) assertEquals(null, eventCaptor.value.messageId) @@ -231,6 +232,7 @@ class UserCreatorChatServiceTest { Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture()) assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type) assertEquals("message.fcm.dm_received", eventCaptor.value.messageKey) + assertEquals("message.fcm.dm_title", eventCaptor.value.titleKey) assertEquals(listOf(2L), eventCaptor.value.recipients) Mockito.verifyNoInteractions(roomMessageBroker) } @@ -289,6 +291,7 @@ class UserCreatorChatServiceTest { Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture()) assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type) assertEquals("message.fcm.voice_received", eventCaptor.value.messageKey) + assertEquals("message.fcm.title", eventCaptor.value.titleKey) assertEquals(listOf(2L), eventCaptor.value.recipients) assertEquals(null, eventCaptor.value.roomId) assertEquals(null, eventCaptor.value.messageId)