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/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)