From 59a035e5c20b809f959d9168079b611591265db9 Mon Sep 17 00:00:00 2001 From: Klaus <klaus@vividnext.co.kr> Date: Tue, 5 Mar 2024 22:20:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20API=20-=20=EC=9D=91=EB=8B=B5?= =?UTF-8?q?=EC=97=90=20=EB=A9=94=EB=89=B4=ED=8C=90=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomService.kt | 6 ++++++ .../sodalive/live/room/info/GetRoomInfoResponse.kt | 1 + 2 files changed, 7 insertions(+) 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 7fb751c..c8937bc 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 @@ -38,6 +38,7 @@ import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfo import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember import kr.co.vividnext.sodalive.live.room.kickout.LiveRoomKickOutService +import kr.co.vividnext.sodalive.live.room.menu.LiveRoomMenuService import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository import kr.co.vividnext.sodalive.live.tag.LiveTagRepository @@ -65,6 +66,8 @@ import kotlin.concurrent.write @Service @Transactional(readOnly = true) class LiveRoomService( + private val menuService: LiveRoomMenuService, + private val repository: LiveRoomRepository, private val rouletteRepository: NewRouletteRepository, private val roomInfoRepository: LiveRoomInfoRedisRepository, @@ -703,6 +706,8 @@ class LiveRoomService( listOf() } + val menuPan = menuService.getLiveMenu(creatorId = room.member!!.id!!) + return GetRoomInfoResponse( roomId = roomId, title = room.title, @@ -738,6 +743,7 @@ class LiveRoomService( listenerList = roomInfo.listenerList, managerList = roomInfo.managerList, donationRankingTop3UserIds = donationRankingTop3UserIds, + menuPan = menuPan.menu, isPrivateRoom = room.type == LiveRoomType.PRIVATE, password = room.password, isActiveRoulette = isActiveRoulette diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt index fd0de33..d4d536e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt @@ -19,6 +19,7 @@ data class GetRoomInfoResponse( val listenerList: List<LiveRoomMember>, val managerList: List<LiveRoomMember>, val donationRankingTop3UserIds: List<Long>, + val menuPan: String, val isPrivateRoom: Boolean = false, val password: String? = null, val isActiveRoulette: Boolean = false