From 920a866ae0ff3740e5aa9f9196af677667a2d915 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Fri, 12 Dec 2025 19:46:29 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=EC=BD=98=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=EC=84=9C=20langua?=
 =?UTF-8?q?geCode=EB=A5=BC=20=EB=B3=84=EB=8F=84=EB=A1=9C=20=EB=B0=9B?=
 =?UTF-8?q?=EB=8D=98=20=EA=B2=83=EC=9D=84=20LangContext=EB=A5=BC=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/AudioContentMainController.kt        |  2 --
 .../content/main/AudioContentMainService.kt   | 31 +++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt
index 892306c..c534be5 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt
@@ -100,7 +100,6 @@ class AudioContentMainController(
     @GetMapping("/new/all")
     fun getNewContentAllByTheme(
         @RequestParam("theme") theme: String,
-        @RequestParam("languageCode", required = false) languageCode: String? = null,
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
@@ -113,7 +112,6 @@ class AudioContentMainController(
                 theme = theme,
                 isAdultContentVisible = isAdultContentVisible ?: true,
                 contentType = contentType ?: ContentType.ALL,
-                languageCode = languageCode,
                 member = member,
                 pageable = pageable
             )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt
index addeb8e..d6977a2 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt
@@ -8,6 +8,7 @@ import kr.co.vividnext.sodalive.content.main.curation.GetAudioContentCurationRes
 import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
 import kr.co.vividnext.sodalive.content.translation.ContentTranslationRepository
 import kr.co.vividnext.sodalive.event.EventItem
+import kr.co.vividnext.sodalive.i18n.LangContext
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
 import org.springframework.beans.factory.annotation.Value
@@ -24,6 +25,8 @@ class AudioContentMainService(
 
     private val contentTranslationRepository: ContentTranslationRepository,
 
+    private val langContext: LangContext,
+
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
@@ -60,7 +63,6 @@ class AudioContentMainService(
         theme: String,
         isAdultContentVisible: Boolean,
         contentType: ContentType,
-        languageCode: String?,
         member: Member,
         pageable: Pageable
     ): GetNewContentAllResponse {
@@ -91,24 +93,19 @@ class AudioContentMainService(
         )
             .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) }
 
-        val translatedContentList = if (!languageCode.isNullOrBlank()) {
-            val contentIds = contentList.map { it.contentId }
+        val contentIds = contentList.map { it.contentId }
+        val translatedContentList = if (contentIds.isNotEmpty()) {
+            val translations = contentTranslationRepository
+                .findByContentIdInAndLocale(contentIds = contentIds, locale = langContext.lang.code)
+                .associateBy { it.contentId }
 
-            if (contentIds.isNotEmpty()) {
-                val translations = contentTranslationRepository
-                    .findByContentIdInAndLocale(contentIds = contentIds, locale = languageCode)
-                    .associateBy { it.contentId }
-
-                contentList.map { item ->
-                    val translatedTitle = translations[item.contentId]?.renderedPayload?.title
-                    if (translatedTitle.isNullOrBlank()) {
-                        item
-                    } else {
-                        item.copy(title = translatedTitle)
-                    }
+            contentList.map { item ->
+                val translatedTitle = translations[item.contentId]?.renderedPayload?.title
+                if (translatedTitle.isNullOrBlank()) {
+                    item
+                } else {
+                    item.copy(title = translatedTitle)
                 }
-            } else {
-                contentList
             }
         } else {
             contentList