From c66421b45d96bef8610ec8aeb2972f701912b815 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 7 Mar 2024 05:39:16 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20=EB=A9=94=EB=89=B4=ED=8C=90=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94/=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/room/EditLiveRoomInfoRequest.kt | 2 +- .../sodalive/live/room/LiveRoomService.kt | 38 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/EditLiveRoomInfoRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/EditLiveRoomInfoRequest.kt index 9d24bfd..bfa5f37 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/EditLiveRoomInfoRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/EditLiveRoomInfoRequest.kt @@ -8,5 +8,5 @@ data class EditLiveRoomInfoRequest( val timezone: String?, val menuPanId: Long = 0, val menuPan: String = "", - val isActiveMenuPan: Boolean + val isActiveMenuPan: Boolean? = null ) 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 5b0fffc..2320726 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 @@ -674,27 +674,29 @@ class LiveRoomService( .toLocalDateTime() } - if (request.isActiveMenuPan) { - if (request.menuPanId > 0) { - menuService.updateLiveMenu( - memberId = member.id!!, - request = UpdateLiveMenuRequest( - id = request.menuPanId, - menu = request.menuPan, - isActive = true + if (request.isActiveMenuPan != null) { + if (request.isActiveMenuPan) { + if (request.menuPanId > 0) { + menuService.updateLiveMenu( + memberId = member.id!!, + request = UpdateLiveMenuRequest( + id = request.menuPanId, + menu = request.menuPan, + isActive = true + ) ) - ) + } else { + menuService.createLiveMenu( + memberId = member.id!!, + request = CreateLiveMenuRequest( + menu = request.menuPan, + isActive = true + ) + ) + } } else { - menuService.createLiveMenu( - memberId = member.id!!, - request = CreateLiveMenuRequest( - menu = request.menuPan, - isActive = true - ) - ) + menuService.deactivateAll(memberId = member.id!!) } - } else { - menuService.deactivateAll(memberId = member.id!!) } } }