Compare commits
3 Commits
7328283b6b
...
c097cb54f1
Author | SHA1 | Date |
---|---|---|
|
c097cb54f1 | |
|
01aeb8e759 | |
|
b163427514 |
|
@ -39,7 +39,7 @@ 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.visit.LiveRoomVisitService
|
||||
import kr.co.vividnext.sodalive.live.roulette.RouletteRepository
|
||||
import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository
|
||||
import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
|
||||
import kr.co.vividnext.sodalive.member.Gender
|
||||
import kr.co.vividnext.sodalive.member.Member
|
||||
|
@ -66,7 +66,7 @@ import kotlin.concurrent.write
|
|||
@Transactional(readOnly = true)
|
||||
class LiveRoomService(
|
||||
private val repository: LiveRoomRepository,
|
||||
private val rouletteRepository: RouletteRepository,
|
||||
private val rouletteRepository: NewRouletteRepository,
|
||||
private val roomInfoRepository: LiveRoomInfoRedisRepository,
|
||||
private val roomCancelRepository: LiveRoomCancelRepository,
|
||||
private val kickOutService: LiveRoomKickOutService,
|
||||
|
@ -1004,10 +1004,12 @@ class LiveRoomService(
|
|||
kickOutService.deleteKickOutData(roomId = room.id!!)
|
||||
roomInfoRepository.deleteById(roomInfo.roomId)
|
||||
|
||||
val roulette = rouletteRepository.findByIdOrNull(member.id!!)
|
||||
if (roulette != null) {
|
||||
roulette.isActive = false
|
||||
rouletteRepository.save(roulette)
|
||||
val rouletteList = rouletteRepository.findByCreatorId(creatorId = member.id!!)
|
||||
if (rouletteList.isNotEmpty()) {
|
||||
rouletteList.forEach {
|
||||
it.isActive = false
|
||||
rouletteRepository.save(it)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
roomInfo.removeSpeaker(member)
|
||||
|
|
|
@ -37,10 +37,8 @@ class NewRouletteService(
|
|||
if (creatorId != memberId) throw SodaException("잘못된 요청입니다.")
|
||||
|
||||
var rouletteList = repository.findByCreatorId(creatorId)
|
||||
println(rouletteList)
|
||||
if (rouletteList.isEmpty()) {
|
||||
val roulette = oldRepository.findByIdOrNull(creatorId)
|
||||
println(roulette)
|
||||
if (roulette != null) {
|
||||
repository.save(
|
||||
NewRoulette(
|
||||
|
@ -57,8 +55,6 @@ class NewRouletteService(
|
|||
}
|
||||
}
|
||||
rouletteList.sortedBy { it.id }
|
||||
println(rouletteList)
|
||||
println(oldRepository.findByIdOrNull(creatorId))
|
||||
|
||||
return rouletteList.asSequence()
|
||||
.map {
|
||||
|
@ -90,6 +86,25 @@ class NewRouletteService(
|
|||
fun updateRoulette(memberId: Long, request: UpdateNewRouletteRequest): Boolean {
|
||||
rouletteValidate(can = request.can, items = request.items)
|
||||
|
||||
if (request.isActive) {
|
||||
val rouletteList = repository.findByCreatorId(creatorId = memberId)
|
||||
|
||||
if (rouletteList.isEmpty()) {
|
||||
throw SodaException("잘못된 요청입니다.")
|
||||
}
|
||||
|
||||
rouletteList.forEach {
|
||||
if (it.id == request.id) {
|
||||
it.can = request.can
|
||||
it.items = request.items
|
||||
it.isActive = true
|
||||
} else {
|
||||
it.isActive = false
|
||||
}
|
||||
|
||||
repository.save(it)
|
||||
}
|
||||
} else {
|
||||
val roulette = repository.findByIdOrNull(request.id)
|
||||
?: throw SodaException("잘못된 요청입니다.")
|
||||
|
||||
|
@ -99,8 +114,9 @@ class NewRouletteService(
|
|||
|
||||
roulette.can = request.can
|
||||
roulette.items = request.items
|
||||
roulette.isActive = request.isActive
|
||||
roulette.isActive = false
|
||||
repository.save(roulette)
|
||||
}
|
||||
|
||||
return request.isActive
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue