From 0d6e4804f5d4ee57968e869d39b17a93f3d881e4 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 9 Oct 2024 00:18:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0,=20=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20-?= =?UTF-8?q?=20=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D=EC=9D=84=20=ED=96=88?= =?UTF-8?q?=EB=8D=94=EB=9D=BC=EB=8F=84=2019=EA=B8=88=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=20=EB=B3=B4=EA=B8=B0=EB=A5=BC=20=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94=20=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9C=BC=EB=A9=B4=20?= =?UTF-8?q?19=EA=B8=88=20=EC=BD=98=ED=85=90=EC=B8=A0=EA=B0=80=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=9C=A0?= =?UTF-8?q?=ED=98=95(=EB=82=A8=EC=84=B1=ED=96=A5/=EC=97=AC=EC=84=B1?= =?UTF-8?q?=ED=96=A5)=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=95=A0=20=EC=88=98?= =?UTF-8?q?=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/AudioContentRepository.kt | 44 +++++++++++-- .../vividnext/sodalive/content/ContentType.kt | 12 ++++ .../main/AudioContentMainController.kt | 18 +++++- .../content/main/AudioContentMainService.kt | 64 +++++++++++-------- 4 files changed, 104 insertions(+), 34 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/ContentType.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index e086e62..d0b212f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -79,11 +79,17 @@ interface AudioContentQueryRepository { memberId: Long, theme: String = "", isAdult: Boolean = false, + contentType: ContentType = ContentType.ALL, offset: Long = 0, limit: Long = 20 ): List - fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int + fun totalCountNewContentFor2Weeks( + theme: String, + memberId: Long, + isAdult: Boolean, + contentType: ContentType = ContentType.ALL + ): Int fun getNewContentUploadCreatorList( cloudfrontHost: String, @@ -95,7 +101,8 @@ interface AudioContentQueryRepository { fun findAudioContentByCurationId( curationId: Long, cloudfrontHost: String, - isAdult: Boolean + isAdult: Boolean, + contentType: ContentType = ContentType.ALL ): List fun getAudioContentRanking( @@ -417,7 +424,12 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .size } - override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int { + override fun totalCountNewContentFor2Weeks( + theme: String, + memberId: Long, + isAdult: Boolean, + contentType: ContentType + ): Int { var where = audioContent.isActive.isTrue .and(audioContent.duration.isNotNull) .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) @@ -429,6 +441,12 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) + } else { + if (contentType != ContentType.ALL) { + where = where.and( + audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 1 else 0) + ) + } } if (theme.isNotBlank()) { @@ -450,6 +468,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) memberId: Long, theme: String, isAdult: Boolean, + contentType: ContentType, offset: Long, limit: Long ): List { @@ -464,6 +483,12 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) + } else { + if (contentType != ContentType.ALL) { + where = where.and( + audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 1 else 0) + ) + } } if (theme.isNotBlank()) { @@ -514,7 +539,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc()) .limit(20) .fetch() - .asSequence() .map { GetNewContentUploadCreator( it.id!!, @@ -526,7 +550,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) } ) } - .toList() } override fun getAudioContentMainBannerList(isAdult: Boolean): List { @@ -562,7 +585,8 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) override fun findAudioContentByCurationId( curationId: Long, cloudfrontHost: String, - isAdult: Boolean + isAdult: Boolean, + contentType: ContentType ): List { var where = audioContent.isActive.isTrue .and(audioContent.member.isNotNull) @@ -572,6 +596,14 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) + } else { + if (contentType != ContentType.ALL) { + where = where.and( + audioContent.member.auth.gender.eq( + if (contentType == ContentType.MALE) 1 else 0 + ) + ) + } } return queryFactory diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/ContentType.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/ContentType.kt new file mode 100644 index 0000000..d7e350e --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/ContentType.kt @@ -0,0 +1,12 @@ +package kr.co.vividnext.sodalive.content + +enum class ContentType { + // 전체 + ALL, + + // 남성향 + MALE, + + // 여성향 + FEMALE +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt index 058ccf3..1cc4fd3 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.content.main import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.content.ContentType import kr.co.vividnext.sodalive.content.order.OrderService import kr.co.vividnext.sodalive.member.Member import org.springframework.data.domain.Pageable @@ -82,16 +83,28 @@ class AudioContentMainController( @GetMapping("/new/all") fun getNewContentAllByTheme( @RequestParam("theme") theme: String, + @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null, + @RequestParam("contentType", required = false) contentType: ContentType? = null, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, pageable: Pageable ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(service.getNewContentFor2WeeksByTheme(theme, member, pageable)) + ApiResponse.ok( + service.getNewContentFor2WeeksByTheme( + theme = theme, + isAdultContentVisible = isAdultContentVisible ?: true, + contentType = contentType ?: ContentType.ALL, + member = member, + pageable = pageable + ) + ) } @GetMapping("/curation-list") fun getCurationList( + @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null, + @RequestParam("contentType", required = false) contentType: ContentType? = null, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, pageable: Pageable ) = run { @@ -100,7 +113,8 @@ class AudioContentMainController( ApiResponse.ok( service.getAudioContentCurationListWithPaging( memberId = member.id!!, - isAdult = member.auth != null, + isAdult = member.auth != null && (isAdultContentVisible ?: true), + contentType = contentType ?: ContentType.ALL, offset = pageable.offset, limit = pageable.pageSize.toLong() ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 1b78b64..62f37c2 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -1,6 +1,7 @@ package kr.co.vividnext.sodalive.content.main import kr.co.vividnext.sodalive.content.AudioContentRepository +import kr.co.vividnext.sodalive.content.ContentType import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerType import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse import kr.co.vividnext.sodalive.content.main.curation.GetAudioContentCurationResponse @@ -45,20 +46,29 @@ class AudioContentMainService( } @Transactional(readOnly = true) - fun getNewContentFor2WeeksByTheme(theme: String, member: Member, pageable: Pageable): GetNewContentAllResponse { - val totalCount = - repository.totalCountNewContentFor2Weeks(theme, memberId = member.id!!, isAdult = member.auth != null) + fun getNewContentFor2WeeksByTheme( + theme: String, + isAdultContentVisible: Boolean, + contentType: ContentType, + member: Member, + pageable: Pageable + ): GetNewContentAllResponse { + val totalCount = repository.totalCountNewContentFor2Weeks( + theme, + memberId = member.id!!, + isAdult = member.auth != null && isAdultContentVisible, + contentType = contentType + ) val items = repository.findByThemeFor2Weeks( cloudfrontHost = imageHost, memberId = member.id!!, theme = theme, - isAdult = member.auth != null, + isAdult = member.auth != null && isAdultContentVisible, + contentType = contentType, offset = pageable.offset, limit = pageable.pageSize.toLong() ) - .asSequence() .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) } - .toList() return GetNewContentAllResponse(totalCount, items) } @@ -130,26 +140,28 @@ class AudioContentMainService( cacheNames = ["default"], key = "'getAudioContentCurationListWithPaging:' + #memberId + ':' + #isAdult + ':' + #offset + ':' + #limit" ) - fun getAudioContentCurationListWithPaging(memberId: Long, isAdult: Boolean, offset: Long, limit: Long) = - repository.getAudioContentCurationList(isAdult = isAdult, offset = offset, limit = limit) - .asSequence() - .map { - GetAudioContentCurationResponse( + fun getAudioContentCurationListWithPaging( + memberId: Long, + isAdult: Boolean, + contentType: ContentType, + offset: Long, + limit: Long + ) = repository.getAudioContentCurationList(isAdult = isAdult, offset = offset, limit = limit) + .map { + GetAudioContentCurationResponse( + curationId = it.id!!, + title = it.title, + description = it.description, + contents = repository.findAudioContentByCurationId( curationId = it.id!!, - title = it.title, - description = it.description, - contents = repository.findAudioContentByCurationId( - curationId = it.id!!, - cloudfrontHost = imageHost, - isAdult = isAdult - ) - .asSequence() - .filter { content -> - !blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = content.creatorId) - } - .toList() + cloudfrontHost = imageHost, + isAdult = isAdult, + contentType = contentType ) - } - .filter { it.contents.isNotEmpty() } - .toList() + .filter { content -> + !blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = content.creatorId) + } + ) + } + .filter { it.contents.isNotEmpty() } }