diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt index 1302b63..674d5c4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt @@ -54,6 +54,7 @@ class ExplorerQueryRepository( .where( creatorFollowing.isActive.isTrue .and(creatorFollowing.creator.id.eq(creatorId)) + .and(creatorFollowing.member.isActive.isTrue) ) .fetch() } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt index 08a2904..e70f705 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt @@ -58,8 +58,8 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L .offset(offset) .limit(limit) .orderBy( - quarterLiveRankings.totalCan.desc(), - quarterLiveRankings.totalParticipants.desc(), + quarterLiveRankings.totalCan.coalesce(0).desc(), + quarterLiveRankings.totalParticipants.coalesce(0).desc(), liveRoom.beginDateTime.desc(), liveRoom.member.createdAt.desc() )