From 80930ebd3df6a19db16c689b47175bce73d322f0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sun, 10 Dec 2023 21:26:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EA=B8=88=20=EC=A6=89=EC=8B=9C=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=A7=8C=EB=93=A4=EA=B8=B0,=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=8B=9C=EC=9E=91=20-=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=8B=9C=EC=9E=91=EC=8B=9C=20?= =?UTF-8?q?=EB=B3=B8=EC=9D=B8=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=A7=8C?= =?UTF-8?q?=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EC=A7=84=ED=96=89=20=EC=A4=91?= =?UTF-8?q?=EC=9D=B8=20=EB=AA=A8=EB=93=A0=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt | 5 +++-- .../kr/co/vividnext/sodalive/live/room/LiveRoomService.kt | 4 ++-- 2 files changed, 5 insertions(+), 4 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 b7de267..9f03a50 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 @@ -41,7 +41,7 @@ interface LiveRoomQueryRepository { fun getRecentRoomInfo(memberId: Long, cloudFrontHost: String): GetRecentRoomInfoResponse? fun getDonationTotal(roomId: Long): Int? fun getDonationList(roomId: Long, cloudFrontHost: String): List - fun getRoomActiveAndChannelNameIsNotNull(): List + fun getRoomActiveAndChannelNameIsNotNull(memberId: Long): List } class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : LiveRoomQueryRepository { @@ -191,12 +191,13 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L .fetch() } - override fun getRoomActiveAndChannelNameIsNotNull(): List { + override fun getRoomActiveAndChannelNameIsNotNull(memberId: Long): List { return queryFactory .selectFrom(liveRoom) .where( liveRoom.isActive.isTrue .and(liveRoom.channelName.isNotNull) + .and(liveRoom.member.id.eq(memberId)) ) .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 46577ed..09101b0 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 @@ -183,7 +183,7 @@ class LiveRoomService( } if (now == beginDateTime) { - val activeRooms = repository.getRoomActiveAndChannelNameIsNotNull() + val activeRooms = repository.getRoomActiveAndChannelNameIsNotNull(memberId = member.id!!) for (activeRoom in activeRooms) { activeRoom.isActive = false } @@ -410,7 +410,7 @@ class LiveRoomService( throw SodaException("$startAvailableDateTimeString 이후에 시작할 수 있습니다.") } - val activeRooms = repository.getRoomActiveAndChannelNameIsNotNull() + val activeRooms = repository.getRoomActiveAndChannelNameIsNotNull(memberId = member.id!!) for (activeRoom in activeRooms) { activeRoom.isActive = false }