feat(content-preference): 콘텐츠 조회 설정 서버 저장 전환을 반영한다

2026-03-27 13:33:51 +09:00
parent 1ba3cb8a40
commit a87bd147dc
75 changed files with 3593 additions and 301 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
@@ -5,6 +5,7 @@ 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
 import org.springframework.data.domain.Pageable
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
@@ -15,7 +16,10 @@ import org.springframework.web.bind.annotation.RestController

@RestController
@RequestMapping("/audio-content/series")
-class ContentSeriesController(private val service: ContentSeriesService) {
+class ContentSeriesController(
+    private val service: ContentSeriesService,
+    private val memberContentPreferenceService: MemberContentPreferenceService
+) {
    @GetMapping
    fun getSeriesList(
        @RequestParam(required = false) creatorId: Long?,
@@ -27,14 +31,15 @@ class ContentSeriesController(private val service: ContentSeriesService) {
        pageable: Pageable
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
+        val preference = resolvePreference(member, isAdultContentVisible, contentType)

        ApiResponse.ok(
            service.getSeriesList(
                creatorId = creatorId,
                isOriginal = isOriginal ?: false,
                isCompleted = isCompleted ?: false,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member,
                offset = pageable.offset,
                limit = pageable.pageSize.toLong()
@@ -50,12 +55,13 @@ class ContentSeriesController(private val service: ContentSeriesService) {
        @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)

        ApiResponse.ok(
            service.getSeriesDetail(
                seriesId = id,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member
            )
        )
@@ -71,12 +77,13 @@ class ContentSeriesController(private val service: ContentSeriesService) {
        pageable: Pageable
    ) = run {
        if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
+        val preference = resolvePreference(member, isAdultContentVisible, contentType)

        ApiResponse.ok(
            service.getSeriesContentList(
                seriesId = id,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member,
                sortType = sortType ?: SeriesSortType.NEWEST,
                offset = pageable.offset,
@@ -92,13 +99,24 @@ class ContentSeriesController(private val service: ContentSeriesService) {
        @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)

        ApiResponse.ok(
            service.getRecommendSeriesList(
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member
            )
        )
    }
+
+    private fun resolvePreference(
+        member: Member,
+        isAdultContentVisible: Boolean?,
+        contentType: ContentType?
+    ) = memberContentPreferenceService.resolveForQuery(
+        member = member,
+        isAdultContentVisible = isAdultContentVisible,
+        contentType = contentType
+    )
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
@@ -918,8 +918,10 @@ class ContentSeriesQueryRepositoryImpl(
            .and(blockMember.id.isNull)

        if (!isAdult) {
+            // 비성인 조회에서는 장르/시리즈/콘텐츠 3계층 모두에서 성인 항목을 제외한다.
            where = where.and(seriesGenre.isAdult.isFalse)
                .and(series.isAdult.isFalse)
+                .and(audioContent.isAdult.isFalse)
        } else {
            if (contentType != ContentType.ALL) {
                where = where.and(
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt
@@ -21,6 +21,7 @@ import kr.co.vividnext.sodalive.i18n.translation.PapagoTranslationService
 import kr.co.vividnext.sodalive.i18n.translation.TranslateRequest
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
+import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -168,7 +169,7 @@ class ContentSeriesService(
        offset: Long = 0,
        limit: Long = 20
    ): GetSeriesListResponse {
-        val isAuth = member.auth != null && isAdultContentVisible
+        val isAuth = isAdultVisibleByPolicy(member, isAdultContentVisible)

        val totalCount = repository.getSeriesTotalCount(
            creatorId = creatorId,
@@ -206,7 +207,7 @@ class ContentSeriesService(
        offset: Long = 0,
        limit: Long = 20
    ): GetSeriesListResponse {
-        val isAuth = member.auth != null && isAdultContentVisible
+        val isAuth = isAdultVisibleByPolicy(member, isAdultContentVisible)

        val totalCount = repository.getSeriesByGenreTotalCount(
            genreId = genreId,
@@ -240,7 +241,7 @@ class ContentSeriesService(
    ): GetSeriesDetailResponse {
        val series = repository.getSeriesDetail(
            seriesId = seriesId,
-            isAuth = member.auth != null && isAdultContentVisible,
+            isAuth = isAdultVisibleByPolicy(member, isAdultContentVisible),
            contentType = contentType
        ) ?: throw SodaException(messageKey = "series.error.invalid_series_retry")

@@ -428,7 +429,7 @@ class ContentSeriesService(
        offset: Long,
        limit: Long
    ): GetSeriesContentListResponse {
-        val isAdult = member.auth != null && isAdultContentVisible
+        val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)

        val totalCount = seriesContentRepository.getContentCount(seriesId, isAdult = isAdult, contentType = contentType)
        val contentList = seriesContentRepository.getContentList(
@@ -491,7 +492,7 @@ class ContentSeriesService(
        contentType: ContentType,
        member: Member
    ): List<GetSeriesListResponse.SeriesListItem> {
-        val isAuth = member.auth != null && isAdultContentVisible
+        val isAuth = isAdultVisibleByPolicy(member, isAdultContentVisible)
        return repository.getRecommendSeriesListV2(
            imageHost = coverImageHost,
            isAuth = isAuth,
--- 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
@@ -8,6 +8,7 @@ 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
 import kr.co.vividnext.sodalive.member.Member
+import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.domain.PageRequest
 import org.springframework.security.core.annotation.AuthenticationPrincipal
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController
 class SeriesMainController(
    private val contentSeriesService: ContentSeriesService,
    private val bannerService: ContentSeriesBannerService,
+    private val memberContentPreferenceService: MemberContentPreferenceService,

    @Value("\${cloud.aws.cloud-front.host}")
    private val imageHost: String
@@ -32,6 +34,7 @@ class SeriesMainController(
        @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 banners = bannerService.getActiveBanners(PageRequest.of(0, 10))
            .content
@@ -43,14 +46,14 @@ class SeriesMainController(
            creatorId = null,
            isCompleted = true,
            orderByRandom = true,
-            isAdultContentVisible = isAdultContentVisible ?: true,
-            contentType = contentType ?: ContentType.ALL,
+            isAdultContentVisible = preference.isAdultContentVisible,
+            contentType = preference.contentType,
            member = member
        ).items

        val recommendSeriesList = contentSeriesService.getRecommendSeriesList(
-            isAdultContentVisible = isAdultContentVisible ?: true,
-            contentType = contentType ?: ContentType.ALL,
+            isAdultContentVisible = preference.isAdultContentVisible,
+            contentType = preference.contentType,
            member = member
        )

@@ -71,11 +74,12 @@ class SeriesMainController(
        @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)

        ApiResponse.ok(
            contentSeriesService.getRecommendSeriesList(
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member
            )
        )
@@ -91,13 +95,14 @@ class SeriesMainController(
        @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 pageable = PageRequest.of(page, size)

        ApiResponse.ok(
            contentSeriesService.getDayOfWeekSeriesList(
                memberId = member.id,
-                isAdult = member.auth != null && (isAdultContentVisible ?: true),
-                contentType = contentType ?: ContentType.ALL,
+                isAdult = preference.isAdult,
+                contentType = preference.contentType,
                dayOfWeek = dayOfWeek,
                offset = pageable.offset,
                limit = pageable.pageSize.toLong()
@@ -112,15 +117,16 @@ class SeriesMainController(
        @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 memberId = member.id!!
-        val isAdult = member.auth != null && (isAdultContentVisible ?: true)
+        val isAdult = preference.isAdult

        ApiResponse.ok(
            contentSeriesService.getGenreList(
                memberId = memberId,
                isAdult = isAdult,
-                contentType = contentType ?: ContentType.ALL
+                contentType = preference.contentType
            )
        )
    }
@@ -135,17 +141,28 @@ class SeriesMainController(
        @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 pageable = PageRequest.of(page, size)

        ApiResponse.ok(
            contentSeriesService.getSeriesListByGenre(
                genreId = genreId,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
+                isAdultContentVisible = preference.isAdultContentVisible,
+                contentType = preference.contentType,
                member = member,
                offset = pageable.offset,
                limit = pageable.pageSize.toLong()
            )
        )
    }
+
+    private fun resolvePreference(
+        member: Member,
+        isAdultContentVisible: Boolean?,
+        contentType: ContentType?
+    ) = memberContentPreferenceService.resolveForQuery(
+        member = member,
+        isAdultContentVisible = isAdultContentVisible,
+        contentType = contentType
+    )
 }