fix(content-preference): 조회 API 선호도 쿼리 파라미터를 제거한다

2026-03-28 18:09:39 +09:00
parent ff47a7686a
commit feb1ab9f13
9 changed files with 73 additions and 104 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeController.kt
@@ -1,7 +1,6 @@
 package kr.co.vividnext.sodalive.api.home

 import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.rank.ContentRankingSortType
@@ -17,15 +16,11 @@ class HomeController(private val service: HomeService) {
    @GetMapping
    fun fetchData(
        @RequestParam timezone: String,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        ApiResponse.ok(
            service.fetchData(
                timezone = timezone,
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                member
            )
        )
@@ -34,15 +29,11 @@ class HomeController(private val service: HomeService) {
    @GetMapping("/latest-content")
    fun getLatestContentByTheme(
        @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?
    ) = run {
        ApiResponse.ok(
            service.getLatestContentByTheme(
                theme = theme,
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                member
            )
        )
@@ -51,15 +42,11 @@ class HomeController(private val service: HomeService) {
    @GetMapping("/day-of-week-series")
    fun getDayOfWeekSeriesList(
        @RequestParam("dayOfWeek") dayOfWeek: SeriesPublishedDaysOfWeek,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        ApiResponse.ok(
            service.getDayOfWeekSeriesList(
                dayOfWeek = dayOfWeek,
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                member
            )
        )
@@ -68,14 +55,10 @@ class HomeController(private val service: HomeService) {
    // 추천 콘텐츠만 새로고침하기 위한 엔드포인트
    @GetMapping("/recommend-contents")
    fun getRecommendContents(
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        ApiResponse.ok(
            service.getRecommendContentList(
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                member = member
            )
        )
@@ -85,8 +68,6 @@ class HomeController(private val service: HomeService) {
    @GetMapping("/content-ranking")
    fun getContentRanking(
        @RequestParam("sort", required = false) sort: ContentRankingSortType? = null,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @RequestParam("offset", required = false) offset: Long? = null,
        @RequestParam("limit", required = false) limit: Long? = null,
        @RequestParam("theme", required = false) theme: String? = null,
@@ -95,8 +76,6 @@ class HomeController(private val service: HomeService) {
        ApiResponse.ok(
            service.getContentRankingBySort(
                sort = sort ?: ContentRankingSortType.REVENUE,
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                offset = offset,
                limit = limit,
                theme = theme,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt
@@ -72,11 +72,9 @@ class HomeService(

    fun fetchData(
        timezone: String,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        member: Member?
    ): GetHomeResponse {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val memberId = member?.id
        val isAdult = preference.isAdult
        val resolvedContentType = preference.contentType
@@ -84,7 +82,6 @@ class HomeService(
        val liveList = liveRoomService.getRoomList(
            dateString = null,
            status = LiveRoomStatus.NOW,
-            isAdultContentVisible = isAdult,
            pageable = Pageable.ofSize(10),
            member = member,
            timezone = timezone
@@ -227,11 +224,9 @@ class HomeService(

    fun getLatestContentByTheme(
        theme: String,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        member: Member?
    ): List<AudioContentMainItem> {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val memberId = member?.id
        val isAdult = preference.isAdult
        val resolvedContentType = preference.contentType
@@ -258,11 +253,9 @@ class HomeService(

    fun getDayOfWeekSeriesList(
        dayOfWeek: SeriesPublishedDaysOfWeek,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        member: Member?
    ): List<GetSeriesListResponse.SeriesListItem> {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val memberId = member?.id
        val isAdult = preference.isAdult

@@ -276,14 +269,12 @@ class HomeService(

    fun getContentRankingBySort(
        sort: ContentRankingSortType,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        offset: Long?,
        limit: Long?,
        theme: String?,
        member: Member?
    ): List<GetAudioContentRankingItem> {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val memberId = member?.id
        val isAdult = preference.isAdult

@@ -328,12 +319,10 @@ class HomeService(
    }

    fun getRecommendContentList(
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        member: Member?,
        excludeContentIds: List<Long> = emptyList()
    ): List<AudioContentMainItem> {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        return getRecommendContentListByPreference(preference, member, excludeContentIds)
    }

@@ -391,16 +380,12 @@ class HomeService(
        return result.take(RECOMMEND_TARGET_SIZE).shuffled()
    }

-    private fun resolvePreference(
-        member: Member?,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ): ViewerContentPreference {
+    private fun resolvePreference(member: Member?): ViewerContentPreference {
        if (member == null) {
            return ViewerContentPreference(
                countryCode = "KR",
-                isAdultContentVisible = isAdultContentVisible ?: false,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = false,
+                contentType = ContentType.ALL,
                isAdult = false
            )
        }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/api/live/LiveApiController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/live/LiveApiController.kt
@@ -1,7 +1,6 @@
 package kr.co.vividnext.sodalive.api.live

 import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
@@ -17,14 +16,10 @@ class LiveApiController(
    @GetMapping
    fun fetchData(
        @RequestParam timezone: String,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        ApiResponse.ok(
            service.fetchData(
-                isAdultContentVisible = isAdultContentVisible,
-                contentType = contentType,
                timezone = timezone,
                member = member
            )
--- a/src/main/kotlin/kr/co/vividnext/sodalive/api/live/LiveApiService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/live/LiveApiService.kt
@@ -24,19 +24,16 @@ class LiveApiService(
    private val blockMemberRepository: BlockMemberRepository
 ) {
    fun fetchData(
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?,
        timezone: String,
        member: Member?
    ): LiveMainResponse {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val memberId = member?.id
        val isAdult = preference.isAdult

        val liveOnAirRoomList = liveService.getRoomList(
            dateString = null,
            status = LiveRoomStatus.NOW,
-            isAdultContentVisible = isAdult,
            pageable = Pageable.ofSize(20),
            member = member,
            timezone = timezone
@@ -81,7 +78,6 @@ class LiveApiService(
        val liveReservationRoomList = liveService.getRoomList(
            dateString = null,
            status = LiveRoomStatus.RESERVATION,
-            isAdultContentVisible = isAdult,
            pageable = Pageable.ofSize(10),
            member = member,
            timezone = timezone
@@ -98,16 +94,12 @@ class LiveApiService(
        )
    }

-    private fun resolvePreference(
-        member: Member?,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ): ViewerContentPreference {
+    private fun resolvePreference(member: Member?): ViewerContentPreference {
        if (member == null) {
            return ViewerContentPreference(
                countryCode = "KR",
-                isAdultContentVisible = isAdultContentVisible ?: false,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = false,
+                contentType = ContentType.ALL,
                isAdult = false
            )
        }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt
@@ -111,13 +111,11 @@ class AudioContentController(
        @RequestParam("creator-id") creatorId: Long,
        @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
        @RequestParam("category-id", required = false) categoryId: Long? = 0,
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            service.getAudioContentList(
@@ -137,11 +135,10 @@ class AudioContentController(
    fun getDetail(
        @PathVariable id: Long,
        @RequestParam timezone: String,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, null)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            service.getDetail(
@@ -194,12 +191,10 @@ class AudioContentController(
    @GetMapping("/ranking")
    fun getAudioContentRanking(
        @RequestParam("sort-type", required = false) sortType: 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 {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val currentDateTime = LocalDateTime.now()
        val startDate = currentDateTime
            .withHour(15)
@@ -247,8 +242,6 @@ class AudioContentController(

    @GetMapping("/all")
    fun getAllContents(
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @RequestParam("isFree", required = false) isFree: Boolean? = null,
        @RequestParam("isPointAvailableOnly", required = false) isPointAvailableOnly: Boolean? = null,
        @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
@@ -257,7 +250,7 @@ class AudioContentController(
        pageable: Pageable
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            service.getLatestContentByTheme(
@@ -276,11 +269,9 @@ class AudioContentController(

    @GetMapping("/replay-live")
    fun replayLive(
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        ApiResponse.ok(
            service.getLatestContentByTheme(
                memberId = member?.id,
@@ -292,16 +283,12 @@ class AudioContentController(
        )
    }

-    private fun resolvePreference(
-        member: Member?,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ): ViewerContentPreference {
+    private fun resolvePreference(member: Member?): ViewerContentPreference {
        if (member == null) {
            return ViewerContentPreference(
                countryCode = "KR",
-                isAdultContentVisible = isAdultContentVisible ?: false,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = false,
+                contentType = ContentType.ALL,
                isAdult = false
            )
        }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeController.kt
@@ -19,11 +19,9 @@ class AudioContentMainTabHomeController(
 ) {
    @GetMapping
    fun fetchContentMainHome(
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        ApiResponse.ok(
            service.fetchData(
                isAdultContentVisible = preference.isAdultContentVisible,
@@ -36,11 +34,9 @@ class AudioContentMainTabHomeController(
    @GetMapping("/popular-content-by-creator")
    fun getPopularContentByCreator(
        @RequestParam creatorId: Long,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        ApiResponse.ok(
            service.getPopularContentByCreator(
                creatorId = creatorId,
@@ -53,11 +49,9 @@ class AudioContentMainTabHomeController(
    @GetMapping("/content/ranking")
    fun getContentRanking(
        @RequestParam("sort-type", required = false) sortType: String? = "매출",
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        ApiResponse.ok(
            service.getContentRanking(
                sortType = sortType ?: "매출",
@@ -68,16 +62,12 @@ class AudioContentMainTabHomeController(
        )
    }

-    private fun resolvePreference(
-        member: Member?,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ): ViewerContentPreference {
+    private fun resolvePreference(member: Member?): ViewerContentPreference {
        if (member == null) {
            return ViewerContentPreference(
                countryCode = "KR",
-                isAdultContentVisible = isAdultContentVisible ?: false,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = false,
+                contentType = ContentType.ALL,
                isAdult = false
            )
        }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
@@ -35,7 +35,6 @@ class LiveRoomController(
        @RequestParam timezone: String,
        @RequestParam dateString: String? = null,
        @RequestParam status: LiveRoomStatus,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
        pageable: Pageable
    ) = run {
@@ -43,7 +42,6 @@ class LiveRoomController(
            service.getRoomList(
                dateString,
                status,
-                isAdultContentVisible,
                pageable,
                member,
                timezone
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -205,12 +205,11 @@ class LiveRoomService(
    fun getRoomList(
        dateString: String?,
        status: LiveRoomStatus,
-        isAdultContentVisible: Boolean?,
        pageable: Pageable,
        member: Member?,
        timezone: String
    ): List<GetRoomListResponse> {
-        val preference = resolvePreference(member, isAdultContentVisible)
+        val preference = resolvePreference(member)
        val isAdult = preference.isAdult
        val effectiveGender = member?.let {
            if (it.auth != null) {
@@ -1470,11 +1469,11 @@ class LiveRoomService(
        return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() }
    }

-    private fun resolvePreference(member: Member?, isAdultContentVisible: Boolean?): ViewerContentPreference {
+    private fun resolvePreference(member: Member?): ViewerContentPreference {
        if (member == null) {
            return ViewerContentPreference(
                countryCode = "KR",
-                isAdultContentVisible = isAdultContentVisible ?: false,
+                isAdultContentVisible = false,
                contentType = ContentType.ALL,
                isAdult = false
            )