[COZY-328] fix: 방 참여 요청시 EXITED 상태인 경우 재사용 (#205)

cozy-mate · Dec 2, 2024 · 180045a · 180045a
1 parent 2acf136
commit 180045a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/room/service/RoomCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/room/service/RoomCommandService.java
@@ -465,16 +465,22 @@ public void requestToJoin(Long roomId, Long memberId) {
             throw new GeneralException(ErrorStatus._ROOM_ALREADY_EXISTS);
         }
 
-        Optional<Mate> existingMate = mateRepository.findByRoomIdAndMemberIdAndNotEntryStatus(
-            roomId, memberId, EntryStatus.EXITED);
+        Optional<Mate> existingMate = mateRepository.findByRoomIdAndMemberId(room.getId(), memberId);
         checkEntryStatus(existingMate);
 
         if (room.getNumOfArrival() >= room.getMaxMateNum()) {
             throw new GeneralException(ErrorStatus._ROOM_FULL);
         }
 
-        Mate mate = MateConverter.toPending(room, member, false);
-        mateRepository.save(mate);
+        if (existingMate.isPresent()) {
+            Mate mate = existingMate.get();
+            mate.setEntryStatus(EntryStatus.PENDING);
+            mate.setNotExit();
+            mateRepository.save(mate);
+        } else {
+            Mate mate = MateConverter.toPending(room, member, false);
+            mateRepository.save(mate);
+        }
 
         // 푸시 알림 코드
         Mate managerMate = mateRepository.findFetchByRoomAndIsRoomManager(room, true).orElseThrow(