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

src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt

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

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

@@ -843,19 +843,24 @@ class LiveRoomService(
         )
     }
 
-    fun quitRoom(roomId: Long, member: Member) {
+    fun quitRoom(member: Member) {
-        val room = repository.getLiveRoom(roomId)
+        val roomVisit = roomVisitService.getLatestRoomVisit(member.id!!)
-        val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
+
-        if (roomInfo != null) {
+        val roomId = roomVisit?.room?.id
-            if (room?.member != null && room.member!! == member) {
+        if (roomId != null) {
-                room.isActive = false
+            val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
-                kickOutService.deleteKickOutData(roomId = room.id!!)
+            if (roomInfo != null) {
-                roomInfoRepository.deleteById(roomInfo.roomId)
+                val room = repository.getLiveRoom(roomId) ?: return
-            } else {
+                if (room.member != null && room.member!! == member) {
-                roomInfo.removeSpeaker(member)
+                    room.isActive = false
-                roomInfo.removeListener(member)
+                    kickOutService.deleteKickOutData(roomId = room.id!!)
-                roomInfo.removeManager(member)
+                    roomInfoRepository.deleteById(roomInfo.roomId)
-                roomInfoRepository.save(roomInfo)
+                } else {
+                    roomInfo.removeSpeaker(member)
+                    roomInfo.removeListener(member)
+                    roomInfo.removeManager(member)
+                    roomInfoRepository.save(roomInfo)
+                }
             }
         }
     }

src/main/kotlin/kr/co/vividnext/sodalive/live/room/visit/LiveRoomVisitRepository.kt

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

src/main/kotlin/kr/co/vividnext/sodalive/live/room/visit/LiveRoomVisitService.kt

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