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 +21 -9
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 82afdecf6c - Show all commits

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

@ -53,9 +53,13 @@ class RankingRepository(
sortType: String, sortType: String,
theme: String = "" theme: String = ""
): List<GetAudioContentRankingItem> { ): List<GetAudioContentRankingItem> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = if (memberId != null) {
.and(blockMember.isActive.isTrue) blockMember.member.id.eq(member.id)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
var where = audioContent.isActive.isTrue var where = audioContent.isActive.isTrue
.and(audioContent.member.isActive.isTrue) .and(audioContent.member.isActive.isTrue)
@ -205,9 +209,13 @@ class RankingRepository(
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<Series> { ): List<Series> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = if (memberId != null) {
.and(blockMember.isActive.isTrue) blockMember.member.id.eq(member.id)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
var where = series.isActive.isTrue var where = series.isActive.isTrue
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
@ -437,9 +445,13 @@ class RankingRepository(
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = if (memberId != null) {
.and(blockMember.isActive.isTrue) blockMember.member.id.eq(member.id)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
val ordersCondition = order.audioContent.id.eq(audioContent.id) val ordersCondition = order.audioContent.id.eq(audioContent.id)
.and(order.isActive.isTrue) .and(order.isActive.isTrue)