test #139

Merged
klaus merged 14 commits from test into main 2024-03-08 13:40:27 +00:00
2 changed files with 21 additions and 19 deletions
Showing only changes of commit c66421b45d - Show all commits

View File

@ -8,5 +8,5 @@ data class EditLiveRoomInfoRequest(
val timezone: String?, val timezone: String?,
val menuPanId: Long = 0, val menuPanId: Long = 0,
val menuPan: String = "", val menuPan: String = "",
val isActiveMenuPan: Boolean val isActiveMenuPan: Boolean? = null
) )

View File

@ -674,27 +674,29 @@ class LiveRoomService(
.toLocalDateTime() .toLocalDateTime()
} }
if (request.isActiveMenuPan) { if (request.isActiveMenuPan != null) {
if (request.menuPanId > 0) { if (request.isActiveMenuPan) {
menuService.updateLiveMenu( if (request.menuPanId > 0) {
memberId = member.id!!, menuService.updateLiveMenu(
request = UpdateLiveMenuRequest( memberId = member.id!!,
id = request.menuPanId, request = UpdateLiveMenuRequest(
menu = request.menuPan, id = request.menuPanId,
isActive = true menu = request.menuPan,
isActive = true
)
) )
) } else {
menuService.createLiveMenu(
memberId = member.id!!,
request = CreateLiveMenuRequest(
menu = request.menuPan,
isActive = true
)
)
}
} else { } else {
menuService.createLiveMenu( menuService.deactivateAll(memberId = member.id!!)
memberId = member.id!!,
request = CreateLiveMenuRequest(
menu = request.menuPan,
isActive = true
)
)
} }
} else {
menuService.deactivateAll(memberId = member.id!!)
} }
} }
} }