diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryService.kt index 0dd90f21..f3b8e0b5 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryService.kt @@ -6,7 +6,6 @@ import kr.co.vividnext.sodalive.i18n.SodaMessageSource 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.toCdnUrl import kr.co.vividnext.sodalive.v2.creator.channel.audio.domain.CreatorChannelAudioQueryPolicy import kr.co.vividnext.sodalive.v2.creator.channel.audio.domain.CreatorChannelAudioTab @@ -58,8 +57,7 @@ class CreatorChannelAudioQueryService( validateCreatorRole(creator) - val preference = memberContentPreferenceService.getStoredPreference(viewer) - val canViewAdultContent = isAdultVisibleByPolicy(viewer, preference.isAdultContentVisible) + val canViewAdultContent = memberContentPreferenceService.canViewAdultContent(viewer) val resolvedThemeId = themeId?.let(queryPort::findActiveThemeId) val locale = langContext.lang.code val fetchedContents = queryPort.findAudioContents( diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryServiceTest.kt index 38fc6860..6ad0f695 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/audio/application/CreatorChannelAudioQueryServiceTest.kt @@ -1,7 +1,6 @@ package kr.co.vividnext.sodalive.v2.creator.channel.audio.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 @@ -9,7 +8,6 @@ import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberProvider import kr.co.vividnext.sodalive.member.MemberRole 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.audio.domain.CreatorChannelAudioQueryPolicy import kr.co.vividnext.sodalive.v2.creator.channel.audio.port.out.CreatorChannelAudioContentRecord @@ -134,15 +132,8 @@ class CreatorChannelAudioQueryServiceTest { ): CreatorChannelAudioQueryService { 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 langContext = LangContext() langContext.setLang(Lang.EN) return CreatorChannelAudioQueryService(