From 0e8d3656b2e9e9209de81ca889b3867f229ce2ec Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 29 Nov 2023 19:46:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EA=B0=80=EC=A0=B8=20?= =?UTF-8?q?=EC=98=A4=EA=B8=B0=20API=20-=20isActive=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/live/roulette/GetRouletteResponse.kt | 1 + .../co/vividnext/sodalive/live/roulette/RouletteController.kt | 4 +++- .../kr/co/vividnext/sodalive/live/roulette/RouletteService.kt | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt index a0e6e48..8b08ce5 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt @@ -2,5 +2,6 @@ package kr.co.vividnext.sodalive.live.roulette data class GetRouletteResponse( val can: Int, + val isActive: Boolean, val items: List ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index 69dd64d..29df13a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -35,7 +35,9 @@ class RouletteController(private val service: RouletteService) { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") val response = service.getRoulette(creatorId = creatorId) - ?: throw SodaException("룰렛을 사용할 수 없습니다.") + if (response == null && creatorId != member.id!!) { + throw SodaException("룰렛을 사용할 수 없습니다.") + } return ApiResponse.ok(response) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 4a90880..9c1460e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -60,7 +60,7 @@ class RouletteService( return null } - return GetRouletteResponse(can = roulette.can, items = roulette.items) + return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } @Transactional @@ -91,7 +91,7 @@ class RouletteService( container = request.container ) - return GetRouletteResponse(can = roulette.can, items = roulette.items) + return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock {