From 3e89025fd9edbe089d7432438de6ac6de871ef46 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 22 Feb 2024 18:01:19 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=ED=94=84=EB=A6=AC?= =?UTF-8?q?=EC=85=8B=20API=20=EC=B6=94=EA=B0=80=20-=20=EB=A3=B0=EB=A0=9B?= =?UTF-8?q?=20=EB=A7=8C=EB=93=A4=EA=B8=B0=20-=20=EB=A3=B0=EB=A0=9B=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20-=20=EB=A3=B0=EB=A0=9B?= =?UTF-8?q?=20=ED=94=84=EB=A6=AC=EC=85=8B=20=EC=A0=84=EC=B2=B4=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt | 2 ++ .../sodalive/live/roulette/NewRouletteRepository.kt | 4 ++-- .../sodalive/live/roulette/NewRouletteService.kt | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt index 0548502..262bf40 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt @@ -1,12 +1,14 @@ package kr.co.vividnext.sodalive.live.roulette import org.springframework.data.redis.core.RedisHash +import org.springframework.data.redis.core.index.Indexed import javax.persistence.Id @RedisHash("newRoulette") data class NewRoulette( @Id val id: Long, + @Indexed val creatorId: Long, var can: Int, var isActive: Boolean, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt index 76cf94f..fca5623 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt @@ -3,6 +3,6 @@ package kr.co.vividnext.sodalive.live.roulette import org.springframework.data.repository.CrudRepository interface NewRouletteRepository : CrudRepository { - fun findAllByCreatorId(creatorId: Long): List - fun findAllByCreatorIdAndActive(creatorId: Long, isActive: Boolean): List + fun findByCreatorId(creatorId: Long): List + fun findByCreatorIdAndActive(creatorId: Long, isActive: Boolean): List } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt index 691343d..1a0bd72 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt @@ -36,7 +36,7 @@ class NewRouletteService( fun getAllRoulette(creatorId: Long, memberId: Long): List { if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") - var rouletteList = repository.findAllByCreatorId(creatorId) + var rouletteList = repository.findByCreatorId(creatorId) println(rouletteList) if (rouletteList.isEmpty()) { val roulette = oldRepository.findByIdOrNull(creatorId) @@ -54,7 +54,7 @@ class NewRouletteService( ) ) - rouletteList = repository.findAllByCreatorId(creatorId) + rouletteList = repository.findByCreatorId(creatorId) } } @@ -108,7 +108,7 @@ class NewRouletteService( } fun getRoulette(creatorId: Long, memberId: Long): GetRouletteResponse { - val roulette = repository.findAllByCreatorIdAndActive(creatorId = creatorId, isActive = true) + val roulette = repository.findByCreatorIdAndActive(creatorId = creatorId, isActive = true) if (roulette.isEmpty() || !roulette[0].isActive || roulette[0].items.isEmpty()) { throw SodaException("룰렛을 사용할 수 없습니다.") @@ -134,7 +134,7 @@ class NewRouletteService( } // STEP 2 - 룰렛 데이터 가져오기 - val rouletteList = repository.findAllByCreatorIdAndActive(creatorId = host.id!!, isActive = true) + val rouletteList = repository.findByCreatorIdAndActive(creatorId = host.id!!, isActive = true) if (rouletteList.isEmpty() || !rouletteList[0].isActive || rouletteList[0].items.isEmpty()) { throw SodaException("룰렛을 사용할 수 없습니다.")