klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:2bd1c994091ea45500080cef46832918b9cd945b
Branches Tags
klaus:test
klaus:main
..
compare: klaus:e8d16217b0e8578e6aa4e145cbe4ccf6c7b89f58
Branches Tags
klaus:test
klaus:main

No commits in common. "2bd1c994091ea45500080cef46832918b9cd945b" and "e8d16217b0e8578e6aa4e145cbe4ccf6c7b89f58" have entirely different histories.
2bd1c99409 ... e8d16217b0

2 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

3
src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt
View File

@ -195,7 +195,6 @@ 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)
@ -210,7 +209,6 @@ 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)
@ -235,7 +233,6 @@ 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(

6
src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt
View File

@ -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.isActive blockMember.blockedMember.isActive
) )
) )
.from(blockMember) .from(blockMember)
@ -76,7 +76,6 @@ 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)
@ -90,7 +89,6 @@ 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