Test #451
@@ -38,7 +38,7 @@ import kr.co.vividnext.sodalive.i18n.translation.ResourceTranslationJobScheduler
|
|||||||
import kr.co.vividnext.sodalive.member.Member
|
import kr.co.vividnext.sodalive.member.Member
|
||||||
import kr.co.vividnext.sodalive.member.MemberRepository
|
import kr.co.vividnext.sodalive.member.MemberRepository
|
||||||
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
|
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
|
||||||
import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
|
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
|
||||||
import kr.co.vividnext.sodalive.utils.generateFileName
|
import kr.co.vividnext.sodalive.utils.generateFileName
|
||||||
import kr.co.vividnext.sodalive.v2.home.following.application.HomeFollowingNewsPublishService
|
import kr.co.vividnext.sodalive.v2.home.following.application.HomeFollowingNewsPublishService
|
||||||
import kr.co.vividnext.sodalive.v2.recommendation.application.CreatorContentViewHistoryService
|
import kr.co.vividnext.sodalive.v2.recommendation.application.CreatorContentViewHistoryService
|
||||||
@@ -90,6 +90,7 @@ class AudioContentService(
|
|||||||
|
|
||||||
private val contentThemeTranslationRepository: ContentThemeTranslationRepository,
|
private val contentThemeTranslationRepository: ContentThemeTranslationRepository,
|
||||||
private val homeFollowingNewsPublishService: HomeFollowingNewsPublishService,
|
private val homeFollowingNewsPublishService: HomeFollowingNewsPublishService,
|
||||||
|
private val memberContentPreferenceService: MemberContentPreferenceService,
|
||||||
|
|
||||||
@Value("\${cloud.aws.s3.content-bucket}")
|
@Value("\${cloud.aws.s3.content-bucket}")
|
||||||
private val audioContentBucket: String,
|
private val audioContentBucket: String,
|
||||||
@@ -616,7 +617,7 @@ class AudioContentService(
|
|||||||
isAdultContentVisible: Boolean,
|
isAdultContentVisible: Boolean,
|
||||||
timezone: String
|
timezone: String
|
||||||
): GetAudioContentDetailResponse {
|
): GetAudioContentDetailResponse {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
|
|
||||||
// 오디오 콘텐츠 조회 (content_id, 제목, 내용, 테마, 태그, 19여부, 이미지, 콘텐츠 PATH)
|
// 오디오 콘텐츠 조회 (content_id, 제목, 내용, 테마, 태그, 19여부, 이미지, 콘텐츠 PATH)
|
||||||
val audioContent = repository.findByIdOrNull(id)
|
val audioContent = repository.findByIdOrNull(id)
|
||||||
@@ -977,7 +978,7 @@ class AudioContentService(
|
|||||||
member: Member,
|
member: Member,
|
||||||
isAdultContentVisible: Boolean
|
isAdultContentVisible: Boolean
|
||||||
): GetAudioContentListItem? {
|
): GetAudioContentListItem? {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
|
|
||||||
if (isBlockedBetweenMembers(memberId = member.id!!, creatorId = creatorId)) {
|
if (isBlockedBetweenMembers(memberId = member.id!!, creatorId = creatorId)) {
|
||||||
return null
|
return null
|
||||||
@@ -1051,7 +1052,7 @@ class AudioContentService(
|
|||||||
offset: Long,
|
offset: Long,
|
||||||
limit: Long
|
limit: Long
|
||||||
): GetAudioContentListResponse {
|
): GetAudioContentListResponse {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val isCreator = member.id == creatorId
|
val isCreator = member.id == creatorId
|
||||||
|
|
||||||
if (!isCreator && isBlockedBetweenMembers(memberId = member.id!!, creatorId = creatorId)) {
|
if (!isCreator && isBlockedBetweenMembers(memberId = member.id!!, creatorId = creatorId)) {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import kr.co.vividnext.sodalive.i18n.translation.ResourceTranslationJobScheduler
|
|||||||
import kr.co.vividnext.sodalive.member.Member
|
import kr.co.vividnext.sodalive.member.Member
|
||||||
import kr.co.vividnext.sodalive.member.MemberRepository
|
import kr.co.vividnext.sodalive.member.MemberRepository
|
||||||
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
|
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
|
||||||
|
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
|
||||||
import kr.co.vividnext.sodalive.v2.home.following.application.HomeFollowingNewsPublishService
|
import kr.co.vividnext.sodalive.v2.home.following.application.HomeFollowingNewsPublishService
|
||||||
import kr.co.vividnext.sodalive.v2.recommendation.application.CreatorContentViewHistoryService
|
import kr.co.vividnext.sodalive.v2.recommendation.application.CreatorContentViewHistoryService
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
||||||
@@ -63,6 +64,7 @@ class AudioContentServiceTest {
|
|||||||
private lateinit var applicationEventPublisher: ApplicationEventPublisher
|
private lateinit var applicationEventPublisher: ApplicationEventPublisher
|
||||||
private lateinit var contentThemeTranslationRepository: ContentThemeTranslationRepository
|
private lateinit var contentThemeTranslationRepository: ContentThemeTranslationRepository
|
||||||
private lateinit var homeFollowingNewsPublishService: HomeFollowingNewsPublishService
|
private lateinit var homeFollowingNewsPublishService: HomeFollowingNewsPublishService
|
||||||
|
private lateinit var memberContentPreferenceService: MemberContentPreferenceService
|
||||||
|
|
||||||
private lateinit var service: AudioContentService
|
private lateinit var service: AudioContentService
|
||||||
|
|
||||||
@@ -88,6 +90,7 @@ class AudioContentServiceTest {
|
|||||||
applicationEventPublisher = Mockito.mock(ApplicationEventPublisher::class.java)
|
applicationEventPublisher = Mockito.mock(ApplicationEventPublisher::class.java)
|
||||||
contentThemeTranslationRepository = Mockito.mock(ContentThemeTranslationRepository::class.java)
|
contentThemeTranslationRepository = Mockito.mock(ContentThemeTranslationRepository::class.java)
|
||||||
homeFollowingNewsPublishService = Mockito.mock(HomeFollowingNewsPublishService::class.java)
|
homeFollowingNewsPublishService = Mockito.mock(HomeFollowingNewsPublishService::class.java)
|
||||||
|
memberContentPreferenceService = Mockito.mock(MemberContentPreferenceService::class.java)
|
||||||
|
|
||||||
service = AudioContentService(
|
service = AudioContentService(
|
||||||
repository = repository,
|
repository = repository,
|
||||||
@@ -113,6 +116,7 @@ class AudioContentServiceTest {
|
|||||||
langContext = LangContext(),
|
langContext = LangContext(),
|
||||||
contentThemeTranslationRepository = contentThemeTranslationRepository,
|
contentThemeTranslationRepository = contentThemeTranslationRepository,
|
||||||
homeFollowingNewsPublishService = homeFollowingNewsPublishService,
|
homeFollowingNewsPublishService = homeFollowingNewsPublishService,
|
||||||
|
memberContentPreferenceService = memberContentPreferenceService,
|
||||||
audioContentBucket = "audio-bucket",
|
audioContentBucket = "audio-bucket",
|
||||||
coverImageBucket = "cover-bucket",
|
coverImageBucket = "cover-bucket",
|
||||||
coverImageHost = "https://cdn.test"
|
coverImageHost = "https://cdn.test"
|
||||||
|
|||||||
Reference in New Issue
Block a user