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

test #384

Merged
klaus merged 10 commits from test into main 2026-02-04 12:52:24 +00:00
Conversation 0 Commits 10 Files Changed 24 +27 -24
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04a4b362da - Show all commits

51
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
View File

@@ -101,14 +101,15 @@ class LiveRoomQueryRepositoryImpl(
} }
if (effectiveGender != null && effectiveGender != Gender.NONE) { if (effectiveGender != null && effectiveGender != Gender.NONE) {
where = when (effectiveGender) { val genderCondition = when (effectiveGender) {
Gender.MALE -> where.and( Gender.MALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY)
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY) Gender.FEMALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY)
) Gender.NONE -> liveRoom.genderRestriction.isNotNull
Gender.FEMALE -> where.and( }
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY) where = if (memberId != null) {
) where.and(genderCondition.or(liveRoom.member.id.eq(memberId)))
Gender.NONE -> where } else {
where.and(genderCondition)
} }
} }
@@ -169,14 +170,15 @@ class LiveRoomQueryRepositoryImpl(
} }
if (effectiveGender != null && effectiveGender != Gender.NONE) { if (effectiveGender != null && effectiveGender != Gender.NONE) {
where = when (effectiveGender) { val genderCondition = when (effectiveGender) {
Gender.MALE -> where.and( Gender.MALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY)
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY) Gender.FEMALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY)
) Gender.NONE -> liveRoom.genderRestriction.isNotNull
Gender.FEMALE -> where.and( }
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY) where = if (memberId != null) {
) where.and(genderCondition.or(liveRoom.member.id.eq(memberId)))
Gender.NONE -> where } else {
where.and(genderCondition)
} }
} }
@@ -233,14 +235,15 @@ class LiveRoomQueryRepositoryImpl(
} }
if (effectiveGender != null && effectiveGender != Gender.NONE) { if (effectiveGender != null && effectiveGender != Gender.NONE) {
where = when (effectiveGender) { val genderCondition = when (effectiveGender) {
Gender.MALE -> where.and( Gender.MALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY)
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY) Gender.FEMALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY)
) Gender.NONE -> liveRoom.genderRestriction.isNotNull
Gender.FEMALE -> where.and( }
liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY) where = if (memberId != null) {
) where.and(genderCondition.or(liveRoom.member.id.eq(memberId)))
Gender.NONE -> where } else {
where.and(genderCondition)
} }
} }