From 1a774937b382cf35130dc21832bb44b886453530 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 12 Jun 2025 12:00:21 +0900
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0?=
 =?UTF-8?q?=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=A1=B0=ED=9A=8C=20-=20isAdu?=
 =?UTF-8?q?lt=EB=A5=BC=20=EB=AC=B4=EC=A1=B0=EA=B1=B4=20false=EB=A1=9C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=EC=9D=98=20isAdult?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=8B=A4=EB=A5=B4=EA=B2=8C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatorCommunity/CreatorCommunityRepository.kt       | 9 ++++++---
 .../creatorCommunity/SelectCommunityPostResponse.kt      | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityRepository.kt
index 6f3ffcf..1b31eec 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityRepository.kt
@@ -68,7 +68,8 @@ class CreatorCommunityQueryRepositoryImpl(private val queryFactory: JPAQueryFact
                     creatorCommunity.content,
                     creatorCommunity.createdAt,
                     creatorCommunity.isCommentAvailable,
-                    creatorCommunity.price
+                    creatorCommunity.price,
+                    creatorCommunity.isAdult
                 )
             )
             .from(creatorCommunity)
@@ -154,7 +155,8 @@ class CreatorCommunityQueryRepositoryImpl(private val queryFactory: JPAQueryFact
                     creatorCommunity.content,
                     creatorCommunity.createdAt,
                     creatorCommunity.isCommentAvailable,
-                    creatorCommunity.price
+                    creatorCommunity.price,
+                    creatorCommunity.isAdult
                 )
             )
             .from(creatorCommunity)
@@ -185,7 +187,8 @@ class CreatorCommunityQueryRepositoryImpl(private val queryFactory: JPAQueryFact
                     creatorCommunity.content,
                     creatorCommunity.createdAt,
                     creatorCommunity.isCommentAvailable,
-                    creatorCommunity.price
+                    creatorCommunity.price,
+                    creatorCommunity.isAdult
                 )
             )
             .from(creatorCommunity)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/SelectCommunityPostResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/SelectCommunityPostResponse.kt
index 8f69f6f..c290067 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/SelectCommunityPostResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/SelectCommunityPostResponse.kt
@@ -14,7 +14,8 @@ data class SelectCommunityPostResponse @QueryProjection constructor(
     val content: String,
     val date: LocalDateTime,
     val isCommentAvailable: Boolean,
-    val price: Int
+    val price: Int,
+    val isAdult: Boolean
 ) {
     fun toCommunityPostListResponse(
         imageHost: String,
@@ -57,7 +58,7 @@ data class SelectCommunityPostResponse @QueryProjection constructor(
             price = price,
             date = date,
             isCommentAvailable = isCommentAvailable,
-            isAdult = false,
+            isAdult = isAdult,
             isLike = isLike,
             existOrdered = existOrdered,
             likeCount = likeCount,

From 832586bd41a9726b97af192ad1b8c5315e6301fa Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 12 Jun 2025 13:25:51 +0900
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EC=B0=A8=EB=8B=A8=ED=95=9C?=
 =?UTF-8?q?=20=EB=A9=A4=EB=B2=84=EB=8A=94=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=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

---
 .../vividnext/sodalive/explorer/ExplorerQueryRepository.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
index 9de8a29..cac0847 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
@@ -28,6 +28,7 @@ import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember
 import kr.co.vividnext.sodalive.member.QMember.member
 import kr.co.vividnext.sodalive.member.auth.QAuth.auth
+import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
 import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing
 import kr.co.vividnext.sodalive.member.tag.QCreatorTag.creatorTag
 import kr.co.vividnext.sodalive.member.tag.QMemberCreatorTag.memberCreatorTag
@@ -575,6 +576,10 @@ class ExplorerQueryRepository(
         offset: Long,
         limit: Long
     ): List<GetFollowerListDto> {
+        val blockMemberCondition = blockMember.member.id.eq(member.id)
+            .and(blockMember.isActive.isTrue)
+            .and(blockMember.member.id.eq(creatorId))
+
         return queryFactory
             .select(
                 QGetFollowerListDto(
@@ -586,11 +591,13 @@ class ExplorerQueryRepository(
             )
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.member, member)
+            .leftJoin(blockMember).on(blockMemberCondition)
             .where(
                 member.isActive.isTrue
                     .and(creatorFollowing.isActive.isTrue)
                     .and(creatorFollowing.creator.id.eq(creatorId))
                     .and(creatorFollowing.member.id.ne(creatorId))
+                    .and(blockMember.id.isNull)
             )
             .offset(offset)
             .limit(limit)

From c0be30027c50cc94f56d21fbee6dd30fdfac1066 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 12 Jun 2025 13:44:09 +0900
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EC=B0=A8=EB=8B=A8=ED=95=9C?=
 =?UTF-8?q?=20=EB=A9=A4=EB=B2=84=EB=8A=94=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=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

---
 .../co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
index cac0847..b27495d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
@@ -576,9 +576,9 @@ class ExplorerQueryRepository(
         offset: Long,
         limit: Long
     ): List<GetFollowerListDto> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
+        val blockMemberCondition = blockMember.member.id.eq(creatorId)
             .and(blockMember.isActive.isTrue)
-            .and(blockMember.member.id.eq(creatorId))
+            .and(blockMember.blockedMember.id.eq(member.id))
 
         return queryFactory
             .select(

From 640f5ce6f5fdfbd9f5a79f8f09d0896ab0c89a7e Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 12 Jun 2025 13:51:03 +0900
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EC=B0=A8=EB=8B=A8=ED=95=9C?=
 =?UTF-8?q?=20=EB=A9=A4=EB=B2=84=EB=8A=94=20=ED=8C=94=EB=A1=9C=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=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

---
 .../vividnext/sodalive/explorer/ExplorerQueryRepository.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
index b27495d..a8a55aa 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt
@@ -558,14 +558,20 @@ class ExplorerQueryRepository(
     }
 
     fun getFollowerListTotalCount(creatorId: Long): Int {
+        val blockMemberCondition = blockMember.member.id.eq(creatorId)
+            .and(blockMember.isActive.isTrue)
+            .and(blockMember.blockedMember.id.eq(member.id))
+
         return queryFactory.select(creatorFollowing.id)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.member, member)
+            .leftJoin(blockMember).on(blockMemberCondition)
             .where(
                 member.isActive.isTrue
                     .and(creatorFollowing.isActive.isTrue)
                     .and(creatorFollowing.creator.id.eq(creatorId))
                     .and(creatorFollowing.member.id.ne(creatorId))
+                    .and(blockMember.id.isNull)
             )
             .fetch()
             .size