From b34585afd2b286e8768885e1c0a76d486d93b6f6 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 23 Jun 2026 22:41:29 +0900 Subject: [PATCH] =?UTF-8?q?refactor(creator-channel):=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=ED=83=AD=20=EC=84=B1=EC=9D=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EC=A0=95=EC=B1=85=20=ED=98=B8=EC=B6=9C=EC=9D=84=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/CreatorChannelLiveQueryService.kt | 4 +--- .../CreatorChannelLiveQueryServiceTest.kt | 13 ++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt index 07360f11..bd09bc8a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt @@ -7,7 +7,6 @@ import kr.co.vividnext.sodalive.member.Gender import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberRole import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService -import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy import kr.co.vividnext.sodalive.v2.common.domain.ContentSort import kr.co.vividnext.sodalive.v2.common.domain.toCdnUrl import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent @@ -58,8 +57,7 @@ class CreatorChannelLiveQueryService( validateCreatorRole(creator) - val preference = memberContentPreferenceService.getStoredPreference(viewer) - val canViewAdultContent = isAdultVisibleByPolicy(viewer, preference.isAdultContentVisible) + val canViewAdultContent = memberContentPreferenceService.canViewAdultContent(viewer) val isViewerCreator = viewerId == creatorId val effectiveViewerGender = viewer.effectiveGender() val fetchedContents = queryPort.findLiveReplayAudioContents( diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryServiceTest.kt index c669f7e5..b631c0e5 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryServiceTest.kt @@ -1,7 +1,6 @@ package kr.co.vividnext.sodalive.v2.creator.channel.live.application import kr.co.vividnext.sodalive.common.SodaException -import kr.co.vividnext.sodalive.content.ContentType import kr.co.vividnext.sodalive.i18n.Lang import kr.co.vividnext.sodalive.i18n.LangContext import kr.co.vividnext.sodalive.i18n.SodaMessageSource @@ -11,7 +10,6 @@ import kr.co.vividnext.sodalive.member.MemberProvider import kr.co.vividnext.sodalive.member.MemberRole import kr.co.vividnext.sodalive.member.auth.Auth import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService -import kr.co.vividnext.sodalive.member.contentpreference.ViewerContentPreference import kr.co.vividnext.sodalive.v2.common.domain.ContentSort import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLiveReplayQueryPolicy import kr.co.vividnext.sodalive.v2.creator.channel.live.port.out.CreatorChannelAudioContentRecord @@ -220,15 +218,8 @@ class CreatorChannelLiveQueryServiceTest { ): CreatorChannelLiveQueryService { val preferenceService = Mockito.mock(MemberContentPreferenceService::class.java) Mockito.`when`( - preferenceService.getStoredPreference(Mockito.any(Member::class.java) ?: createMember(id = 0L)) - ).thenReturn( - ViewerContentPreference( - countryCode = "US", - isAdultContentVisible = canViewAdultContent, - contentType = ContentType.ALL, - isAdult = canViewAdultContent - ) - ) + preferenceService.canViewAdultContent(Mockito.any(Member::class.java) ?: createMember(id = 0L)) + ).thenReturn(canViewAdultContent) val messageSource = SodaMessageSource() val langContext = LangContext() langContext.setLang(Lang.KO)