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 { + 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)