크리에이터 프로필 라이브 성별 제한 적용

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt

@@ -22,11 +22,13 @@ import kr.co.vividnext.sodalive.explorer.profile.TimeDifferenceResult
 import kr.co.vividnext.sodalive.i18n.Lang
 import kr.co.vividnext.sodalive.i18n.LangContext
 import kr.co.vividnext.sodalive.i18n.SodaMessageSource
+import kr.co.vividnext.sodalive.live.room.GenderRestriction
 import kr.co.vividnext.sodalive.live.room.LiveRoom
 import kr.co.vividnext.sodalive.live.room.LiveRoomType
 import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
 import kr.co.vividnext.sodalive.live.room.cancel.QLiveRoomCancel.liveRoomCancel
 import kr.co.vividnext.sodalive.live.room.visit.QLiveRoomVisit.liveRoomVisit
+import kr.co.vividnext.sodalive.member.Gender
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember
@@ -342,6 +344,21 @@ class ExplorerQueryRepository(
             .and(liveRoom.cancel.id.isNull)
             .and(liveRoom.isActive.isTrue)
 
+        val effectiveGender = if (userMember.auth != null) {
+            if (userMember.auth!!.gender == 1) Gender.MALE else Gender.FEMALE
+        } else {
+            userMember.gender
+        }
+
+        if (effectiveGender != Gender.NONE) {
+            val genderCondition = when (effectiveGender) {
+                Gender.MALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.MALE_ONLY)
+                Gender.FEMALE -> liveRoom.genderRestriction.`in`(GenderRestriction.ALL, GenderRestriction.FEMALE_ONLY)
+                Gender.NONE -> liveRoom.genderRestriction.isNotNull
+            }
+            where = where.and(genderCondition.or(liveRoom.member.id.eq(userMember.id)))
+        }
+
         if (userMember.auth == null) {
             where = where.and(liveRoom.isAdult.isFalse)
         }

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

@@ -101,14 +101,15 @@ class LiveRoomQueryRepositoryImpl(
         }
 
         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) {
-            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) {
-            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)
             }
         }