From e488f3419e6ae41a923d271b79858b6980cb4e55 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Wed, 19 Mar 2025 12:23:54 +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=ED=99=88=20-=20=EC=B1=84=EB=84=90=EB=B3=84=20?=
 =?UTF-8?q?=EC=9D=B8=EA=B8=B0=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=B1=84?=
 =?UTF-8?q?=EB=84=90=20-=2019=EA=B8=88=20=EC=BD=98=ED=85=90=EC=B8=A0=20?=
 =?UTF-8?q?=EC=95=88=EB=B3=B4=EA=B8=B0=20=EC=84=A4=EC=A0=95=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9D=BC=EB=B0=98=20=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=8C=90?=
 =?UTF-8?q?=EB=A7=A4=EB=9F=89=EC=9C=BC=EB=A1=9C=20=EC=B1=84=EB=84=90=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/AudioContentMainTabHomeService.kt    |  1 +
 .../sodalive/rank/RankingRepository.kt        | 27 +++++++++++--------
 .../vividnext/sodalive/rank/RankingService.kt |  3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt
index a748425..7179cd3 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt
@@ -83,6 +83,7 @@ class AudioContentMainTabHomeService(
 
         val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
             memberId = member.id!!,
+            isAdult = isAdult,
             contentType = contentType,
             startDate = startDate.minusDays(1),
             endDate = endDate
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
index 611f595..b0639c1 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
@@ -409,6 +409,7 @@ class RankingRepository(
 
     fun fetchCreatorBySellContentCountRankTop20(
         memberId: Long,
+        isAdult: Boolean,
         contentType: ContentType,
         startDate: LocalDateTime,
         endDate: LocalDateTime
@@ -422,7 +423,7 @@ class RankingRepository(
             .and(order.createdAt.goe(startDate))
             .and(order.createdAt.lt(endDate))
 
-        var memberCondition = member.isActive.isTrue
+        val memberCondition = member.isActive.isTrue
             .and(member.role.eq(MemberRole.CREATOR))
             .and(member.id.eq(audioContent.member.id))
 
@@ -432,18 +433,22 @@ class RankingRepository(
             .and(audioContent.limited.isNull)
             .and(blockMember.id.isNull)
 
-        if (contentType != ContentType.ALL) {
-            where = where.and(
-                audioContent.member.auth.isNull.or(
-                    audioContent.member.auth.gender.eq(
-                        if (contentType == ContentType.MALE) {
-                            0
-                        } else {
-                            1
-                        }
+        if (!isAdult) {
+            where = where.and(audioContent.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    audioContent.member.auth.isNull.or(
+                        audioContent.member.auth.gender.eq(
+                            if (contentType == ContentType.MALE) {
+                                0
+                            } else {
+                                1
+                            }
+                        )
                     )
                 )
-            )
+            }
         }
 
         return queryFactory
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt
index e921c34..088fc7d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt
@@ -189,11 +189,12 @@ class RankingService(
 
     fun fetchCreatorBySellContentCountRankTop20(
         memberId: Long,
+        isAdult: Boolean,
         contentType: ContentType,
         startDate: LocalDateTime,
         endDate: LocalDateTime
     ): List<ContentCreatorResponse> {
-        return repository.fetchCreatorBySellContentCountRankTop20(memberId, contentType, startDate, endDate)
+        return repository.fetchCreatorBySellContentCountRankTop20(memberId, isAdult, contentType, startDate, endDate)
     }
 
     fun fetchCreatorContentBySalesCountTop4(