From 81415e0854ae10b238138d7238262e99214c5a44 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 22 Dec 2023 04:23:15 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=94=EB=A1=9C=EC=9A=B0=20=ED=95=9C=20?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0=20=EC=BB=A4?= =?UTF-8?q?=EB=AE=A4=EB=8B=88=ED=8B=B0=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20-=20=EC=B0=A8=EB=8B=A8=EB=90=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EB=8A=94=20=EC=A1=B0=ED=9A=8C=EB=90=98?= =?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 --- .../profile/creatorCommunity/CreatorCommunityRepository.kt | 5 ++++- .../profile/creatorCommunity/CreatorCommunityService.kt | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 cd426d6..eeae41e 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 @@ -99,7 +99,10 @@ class CreatorCommunityQueryRepositoryImpl(private val queryFactory: JPAQueryFact val memberSubQuery = queryFactory .select(creatorFollowing.creator.id) .from(creatorFollowing) - .where(creatorFollowing.member.id.eq(memberId)) + .where( + creatorFollowing.member.id.eq(memberId) + .and(creatorFollowing.isActive.isTrue) + ) where = where.and( creatorCommunity.member.id.`in`(memberSubQuery) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt index 60ef7c4..b44dc0c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt @@ -384,6 +384,12 @@ class CreatorCommunityService( return postList .asSequence() + .filter { + !blockMemberRepository.isBlocked( + blockedMemberId = memberId, + memberId = it.member!!.id!! + ) + } .map { val isLike = likeRepository.findByPostIdAndMemberId(postId = it.id!!, memberId = memberId)?.isActive ?: false