푸시 알림 전송 언어 처리

src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionService.kt

@@ -7,8 +7,6 @@ import kr.co.vividnext.sodalive.aws.s3.S3Uploader
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.fcm.FcmEvent
 import kr.co.vividnext.sodalive.fcm.FcmEventType
-import kr.co.vividnext.sodalive.i18n.LangContext
-import kr.co.vividnext.sodalive.i18n.SodaMessageSource
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.ApplicationEventPublisher
@@ -24,8 +22,6 @@ class AdminAuditionService(
     private val repository: AdminAuditionRepository,
     private val roleRepository: AdminAuditionRoleRepository,
     private val applicationEventPublisher: ApplicationEventPublisher,
-    private val langContext: LangContext,
-    private val messageSource: SodaMessageSource,
 
     @Value("\${cloud.aws.s3.bucket}")
     private val bucket: String
@@ -92,14 +88,12 @@ class AdminAuditionService(
         }
 
         if (request.status != null && request.status == AuditionStatus.IN_PROGRESS && audition.isActive) {
-            val title = messageSource.getMessage("admin.audition.fcm.title.new", langContext.lang).orEmpty()
-            val messageTemplate = messageSource.getMessage("admin.audition.fcm.message.new", langContext.lang).orEmpty()
-            val message = String.format(messageTemplate, audition.title)
             applicationEventPublisher.publishEvent(
                 FcmEvent(
                     type = FcmEventType.IN_PROGRESS_AUDITION,
-                    title = title,
-                    message = message,
+                    titleKey = "admin.audition.fcm.title.new",
+                    messageKey = "admin.audition.fcm.message.new",
+                    args = listOf(audition.title),
                     isAuth = audition.isAdult,
                     auditionId = audition.id ?: -1
                 )

src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt

@@ -321,20 +321,17 @@ class AdminLiveService(
             }
 
             // 예약현황 취소
-            val pushTokenListMap = memberRepository.getPushTokenFromReservationList(room.id!!)
+            val pushTokens = memberRepository.getPushTokenFromReservationList(room.id!!)
             reservationRepository.cancelReservation(roomId = room.id!!)
 
             // 라이브 취소 푸시 발송
-            val cancelMessageTemplate = messageSource
-                .getMessage("live.room.fcm.message.canceled", langContext.lang)
-                .orEmpty()
-            val cancelMessage = String.format(cancelMessageTemplate, room.title)
             applicationEventPublisher.publishEvent(
                 FcmEvent(
                     type = FcmEventType.CANCEL_LIVE,
                     title = room.member!!.nickname,
-                    message = cancelMessage,
-                    recipientsMap = pushTokenListMap
+                    messageKey = "live.room.fcm.message.canceled",
+                    args = listOf(room.title),
+                    pushTokens = pushTokens
                 )
             )
         }