fix(content-preference): 조회 선호도 오버라이드 파라미터를 제거해 저장값만 사용한다

2026-03-28 00:51:19 +09:00
parent ae68886bdb
commit ff47a7686a
23 changed files with 183 additions and 353 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt
@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.series

 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.creator.admin.content.series.SeriesSortType
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
@@ -25,13 +24,11 @@ class ContentSeriesController(
        @RequestParam(required = false) creatorId: Long?,
        @RequestParam(name = "isOriginal", required = false) isOriginal: Boolean? = null,
        @RequestParam(name = "isCompleted", required = false) isCompleted: Boolean? = null,
-        @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.getSeriesList(
@@ -50,12 +47,10 @@ class ContentSeriesController(
    @GetMapping("/{id}")
    fun getSeriesDetail(
        @PathVariable id: Long,
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            service.getSeriesDetail(
@@ -71,13 +66,11 @@ class ContentSeriesController(
    fun getSeriesContentList(
        @PathVariable id: Long,
        @RequestParam("sortType", required = false) sortType: SeriesSortType? = SeriesSortType.NEWEST,
-        @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.getSeriesContentList(
@@ -94,12 +87,10 @@ class ContentSeriesController(

    @GetMapping("/recommend")
    fun getRecommendSeriesList(
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            service.getRecommendSeriesList(
@@ -110,13 +101,5 @@ class ContentSeriesController(
        )
    }

-    private fun resolvePreference(
-        member: Member,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ) = memberContentPreferenceService.resolveForQuery(
-        member = member,
-        isAdultContentVisible = isAdultContentVisible,
-        contentType = contentType
-    )
+    private fun resolvePreference(member: Member) = memberContentPreferenceService.resolveForQuery(member = member)
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/SeriesMainController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/SeriesMainController.kt
@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.content.series.main
 import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
 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.content.series.ContentSeriesService
 import kr.co.vividnext.sodalive.content.series.main.banner.ContentSeriesBannerService
 import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
@@ -29,12 +28,10 @@ class SeriesMainController(
 ) {
    @GetMapping
    fun fetchData(
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        val banners = bannerService.getActiveBanners(PageRequest.of(0, 10))
            .content
@@ -69,12 +66,10 @@ class SeriesMainController(

    @GetMapping("/recommend")
    fun getRecommendSeriesList(
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        ApiResponse.ok(
            contentSeriesService.getRecommendSeriesList(
@@ -88,14 +83,12 @@ class SeriesMainController(
    @GetMapping("/day-of-week")
    fun getDayOfWeekSeriesList(
        @RequestParam("dayOfWeek") dayOfWeek: SeriesPublishedDaysOfWeek,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @RequestParam(defaultValue = "0") page: Int,
        @RequestParam(defaultValue = "20") size: Int,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val pageable = PageRequest.of(page, size)

        ApiResponse.ok(
@@ -112,12 +105,10 @@ class SeriesMainController(

    @GetMapping("/genre-list")
    fun getGenreList(
-        @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(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)

        val memberId = member.id!!
        val isAdult = preference.isAdult
@@ -134,14 +125,12 @@ class SeriesMainController(
    @GetMapping("/list-by-genre")
    fun getSeriesListByGenre(
        @RequestParam("genreId") genreId: Long,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @RequestParam(defaultValue = "0") page: Int,
        @RequestParam(defaultValue = "20") size: Int,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
-        val preference = resolvePreference(member, isAdultContentVisible, contentType)
+        val preference = resolvePreference(member)
        val pageable = PageRequest.of(page, size)

        ApiResponse.ok(
@@ -156,13 +145,5 @@ class SeriesMainController(
        )
    }

-    private fun resolvePreference(
-        member: Member,
-        isAdultContentVisible: Boolean?,
-        contentType: ContentType?
-    ) = memberContentPreferenceService.resolveForQuery(
-        member = member,
-        isAdultContentVisible = isAdultContentVisible,
-        contentType = contentType
-    )
+    private fun resolvePreference(member: Member) = memberContentPreferenceService.resolveForQuery(member = member)
 }