From 190c63124bcd7265981875b2931331ad36cdb4c3 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 17 Sep 2026 20:18:45 +0900 Subject: [PATCH] =?UTF-8?q?refactor(content-main):=20=ED=99=88=C2=B7?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=EB=93=A3=EA=B8=B0=C2=B7=EC=8B=9C=EB=A6=AC?= =?UTF-8?q?=EC=A6=88=20=ED=83=AD=20=EC=A0=95=EC=B1=85=20=ED=98=B8=EC=B6=9C?= =?UTF-8?q?=EC=9D=84=20=ED=86=B5=ED=95=A9=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/tab/home/AudioContentMainTabHomeService.kt | 13 +++++++++---- .../replay/AudioContentMainTabLiveReplayService.kt | 7 ++++--- .../tab/series/AudioContentMainTabSeriesService.kt | 7 ++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt index c066fab0..90d37fbd 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt @@ -5,7 +5,7 @@ import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.event.EventService import kr.co.vividnext.sodalive.member.Member -import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy +import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService import kr.co.vividnext.sodalive.notice.ServiceNoticeService import kr.co.vividnext.sodalive.rank.RankingService import org.springframework.stereotype.Service @@ -19,7 +19,8 @@ class AudioContentMainTabHomeService( private val noticeService: ServiceNoticeService, private val bannerService: AudioContentBannerService, private val rankingService: RankingService, - private val eventService: EventService + private val eventService: EventService, + private val memberContentPreferenceService: MemberContentPreferenceService ) { fun fetchData( isAdultContentVisible: Boolean, @@ -43,7 +44,9 @@ class AudioContentMainTabHomeService( val formattedLastMonday = startDate.format(startDateFormatter) val formattedLastSunday = endDate.format(endDateFormatter) - val isAdult = member?.let { isAdultVisibleByPolicy(it, isAdultContentVisible) } ?: false + val isAdult = member + ?.let { memberContentPreferenceService.isAdultVisibleForQuery(it, isAdultContentVisible) } + ?: false // 최근 공지사항 val latestNotice = noticeService.getLatestNotice() @@ -131,7 +134,9 @@ class AudioContentMainTabHomeService( contentType: ContentType, member: Member? ): List { - val isAdult = member?.let { isAdultVisibleByPolicy(it, isAdultContentVisible) } ?: false + val isAdult = member + ?.let { memberContentPreferenceService.isAdultVisibleForQuery(it, isAdultContentVisible) } + ?: false val currentDateTime = LocalDateTime.now() val startDate = currentDateTime diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayService.kt index 6a2e6a84..adaf393f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayService.kt @@ -9,7 +9,7 @@ import kr.co.vividnext.sodalive.content.main.tab.AudioContentMainTabRepository import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse import kr.co.vividnext.sodalive.event.EventService import kr.co.vividnext.sodalive.member.Member -import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy +import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService import kr.co.vividnext.sodalive.rank.RankingService import org.springframework.stereotype.Service @@ -20,14 +20,15 @@ class AudioContentMainTabLiveReplayService( private val contentRepository: AudioContentRepository, private val rankingService: RankingService, private val eventService: EventService, - private val curationRepository: AudioContentCurationQueryRepository + private val curationRepository: AudioContentCurationQueryRepository, + private val memberContentPreferenceService: MemberContentPreferenceService ) { fun fetchData( isAdultContentVisible: Boolean, contentType: ContentType, member: Member ): GetContentMainTabLiveReplayResponse { - val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible) + val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible) val memberId = member.id!! val theme = "다시듣기" val tabId = 6L diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt index 4e6fea5b..fd90c425 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt @@ -8,7 +8,7 @@ import kr.co.vividnext.sodalive.content.series.ContentSeriesService import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.event.EventService import kr.co.vividnext.sodalive.member.Member -import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy +import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService import kr.co.vividnext.sodalive.rank.RankingService import org.springframework.stereotype.Service import java.time.DayOfWeek @@ -24,14 +24,15 @@ class AudioContentMainTabSeriesService( private val rankingService: RankingService, private val recommendSeriesRepository: RecommendSeriesRepository, private val eventService: EventService, - private val curationRepository: AudioContentCurationQueryRepository + private val curationRepository: AudioContentCurationQueryRepository, + private val memberContentPreferenceService: MemberContentPreferenceService ) { fun fetchData( isAdultContentVisible: Boolean, contentType: ContentType, member: Member ): GetContentMainTabSeriesResponse { - val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible) + val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible) val memberId = member.id!! // 메인 배너 (시리즈)