라이브 방 - 라이브 나가기 로직 수정

This commit is contained in:
Klaus 2023-08-01 05:39:14 +09:00
parent 3cac42b5b9
commit 7671e24470
4 changed files with 33 additions and 15 deletions

View File

@ -223,10 +223,9 @@ 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(roomId, member))
ApiResponse.ok(service.quitRoom(member))
}
}

View File

@ -843,19 +843,24 @@ class LiveRoomService(
)
}
fun quitRoom(roomId: Long, member: Member) {
val room = repository.getLiveRoom(roomId)
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)
fun quitRoom(member: Member) {
val roomVisit = roomVisitService.getLatestRoomVisit(member.id!!)
val roomId = roomVisit?.room?.id
if (roomId != null) {
val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
if (roomInfo != null) {
val room = repository.getLiveRoom(roomId) ?: return
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)
}
}
}
}

View File

@ -13,6 +13,7 @@ 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
@ -38,4 +39,13 @@ 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()
}
}

View File

@ -22,4 +22,8 @@ class LiveRoomVisitService(private val repository: LiveRoomVisitRepository) {
repository.save(roomVisit)
}
fun getLatestRoomVisit(memberId: Long): LiveRoomVisit? {
return repository.getLatestRoomVisit(memberId)
}
}