From 780088eb0c72f34f327a67f9d1466041478ff7e9 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Sat, 22 Feb 2025 10:52:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=20=EB=AC=B4=EB=A3=8C=20=ED=83=AD=20-=20=EC=83=88?=
 =?UTF-8?q?=EB=A1=9C=EC=9A=B4=20=EC=BD=98=ED=85=90=EC=B8=A0=20-=20?=
 =?UTF-8?q?=EC=83=81=EB=8B=A8=20=ED=83=AD=EC=97=90=20=EC=9E=88=EB=8A=94=20?=
 =?UTF-8?q?=ED=85=8C=EB=A7=88=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/main/AudioContentMainService.kt   |  2 +-
 .../free/AudioContentMainTabFreeService.kt    | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

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 e1d3031..bd22aea 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
@@ -74,7 +74,7 @@ class AudioContentMainService(
     ): GetNewContentAllResponse {
         val isAdult = member.auth != null && isAdultContentVisible
         val themeList = if (theme.isBlank()) {
-            audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
+            audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = isFree)
                 .filter {
                     it != "오디오북" &&
                         it != "모닝콜" &&
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt
index a320557..a9552f5 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt
@@ -55,9 +55,21 @@ class AudioContentMainTabFreeService(
         val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList(isAdult = isAdult)
 
         val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
+            .filter {
+                it != "오디오북" &&
+                    it != "모닝콜" &&
+                    it != "알람" &&
+                    it != "슬립콜" &&
+                    it != "다시듣기" &&
+                    it != "ASMR" &&
+                    it != "릴레이" &&
+                    it != "챌린지" &&
+                    it != "자기소개"
+            }
         val newFreeContentList = if (themeList.isNotEmpty()) {
             audioContentRepository.findByTheme(
                 memberId = member.id!!,
+                theme = themeList,
                 isAdult = member.auth != null,
                 contentType = ContentType.ALL,
                 offset = 0,
@@ -140,7 +152,21 @@ class AudioContentMainTabFreeService(
             theme = if (theme.isNotBlank()) {
                 listOf(theme)
             } else {
-                emptyList()
+                audioContentThemeRepository.getActiveThemeOfContent(
+                    isAdult = member.auth != null && isAdultContentVisible,
+                    isFree = true
+                )
+                    .filter {
+                        it != "오디오북" &&
+                            it != "모닝콜" &&
+                            it != "알람" &&
+                            it != "슬립콜" &&
+                            it != "다시듣기" &&
+                            it != "ASMR" &&
+                            it != "릴레이" &&
+                            it != "챌린지" &&
+                            it != "자기소개"
+                    }
             },
             isAdult = member.auth != null && isAdultContentVisible,
             contentType = contentType,