fix(chat): DM 텍스트 푸시 문구 키를 분리한다
This commit is contained in:
@@ -1170,6 +1170,11 @@ class SodaMessageSource {
|
|||||||
Lang.EN to "You have received a text message from %s.",
|
Lang.EN to "You have received a text message from %s.",
|
||||||
Lang.JA to "%sからテキストメッセージが届きました。"
|
Lang.JA to "%sからテキストメッセージが届きました。"
|
||||||
),
|
),
|
||||||
|
"message.fcm.dm_received" to mapOf(
|
||||||
|
Lang.KO to "%s님으로 부터 DM이 도착했습니다.",
|
||||||
|
Lang.EN to "You have received a DM from %s.",
|
||||||
|
Lang.JA to "%sからDMが届きました。"
|
||||||
|
),
|
||||||
"message.fcm.voice_received" to mapOf(
|
"message.fcm.voice_received" to mapOf(
|
||||||
Lang.KO to "%s님으로 부터 음성메시지가 도착했습니다.",
|
Lang.KO to "%s님으로 부터 음성메시지가 도착했습니다.",
|
||||||
Lang.EN to "You have received a voice message from %s.",
|
Lang.EN to "You have received a voice message from %s.",
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ class UserCreatorChatService(
|
|||||||
val messageKey = if (message.messageType == UserCreatorChatMessageType.VOICE) {
|
val messageKey = if (message.messageType == UserCreatorChatMessageType.VOICE) {
|
||||||
"message.fcm.voice_received"
|
"message.fcm.voice_received"
|
||||||
} else {
|
} else {
|
||||||
"message.fcm.text_received"
|
"message.fcm.dm_received"
|
||||||
}
|
}
|
||||||
applicationEventPublisher.publishEvent(
|
applicationEventPublisher.publishEvent(
|
||||||
FcmEvent(
|
FcmEvent(
|
||||||
|
|||||||
@@ -21,4 +21,24 @@ class SodaMessageSourceTest {
|
|||||||
sodaMessageSource.getMessage("partner.agent.ratio.not_found", Lang.JA)
|
sodaMessageSource.getMessage("partner.agent.ratio.not_found", Lang.JA)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun shouldProvideDmPushMessagesAndKeepLegacyTextMessage() {
|
||||||
|
assertEquals(
|
||||||
|
"%s님으로 부터 문자메시지가 도착했습니다.",
|
||||||
|
sodaMessageSource.getMessage("message.fcm.text_received", Lang.KO)
|
||||||
|
)
|
||||||
|
assertEquals(
|
||||||
|
"%s님으로 부터 DM이 도착했습니다.",
|
||||||
|
sodaMessageSource.getMessage("message.fcm.dm_received", Lang.KO)
|
||||||
|
)
|
||||||
|
assertEquals(
|
||||||
|
"You have received a DM from %s.",
|
||||||
|
sodaMessageSource.getMessage("message.fcm.dm_received", Lang.EN)
|
||||||
|
)
|
||||||
|
assertEquals(
|
||||||
|
"%sからDMが届きました。",
|
||||||
|
sodaMessageSource.getMessage("message.fcm.dm_received", Lang.JA)
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -197,6 +197,7 @@ class UserCreatorChatServiceTest {
|
|||||||
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
||||||
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
||||||
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
||||||
|
assertEquals("message.fcm.dm_received", eventCaptor.value.messageKey)
|
||||||
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
||||||
assertEquals(null, eventCaptor.value.roomId)
|
assertEquals(null, eventCaptor.value.roomId)
|
||||||
assertEquals(null, eventCaptor.value.messageId)
|
assertEquals(null, eventCaptor.value.messageId)
|
||||||
@@ -229,6 +230,7 @@ class UserCreatorChatServiceTest {
|
|||||||
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
||||||
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
||||||
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
||||||
|
assertEquals("message.fcm.dm_received", eventCaptor.value.messageKey)
|
||||||
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
||||||
Mockito.verifyNoInteractions(roomMessageBroker)
|
Mockito.verifyNoInteractions(roomMessageBroker)
|
||||||
}
|
}
|
||||||
@@ -286,6 +288,7 @@ class UserCreatorChatServiceTest {
|
|||||||
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
val eventCaptor = ArgumentCaptor.forClass(FcmEvent::class.java)
|
||||||
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
Mockito.verify(eventPublisher).publishEvent(eventCaptor.capture())
|
||||||
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
assertEquals(FcmEventType.INDIVIDUAL, eventCaptor.value.type)
|
||||||
|
assertEquals("message.fcm.voice_received", eventCaptor.value.messageKey)
|
||||||
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
||||||
assertEquals(null, eventCaptor.value.roomId)
|
assertEquals(null, eventCaptor.value.roomId)
|
||||||
assertEquals(null, eventCaptor.value.messageId)
|
assertEquals(null, eventCaptor.value.messageId)
|
||||||
|
|||||||
Reference in New Issue
Block a user