Compare commits
3 Commits
e8d16217b0
...
2bd1c99409
Author | SHA1 | Date |
---|---|---|
|
2bd1c99409 | |
|
b45c762bbe | |
|
a7b58089dd |
|
@ -195,6 +195,7 @@ class LiveRecommendRepository(
|
||||||
.and(member.id.notIn(withOutCreatorList))
|
.and(member.id.notIn(withOutCreatorList))
|
||||||
.and(creatorFollowing.isActive.isTrue)
|
.and(creatorFollowing.isActive.isTrue)
|
||||||
.and(creatorFollowing.member.id.eq(memberId))
|
.and(creatorFollowing.member.id.eq(memberId))
|
||||||
|
.and(creatorFollowing.member.isActive.isTrue)
|
||||||
)
|
)
|
||||||
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
|
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
@ -209,6 +210,7 @@ class LiveRecommendRepository(
|
||||||
.and(member.isActive.isTrue)
|
.and(member.isActive.isTrue)
|
||||||
.and(creatorFollowing.isActive.isTrue)
|
.and(creatorFollowing.isActive.isTrue)
|
||||||
.and(creatorFollowing.member.id.eq(memberId))
|
.and(creatorFollowing.member.id.eq(memberId))
|
||||||
|
.and(creatorFollowing.member.isActive.isTrue)
|
||||||
|
|
||||||
return queryFactory
|
return queryFactory
|
||||||
.select(creatorFollowing.creator.id)
|
.select(creatorFollowing.creator.id)
|
||||||
|
@ -233,6 +235,7 @@ class LiveRecommendRepository(
|
||||||
.and(member.isActive.isTrue)
|
.and(member.isActive.isTrue)
|
||||||
.and(creatorFollowing.isActive.isTrue)
|
.and(creatorFollowing.isActive.isTrue)
|
||||||
.and(creatorFollowing.member.id.eq(memberId))
|
.and(creatorFollowing.member.id.eq(memberId))
|
||||||
|
.and(creatorFollowing.member.isActive.isTrue)
|
||||||
|
|
||||||
return queryFactory
|
return queryFactory
|
||||||
.select(
|
.select(
|
||||||
|
|
|
@ -67,8 +67,8 @@ class BlockMemberQueryRepositoryImpl(
|
||||||
QGetBlockedMemberListItem(
|
QGetBlockedMemberListItem(
|
||||||
blockMember.blockedMember.id,
|
blockMember.blockedMember.id,
|
||||||
blockMember.blockedMember.nickname,
|
blockMember.blockedMember.nickname,
|
||||||
blockMember.blockedMember.profileImage.prepend("").prepend(cloudFrontHost),
|
blockMember.blockedMember.profileImage.prepend("/").prepend(cloudFrontHost),
|
||||||
blockMember.blockedMember.isActive
|
blockMember.isActive
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.from(blockMember)
|
.from(blockMember)
|
||||||
|
@ -76,6 +76,7 @@ class BlockMemberQueryRepositoryImpl(
|
||||||
.where(
|
.where(
|
||||||
blockMember.member.id.eq(memberId)
|
blockMember.member.id.eq(memberId)
|
||||||
.and(blockMember.isActive.isTrue)
|
.and(blockMember.isActive.isTrue)
|
||||||
|
.and(blockMember.blockedMember.isActive.isTrue)
|
||||||
)
|
)
|
||||||
.offset(offset)
|
.offset(offset)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
@ -89,6 +90,7 @@ class BlockMemberQueryRepositoryImpl(
|
||||||
.where(
|
.where(
|
||||||
blockMember.member.id.eq(memberId)
|
blockMember.member.id.eq(memberId)
|
||||||
.and(blockMember.isActive.isTrue)
|
.and(blockMember.isActive.isTrue)
|
||||||
|
.and(blockMember.blockedMember.isActive.isTrue)
|
||||||
)
|
)
|
||||||
.fetch()
|
.fetch()
|
||||||
.size
|
.size
|
||||||
|
|
Loading…
Reference in New Issue