Merge pull request #98 from YAPP-Github/feature/DRAW-357

DRAW-357 i18n 버그 수정

adapter/firebase/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 
 dependencies {
     implementation(project(":domain"))
+    implementation(project(":app:support:i18n"))
     implementation(project(":support:metric"))
 
     implementation("org.springframework.boot:spring-boot-starter:${Versions.SPRING_BOOT}")

adapter/firebase/src/main/kotlin/com/xorker/draw/firebase/FcmService.kt

@@ -3,15 +3,15 @@ package com.xorker.draw.firebase
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.Message
 import com.google.firebase.messaging.Notification
+import com.xorker.draw.i18n.MessageService
 import com.xorker.draw.notification.PushMessageUseCase
 import com.xorker.draw.websocket.WaitingQueueSession
 import java.util.Locale
-import org.springframework.context.MessageSource
 import org.springframework.stereotype.Service
 
 @Service
 class FcmService(
-    private val messageSource: MessageSource,
+    private val messageService: MessageService,
 ) : PushMessageUseCase {
 
     override fun quickStart(session: WaitingQueueSession) {
@@ -22,8 +22,8 @@ class FcmService(
         val locale = Locale(localeStr)
 
         val notification = Notification.builder()
-            .setTitle(messageSource.getMessage("fcm.quickstart.title", null, locale))
-            .setBody(String.format(messageSource.getMessage("fcm.quickstart.body", null, locale), nickname))
+            .setTitle(messageService.getMessage("fcm.quickstart.title", locale))
+            .setBody(String.format(messageService.getMessage("fcm.quickstart.body", locale), nickname))
             .build()
 
         val message = Message.builder()

app/support/exception/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
 
 dependencies {
     implementation(project(":domain"))
+    implementation(project(":app:support:i18n"))
 
     implementation("org.springframework.boot:spring-boot-starter-web:${Versions.SPRING_BOOT}")
 }

app/support/exception/src/main/kotlin/com/xorker/draw/exception/ExceptionButtonType.kt

@@ -2,8 +2,8 @@ package com.xorker.draw.exception
 
 import com.xorker.draw.exception.ExceptionButtonAction.CloseDialog
 import com.xorker.draw.exception.ExceptionButtonAction.ForceUpdate
+import com.xorker.draw.i18n.MessageService
 import java.util.*
-import org.springframework.context.MessageSource
 
 enum class ExceptionButtonType(
     private val i18nCode: String,
@@ -17,10 +17,10 @@ enum class ExceptionButtonType(
 
     private val responseMap = HashMap<Locale, ExceptionButtonResponse>()
 
-    fun toResponse(source: MessageSource, locale: Locale): ExceptionButtonResponse {
+    fun toResponse(source: MessageService, locale: Locale): ExceptionButtonResponse {
         if (responseMap.containsKey(locale).not()) {
             val response = ExceptionButtonResponse(
-                text = source.getMessage(this.i18nCode, null, locale),
+                text = source.getMessage(this.i18nCode, locale),
                 action = this.action,
             )
 
@@ -62,6 +62,7 @@ fun XorkerException.getButtons(): List<ExceptionButtonType> {
         InvalidRequestOtherPlayingException,
         AlreadyPlayingRoomException,
         InvalidWebSocketStatusException,
+        is NotDefinedMessageCodeException,
         -> buttonOk
     }
 }

app/support/exception/src/main/kotlin/com/xorker/draw/exception/ExceptionDesignFactory.kt

@@ -1,12 +1,12 @@
 package com.xorker.draw.exception
 
-import org.springframework.context.MessageSource
+import com.xorker.draw.i18n.MessageService
 import org.springframework.context.i18n.LocaleContextHolder
 import org.springframework.stereotype.Component
 
 @Component
 class ExceptionDesignFactory(
-    private val messageSource: MessageSource,
+    private val messageService: MessageService,
 ) {
     fun generate(ex: XorkerException): ExceptionDesign {
         return when (ex) {
@@ -20,19 +20,20 @@ class ExceptionDesignFactory(
 
     private fun generateToast(ex: XorkerException): ToastResponse {
         val locale = LocaleContextHolder.getLocale()
-        val text = messageSource.getMessage("exception.${ex.code}.text", null, "ERROR", locale)
-            ?: messageSource.getMessage("exception.default.description", null, locale)
+        val text = messageService.getMessageOrNull("exception.${ex.code}.description", locale)
+            ?: messageService.getMessage("exception.default.description", locale)
 
         return ToastResponse(text)
     }
 
     private fun generateDialog(ex: XorkerException): DialogResponse {
         val locale = LocaleContextHolder.getLocale()
 
-        val title = messageSource.getMessage("exception.${ex.code}.title", null, "ERROR", locale) // TODO 기본 에러 처리 하기
-        val description = messageSource.getMessage("exception.${ex.code}.description", null, null, locale)
-            ?: messageSource.getMessage("exception.default.description", null, locale)
-        val buttons = ex.getButtons().map { it.toResponse(messageSource, locale) }
+        val title = messageService.getMessageOrNull("exception.${ex.code}.title", locale) ?: "ERROR" // TODO 기본 에러 처리 하기
+        val description =
+            messageService.getMessageOrNull("exception.${ex.code}.description", locale)
+                ?: messageService.getMessage("exception.default.description", locale)
+        val buttons = ex.getButtons().map { it.toResponse(messageService, locale) }
 
         return DialogResponse(title, description, buttons)
     }

app/support/i18n/build.gradle.kts

@@ -0,0 +1,19 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+plugins {
+    id("org.springframework.boot")
+    kotlin("plugin.spring")
+}
+
+dependencies {
+    implementation(project(":domain"))
+    implementation(project(":support:logging"))
+    implementation(project(":support:yaml"))
+
+    implementation("org.springframework.boot:spring-boot-starter:${Versions.SPRING_BOOT}")
+}
+
+tasks {
+    withType<Jar> { enabled = true }
+    withType<BootJar> { enabled = false }
+}

app/support/i18n/src/main/kotlin/com/xorker/draw/i18n/MessageConfig.kt

@@ -0,0 +1,30 @@
+package com.xorker.draw.i18n
+
+import org.springframework.context.MessageSource
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.support.ResourceBundleMessageSource
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver
+import org.springframework.core.io.support.ResourcePatternResolver
+
+@Configuration
+class MessageConfig {
+
+    @Bean
+    fun messageSource(): MessageSource {
+        val resolver: ResourcePatternResolver = PathMatchingResourcePatternResolver()
+        val resources = resolver.getResources("classpath*:i18n/*")
+
+        val basename = resources
+            .mapNotNull { it.filename }
+            .map { "i18n/${it.substring(0, it.lastIndexOf('_'))}" }
+            .distinct()
+            .toTypedArray()
+
+        val messageSource = ResourceBundleMessageSource()
+        messageSource.setDefaultEncoding("UTF-8")
+        messageSource.setBasenames(*basename)
+
+        return messageSource
+    }
+}

app/support/i18n/src/main/kotlin/com/xorker/draw/i18n/MessageService.kt

@@ -0,0 +1,33 @@
+package com.xorker.draw.i18n
+
+import com.xorker.draw.exception.NotDefinedMessageCodeException
+import com.xorker.draw.support.logging.logger
+import java.util.Locale
+import org.springframework.context.MessageSource
+import org.springframework.context.NoSuchMessageException
+import org.springframework.stereotype.Component
+
+@Component
+class MessageService(
+    private val messageSource: MessageSource,
+) {
+    private val logger = logger()
+
+    fun getMessage(code: String, locale: Locale): String {
+        try {
+            return messageSource.getMessage(code, null, locale)
+        } catch (e: NoSuchMessageException) {
+            logger.error("i18n Error - $code", e)
+            throw NotDefinedMessageCodeException(code, locale, e)
+        }
+    }
+
+    fun getMessageOrNull(code: String, locale: Locale): String? {
+        try {
+            return messageSource.getMessage(code, null, locale)
+        } catch (e: NoSuchMessageException) {
+            logger.warn("i18n Error - $code", e)
+            return null
+        }
+    }
+}

domain/src/main/kotlin/com/xorker/draw/exception/XorkerException.kt

@@ -1,5 +1,8 @@
 package com.xorker.draw.exception
 
+import java.util.Locale
+import org.springframework.context.NoSuchMessageException
+
 sealed class XorkerException(val code: String, message: String, cause: Throwable? = null) : RuntimeException(message, cause)
 
 //region Client
@@ -36,4 +39,5 @@ data object UnSupportedException : CriticalException("crt003", "정의하지 않
 data object InvalidBroadcastException : CriticalException("crt004", "유효하지 않은 브로드캐스트 상태") { private fun readResolve(): Any = InvalidBroadcastException }
 class InvalidMafiaPhaseException(message: String) : CriticalException("crt005", message)
 data object InvalidWebSocketStatusException : CriticalException("crt006", "웹 소켓 세션 상태가 유효하지 않음") { private fun readResolve(): Any = InvalidWebSocketStatusException }
+class NotDefinedMessageCodeException(messageCode: String, locale: Locale, cause: NoSuchMessageException) : CriticalException("crt007", "정의되지 않은 메시지 코드 $locale $messageCode", cause)
 //endregion

settings.gradle.kts

@@ -6,6 +6,7 @@ include(
     "app:api",
     "app:support:auth",
     "app:support:exception",
+    "app:support:i18n",
     "app:websocket",
     "domain",
     "core",