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 {