라이브 방 룰렛 처리 및 저장

- Redis -> Valkey로 이전되도록 수정

src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt

@@ -2,17 +2,12 @@ package kr.co.vividnext.sodalive.admin.calculate
 
 import kr.co.vividnext.sodalive.creator.admin.calculate.GetCreatorCalculateCommunityPostResponse
 import kr.co.vividnext.sodalive.extensions.convertLocalDateTime
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class AdminCalculateService(private val repository: AdminCalculateQueryRepository) {
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'calculateLive:' + " + "#startDateStr + ':' + #endDateStr"
-    )
     fun getCalculateLive(startDateStr: String, endDateStr: String): List<GetCalculateLiveResponse> {
         val startDate = startDateStr.convertLocalDateTime()
         val endDate = endDateStr.convertLocalDateTime(hour = 23, minute = 59, second = 59)
@@ -23,10 +18,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'calculateContent:' + " + "#startDateStr + ':' + #endDateStr"
-    )
     fun getCalculateContentList(startDateStr: String, endDateStr: String): List<GetCalculateContentResponse> {
         val startDate = startDateStr.convertLocalDateTime()
         val endDate = endDateStr.convertLocalDateTime(hour = 23, minute = 59, second = 59)
@@ -37,10 +28,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'cumulativeSalesByContent:' + " + "#offset + ':' + #limit"
-    )
     fun getCumulativeSalesByContent(offset: Long, limit: Long): GetCumulativeSalesByContentResponse {
         val totalCount = repository.getCumulativeSalesByContentTotalCount()
         val items = repository
@@ -51,10 +38,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'calculateContentDonationList2:' + " + "#startDateStr + ':' + #endDateStr"
-    )
     fun getCalculateContentDonationList(
         startDateStr: String,
         endDateStr: String
@@ -68,10 +51,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'calculateCommunityPost:' + " + "#startDateStr + ':' + #endDateStr + ':' + #offset"
-    )
     fun getCalculateCommunityPost(
         startDateStr: String,
         endDateStr: String,

src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt

@@ -20,9 +20,9 @@ import kr.co.vividnext.sodalive.live.recommend.RecommendLiveCreatorBannerReposit
 import kr.co.vividnext.sodalive.live.reservation.LiveReservationRepository
 import kr.co.vividnext.sodalive.live.room.cancel.LiveRoomCancel
 import kr.co.vividnext.sodalive.live.room.cancel.LiveRoomCancelRepository
-import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.utils.generateFileName
+import kr.co.vividnext.sodalive.v2.LiveRoomInfoRedisRepositoryV2
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.data.domain.Pageable
@@ -37,7 +37,7 @@ import java.time.format.DateTimeFormatter
 @Service
 class AdminLiveService(
     private val recommendCreatorBannerRepository: RecommendLiveCreatorBannerRepository,
-    private val roomInfoRepository: LiveRoomInfoRedisRepository,
+    private val roomInfoRepository: LiveRoomInfoRedisRepositoryV2,
     private val roomCancelRepository: LiveRoomCancelRepository,
     private val repository: AdminLiveRoomQueryRepository,
     private val memberRepository: MemberRepository,

src/main/kotlin/kr/co/vividnext/sodalive/configs/JpaConfig.kt

@@ -0,0 +1,18 @@
+package kr.co.vividnext.sodalive.configs
+
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.FilterType
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+
+@Configuration
+@EnableJpaRepositories(
+    basePackages = ["kr.co.vividnext.sodalive"],
+    includeFilters = [
+        ComponentScan.Filter(
+            type = FilterType.ASSIGNABLE_TYPE,
+            classes = [org.springframework.data.jpa.repository.JpaRepository::class]
+        )
+    ]
+)
+class JpaConfig

src/main/kotlin/kr/co/vividnext/sodalive/configs/RedisConfig.kt

@@ -1,32 +1,40 @@
 package kr.co.vividnext.sodalive.configs
 
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.EnableCaching
 import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
-import org.springframework.data.redis.cache.RedisCacheConfiguration
+import org.springframework.context.annotation.FilterType
-import org.springframework.data.redis.cache.RedisCacheManager
 import org.springframework.data.redis.connection.RedisConnectionFactory
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration
 import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
 import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.data.redis.core.StringRedisTemplate
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer
-import org.springframework.data.redis.serializer.RedisSerializationContext
-import org.springframework.data.redis.serializer.StringRedisSerializer
-import java.time.Duration
 
 @Configuration
-@EnableCaching
+@EnableRedisRepositories(
-@EnableRedisRepositories
+    basePackages = ["kr.co.vividnext.sodalive"],
+    redisTemplateRef = "redisTemplate",
+    excludeFilters = [
+        ComponentScan.Filter(
+            type = FilterType.REGEX,
+            pattern = ["kr\\.co\\.vividnext\\.sodalive\\.v2\\..*"]
+        ),
+        ComponentScan.Filter(
+            type = FilterType.ASSIGNABLE_TYPE,
+            classes = [org.springframework.data.jpa.repository.JpaRepository::class]
+        )
+    ]
+)
 class RedisConfig(
     @Value("\${spring.redis.host}")
     private val host: String,
     @Value("\${spring.redis.port}")
     private val port: Int
 ) {
-    @Bean
+    @Bean(name = ["redisConnectionFactory"])
     fun redisConnectionFactory(): RedisConnectionFactory {
         val clientConfiguration = LettuceClientConfiguration.builder()
             .useSsl()
@@ -36,53 +44,15 @@ class RedisConfig(
         return LettuceConnectionFactory(RedisStandaloneConfiguration(host, port), clientConfiguration)
     }
 
-    @Bean
+    @Bean(name = ["redisTemplate"])
     fun redisTemplate(): RedisTemplate<*, *> {
         val redisTemplate: RedisTemplate<*, *> = RedisTemplate<Any, Any>()
         redisTemplate.setConnectionFactory(redisConnectionFactory())
         return redisTemplate
     }
 
-    @Bean
+    @Bean(name = ["redisStringRedisTemplate"])
-    fun cacheManager(redisConnectionFactory: RedisConnectionFactory): RedisCacheManager {
+    fun redisStringRedisTemplate(): StringRedisTemplate {
-        val defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+        return StringRedisTemplate(redisConnectionFactory())
-            .entryTtl(Duration.ofMinutes(30))
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-
-        val cacheConfigMap = mutableMapOf<String, RedisCacheConfiguration>()
-        cacheConfigMap["default"] = RedisCacheConfiguration.defaultCacheConfig()
-            .entryTtl(Duration.ofMinutes(30))
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-        cacheConfigMap["cache_ttl_3_days"] = RedisCacheConfiguration.defaultCacheConfig()
-            .entryTtl(Duration.ofDays(3))
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-        cacheConfigMap["cache_ttl_3_hours"] = RedisCacheConfiguration.defaultCacheConfig()
-            .entryTtl(Duration.ofHours(3))
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-
-        return RedisCacheManager.builder(redisConnectionFactory)
-            .cacheDefaults(defaultCacheConfig)
-            .withInitialCacheConfigurations(cacheConfigMap)
-            .build()
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/configs/ValkeyConfig.kt

@@ -0,0 +1,66 @@
+package kr.co.vividnext.sodalive.configs
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.FilterType
+import org.springframework.data.redis.connection.RedisClusterConfiguration
+import org.springframework.data.redis.connection.RedisConnectionFactory
+import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
+import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.data.redis.core.StringRedisTemplate
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories
+import java.time.Duration
+
+@Configuration
+@EnableRedisRepositories(
+    basePackages = ["kr.co.vividnext.sodalive.v2"],
+    redisTemplateRef = "valkeyTemplate",
+    includeFilters = [
+        ComponentScan.Filter(
+            type = FilterType.REGEX,
+            pattern = ["kr\\.co\\.vividnext\\.sodalive\\.v2\\..*"]
+        )
+    ],
+    excludeFilters = [
+        ComponentScan.Filter(
+            type = FilterType.ASSIGNABLE_TYPE,
+            classes = [org.springframework.data.jpa.repository.JpaRepository::class]
+        )
+    ]
+)
+class ValkeyConfig(
+    @Value("\${spring.valkey.host}")
+    private val host: String,
+    @Value("\${spring.valkey.port}")
+    private val port: Int
+) {
+    @Bean(name = ["valkeyConnectionFactory"])
+    fun valkeyConnectionFactory(): RedisConnectionFactory {
+        val clusterConfig = RedisClusterConfiguration()
+        clusterConfig.clusterNode(host, port)
+
+        val clientConfig = LettuceClientConfiguration.builder()
+            .commandTimeout(Duration.ofSeconds(5))
+            .shutdownTimeout(Duration.ofSeconds(5))
+            .useSsl()
+            .disablePeerVerification()
+            .build()
+
+        return LettuceConnectionFactory(clusterConfig, clientConfig)
+    }
+
+    @Bean(name = ["valkeyTemplate"])
+    fun valkeyTemplate(): RedisTemplate<*, *> {
+        val redisTemplate: RedisTemplate<*, *> = RedisTemplate<Any, Any>()
+        redisTemplate.setConnectionFactory(valkeyConnectionFactory())
+        return redisTemplate
+    }
+
+    @Bean(name = ["valkeyStringRedisTemplate"])
+    fun valkeyStringRedisTemplate(): StringRedisTemplate {
+        return StringRedisTemplate(valkeyConnectionFactory())
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt

@@ -28,7 +28,6 @@ import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
@@ -717,11 +716,6 @@ class AudioContentService(
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_days"],
-        key = "'contentRanking:' + ':' +" +
-            "#isAdult + ':' + #startDate + ':' + #endDate + ':' + #sortType + ':' + #offset + ':' + #limit"
-    )
     fun getAudioContentRanking(
         isAdult: Boolean,
         startDate: LocalDateTime,

src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt

@@ -10,7 +10,6 @@ import kr.co.vividnext.sodalive.event.EventItem
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -27,7 +26,6 @@ class AudioContentMainService(
     private val imageHost: String
 ) {
     @Transactional(readOnly = true)
-    @Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
     fun getThemeList(isAdult: Boolean): List<String> {
         return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
     }
@@ -81,7 +79,6 @@ class AudioContentMainService(
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(cacheNames = ["default"], key = "'newContentUploadCreatorList:' + #memberId + ':' + #isAdult")
     fun getNewContentUploadCreatorList(memberId: Long, isAdult: Boolean): List<GetNewContentUploadCreator> {
         return repository.getNewContentUploadCreatorList(
             cloudfrontHost = imageHost,
@@ -93,7 +90,6 @@ class AudioContentMainService(
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(cacheNames = ["default"], key = "'contentMainBannerList:' + #memberId + ':' + #isAdult")
     fun getAudioContentMainBannerList(memberId: Long, isAdult: Boolean) =
         repository.getAudioContentMainBannerList(isAdult = isAdult)
             .asSequence()
@@ -156,11 +152,6 @@ class AudioContentMainService(
             .toList()
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["default"],
-        key = "'getAudioContentCurationListWithPaging:' + #memberId + ':' + #isAdult + ':' + #contentType" +
-            "+ ':' + #offset + ':' + #limit"
-    )
     fun getAudioContentCurationListWithPaging(
         memberId: Long,
         isAdult: Boolean,

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt

@@ -4,17 +4,12 @@ import kr.co.vividnext.sodalive.admin.calculate.GetCalculateLiveResponse
 import kr.co.vividnext.sodalive.admin.calculate.GetCumulativeSalesByContentResponse
 import kr.co.vividnext.sodalive.extensions.convertLocalDateTime
 import kr.co.vividnext.sodalive.member.Member
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class CreatorAdminCalculateService(private val repository: CreatorAdminCalculateQueryRepository) {
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["default"],
-        key = "'creatorCalculateLive:v20240403_01:' + " + "#member + ':' + #startDateStr + ':' + #endDateStr"
-    )
     fun getCalculateLive(startDateStr: String, endDateStr: String, member: Member): List<GetCalculateLiveResponse> {
         val startDate = startDateStr.convertLocalDateTime()
         val endDate = endDateStr.convertLocalDateTime(hour = 23, minute = 59, second = 59)
@@ -25,11 +20,6 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'creatorCalculateContentList:v20240403_01:' + " +
-            "#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit"
-    )
     fun getCalculateContentList(
         startDateStr: String,
         endDateStr: String,
@@ -48,10 +38,6 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'creatorCumulativeSalesByContent:' + " + "#memberId + ':' + #offset + ':' + #limit"
-    )
     fun getCumulativeSalesByContent(memberId: Long, offset: Long, limit: Long): GetCumulativeSalesByContentResponse {
         val totalCount = repository.getCumulativeSalesByContentTotalCount(memberId)
         val items = repository
@@ -62,11 +48,6 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'creatorCalculateContentDonationList2:' + " +
-            "#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit"
-    )
     fun getCalculateContentDonationList(
         startDateStr: String,
         endDateStr: String,
@@ -86,11 +67,6 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(
-        cacheNames = ["cache_ttl_3_hours"],
-        key = "'creatorCalculateCommunityPost:' + " +
-            "#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit"
-    )
     fun getCalculateCommunityPost(
         startDateStr: String,
         endDateStr: String,

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt

@@ -7,7 +7,9 @@ import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.login.LoginRequest
 import kr.co.vividnext.sodalive.member.login.LoginResponse
+import kr.co.vividnext.sodalive.member.token.MemberToken
 import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
+import kr.co.vividnext.sodalive.v2.MemberTokenRepositoryV2
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
@@ -22,6 +24,7 @@ import kotlin.concurrent.write
 class CreatorAdminMemberService(
     private val repository: MemberRepository,
     private val tokenRepository: MemberTokenRepository,
+    private val tokenRepositoryV2: MemberTokenRepositoryV2,
     private val tokenProvider: TokenProvider,
     private val authenticationManagerBuilder: AuthenticationManagerBuilder,
 
@@ -47,13 +50,29 @@ class CreatorAdminMemberService(
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
-            val memberToken = tokenRepository.findByIdOrNull(memberId)
+            val memberToken = saveAndGetTokenById(memberId)
-                ?: throw SodaException("로그인 정보를 확인해주세요.")
 
+            if (memberToken != null) {
                 memberToken.tokenSet.remove(token)
-            tokenRepository.save(memberToken)
+                tokenRepositoryV2.save(memberToken)
             }
         }
+    }
+
+    private fun saveAndGetTokenById(id: Long): MemberToken? {
+        var memberToken = tokenRepositoryV2.findByIdOrNull(id = id)
+
+        if (memberToken == null) {
+            memberToken = tokenRepository.findByIdOrNull(id = id)
+
+            if (memberToken != null) {
+                tokenRepositoryV2.save(memberToken)
+                tokenRepository.delete(memberToken)
+            }
+        }
+
+        return memberToken
+    }
 
     private fun login(email: String, password: String): LoginResponse {
         val member = repository.findByEmail(email = email) ?: throw SodaException("로그인 정보를 확인해주세요.")

src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt

@@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.member.MemberAdapter
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.token.MemberToken
 import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
+import kr.co.vividnext.sodalive.v2.MemberTokenRepositoryV2
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.InitializingBean
 import org.springframework.beans.factory.annotation.Value
@@ -35,7 +36,8 @@ class TokenProvider(
     @Value("\${jwt.token-validity-in-seconds}")
     private val tokenValidityInSeconds: Long,
     private val repository: MemberRepository,
-    private val tokenRepository: MemberTokenRepository
+    private val tokenRepository: MemberTokenRepository,
+    private val tokenRepositoryV2: MemberTokenRepositoryV2
 ) : InitializingBean {
 
     private val logger = LoggerFactory.getLogger(TokenProvider::class.java)
@@ -65,11 +67,11 @@ class TokenProvider(
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
-            val memberToken = tokenRepository.findByIdOrNull(memberId)
+            val memberToken = saveAndGetTokenById(memberId)
                 ?: MemberToken(id = memberId)
 
             memberToken.tokenSet.add(token)
-            tokenRepository.save(memberToken)
+            tokenRepositoryV2.save(memberToken)
         }
 
         return token
@@ -84,7 +86,7 @@ class TokenProvider(
             .body
 
         val authorities = claims[AUTHORITIES_KEY].toString().split(",").map { SimpleGrantedAuthority(it) }
-        val memberToken = tokenRepository.findByIdOrNull(id = claims.subject.toLong())
+        val memberToken = saveAndGetTokenById(id = claims.subject.toLong())
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
         if (!memberToken.tokenSet.contains(token)) throw SodaException("로그인 정보를 확인해주세요.")
@@ -96,6 +98,21 @@ class TokenProvider(
         return UsernamePasswordAuthenticationToken(principal, token, authorities)
     }
 
+    private fun saveAndGetTokenById(id: Long): MemberToken? {
+        var memberToken = tokenRepositoryV2.findByIdOrNull(id = id)
+
+        if (memberToken == null) {
+            memberToken = tokenRepository.findByIdOrNull(id = id)
+
+            if (memberToken != null) {
+                tokenRepositoryV2.save(memberToken)
+                tokenRepository.delete(memberToken)
+            }
+        }
+
+        return memberToken
+    }
+
     fun validateToken(token: String): Boolean {
         try {
             Jwts.parserBuilder()

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

@@ -35,7 +35,6 @@ 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
@@ -46,7 +45,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.NewRouletteRepository
+import kr.co.vividnext.sodalive.live.roulette.NewRouletteService
 import kr.co.vividnext.sodalive.live.signature.SignatureCanRepository
 import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
 import kr.co.vividnext.sodalive.member.Gender
@@ -55,6 +54,8 @@ 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.utils.generateFileName
+import kr.co.vividnext.sodalive.v2.LiveRoomInfoRedisRepositoryV2
+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
@@ -75,10 +76,11 @@ 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,
@@ -113,6 +115,22 @@ 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,
@@ -150,7 +168,7 @@ class LiveRoomService(
         return roomList
             .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
             .map {
-                val roomInfo = roomInfoRepository.findByIdOrNull(it.id!!)
+                val roomInfo = getLiveRoomInfo(it.id!!)
 
                 val reservations = it.reservations
                     .filter { reservation -> reservation.member!!.id!! == member.id!! && reservation.isActive }
@@ -442,7 +460,7 @@ class LiveRoomService(
         response.manager = GetRoomDetailManager(room.member!!, cloudFrontHost = cloudFrontHost)
 
         if (!room.channelName.isNullOrBlank()) {
-            val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+            val roomInfo = getLiveRoomInfo(roomId)
 
             if (roomInfo != null) {
                 response.isPaid = canRepository.isExistPaidLiveRoom(
@@ -651,9 +669,9 @@ class LiveRoomService(
 
         val lock = getOrCreateLock(memberId = member.id!!)
         lock.write {
-            var roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
+            var roomInfo = getLiveRoomInfo(request.roomId)
             if (roomInfo == null) {
-                roomInfo = roomInfoRepository.save(LiveRoomInfo(roomId = request.roomId))
+                roomInfo = roomInfoRepositoryV2.save(LiveRoomInfoV2(roomId = request.roomId))
             }
 
             if (roomInfo.speakerCount + roomInfo.listenerCount + roomInfo.managerCount >= room.numberOfPeople) {
@@ -692,7 +710,7 @@ class LiveRoomService(
                 roomInfo.addListener(member, cloudFrontHost)
             }
 
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
             roomVisitService.roomVisit(room, member)
         }
     }
@@ -789,7 +807,7 @@ class LiveRoomService(
     }
 
     fun getRoomInfo(roomId: Long, member: Member): GetRoomInfoResponse {
-        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+        val roomInfo = getLiveRoomInfo(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
         val room = repository.findByIdOrNull(roomId)
@@ -817,15 +835,7 @@ class LiveRoomService(
             .getNotificationUserIds(room.member!!.id!!)
             .contains(member.id)
 
-        var isActiveRoulette = false
+        val isActiveRoulette = rouletteService.hasActiveRoulette(creatorId = room.member!!.id!!)
-        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
@@ -889,7 +899,7 @@ class LiveRoomService(
         val liveRoomCreatorId = repository.getLiveRoomCreatorId(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
-        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+        val roomInfo = getLiveRoomInfo(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
         return if (liveRoomCreatorId != member.id!!) {
@@ -910,18 +920,18 @@ class LiveRoomService(
                 throw SodaException("잘못된 요청입니다.")
             }
 
-            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
+            val roomInfo = getLiveRoomInfo(request.roomId)
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             roomInfo.removeDonationMessage(request.messageUUID)
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
     }
 
     fun getUserProfile(roomId: Long, userId: Long, member: Member): GetLiveRoomUserProfileResponse {
         val room = repository.getLiveRoom(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
-        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+        val roomInfo = getLiveRoomInfo(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
         val user = memberRepository.findByIdOrNull(userId)
@@ -990,7 +1000,7 @@ class LiveRoomService(
     fun setSpeaker(request: SetManagerOrSpeakerOrAudienceRequest) {
         val lock = getOrCreateLock(memberId = request.memberId)
         lock.write {
-            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
+            val roomInfo = getLiveRoomInfo(request.roomId)
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             val member = memberRepository.findByIdOrNull(request.memberId)
@@ -1004,14 +1014,14 @@ class LiveRoomService(
             roomInfo.removeManager(member)
             roomInfo.addSpeaker(member, cloudFrontHost)
 
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
     }
 
     fun setListener(request: SetManagerOrSpeakerOrAudienceRequest) {
         val lock = getOrCreateLock(memberId = request.memberId)
         lock.write {
-            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
+            val roomInfo = getLiveRoomInfo(request.roomId)
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             val member = memberRepository.findByIdOrNull(request.memberId)
@@ -1021,7 +1031,7 @@ class LiveRoomService(
             roomInfo.removeManager(member)
             roomInfo.addListener(member, cloudFrontHost)
 
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
     }
 
@@ -1034,7 +1044,7 @@ class LiveRoomService(
             }
 
             val user = memberRepository.findByIdOrNull(request.memberId) ?: throw SodaException("해당하는 유저가 없습니다.")
-            val roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)
+            val roomInfo = getLiveRoomInfo(request.roomId)
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             val roomAccountResponse = LiveRoomMember(member = user, cloudFrontHost)
@@ -1053,7 +1063,7 @@ class LiveRoomService(
             roomInfo.removeSpeaker(user)
             roomInfo.addManager(user, cloudFrontHost)
 
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
     }
 
@@ -1080,7 +1090,7 @@ class LiveRoomService(
         if (request.message.isNotBlank()) {
             val lock = getOrCreateLock(memberId = member.id!!)
             lock.write {
-                val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
+                val roomInfo = getLiveRoomInfo(room.id!!)
                     ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
                 roomInfo.addDonationMessage(
@@ -1091,7 +1101,7 @@ class LiveRoomService(
                     donationMessage = request.message
                 )
 
-                roomInfoRepository.save(roomInfo)
+                roomInfoRepositoryV2.save(roomInfo)
             }
         }
 
@@ -1126,7 +1136,7 @@ class LiveRoomService(
         if (request.message.isNotBlank()) {
             val lock = getOrCreateLock(memberId = member.id!!)
             lock.write {
-                val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
+                val roomInfo = getLiveRoomInfo(room.id!!)
                     ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
                 roomInfo.addDonationMessage(
@@ -1137,7 +1147,7 @@ class LiveRoomService(
                     donationMessage = request.message
                 )
 
-                roomInfoRepository.save(roomInfo)
+                roomInfoRepositoryV2.save(roomInfo)
             }
         }
 
@@ -1216,27 +1226,20 @@ class LiveRoomService(
         val room = repository.getLiveRoom(roomId)
         val lock = getOrCreateLock(memberId = member.id!!)
         lock.write {
-            val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+            val roomInfo = getLiveRoomInfo(roomId)
             if (roomInfo != null) {
                 if (room?.member != null && room.member!! == member) {
                     room.isActive = false
                     kickOutService.deleteKickOutData(roomId = room.id!!)
-                    roomInfoRepository.deleteById(roomInfo.roomId)
+                    roomInfoRepositoryV2.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)
-                    roomInfoRepository.save(roomInfo)
+                    roomInfoRepositoryV2.save(roomInfo)
                 }
             }
         }

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

@@ -2,6 +2,7 @@ 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
 
@@ -118,4 +119,14 @@ 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
+        )
+    }
 }

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

@@ -1,5 +1,6 @@
 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
 
@@ -20,6 +21,13 @@ data class LiveRoomKickOut(
         userList.removeIf { it.userId == userId }
         userList.add(liveRoomKickOutUser)
     }
+
+    fun convertV2(): LiveRoomKickOutV2 {
+        return LiveRoomKickOutV2(
+            roomId = roomId,
+            userList = userList
+        )
+    }
 }
 
 data class LiveRoomKickOutUser(

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

@@ -6,6 +6,10 @@ 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.v2.LiveRoomInfoRedisRepositoryV2
+import kr.co.vividnext.sodalive.v2.LiveRoomInfoV2
+import kr.co.vividnext.sodalive.v2.LiveRoomKickOutRedisRepositoryV2
+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
@@ -13,18 +17,52 @@ 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 = roomInfoRepository.findByIdOrNull(request.roomId)
+        val roomInfo = getLiveRoomInfo(request.roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
         if (room.member == null || room.member!!.id == null) {
@@ -35,20 +73,20 @@ class LiveRoomKickOutService(
             throw SodaException("권한이 없습니다.")
         }
 
-        var liveRoomKickOut = repository.findByIdOrNull(request.roomId)
+        var liveRoomKickOut = getLiveRoomKickOut(request.roomId)
         if (liveRoomKickOut == null) {
-            liveRoomKickOut = repository.save(LiveRoomKickOut(roomId = request.roomId))
+            liveRoomKickOut = repositoryV2.save(LiveRoomKickOutV2(roomId = request.roomId))
         }
 
         liveRoomKickOut.kickOut(request.userId)
-        repository.save(liveRoomKickOut)
+        repositoryV2.save(liveRoomKickOut)
 
         val kickOutUser = memberRepository.findByIdOrNull(request.userId)
         if (kickOutUser != null) {
             roomInfo.removeSpeaker(kickOutUser)
             roomInfo.removeListener(kickOutUser)
             roomInfo.removeManager(kickOutUser)
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
     }
 

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

@@ -2,17 +2,48 @@ 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.v2.LiveRoomMenuRepositoryV2
 import org.springframework.stereotype.Service
 
 @Service
 class LiveRoomMenuService(
     private val idGenerator: RedisIdGenerator,
-    private val repository: LiveRoomMenuRepository
+    private val repository: LiveRoomMenuRepository,
+    private val repositoryV2: LiveRoomMenuRepositoryV2
 ) {
+    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 repository.findByCreatorId(creatorId)
+        return findByCreatorId(creatorId)
             .sortedBy { it.id }
             .asSequence()
             .map { GetMenuPresetResponse(id = it.id, menu = it.menu, isActive = it.isActive) }
@@ -22,7 +53,7 @@ class LiveRoomMenuService(
     fun createLiveMenu(memberId: Long, request: CreateLiveMenuRequest): Boolean {
         liveMenuValidate(menu = request.menu)
 
-        val menuList = repository.findByCreatorId(creatorId = memberId)
+        val menuList = findByCreatorId(creatorId = memberId)
 
         if (menuList.size >= 3) {
             throw SodaException("메뉴판의 최대개수는 3개입니다.")
@@ -31,7 +62,7 @@ class LiveRoomMenuService(
         if (request.isActive) {
             menuList.forEach {
                 it.isActive = false
-                repository.save(it)
+                repositoryV2.save(it)
             }
         }
 
@@ -42,14 +73,14 @@ class LiveRoomMenuService(
             menu = request.menu
         )
 
-        repository.save(menu)
+        repositoryV2.save(menu)
         return request.isActive
     }
 
     fun updateLiveMenu(memberId: Long, request: UpdateLiveMenuRequest) {
         liveMenuValidate(menu = request.menu)
 
-        val menuList = repository.findByCreatorId(creatorId = memberId)
+        val menuList = findByCreatorId(creatorId = memberId)
         if (menuList.isEmpty()) {
             throw SodaException("잘못된 요청입니다.")
         }
@@ -58,16 +89,16 @@ class LiveRoomMenuService(
             if (it.id == request.id) {
                 it.menu = request.menu
                 it.isActive = request.isActive
-                repository.save(it)
+                repositoryV2.save(it)
             } else if (request.isActive) {
                 it.isActive = false
-                repository.save(it)
+                repositoryV2.save(it)
             }
         }
     }
 
     fun getLiveMenu(creatorId: Long): GetMenuPresetResponse? {
-        val menuList = repository.findByCreatorId(creatorId = creatorId)
+        val menuList = findByCreatorId(creatorId = creatorId)
 
         var activeMenu: LiveRoomMenu? = null
         for (menu in menuList) {
@@ -85,11 +116,11 @@ class LiveRoomMenuService(
     }
 
     fun deactivateAll(memberId: Long) {
-        val menuList = repository.findByCreatorId(creatorId = memberId)
+        val menuList = findByCreatorId(creatorId = memberId)
 
         menuList.forEach {
             it.isActive = false
-            repository.save(it)
+            repositoryV2.save(it)
         }
     }
 

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

@@ -16,6 +16,8 @@ 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.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
@@ -27,15 +29,43 @@ 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 = repository.findByCreatorId(creatorId)
+        val rouletteList = findByCreatorId(creatorId)
 
         return rouletteList.sortedBy { it.id }
             .map {
@@ -52,14 +82,14 @@ class NewRouletteService(
         rouletteValidate(can = request.can, items = request.items)
 
         if (request.isActive) {
-            val rouletteList = repository.findByCreatorId(creatorId = memberId)
+            val rouletteList = findByCreatorId(creatorId = memberId)
             rouletteList.forEach {
                 it.isActive = false
-                repository.save(it)
+                repositoryV2.save(it)
             }
         }
 
-        val roulette = NewRoulette(
+        val roulette = RouletteV2(
             id = idGenerator.generateId(SEQUENCE_NAME),
             creatorId = memberId,
             can = request.can,
@@ -67,14 +97,14 @@ class NewRouletteService(
             items = request.items
         )
 
-        repository.save(roulette)
+        repositoryV2.save(roulette)
         return request.isActive
     }
 
     fun updateRoulette(memberId: Long, request: UpdateNewRouletteRequest): Boolean {
         rouletteValidate(can = request.can, items = request.items)
 
-        val rouletteList = repository.findByCreatorId(creatorId = memberId)
+        val rouletteList = findByCreatorId(creatorId = memberId)
 
         if (rouletteList.isEmpty()) {
             throw SodaException("잘못된 요청입니다.")
@@ -90,10 +120,10 @@ class NewRouletteService(
                 it.can = request.can
                 it.items = request.items
                 it.isActive = request.isActive
-                repository.save(it)
+                repositoryV2.save(it)
             } else if (request.isActive) {
                 it.isActive = false
-                repository.save(it)
+                repositoryV2.save(it)
             }
         }
 
@@ -101,13 +131,13 @@ class NewRouletteService(
     }
 
     fun getRoulette(creatorId: Long, memberId: Long): GetRouletteResponse {
-        val rouletteList = repository.findByCreatorId(creatorId = creatorId)
+        val rouletteList = findByCreatorId(creatorId = creatorId)
 
         if (rouletteList.isEmpty()) {
             throw SodaException("룰렛을 사용할 수 없습니다.")
         }
 
-        var activeRoulette: NewRoulette? = null
+        var activeRoulette: RouletteV2? = null
         for (roulette in rouletteList) {
             if (roulette.isActive) {
                 activeRoulette = roulette
@@ -139,13 +169,13 @@ class NewRouletteService(
         }
 
         // STEP 2 - 룰렛 데이터 가져오기
-        val rouletteList = repository.findByCreatorId(creatorId = host.id!!)
+        val rouletteList = findByCreatorId(creatorId = host.id!!)
 
         if (rouletteList.isEmpty()) {
             throw SodaException("룰렛을 사용할 수 없습니다.")
         }
 
-        var activeRoulette: NewRoulette? = null
+        var activeRoulette: RouletteV2? = null
         for (roulette in rouletteList) {
             if (roulette.isActive) {
                 activeRoulette = roulette
@@ -220,7 +250,28 @@ 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 = "newRoulette:sequence"
+        const val SEQUENCE_NAME = "Roulette:sequence"
     }
 }

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

@@ -1,10 +1,13 @@
 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(private val stringRedisTemplate: StringRedisTemplate) {
+class RedisIdGenerator(
+    @Qualifier("valkeyStringRedisTemplate") private val stringRedisTemplate: StringRedisTemplate
+) {
     fun generateId(key: String): Long {
         return stringRedisTemplate.opsForValue().increment(key, 1) ?: 1L
     }

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

@@ -20,6 +20,8 @@ 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.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
@@ -38,10 +40,27 @@ 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("잘못된 요청입니다.")
 
@@ -158,7 +177,7 @@ class RouletteService(
 
         val lock = getOrCreateLock(memberId = member.id!!)
         lock.write {
-            val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
+            val roomInfo = getLiveRoomInfo(room.id!!)
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             roomInfo.addRouletteMessage(
@@ -167,7 +186,7 @@ class RouletteService(
                 donationMessage = "[$result] 당첨!"
             )
 
-            roomInfoRepository.save(roomInfo)
+            roomInfoRepositoryV2.save(roomInfo)
         }
 
         return SpinRouletteResponse(can = roulette.can, result = result, items = itemList)

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt

@@ -35,9 +35,11 @@ import kr.co.vividnext.sodalive.member.stipulation.StipulationIds
 import kr.co.vividnext.sodalive.member.stipulation.StipulationRepository
 import kr.co.vividnext.sodalive.member.tag.MemberCreatorTag
 import kr.co.vividnext.sodalive.member.tag.MemberTagRepository
+import kr.co.vividnext.sodalive.member.token.MemberToken
 import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
 import kr.co.vividnext.sodalive.utils.generateFileName
 import kr.co.vividnext.sodalive.utils.generatePassword
+import kr.co.vividnext.sodalive.v2.MemberTokenRepositoryV2
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
@@ -62,6 +64,7 @@ import kotlin.concurrent.write
 class MemberService(
     private val repository: MemberRepository,
     private val tokenRepository: MemberTokenRepository,
+    private val tokenRepositoryV2: MemberTokenRepositoryV2,
     private val stipulationRepository: StipulationRepository,
     private val stipulationAgreeRepository: StipulationAgreeRepository,
     private val creatorFollowingRepository: CreatorFollowingRepository,
@@ -435,11 +438,12 @@ class MemberService(
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
-            val memberToken = tokenRepository.findByIdOrNull(memberId)
+            val memberToken = saveAndGetTokenById(memberId)
-                ?: throw SodaException("로그인 정보를 확인해주세요.")
 
+            if (memberToken != null) {
                 memberToken.tokenSet.remove(token)
-            tokenRepository.save(memberToken)
+                tokenRepositoryV2.save(memberToken)
+            }
         }
     }
 
@@ -451,7 +455,25 @@ class MemberService(
         member.pushToken = null
 
         val lock = getOrCreateLock(memberId = memberId)
-        lock.write { tokenRepository.deleteById(memberId) }
+        lock.write {
+            tokenRepository.deleteById(memberId)
+            tokenRepositoryV2.deleteById(memberId)
+        }
+    }
+
+    private fun saveAndGetTokenById(id: Long): MemberToken? {
+        var memberToken = tokenRepositoryV2.findByIdOrNull(id = id)
+
+        if (memberToken == null) {
+            memberToken = tokenRepository.findByIdOrNull(id = id)
+
+            if (memberToken != null) {
+                tokenRepositoryV2.save(memberToken)
+                tokenRepository.delete(memberToken)
+            }
+        }
+
+        return memberToken
     }
 
     @Transactional

src/main/kotlin/kr/co/vividnext/sodalive/v2/LiveRoomInfoRedisRepositoryV2.kt

@@ -0,0 +1,5 @@
+package kr.co.vividnext.sodalive.v2
+
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomInfoRedisRepositoryV2 : CrudRepository<LiveRoomInfoV2, Long>

src/main/kotlin/kr/co/vividnext/sodalive/v2/LiveRoomInfoV2.kt

@@ -0,0 +1,123 @@
+package kr.co.vividnext.sodalive.v2
+
+import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationMessage
+import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember
+import kr.co.vividnext.sodalive.live.room.info.LiveRoomMemberRole
+import kr.co.vividnext.sodalive.member.Member
+import org.springframework.data.annotation.Id
+import org.springframework.data.redis.core.RedisHash
+
+@RedisHash("LiveRoomInfo")
+data class LiveRoomInfoV2(
+    @Id
+    val roomId: Long,
+    var speakerList: List<LiveRoomMember> = mutableListOf(),
+    var listenerList: List<LiveRoomMember> = mutableListOf(),
+    var managerList: List<LiveRoomMember> = mutableListOf(),
+    var donationMessageList: List<LiveRoomDonationMessage> = mutableListOf()
+) {
+    var speakerCount = 0
+        private set
+
+    var listenerCount = 0
+        private set
+
+    var managerCount = 0
+        private set
+
+    fun addSpeaker(member: Member, cloudFrontHost: String) {
+        val liveRoomMember = LiveRoomMember(member, cloudFrontHost)
+        liveRoomMember.role = LiveRoomMemberRole.SPEAKER
+
+        val speakerSet = speakerList.toMutableSet()
+        speakerSet.add(liveRoomMember)
+        speakerList = speakerSet.toList()
+
+        setSpeakerCount()
+    }
+
+    fun removeSpeaker(member: Member) {
+        (speakerList as MutableList).removeIf { it.id == member.id!! }
+        setSpeakerCount()
+    }
+
+    private fun setSpeakerCount() {
+        speakerCount = speakerList.size
+    }
+
+    fun addListener(member: Member, cloudFrontHost: String) {
+        val liveRoomMember = LiveRoomMember(member, cloudFrontHost)
+        liveRoomMember.role = LiveRoomMemberRole.LISTENER
+
+        val listenerSet = listenerList.toMutableSet()
+        listenerSet.add(liveRoomMember)
+        listenerList = listenerSet.toList()
+
+        setListenerCount()
+    }
+
+    fun removeListener(member: Member) {
+        (listenerList as MutableList).removeIf { it.id == member.id!! }
+        setListenerCount()
+    }
+
+    private fun setListenerCount() {
+        listenerCount = listenerList.size
+    }
+
+    fun addManager(member: Member, cloudFrontHost: String) {
+        val liveRoomMember = LiveRoomMember(member, cloudFrontHost)
+        liveRoomMember.role = LiveRoomMemberRole.MANAGER
+
+        val managerSet = managerList.toMutableSet()
+        managerSet.add(liveRoomMember)
+        managerList = managerSet.toList()
+
+        setManagerCount()
+    }
+
+    fun removeManager(member: Member) {
+        (managerList as MutableList).removeIf { it.id == member.id!! }
+        setManagerCount()
+    }
+
+    private fun setManagerCount() {
+        managerCount = managerList.size
+    }
+
+    fun addDonationMessage(memberId: Long, nickname: String, isSecret: Boolean, can: Int, donationMessage: String) {
+        val donationMessageSet = donationMessageList.toMutableSet()
+        donationMessageSet.add(
+            LiveRoomDonationMessage(
+                memberId = memberId,
+                nickname = nickname,
+                isSecret = isSecret,
+                canMessage = if (isSecret) {
+                    "${can}캔으로 비밀미션을 보냈습니다."
+                } else {
+                    "${can}캔을 후원하셨습니다."
+                },
+                donationMessage = donationMessage
+            )
+        )
+        donationMessageList = donationMessageSet.toList()
+    }
+
+    fun addRouletteMessage(memberId: Long, nickname: String, donationMessage: String) {
+        val donationMessageSet = donationMessageList.toMutableSet()
+        donationMessageSet.add(
+            LiveRoomDonationMessage(
+                memberId = memberId,
+                nickname = nickname,
+                isSecret = false,
+                canMessage = "",
+                donationMessage = donationMessage
+            )
+        )
+        donationMessageList = donationMessageSet.toList()
+    }
+
+    fun removeDonationMessage(uuid: String) {
+        (donationMessageList as MutableList).removeIf { it.uuid == uuid }
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/v2/LiveRoomKickOutRedisRepositoryV2.kt

@@ -0,0 +1,5 @@
+package kr.co.vividnext.sodalive.v2
+
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomKickOutRedisRepositoryV2 : CrudRepository<LiveRoomKickOutV2, Long>

src/main/kotlin/kr/co/vividnext/sodalive/v2/LiveRoomKickOutV2.kt

@@ -0,0 +1,24 @@
+package kr.co.vividnext.sodalive.v2
+
+import kr.co.vividnext.sodalive.live.room.kickout.LiveRoomKickOutUser
+import org.springframework.data.annotation.Id
+import org.springframework.data.redis.core.RedisHash
+
+@RedisHash("LiveRoomKickOut")
+data class LiveRoomKickOutV2(
+    @Id
+    val roomId: Long,
+    var userList: MutableList<LiveRoomKickOutUser> = mutableListOf()
+) {
+    fun kickOut(userId: Long) {
+        var liveRoomKickOutUser = userList.find { it.userId == userId }
+        if (liveRoomKickOutUser == null) {
+            liveRoomKickOutUser = LiveRoomKickOutUser(userId)
+        } else {
+            liveRoomKickOutUser.plusCount()
+        }
+
+        userList.removeIf { it.userId == userId }
+        userList.add(liveRoomKickOutUser)
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/v2/LiveRoomMenuRepositoryV2.kt

@@ -0,0 +1,8 @@
+package kr.co.vividnext.sodalive.v2
+
+import kr.co.vividnext.sodalive.live.room.menu.LiveRoomMenu
+import org.springframework.data.repository.CrudRepository
+
+interface LiveRoomMenuRepositoryV2 : CrudRepository<LiveRoomMenu, Long> {
+    fun findByCreatorId(creatorId: Long): List<LiveRoomMenu>
+}

src/main/kotlin/kr/co/vividnext/sodalive/v2/MemberTokenRepositoryV2.kt

@@ -0,0 +1,8 @@
+package kr.co.vividnext.sodalive.v2
+
+import kr.co.vividnext.sodalive.member.token.MemberToken
+import org.springframework.data.repository.CrudRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface MemberTokenRepositoryV2 : CrudRepository<MemberToken, Long>

src/main/kotlin/kr/co/vividnext/sodalive/v2/RouletteRepositoryV2.kt

@@ -0,0 +1,7 @@
+package kr.co.vividnext.sodalive.v2
+
+import org.springframework.data.repository.CrudRepository
+
+interface RouletteRepositoryV2 : CrudRepository<RouletteV2, Long> {
+    fun findByCreatorId(creatorId: Long): List<RouletteV2>
+}

src/main/kotlin/kr/co/vividnext/sodalive/v2/RouletteV2.kt

@@ -0,0 +1,17 @@
+package kr.co.vividnext.sodalive.v2
+
+import kr.co.vividnext.sodalive.live.roulette.RouletteItem
+import org.springframework.data.redis.core.RedisHash
+import org.springframework.data.redis.core.index.Indexed
+import javax.persistence.Id
+
+@RedisHash("Roulette")
+data class RouletteV2(
+    @Id
+    val id: Long,
+    @Indexed
+    val creatorId: Long,
+    var can: Int,
+    var isActive: Boolean,
+    var items: List<RouletteItem> = mutableListOf()
+)

src/main/resources/application.yml

@@ -52,6 +52,10 @@ jwt:
     secret: ${JWT_SECRET}
 
 spring:
+    valkey:
+        host: ${VALKEY_HOST}
+        port: ${VALKEY_PORT}
+
     redis:
         host: ${REDIS_HOST}
         port: ${REDIS_PORT}