From ecddf9975f107c478e0d17712e7cf0a47f174f37 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 13 Feb 2025 14:15:34 +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=8B=A8=ED=8E=B8=20=ED=83=AD=20-=20=ED=85=8C?=
 =?UTF-8?q?=EB=A7=88=EB=B3=84=20=EC=BD=98=ED=85=90=EC=B8=A0=20API=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AudioContentMainTabContentController.kt   | 33 ++++++++++++++++++-
 .../AudioContentMainTabContentService.kt      | 23 ++++++++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentController.kt
index 80762a1..375d316 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentController.kt
@@ -2,10 +2,13 @@ package kr.co.vividnext.sodalive.content.main.tab.content
 
 import kr.co.vividnext.sodalive.common.ApiResponse
 import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.member.Member
+import org.springframework.data.domain.Pageable
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -13,10 +16,38 @@ import org.springframework.web.bind.annotation.RestController
 class AudioContentMainTabContentController(private val service: AudioContentMainTabContentService) {
     @GetMapping
     fun fetchContentMainTabContent(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(service.fetchData(member))
+        ApiResponse.ok(
+            service.fetchData(
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member
+            )
+        )
+    }
+
+    @GetMapping("/new-content-by-theme")
+    fun getNewContentByTheme(
+        @RequestParam("theme") theme: String,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
+        pageable: Pageable
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.getNewContentByTheme(
+                theme,
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member
+            )
+        )
     }
 }
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt
index f505e2e..8c20e44 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt
@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.content.main.tab.content
 
 import kr.co.vividnext.sodalive.content.AudioContentRepository
 import kr.co.vividnext.sodalive.content.ContentType
+import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
 import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
 import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
 import kr.co.vividnext.sodalive.event.EventService
@@ -18,7 +19,11 @@ class AudioContentMainTabContentService(
     private val rankingService: RankingService,
     private val eventService: EventService
 ) {
-    fun fetchData(member: Member): GetContentMainTabContentResponse {
+    fun fetchData(
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member
+    ): GetContentMainTabContentResponse {
         val memberId = member.id!!
         val isAdult = member.auth != null
 
@@ -98,4 +103,20 @@ class AudioContentMainTabContentService(
             eventBannerList = eventBannerList
         )
     }
+
+    fun getNewContentByTheme(
+        theme: String,
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member
+    ): List<GetAudioContentMainItem> {
+        return audioContentRepository.findByTheme(
+            memberId = member.id!!,
+            theme = theme,
+            isAdult = member.auth != null && isAdultContentVisible,
+            contentType = contentType,
+            offset = 0,
+            limit = 10
+        )
+    }
 }