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

@@ -351,10 +351,6 @@ class ExplorerQueryRepository(
             where = where.and(liveRoom.isAdult.isFalse)
         }
 
-        if (userMember.role == MemberRole.CREATOR) {
-            where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
-        }
-
         val result = mutableListOf<LiveRoom>()
 
         if (offset == 0L) {

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

@@ -53,7 +53,6 @@ class LiveRecommendRepository(
     fun getOnAirRecommendChannelList(
         memberId: Long,
         isBlocked: (Long) -> Boolean,
-        isCreator: Boolean,
         isAdult: Boolean
     ): List<GetRecommendChannelResponse> {
         var where = member.role.eq(MemberRole.CREATOR)
@@ -63,10 +62,6 @@ class LiveRecommendRepository(
             where = where.and(liveRoom.isAdult.isFalse)
         }
 
-        if (isCreator) {
-            where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
-        }
-
         return queryFactory
             .select(
                 Projections.constructor(
@@ -118,13 +113,14 @@ class LiveRecommendRepository(
             .orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
             .limit(limit)
             .fetch()
+            .asSequence()
             .filter { !isBlocked(it.creatorId) }
+            .toList()
     }
 
     fun getOnAirFollowingChannelList(
         memberId: Long,
         isBlocked: (Long) -> Boolean,
-        isCreator: Boolean,
         isAdult: Boolean
     ): List<GetRecommendChannelResponse> {
         var where = member.role.eq(MemberRole.CREATOR)
@@ -134,10 +130,6 @@ class LiveRecommendRepository(
             where = where.and(liveRoom.isAdult.isFalse)
         }
 
-        if (isCreator) {
-            where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
-        }
-
         return queryFactory
             .select(
                 Projections.constructor(

src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt

@@ -1,7 +1,6 @@
 package kr.co.vividnext.sodalive.live.recommend
 
 import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
@@ -24,7 +23,6 @@ class LiveRecommendService(
         val onAirChannelList = repository.getOnAirRecommendChannelList(
             member.id!!,
             isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
-            isCreator = member.role == MemberRole.CREATOR,
             isAdult = member.auth != null
         )
 
@@ -32,7 +30,9 @@ class LiveRecommendService(
             return onAirChannelList
         }
 
-        val onAirCreatorIdList = onAirChannelList.map { it.creatorId }
+        val onAirCreatorIdList = onAirChannelList.asSequence()
+            .map { it.creatorId }
+            .toList()
 
         val notOnAirCreatorList = repository.getRecommendChannelList(
             member.id!!,
@@ -48,7 +48,6 @@ class LiveRecommendService(
         val onAirFollowingChannelList = repository.getOnAirFollowingChannelList(
             memberId = member.id!!,
             isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
-            isCreator = member.role == MemberRole.CREATOR,
             isAdult = member.auth != null
         )
 
@@ -56,7 +55,9 @@ class LiveRecommendService(
             return onAirFollowingChannelList
         }
 
-        val onAirCreatorIdList = onAirFollowingChannelList.map { it.creatorId }
+        val onAirCreatorIdList = onAirFollowingChannelList.asSequence()
+            .map { it.creatorId }
+            .toList()
 
         val notOnAirFollowingChannelList = repository.getFollowingChannelList(
             memberId = member.id!!,