From 5609bdb6f4a506b9e3b35ebb005ac55d91e1cfbc Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 7 Mar 2024 04:34:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=89=B4=ED=8C=90=20-=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=EC=97=AC=EB=B6=80=EB=A5=BC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20isActive=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/menu/GetMenuPresetResponse.kt | 7 +++++++ .../vividnext/sodalive/live/room/menu/GetMenuResponse.kt | 6 ------ .../sodalive/live/room/menu/LiveRoomMenuService.kt | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuPresetResponse.kt delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuResponse.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuPresetResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuPresetResponse.kt new file mode 100644 index 0000000..b1d6aec --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuPresetResponse.kt @@ -0,0 +1,7 @@ +package kr.co.vividnext.sodalive.live.room.menu + +data class GetMenuPresetResponse( + val id: Long, + val menu: String, + val isActive: Boolean +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuResponse.kt deleted file mode 100644 index c1187e9..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/GetMenuResponse.kt +++ /dev/null @@ -1,6 +0,0 @@ -package kr.co.vividnext.sodalive.live.room.menu - -data class GetMenuResponse( - val id: Long, - val menu: String -) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt index e27c78a..e9fc6ab 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt @@ -9,13 +9,13 @@ class LiveRoomMenuService( private val idGenerator: RedisIdGenerator, private val repository: LiveRoomMenuRepository ) { - fun getAllLiveMenu(creatorId: Long, memberId: Long): List { + fun getAllLiveMenu(creatorId: Long, memberId: Long): List { if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") return repository.findByCreatorId(creatorId) .sortedBy { it.id } .asSequence() - .map { GetMenuResponse(id = it.id, menu = it.menu) } + .map { GetMenuPresetResponse(id = it.id, menu = it.menu, isActive = it.isActive) } .toList() } @@ -66,7 +66,7 @@ class LiveRoomMenuService( } } - fun getLiveMenu(creatorId: Long): GetMenuResponse? { + fun getLiveMenu(creatorId: Long): GetMenuPresetResponse? { val menuList = repository.findByCreatorId(creatorId = creatorId) var activeMenu: LiveRoomMenu? = null @@ -81,7 +81,7 @@ class LiveRoomMenuService( return null } - return GetMenuResponse(id = activeMenu.id, menu = activeMenu.menu) + return GetMenuPresetResponse(id = activeMenu.id, menu = activeMenu.menu, isActive = activeMenu.isActive) } fun deactivateAll(memberId: Long) {