diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryService.kt index 7769b621..4bb7ba4d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryService.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.community.domain.CreatorChannelCommunityPost import kr.co.vividnext.sodalive.v2.creator.channel.community.domain.CreatorChannelCommunityQueryPolicy @@ -55,8 +54,7 @@ class CreatorChannelCommunityQueryService( validateCreatorRole(creator) - val preference = memberContentPreferenceService.getStoredPreference(viewer) - val canViewAdultContent = isAdultVisibleByPolicy(viewer, preference.isAdultContentVisible) + val canViewAdultContent = memberContentPreferenceService.canViewAdultContent(viewer) val fetchedPosts = queryPort.findCommunityPosts( creatorId = creatorId, viewerId = viewerId, diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryServiceTest.kt index d8bbaac5..afdd6a63 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/community/application/CreatorChannelCommunityQueryServiceTest.kt @@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.v2.creator.channel.community.application import kr.co.vividnext.sodalive.aws.cloudfront.AudioContentCloudFront 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 @@ -10,7 +9,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.creator.channel.community.domain.CreatorChannelCommunityQueryPolicy import kr.co.vividnext.sodalive.v2.creator.channel.community.port.out.CreatorChannelCommunityCreatorRecord import kr.co.vividnext.sodalive.v2.creator.channel.community.port.out.CreatorChannelCommunityPostRecord @@ -180,15 +178,8 @@ class CreatorChannelCommunityQueryServiceTest { ): CreatorChannelCommunityQueryService { 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 CreatorChannelCommunityQueryService(