klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test #134

Merged
klaus merged 19 commits from test into main 2024-02-24 20:35:58 +00:00
Conversation 0 Commits 19 Files Changed 11 +8 -6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e89025fd9 - Show all commits

2
src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt
View File

@ -1,12 +1,14 @@
package kr.co.vividnext.sodalive.live.roulette package kr.co.vividnext.sodalive.live.roulette
import org.springframework.data.redis.core.RedisHash import org.springframework.data.redis.core.RedisHash
import org.springframework.data.redis.core.index.Indexed
import javax.persistence.Id import javax.persistence.Id
@RedisHash("newRoulette") @RedisHash("newRoulette")
data class NewRoulette( data class NewRoulette(
@Id @Id
val id: Long, val id: Long,
@Indexed
val creatorId: Long, val creatorId: Long,
var can: Int, var can: Int,
var isActive: Boolean, var isActive: Boolean,

4
src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteRepository.kt
View File

@ -3,6 +3,6 @@ package kr.co.vividnext.sodalive.live.roulette
import org.springframework.data.repository.CrudRepository import org.springframework.data.repository.CrudRepository
interface NewRouletteRepository : CrudRepository<NewRoulette, Long> { interface NewRouletteRepository : CrudRepository<NewRoulette, Long> {
fun findAllByCreatorId(creatorId: Long): List<NewRoulette> fun findByCreatorId(creatorId: Long): List<NewRoulette>
fun findAllByCreatorIdAndActive(creatorId: Long, isActive: Boolean): List<NewRoulette> fun findByCreatorIdAndActive(creatorId: Long, isActive: Boolean): List<NewRoulette>
} }

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

@ -36,7 +36,7 @@ class NewRouletteService(
fun getAllRoulette(creatorId: Long, memberId: Long): List<GetNewRouletteResponse> { fun getAllRoulette(creatorId: Long, memberId: Long): List<GetNewRouletteResponse> {
if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")
var rouletteList = repository.findAllByCreatorId(creatorId) var rouletteList = repository.findByCreatorId(creatorId)
println(rouletteList) println(rouletteList)
if (rouletteList.isEmpty()) { if (rouletteList.isEmpty()) {
val roulette = oldRepository.findByIdOrNull(creatorId) 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 { 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()) { if (roulette.isEmpty() || !roulette[0].isActive || roulette[0].items.isEmpty()) {
throw SodaException("룰렛을 사용할 수 없습니다.") throw SodaException("룰렛을 사용할 수 없습니다.")
@ -134,7 +134,7 @@ class NewRouletteService(
} }
// STEP 2 - 룰렛 데이터 가져오기 // 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()) { if (rouletteList.isEmpty() || !rouletteList[0].isActive || rouletteList[0].items.isEmpty()) {
throw SodaException("룰렛을 사용할 수 없습니다.") throw SodaException("룰렛을 사용할 수 없습니다.")