라이브 방 정보 - 방 나가기 로직 @Transactional 추가
This commit is contained in:
parent
7d904067fe
commit
df861bf8a1
|
@ -223,9 +223,10 @@ class LiveRoomController(private val service: LiveRoomService) {
|
|||
|
||||
@PostMapping("/quit")
|
||||
fun quitRoom(
|
||||
@RequestParam("id") roomId: Long,
|
||||
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
||||
) = run {
|
||||
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
||||
ApiResponse.ok(service.quitRoom(member))
|
||||
ApiResponse.ok(service.quitRoom(roomId, member))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -865,27 +865,22 @@ class LiveRoomService(
|
|||
)
|
||||
}
|
||||
|
||||
fun quitRoom(member: Member) {
|
||||
val roomVisit = roomVisitService.getLatestRoomVisit(member.id!!)
|
||||
|
||||
val roomId = roomVisit?.room?.id
|
||||
if (roomId != null) {
|
||||
val lock = getOrCreateLock(memberId = member.id!!)
|
||||
lock.write {
|
||||
val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
|
||||
if (roomInfo != null) {
|
||||
val room = repository.getLiveRoom(roomId) ?: return
|
||||
println(room)
|
||||
if (room.member != null && room.member!!.id!! == member.id!!) {
|
||||
room.isActive = false
|
||||
kickOutService.deleteKickOutData(roomId = room.id!!)
|
||||
roomInfoRepository.deleteById(roomInfo.roomId)
|
||||
} else {
|
||||
roomInfo.removeSpeaker(member)
|
||||
roomInfo.removeListener(member)
|
||||
roomInfo.removeManager(member)
|
||||
roomInfoRepository.save(roomInfo)
|
||||
}
|
||||
@Transactional
|
||||
fun quitRoom(roomId: Long, member: Member) {
|
||||
val room = repository.getLiveRoom(roomId)
|
||||
val lock = getOrCreateLock(memberId = member.id!!)
|
||||
lock.write {
|
||||
val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
|
||||
if (roomInfo != null) {
|
||||
if (room?.member != null && room.member!! == member) {
|
||||
room.isActive = false
|
||||
kickOutService.deleteKickOutData(roomId = room.id!!)
|
||||
roomInfoRepository.deleteById(roomInfo.roomId)
|
||||
} else {
|
||||
roomInfo.removeSpeaker(member)
|
||||
roomInfo.removeListener(member)
|
||||
roomInfo.removeManager(member)
|
||||
roomInfoRepository.save(roomInfo)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,6 @@ interface LiveRoomVisitRepository : JpaRepository<LiveRoomVisit, Long>, LiveRoom
|
|||
interface LiveRoomVisitQueryRepository {
|
||||
fun findByRoomIdAndMemberId(roomId: Long, memberId: Long): LiveRoomVisit?
|
||||
fun findFirstByMemberIdOrderByUpdatedAtDesc(memberId: Long): LiveRoomVisit?
|
||||
fun getLatestRoomVisit(memberId: Long): LiveRoomVisit?
|
||||
}
|
||||
|
||||
@Repository
|
||||
|
@ -39,13 +38,4 @@ class LiveRoomVisitQueryRepositoryImpl(private val queryFactory: JPAQueryFactory
|
|||
.orderBy(liveRoomVisit.updatedAt.desc())
|
||||
.fetchFirst()
|
||||
}
|
||||
|
||||
override fun getLatestRoomVisit(memberId: Long): LiveRoomVisit? {
|
||||
return queryFactory
|
||||
.selectFrom(liveRoomVisit)
|
||||
.innerJoin(liveRoomVisit.member, member)
|
||||
.where(member.id.eq(memberId))
|
||||
.orderBy(liveRoomVisit.updatedAt.desc())
|
||||
.fetchFirst()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,8 +22,4 @@ class LiveRoomVisitService(private val repository: LiveRoomVisitRepository) {
|
|||
|
||||
repository.save(roomVisit)
|
||||
}
|
||||
|
||||
fun getLatestRoomVisit(memberId: Long): LiveRoomVisit? {
|
||||
return repository.getLatestRoomVisit(memberId)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue