test #325

Merged
klaus merged 4 commits from test into main 2025-06-12 05:00:32 +00:00
1 changed files with 7 additions and 0 deletions
Showing only changes of commit 832586bd41 - Show all commits

View File

@ -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
import kr.co.vividnext.sodalive.member.QMember.member import kr.co.vividnext.sodalive.member.QMember.member
import kr.co.vividnext.sodalive.member.auth.QAuth.auth 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.following.QCreatorFollowing.creatorFollowing
import kr.co.vividnext.sodalive.member.tag.QCreatorTag.creatorTag import kr.co.vividnext.sodalive.member.tag.QCreatorTag.creatorTag
import kr.co.vividnext.sodalive.member.tag.QMemberCreatorTag.memberCreatorTag import kr.co.vividnext.sodalive.member.tag.QMemberCreatorTag.memberCreatorTag
@ -575,6 +576,10 @@ class ExplorerQueryRepository(
offset: Long, offset: Long,
limit: Long limit: Long
): List<GetFollowerListDto> { ): List<GetFollowerListDto> {
val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.member.id.eq(creatorId))
return queryFactory return queryFactory
.select( .select(
QGetFollowerListDto( QGetFollowerListDto(
@ -586,11 +591,13 @@ class ExplorerQueryRepository(
) )
.from(creatorFollowing) .from(creatorFollowing)
.innerJoin(creatorFollowing.member, member) .innerJoin(creatorFollowing.member, member)
.leftJoin(blockMember).on(blockMemberCondition)
.where( .where(
member.isActive.isTrue member.isActive.isTrue
.and(creatorFollowing.isActive.isTrue) .and(creatorFollowing.isActive.isTrue)
.and(creatorFollowing.creator.id.eq(creatorId)) .and(creatorFollowing.creator.id.eq(creatorId))
.and(creatorFollowing.member.id.ne(creatorId)) .and(creatorFollowing.member.id.ne(creatorId))
.and(blockMember.id.isNull)
) )
.offset(offset) .offset(offset)
.limit(limit) .limit(limit)