redis를 이전하기 위해 설정했던 모든 커밋 Revert

2024-11-24 01:23:41 +09:00
parent e38ed331b6
commit b7d7afb8a5
34 changed files with 214 additions and 637 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -35,6 +35,8 @@ import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationMessage
 import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationRequest
 import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationResponse
 import kr.co.vividnext.sodalive.live.room.info.GetRoomInfoResponse
+import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfo
+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.like.GetLiveRoomHeartListResponse
@@ -44,7 +46,7 @@ import kr.co.vividnext.sodalive.live.room.menu.CreateLiveMenuRequest
 import kr.co.vividnext.sodalive.live.room.menu.LiveRoomMenuService
 import kr.co.vividnext.sodalive.live.room.menu.UpdateLiveMenuRequest
 import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService
-import kr.co.vividnext.sodalive.live.roulette.NewRouletteService
+import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository
 import kr.co.vividnext.sodalive.live.signature.SignatureCanRepository
 import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
 import kr.co.vividnext.sodalive.member.Gender
@@ -52,10 +54,7 @@ import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
-import kr.co.vividnext.sodalive.redis.v1.LiveRoomInfoRedisRepository
-import kr.co.vividnext.sodalive.redis.v2.LiveRoomInfoRedisRepositoryV2
 import kr.co.vividnext.sodalive.utils.generateFileName
-import kr.co.vividnext.sodalive.v2.LiveRoomInfoV2
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.data.domain.Pageable
@@ -76,11 +75,10 @@ import kotlin.concurrent.write
@Transactional(readOnly = true)
 class LiveRoomService(
    private val menuService: LiveRoomMenuService,
-    private val rouletteService: NewRouletteService,

    private val repository: LiveRoomRepository,
+    private val rouletteRepository: NewRouletteRepository,
    private val roomInfoRepository: LiveRoomInfoRedisRepository,
-    private val roomInfoRepositoryV2: LiveRoomInfoRedisRepositoryV2,
    private val roomCancelRepository: LiveRoomCancelRepository,
    private val kickOutService: LiveRoomKickOutService,
    private val blockMemberRepository: BlockMemberRepository,
@@ -115,22 +113,6 @@ class LiveRoomService(
 ) {
    private val tokenLocks: MutableMap<Long, ReentrantReadWriteLock> = mutableMapOf()

-    private fun getLiveRoomInfo(roomId: Long): LiveRoomInfoV2? {
-        var roomInfoV2 = roomInfoRepositoryV2.findByIdOrNull(roomId)
-
-        if (roomInfoV2 == null) {
-            val roomInfoV1 = roomInfoRepository.findByIdOrNull(roomId)
-
-            if (roomInfoV1 != null) {
-                roomInfoV2 = roomInfoV1.convertRoomInfoV2()
-                roomInfoRepositoryV2.save(roomInfoV2)
-                roomInfoRepository.delete(roomInfoV1)
-            }
-        }
-
-        return roomInfoV2
-    }
-
    fun getRoomList(
        dateString: String?,
        status: LiveRoomStatus,
@@ -168,7 +150,7 @@ class LiveRoomService(
        return roomList
            .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
            .map {
-                val roomInfo = getLiveRoomInfo(it.id!!)
+                val roomInfo = roomInfoRepository.findByIdOrNull(it.id!!)

                val reservations = it.reservations
                    .filter { reservation -> reservation.member!!.id!! == member.id!! && reservation.isActive }
@@ -460,7 +442,7 @@ class LiveRoomService(
        response.manager = GetRoomDetailManager(room.member!!, cloudFrontHost = cloudFrontHost)

        if (!room.channelName.isNullOrBlank()) {
-            val roomInfo = getLiveRoomInfo(roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(roomId)

            if (roomInfo != null) {
                response.isPaid = canRepository.isExistPaidLiveRoom(
@@ -669,9 +651,9 @@ class LiveRoomService(

        val lock = getOrCreateLock(memberId = member.id!!)
        lock.write {
-            var roomInfo = getLiveRoomInfo(request.roomId)
+            var roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
            if (roomInfo == null) {
-                roomInfo = roomInfoRepositoryV2.save(LiveRoomInfoV2(roomId = request.roomId))
+                roomInfo = roomInfoRepository.save(LiveRoomInfo(roomId = request.roomId))
            }

            if (roomInfo.speakerCount + roomInfo.listenerCount + roomInfo.managerCount >= room.numberOfPeople) {
@@ -710,7 +692,7 @@ class LiveRoomService(
                roomInfo.addListener(member, cloudFrontHost)
            }

-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
            roomVisitService.roomVisit(room, member)
        }
    }
@@ -807,7 +789,7 @@ class LiveRoomService(
    }

    fun getRoomInfo(roomId: Long, member: Member): GetRoomInfoResponse {
-        val roomInfo = getLiveRoomInfo(roomId)
+        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

        val room = repository.findByIdOrNull(roomId)
@@ -835,7 +817,15 @@ class LiveRoomService(
            .getNotificationUserIds(room.member!!.id!!)
            .contains(member.id)

-        val isActiveRoulette = rouletteService.hasActiveRoulette(creatorId = room.member!!.id!!)
+        var isActiveRoulette = false
+        val rouletteList = rouletteRepository.findByCreatorId(creatorId = room.member!!.id!!)
+
+        for (roulette in rouletteList) {
+            if (roulette.isActive) {
+                isActiveRoulette = true
+                break
+            }
+        }

        val donationRankingTop3UserIds = if (room.member!!.isVisibleDonationRank) {
            explorerQueryRepository
@@ -899,7 +889,7 @@ class LiveRoomService(
        val liveRoomCreatorId = repository.getLiveRoomCreatorId(roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

-        val roomInfo = getLiveRoomInfo(roomId)
+        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

        return if (liveRoomCreatorId != member.id!!) {
@@ -920,18 +910,18 @@ class LiveRoomService(
                throw SodaException("잘못된 요청입니다.")
            }

-            val roomInfo = getLiveRoomInfo(request.roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
                ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

            roomInfo.removeDonationMessage(request.messageUUID)
-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }
    }

    fun getUserProfile(roomId: Long, userId: Long, member: Member): GetLiveRoomUserProfileResponse {
        val room = repository.getLiveRoom(roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
-        val roomInfo = getLiveRoomInfo(roomId)
+        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

        val user = memberRepository.findByIdOrNull(userId)
@@ -1000,7 +990,7 @@ class LiveRoomService(
    fun setSpeaker(request: SetManagerOrSpeakerOrAudienceRequest) {
        val lock = getOrCreateLock(memberId = request.memberId)
        lock.write {
-            val roomInfo = getLiveRoomInfo(request.roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
                ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

            val member = memberRepository.findByIdOrNull(request.memberId)
@@ -1014,14 +1004,14 @@ class LiveRoomService(
            roomInfo.removeManager(member)
            roomInfo.addSpeaker(member, cloudFrontHost)

-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }
    }

    fun setListener(request: SetManagerOrSpeakerOrAudienceRequest) {
        val lock = getOrCreateLock(memberId = request.memberId)
        lock.write {
-            val roomInfo = getLiveRoomInfo(request.roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
                ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

            val member = memberRepository.findByIdOrNull(request.memberId)
@@ -1031,7 +1021,7 @@ class LiveRoomService(
            roomInfo.removeManager(member)
            roomInfo.addListener(member, cloudFrontHost)

-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }
    }

@@ -1044,7 +1034,7 @@ class LiveRoomService(
            }

            val user = memberRepository.findByIdOrNull(request.memberId) ?: throw SodaException("해당하는 유저가 없습니다.")
-            val roomInfo = getLiveRoomInfo(request.roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
                ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

            val roomAccountResponse = LiveRoomMember(member = user, cloudFrontHost)
@@ -1063,7 +1053,7 @@ class LiveRoomService(
            roomInfo.removeSpeaker(user)
            roomInfo.addManager(user, cloudFrontHost)

-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }
    }

@@ -1090,7 +1080,7 @@ class LiveRoomService(
        if (request.message.isNotBlank()) {
            val lock = getOrCreateLock(memberId = member.id!!)
            lock.write {
-                val roomInfo = getLiveRoomInfo(room.id!!)
+                val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
                    ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

                roomInfo.addDonationMessage(
@@ -1101,7 +1091,7 @@ class LiveRoomService(
                    donationMessage = request.message
                )

-                roomInfoRepositoryV2.save(roomInfo)
+                roomInfoRepository.save(roomInfo)
            }
        }

@@ -1136,7 +1126,7 @@ class LiveRoomService(
        if (request.message.isNotBlank()) {
            val lock = getOrCreateLock(memberId = member.id!!)
            lock.write {
-                val roomInfo = getLiveRoomInfo(room.id!!)
+                val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
                    ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

                roomInfo.addDonationMessage(
@@ -1147,7 +1137,7 @@ class LiveRoomService(
                    donationMessage = request.message
                )

-                roomInfoRepositoryV2.save(roomInfo)
+                roomInfoRepository.save(roomInfo)
            }
        }

@@ -1226,20 +1216,27 @@ class LiveRoomService(
        val room = repository.getLiveRoom(roomId)
        val lock = getOrCreateLock(memberId = member.id!!)
        lock.write {
-            val roomInfo = getLiveRoomInfo(roomId)
+            val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
            if (roomInfo != null) {
                if (room?.member != null && room.member!! == member) {
                    room.isActive = false
                    kickOutService.deleteKickOutData(roomId = room.id!!)
-                    roomInfoRepositoryV2.deleteById(roomInfo.roomId)
+                    roomInfoRepository.deleteById(roomInfo.roomId)
+
+                    val rouletteList = rouletteRepository.findByCreatorId(creatorId = member.id!!)
+                    if (rouletteList.isNotEmpty()) {
+                        rouletteList.forEach {
+                            it.isActive = false
+                            rouletteRepository.save(it)
+                        }
+                    }

                    menuService.deactivateAll(memberId = member.id!!)
-                    rouletteService.deactivateAll(creatorId = member.id!!)
                } else {
                    roomInfo.removeSpeaker(member)
                    roomInfo.removeListener(member)
                    roomInfo.removeManager(member)
-                    roomInfoRepositoryV2.save(roomInfo)
+                    roomInfoRepository.save(roomInfo)
                }
            }
        }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt
@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.live.room.info

 import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationMessage
 import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.v2.LiveRoomInfoV2
 import org.springframework.data.annotation.Id
 import org.springframework.data.redis.core.RedisHash

@@ -119,14 +118,4 @@ data class LiveRoomInfo(
    fun removeDonationMessage(uuid: String) {
        (donationMessageList as MutableList).removeIf { it.uuid == uuid }
    }
-
-    fun convertRoomInfoV2(): LiveRoomInfoV2 {
-        return LiveRoomInfoV2(
-            roomId = roomId,
-            speakerList = speakerList,
-            listenerList = listenerList,
-            managerList = managerList,
-            donationMessageList = donationMessageList
-        )
-    }
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfoRedisRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfoRedisRepository.kt
@@ -0,0 +1,5 @@
+package kr.co.vividnext.sodalive.live.room.info
+
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomInfoRedisRepository : CrudRepository<LiveRoomInfo, Long>
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOut.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOut.kt
@@ -1,6 +1,5 @@
 package kr.co.vividnext.sodalive.live.room.kickout

-import kr.co.vividnext.sodalive.v2.LiveRoomKickOutV2
 import org.springframework.data.annotation.Id
 import org.springframework.data.redis.core.RedisHash

@@ -21,13 +20,6 @@ data class LiveRoomKickOut(
        userList.removeIf { it.userId == userId }
        userList.add(liveRoomKickOutUser)
    }
-
-    fun convertV2(): LiveRoomKickOutV2 {
-        return LiveRoomKickOutV2(
-            roomId = roomId,
-            userList = userList
-        )
-    }
 }

 data class LiveRoomKickOutUser(
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutRedisRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutRedisRepository.kt
@@ -0,0 +1,5 @@
+package kr.co.vividnext.sodalive.live.room.kickout
+
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomKickOutRedisRepository : CrudRepository<LiveRoomKickOut, Long>
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt
@@ -2,15 +2,10 @@ package kr.co.vividnext.sodalive.live.room.kickout

 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.live.room.LiveRoomRepository
+import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository
 import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
-import kr.co.vividnext.sodalive.redis.v1.LiveRoomInfoRedisRepository
-import kr.co.vividnext.sodalive.redis.v1.LiveRoomKickOutRedisRepository
-import kr.co.vividnext.sodalive.redis.v2.LiveRoomInfoRedisRepositoryV2
-import kr.co.vividnext.sodalive.redis.v2.LiveRoomKickOutRedisRepositoryV2
-import kr.co.vividnext.sodalive.v2.LiveRoomInfoV2
-import kr.co.vividnext.sodalive.v2.LiveRoomKickOutV2
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
@@ -18,52 +13,18 @@ import org.springframework.stereotype.Service
@Service
 class LiveRoomKickOutService(
    private val roomInfoRepository: LiveRoomInfoRedisRepository,
-    private val roomInfoRepositoryV2: LiveRoomInfoRedisRepositoryV2,
    private val repository: LiveRoomKickOutRedisRepository,
-    private val repositoryV2: LiveRoomKickOutRedisRepositoryV2,
    private val memberRepository: MemberRepository,
    private val roomRepository: LiveRoomRepository,

    @Value("\${cloud.aws.cloud-front.host}")
    private val cloudFrontHost: String
 ) {
-    private fun getLiveRoomInfo(roomId: Long): LiveRoomInfoV2? {
-        var roomInfoV2 = roomInfoRepositoryV2.findByIdOrNull(roomId)
-
-        if (roomInfoV2 == null) {
-            val roomInfoV1 = roomInfoRepository.findByIdOrNull(roomId)
-
-            if (roomInfoV1 != null) {
-                roomInfoV2 = roomInfoV1.convertRoomInfoV2()
-                roomInfoRepositoryV2.save(roomInfoV2)
-                roomInfoRepository.delete(roomInfoV1)
-            }
-        }
-
-        return roomInfoV2
-    }
-
-    private fun getLiveRoomKickOut(roomId: Long): LiveRoomKickOutV2? {
-        var liveRoomKickOutV2 = repositoryV2.findByIdOrNull(roomId)
-
-        if (liveRoomKickOutV2 == null) {
-            val liveRoomKickOutV1 = repository.findByIdOrNull(roomId)
-
-            if (liveRoomKickOutV1 != null) {
-                liveRoomKickOutV2 = liveRoomKickOutV1.convertV2()
-                repositoryV2.save(liveRoomKickOutV2)
-                repository.delete(liveRoomKickOutV1)
-            }
-        }
-
-        return liveRoomKickOutV2
-    }
-
    fun kickOut(request: LiveRoomKickOutRequest, member: Member) {
        val room = roomRepository.findByIdOrNull(request.roomId)
            ?: throw SodaException("해당하는 라이브가 없습니다.")

-        val roomInfo = getLiveRoomInfo(request.roomId)
+        val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

        if (room.member == null || room.member!!.id == null) {
@@ -74,20 +35,20 @@ class LiveRoomKickOutService(
            throw SodaException("권한이 없습니다.")
        }

-        var liveRoomKickOut = getLiveRoomKickOut(request.roomId)
+        var liveRoomKickOut = repository.findByIdOrNull(request.roomId)
        if (liveRoomKickOut == null) {
-            liveRoomKickOut = repositoryV2.save(LiveRoomKickOutV2(roomId = request.roomId))
+            liveRoomKickOut = repository.save(LiveRoomKickOut(roomId = request.roomId))
        }

        liveRoomKickOut.kickOut(request.userId)
-        repositoryV2.save(liveRoomKickOut)
+        repository.save(liveRoomKickOut)

        val kickOutUser = memberRepository.findByIdOrNull(request.userId)
        if (kickOutUser != null) {
            roomInfo.removeSpeaker(kickOutUser)
            roomInfo.removeListener(kickOutUser)
            roomInfo.removeManager(kickOutUser)
-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }
    }

--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuRepository.kt
@@ -0,0 +1,7 @@
+package kr.co.vividnext.sodalive.live.room.menu
+
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomMenuRepository : CrudRepository<LiveRoomMenu, Long> {
+    fun findByCreatorId(creatorId: Long): List<LiveRoomMenu>
+}
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/menu/LiveRoomMenuService.kt
@@ -2,49 +2,17 @@ package kr.co.vividnext.sodalive.live.room.menu

 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.live.roulette.RedisIdGenerator
-import kr.co.vividnext.sodalive.redis.v1.LiveRoomMenuRepository
-import kr.co.vividnext.sodalive.redis.v2.LiveRoomMenuRepositoryV2
 import org.springframework.stereotype.Service

@Service
 class LiveRoomMenuService(
    private val idGenerator: RedisIdGenerator,
-    private val repository: LiveRoomMenuRepository,
-    private val repositoryV2: LiveRoomMenuRepositoryV2
+    private val repository: LiveRoomMenuRepository
 ) {
-    private fun findByCreatorId(creatorId: Long): List<LiveRoomMenu> {
-        var liveRoomMenuList = repositoryV2.findByCreatorId(creatorId)
-
-        if (liveRoomMenuList.isEmpty()) {
-            liveRoomMenuList = repository.findByCreatorId(creatorId)
-
-            if (liveRoomMenuList.isNotEmpty()) {
-                val newLiveRoomMenuList = liveRoomMenuList.map { liveRoomMenu ->
-                    val newLiveRoomMenu = LiveRoomMenu(
-                        id = idGenerator.generateId(SEQUENCE_NAME),
-                        creatorId = liveRoomMenu.creatorId,
-                        isActive = liveRoomMenu.isActive,
-                        menu = liveRoomMenu.menu
-                    )
-                    repositoryV2.save(newLiveRoomMenu)
-                    repository.delete(liveRoomMenu)
-
-                    newLiveRoomMenu
-                }
-
-                return newLiveRoomMenuList
-            } else {
-                return emptyList()
-            }
-        } else {
-            return liveRoomMenuList
-        }
-    }
-
    fun getAllLiveMenu(creatorId: Long, memberId: Long): List<GetMenuPresetResponse> {
        if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")

-        return findByCreatorId(creatorId)
+        return repository.findByCreatorId(creatorId)
            .sortedBy { it.id }
            .asSequence()
            .map { GetMenuPresetResponse(id = it.id, menu = it.menu, isActive = it.isActive) }
@@ -54,7 +22,7 @@ class LiveRoomMenuService(
    fun createLiveMenu(memberId: Long, request: CreateLiveMenuRequest): Boolean {
        liveMenuValidate(menu = request.menu)

-        val menuList = findByCreatorId(creatorId = memberId)
+        val menuList = repository.findByCreatorId(creatorId = memberId)

        if (menuList.size >= 3) {
            throw SodaException("메뉴판의 최대개수는 3개입니다.")
@@ -63,7 +31,7 @@ class LiveRoomMenuService(
        if (request.isActive) {
            menuList.forEach {
                it.isActive = false
-                repositoryV2.save(it)
+                repository.save(it)
            }
        }

@@ -74,14 +42,14 @@ class LiveRoomMenuService(
            menu = request.menu
        )

-        repositoryV2.save(menu)
+        repository.save(menu)
        return request.isActive
    }

    fun updateLiveMenu(memberId: Long, request: UpdateLiveMenuRequest) {
        liveMenuValidate(menu = request.menu)

-        val menuList = findByCreatorId(creatorId = memberId)
+        val menuList = repository.findByCreatorId(creatorId = memberId)
        if (menuList.isEmpty()) {
            throw SodaException("잘못된 요청입니다.")
        }
@@ -90,16 +58,16 @@ class LiveRoomMenuService(
            if (it.id == request.id) {
                it.menu = request.menu
                it.isActive = request.isActive
-                repositoryV2.save(it)
+                repository.save(it)
            } else if (request.isActive) {
                it.isActive = false
-                repositoryV2.save(it)
+                repository.save(it)
            }
        }
    }

    fun getLiveMenu(creatorId: Long): GetMenuPresetResponse? {
-        val menuList = findByCreatorId(creatorId = creatorId)
+        val menuList = repository.findByCreatorId(creatorId = creatorId)

        var activeMenu: LiveRoomMenu? = null
        for (menu in menuList) {
@@ -117,11 +85,11 @@ class LiveRoomMenuService(
    }

    fun deactivateAll(memberId: Long) {
-        val menuList = findByCreatorId(creatorId = memberId)
+        val menuList = repository.findByCreatorId(creatorId = memberId)

        menuList.forEach {
            it.isActive = false
-            repositoryV2.save(it)
+            repository.save(it)
        }
    }

--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt
@@ -0,0 +1,7 @@
+package kr.co.vividnext.sodalive.live.roulette
+
+import org.springframework.data.repository.CrudRepository
+
+interface NewRouletteRepository : CrudRepository<NewRoulette, Long> {
+    fun findByCreatorId(creatorId: Long): List<NewRoulette>
+}
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt
@@ -16,9 +16,6 @@ import kr.co.vividnext.sodalive.live.room.LiveRoomRepository
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
-import kr.co.vividnext.sodalive.redis.v1.NewRouletteRepository
-import kr.co.vividnext.sodalive.redis.v2.RouletteRepositoryV2
-import kr.co.vividnext.sodalive.v2.RouletteV2
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -30,43 +27,15 @@ class NewRouletteService(

    private val canRepository: CanRepository,
    private val repository: NewRouletteRepository,
-    private val repositoryV2: RouletteRepositoryV2,
    private val roomRepository: LiveRoomRepository,
    private val memberRepository: MemberRepository,
    private val chargeRepository: ChargeRepository,
    private val useCanCalculateRepository: UseCanCalculateRepository
 ) {
-    private fun findByCreatorId(creatorId: Long): List<RouletteV2> {
-        var rouletteV2List = repositoryV2.findByCreatorId(creatorId)
-
-        if (rouletteV2List.isEmpty()) {
-            val rouletteV1List = repository.findByCreatorId(creatorId)
-
-            if (rouletteV1List.isNotEmpty()) {
-                rouletteV1List.forEach { rouletteV1 ->
-                    val rouletteV2 = RouletteV2(
-                        id = idGenerator.generateId(SEQUENCE_NAME),
-                        creatorId = rouletteV1.creatorId,
-                        can = rouletteV1.can,
-                        isActive = rouletteV1.isActive,
-                        items = rouletteV1.items
-                    )
-
-                    repositoryV2.save(rouletteV2)
-                    repository.delete(rouletteV1)
-                }
-
-                rouletteV2List = repositoryV2.findByCreatorId(creatorId)
-            }
-        }
-
-        return rouletteV2List
-    }
-
    fun getAllRoulette(creatorId: Long, memberId: Long): List<GetNewRouletteResponse> {
        if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")

-        val rouletteList = findByCreatorId(creatorId)
+        val rouletteList = repository.findByCreatorId(creatorId)

        return rouletteList.sortedBy { it.id }
            .map {
@@ -83,14 +52,14 @@ class NewRouletteService(
        rouletteValidate(can = request.can, items = request.items)

        if (request.isActive) {
-            val rouletteList = findByCreatorId(creatorId = memberId)
+            val rouletteList = repository.findByCreatorId(creatorId = memberId)
            rouletteList.forEach {
                it.isActive = false
-                repositoryV2.save(it)
+                repository.save(it)
            }
        }

-        val roulette = RouletteV2(
+        val roulette = NewRoulette(
            id = idGenerator.generateId(SEQUENCE_NAME),
            creatorId = memberId,
            can = request.can,
@@ -98,14 +67,14 @@ class NewRouletteService(
            items = request.items
        )

-        repositoryV2.save(roulette)
+        repository.save(roulette)
        return request.isActive
    }

    fun updateRoulette(memberId: Long, request: UpdateNewRouletteRequest): Boolean {
        rouletteValidate(can = request.can, items = request.items)

-        val rouletteList = findByCreatorId(creatorId = memberId)
+        val rouletteList = repository.findByCreatorId(creatorId = memberId)

        if (rouletteList.isEmpty()) {
            throw SodaException("잘못된 요청입니다.")
@@ -121,10 +90,10 @@ class NewRouletteService(
                it.can = request.can
                it.items = request.items
                it.isActive = request.isActive
-                repositoryV2.save(it)
+                repository.save(it)
            } else if (request.isActive) {
                it.isActive = false
-                repositoryV2.save(it)
+                repository.save(it)
            }
        }

@@ -132,13 +101,13 @@ class NewRouletteService(
    }

    fun getRoulette(creatorId: Long, memberId: Long): GetRouletteResponse {
-        val rouletteList = findByCreatorId(creatorId = creatorId)
+        val rouletteList = repository.findByCreatorId(creatorId = creatorId)

        if (rouletteList.isEmpty()) {
            throw SodaException("룰렛을 사용할 수 없습니다.")
        }

-        var activeRoulette: RouletteV2? = null
+        var activeRoulette: NewRoulette? = null
        for (roulette in rouletteList) {
            if (roulette.isActive) {
                activeRoulette = roulette
@@ -170,13 +139,13 @@ class NewRouletteService(
        }

        // STEP 2 - 룰렛 데이터 가져오기
-        val rouletteList = findByCreatorId(creatorId = host.id!!)
+        val rouletteList = repository.findByCreatorId(creatorId = host.id!!)

        if (rouletteList.isEmpty()) {
            throw SodaException("룰렛을 사용할 수 없습니다.")
        }

-        var activeRoulette: RouletteV2? = null
+        var activeRoulette: NewRoulette? = null
        for (roulette in rouletteList) {
            if (roulette.isActive) {
                activeRoulette = roulette
@@ -251,28 +220,7 @@ class NewRouletteService(
        }
    }

-    fun hasActiveRoulette(creatorId: Long): Boolean {
-        val rouletteList = findByCreatorId(creatorId)
-
-        for (roulette in rouletteList) {
-            if (roulette.isActive) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    fun deactivateAll(creatorId: Long) {
-        val rouletteList = findByCreatorId(creatorId)
-
-        rouletteList.forEach {
-            it.isActive = false
-            repositoryV2.save(it)
-        }
-    }
-
    companion object {
-        const val SEQUENCE_NAME = "Roulette:sequence"
+        const val SEQUENCE_NAME = "newRoulette:sequence"
    }
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RedisIdGenerator.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RedisIdGenerator.kt
@@ -1,13 +1,10 @@
 package kr.co.vividnext.sodalive.live.roulette

-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.data.redis.core.StringRedisTemplate
 import org.springframework.stereotype.Service

@Service
-class RedisIdGenerator(
-    @Qualifier("valkeyStringRedisTemplate") private val stringRedisTemplate: StringRedisTemplate
-) {
+class RedisIdGenerator(private val stringRedisTemplate: StringRedisTemplate) {
    fun generateId(key: String): Long {
        return stringRedisTemplate.opsForValue().increment(key, 1) ?: 1L
    }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt
@@ -0,0 +1,10 @@
+package kr.co.vividnext.sodalive.live.roulette.v2
+
+import kr.co.vividnext.sodalive.live.roulette.NewRoulette
+import org.springframework.data.repository.CrudRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface RouletteRepository : CrudRepository<NewRoulette, Long> {
+    fun findByCreatorId(creatorId: Long): List<NewRoulette>
+}
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt
@@ -13,16 +13,13 @@ import kr.co.vividnext.sodalive.can.use.UseCanCalculateRepository
 import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.live.room.LiveRoomRepository
+import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository
 import kr.co.vividnext.sodalive.live.roulette.NewRoulette
 import kr.co.vividnext.sodalive.live.roulette.RedisIdGenerator
 import kr.co.vividnext.sodalive.live.roulette.RouletteItem
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
-import kr.co.vividnext.sodalive.redis.v1.LiveRoomInfoRedisRepository
-import kr.co.vividnext.sodalive.redis.v1.RouletteRepository
-import kr.co.vividnext.sodalive.redis.v2.LiveRoomInfoRedisRepositoryV2
-import kr.co.vividnext.sodalive.v2.LiveRoomInfoV2
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -41,27 +38,10 @@ class RouletteService(
    private val memberRepository: MemberRepository,
    private val chargeRepository: ChargeRepository,
    private val roomInfoRepository: LiveRoomInfoRedisRepository,
-    private val roomInfoRepositoryV2: LiveRoomInfoRedisRepositoryV2,
    private val useCanCalculateRepository: UseCanCalculateRepository
 ) {
    private val tokenLocks: MutableMap<Long, ReentrantReadWriteLock> = mutableMapOf()

-    private fun getLiveRoomInfo(roomId: Long): LiveRoomInfoV2? {
-        var roomInfoV2 = roomInfoRepositoryV2.findByIdOrNull(roomId)
-
-        if (roomInfoV2 == null) {
-            val roomInfoV1 = roomInfoRepository.findByIdOrNull(roomId)
-
-            if (roomInfoV1 != null) {
-                roomInfoV2 = roomInfoV1.convertRoomInfoV2()
-                roomInfoRepositoryV2.save(roomInfoV2)
-                roomInfoRepository.delete(roomInfoV1)
-            }
-        }
-
-        return roomInfoV2
-    }
-
    fun getAllRoulette(creatorId: Long, memberId: Long): List<GetRouletteResponseV2> {
        if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")

@@ -178,7 +158,7 @@ class RouletteService(

        val lock = getOrCreateLock(memberId = member.id!!)
        lock.write {
-            val roomInfo = getLiveRoomInfo(room.id!!)
+            val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
                ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")

            roomInfo.addRouletteMessage(
@@ -187,7 +167,7 @@ class RouletteService(
                donationMessage = "[$result] 당첨!"
            )

-            roomInfoRepositoryV2.save(roomInfo)
+            roomInfoRepository.save(roomInfo)
        }

        return SpinRouletteResponse(can = roulette.can, result = result, items = itemList)