fix(chat): DM 푸시 제목 키를 분리한다
This commit is contained in:
@@ -1175,6 +1175,11 @@ class SodaMessageSource {
|
|||||||
Lang.EN to "You have received a DM from %s.",
|
Lang.EN to "You have received a DM from %s.",
|
||||||
Lang.JA to "%sからDMが届きました。"
|
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(
|
"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.",
|
||||||
|
|||||||
@@ -226,11 +226,16 @@ class UserCreatorChatService(
|
|||||||
} else {
|
} else {
|
||||||
"message.fcm.dm_received"
|
"message.fcm.dm_received"
|
||||||
}
|
}
|
||||||
|
val titleKey = if (messageKey == "message.fcm.dm_received") {
|
||||||
|
"message.fcm.dm_title"
|
||||||
|
} else {
|
||||||
|
"message.fcm.title"
|
||||||
|
}
|
||||||
applicationEventPublisher.publishEvent(
|
applicationEventPublisher.publishEvent(
|
||||||
FcmEvent(
|
FcmEvent(
|
||||||
type = FcmEventType.INDIVIDUAL,
|
type = FcmEventType.INDIVIDUAL,
|
||||||
category = PushNotificationCategory.MESSAGE,
|
category = PushNotificationCategory.MESSAGE,
|
||||||
titleKey = "message.fcm.title",
|
titleKey = titleKey,
|
||||||
messageKey = messageKey,
|
messageKey = messageKey,
|
||||||
senderMemberId = sender.id,
|
senderMemberId = sender.id,
|
||||||
args = listOf(sender.nickname),
|
args = listOf(sender.nickname),
|
||||||
|
|||||||
@@ -198,6 +198,7 @@ class UserCreatorChatServiceTest {
|
|||||||
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("message.fcm.dm_received", eventCaptor.value.messageKey)
|
||||||
|
assertEquals("message.fcm.dm_title", eventCaptor.value.titleKey)
|
||||||
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)
|
||||||
@@ -231,6 +232,7 @@ class UserCreatorChatServiceTest {
|
|||||||
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("message.fcm.dm_received", eventCaptor.value.messageKey)
|
||||||
|
assertEquals("message.fcm.dm_title", eventCaptor.value.titleKey)
|
||||||
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
assertEquals(listOf(2L), eventCaptor.value.recipients)
|
||||||
Mockito.verifyNoInteractions(roomMessageBroker)
|
Mockito.verifyNoInteractions(roomMessageBroker)
|
||||||
}
|
}
|
||||||
@@ -289,6 +291,7 @@ class UserCreatorChatServiceTest {
|
|||||||
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("message.fcm.voice_received", eventCaptor.value.messageKey)
|
||||||
|
assertEquals("message.fcm.title", eventCaptor.value.titleKey)
|
||||||
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