콘텐츠 메인 - 새로운 콘텐츠, 큐레이션

- 본인인증을 했더라도 19금 콘텐츠 보기를 활성화 하지 않으면 19금 콘텐츠가 보이지 않도록 수정 - 콘텐츠 유형(남성향/여성향)을 선택할 수 있도록 수정
2024-10-09 00:18:56 +09:00 · 2024-10-09 00:18:56 +09:00 · 0d6e4804f5
parent d024e0fa23
commit 0d6e4804f5
4 changed files with 104 additions and 34 deletions
--- 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<GetAudioContentMainItem>

-    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<GetAudioContentMainItem>

    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<GetAudioContentMainItem> {
@ -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<AudioContentBanner> {
@ -562,7 +585,8 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
    override fun findAudioContentByCurationId(
        curationId: Long,
        cloudfrontHost: String,
-        isAdult: Boolean
+        isAdult: Boolean,
+        contentType: ContentType
    ): List<GetAudioContentMainItem> {
        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
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/ContentType.kt
+++ 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
+}
--- 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()
            )
--- 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() }
 }