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

라이브 방 정보 처리 및 저장

Browse Source 
- Redis -> Valkey로 이전되도록 수정
This commit is contained in:
Klaus
2024-11-23 00:05:27 +09:00
parent 68472b234e
commit 2d0492cafa
7 changed files with 225 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
@@ -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
@@ -79,6 +80,7 @@ class LiveRoomService(
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)
@@ -889,7 +907,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 +928,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 +1008,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 +1022,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 +1039,7 @@ class LiveRoomService(
roomInfo.removeManager(member)
roomInfo.addListener(member, cloudFrontHost)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}
@@ -1034,7 +1052,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 +1071,7 @@ class LiveRoomService(
roomInfo.removeSpeaker(user)
roomInfo.addManager(user, cloudFrontHost)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}
@@ -1080,7 +1098,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 +1109,7 @@ class LiveRoomService(
donationMessage = request.message
)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}
@@ -1126,7 +1144,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 +1155,7 @@ class LiveRoomService(
donationMessage = request.message
)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}
@@ -1216,12 +1234,12 @@ 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()) {
@@ -1236,7 +1254,7 @@ class LiveRoomService(
roomInfo.removeSpeaker(member)
roomInfo.removeListener(member)
roomInfo.removeManager(member)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}
}

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

@@ -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
)
}
}

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

@@ -6,6 +6,8 @@ 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 org.springframework.beans.factory.annotation.Value
import org.springframework.data.repository.findByIdOrNull
import org.springframework.stereotype.Service
@@ -13,6 +15,7 @@ import org.springframework.stereotype.Service
@Service
class LiveRoomKickOutService(
private val roomInfoRepository: LiveRoomInfoRedisRepository,
private val roomInfoRepositoryV2: LiveRoomInfoRedisRepositoryV2,
private val repository: LiveRoomKickOutRedisRepository,
private val memberRepository: MemberRepository,
private val roomRepository: LiveRoomRepository,
@@ -20,11 +23,27 @@ class LiveRoomKickOutService(
@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
}
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) {
@@ -48,7 +67,7 @@ class LiveRoomKickOutService(
roomInfo.removeSpeaker(kickOutUser)
roomInfo.removeListener(kickOutUser)
roomInfo.removeManager(kickOutUser)
roomInfoRepository.save(roomInfo)
roomInfoRepositoryV2.save(roomInfo)
}
}

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

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