From a99260209bc43d59bddfc7b53ac412397df94d48 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 18 Jul 2025 18:00:36 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=B5=9C=EA=B7=BC=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=ED=95=9C=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20API=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomRepository.kt | 5 ++- .../sodalive/live/room/LiveRoomService.kt | 31 +++++++------------ 2 files changed, 13 insertions(+), 23 deletions(-) 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 9c998c8..8d0ff5a 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 @@ -61,7 +61,7 @@ interface LiveRoomQueryRepository { fun getTotalHeartCount(roomId: Long): Int? fun getLiveRoomCreatorId(roomId: Long): Long? fun getHeartList(roomId: Long): List - fun getLatestFinishedLive(offset: Long): List + fun getLatestFinishedLive(): List } class LiveRoomQueryRepositoryImpl( @@ -383,7 +383,7 @@ class LiveRoomQueryRepositoryImpl( .fetch() } - override fun getLatestFinishedLive(offset: Long): List { + override fun getLatestFinishedLive(): List { val liveRoom = liveRoom val subLiveRoom = QLiveRoom.liveRoom @@ -413,7 +413,6 @@ class LiveRoomQueryRepositoryImpl( .`in`(subQuery) ) .orderBy(liveRoom.updatedAt.desc()) - .offset(offset) .limit(20) .fetch() } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt index 766d41f..b8a6e27 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt @@ -1298,25 +1298,16 @@ class LiveRoomService( } fun getLatestFinishedLive(member: Member?): List { - val result = mutableListOf() - var retry = 0L - - do { - result.addAll( - repository.getLatestFinishedLive(offset = retry) - .filter { - if (member?.id != null) { - !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.memberId) - } else { - true - } - } - .map { - GetLatestFinishedLiveResponse(response = it) - } - ) - } while (result.size < 20 && retry++ < 3) - - return result.take(20) + return repository.getLatestFinishedLive() + .filter { + if (member?.id != null) { + !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.memberId) + } else { + true + } + } + .map { + GetLatestFinishedLiveResponse(response = it) + } } }