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

test #294

Merged
klaus merged 10 commits from test into main 2025-03-24 09:09:17 +00:00
Conversation 0 Commits 10 Files Changed 16 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 387d364861 - Show all commits

6
src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
View File

@@ -68,7 +68,6 @@ class RankingRepository(
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContentTheme.isActive.isTrue) .and(audioContentTheme.isActive.isTrue)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
@@ -142,6 +141,7 @@ class RankingRepository(
} }
if (memberId != null) { if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition) select = select.leftJoin(blockMember).on(blockMemberCondition)
} }
@@ -224,7 +224,6 @@ class RankingRepository(
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
.and(order.isActive.isTrue) .and(order.isActive.isTrue)
.and(order.createdAt.goe(startDate)) .and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate)) .and(order.createdAt.lt(endDate))
@@ -256,6 +255,7 @@ class RankingRepository(
.leftJoin(order).on(audioContent.id.eq(order.audioContent.id)) .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
if (memberId != null) { if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition) select = select.leftJoin(blockMember).on(blockMemberCondition)
} }
@@ -466,7 +466,6 @@ class RankingRepository(
.and(audioContent.price.gt(0)) .and(audioContent.price.gt(0))
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
@@ -499,6 +498,7 @@ class RankingRepository(
.leftJoin(order).on(ordersCondition) .leftJoin(order).on(ordersCondition)
if (memberId != null) { if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition) select = select.leftJoin(blockMember).on(blockMemberCondition)
} }