diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryService.kt index 565b91f2..8c61a6f8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryService.kt @@ -7,7 +7,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.series.domain.CreatorChannelSeries import kr.co.vividnext.sodalive.v2.creator.channel.series.domain.CreatorChannelSeriesQueryPolicy @@ -56,8 +55,7 @@ class CreatorChannelSeriesQueryService( validateCreatorRole(creator) - val preference = memberContentPreferenceService.getStoredPreference(viewer) - val canViewAdultContent = isAdultVisibleByPolicy(viewer, preference.isAdultContentVisible) + val canViewAdultContent = memberContentPreferenceService.canViewAdultContent(viewer) val locale = langContext.lang.code val fetchedSeries = queryPort.findSeries( creatorId = creatorId, diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryServiceTest.kt index 82accfe1..67f1a03f 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/series/application/CreatorChannelSeriesQueryServiceTest.kt @@ -1,7 +1,6 @@ package kr.co.vividnext.sodalive.v2.creator.channel.series.application import kr.co.vividnext.sodalive.common.SodaException -import kr.co.vividnext.sodalive.content.ContentType import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesState import kr.co.vividnext.sodalive.i18n.Lang @@ -11,7 +10,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.series.domain.CreatorChannelSeriesQueryPolicy import kr.co.vividnext.sodalive.v2.creator.channel.series.port.out.CreatorChannelSeriesCreatorRecord @@ -143,15 +141,8 @@ class CreatorChannelSeriesQueryServiceTest { ): CreatorChannelSeriesQueryService { 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 CreatorChannelSeriesQueryService(