src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt

@@ -39,7 +39,7 @@ import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository
 import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember
 import kr.co.vividnext.sodalive.live.room.kickout.LiveRoomKickOutService
 import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService
-import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository
+import kr.co.vividnext.sodalive.live.roulette.RouletteRepository
 import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
 import kr.co.vividnext.sodalive.member.Gender
 import kr.co.vividnext.sodalive.member.Member
@@ -66,7 +66,7 @@ import kotlin.concurrent.write
 @Transactional(readOnly = true)
 class LiveRoomService(
     private val repository: LiveRoomRepository,
-    private val rouletteRepository: NewRouletteRepository,
+    private val rouletteRepository: RouletteRepository,
     private val roomInfoRepository: LiveRoomInfoRedisRepository,
     private val roomCancelRepository: LiveRoomCancelRepository,
     private val kickOutService: LiveRoomKickOutService,
@@ -1004,12 +1004,10 @@ class LiveRoomService(
                     kickOutService.deleteKickOutData(roomId = room.id!!)
                     roomInfoRepository.deleteById(roomInfo.roomId)
 
-                    val rouletteList = rouletteRepository.findByCreatorId(creatorId = member.id!!)
+                    val roulette = rouletteRepository.findByIdOrNull(member.id!!)
-                    if (rouletteList.isNotEmpty()) {
+                    if (roulette != null) {
-                        rouletteList.forEach {
+                        roulette.isActive = false
-                            it.isActive = false
+                        rouletteRepository.save(roulette)
-                            rouletteRepository.save(it)
-                        }
                     }
                 } else {
                     roomInfo.removeSpeaker(member)

src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt

@@ -37,8 +37,10 @@ class NewRouletteService(
         if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")
 
         var rouletteList = repository.findByCreatorId(creatorId)
+        println(rouletteList)
         if (rouletteList.isEmpty()) {
             val roulette = oldRepository.findByIdOrNull(creatorId)
+            println(roulette)
             if (roulette != null) {
                 repository.save(
                     NewRoulette(
@@ -55,6 +57,8 @@ class NewRouletteService(
             }
         }
         rouletteList.sortedBy { it.id }
+        println(rouletteList)
+        println(oldRepository.findByIdOrNull(creatorId))
 
         return rouletteList.asSequence()
             .map {
@@ -86,38 +90,18 @@ class NewRouletteService(
     fun updateRoulette(memberId: Long, request: UpdateNewRouletteRequest): Boolean {
         rouletteValidate(can = request.can, items = request.items)
 
-        if (request.isActive) {
+        val roulette = repository.findByIdOrNull(request.id)
-            val rouletteList = repository.findByCreatorId(creatorId = memberId)
+            ?: throw SodaException("잘못된 요청입니다.")
 
-            if (rouletteList.isEmpty()) {
+        if (roulette.creatorId != memberId) {
-                throw SodaException("잘못된 요청입니다.")
+            throw SodaException("잘못된 요청입니다.")
-            }
-
-            rouletteList.forEach {
-                if (it.id == request.id) {
-                    it.can = request.can
-                    it.items = request.items
-                    it.isActive = true
-                } else {
-                    it.isActive = false
-                }
-
-                repository.save(it)
-            }
-        } else {
-            val roulette = repository.findByIdOrNull(request.id)
-                ?: throw SodaException("잘못된 요청입니다.")
-
-            if (roulette.creatorId != memberId) {
-                throw SodaException("잘못된 요청입니다.")
-            }
-
-            roulette.can = request.can
-            roulette.items = request.items
-            roulette.isActive = false
-            repository.save(roulette)
         }
 
+        roulette.can = request.can
+        roulette.items = request.items
+        roulette.isActive = request.isActive
+        repository.save(roulette)
+
         return request.isActive
     }