From a6920174eb6ab63742b42880f2d0b5772d2772fd Mon Sep 17 00:00:00 2001 From: d1ng1724 Date: Thu, 3 Sep 2026 09:48:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?delete:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=20=EB=A6=AC=ED=8F=AC=EC=A7=80=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit findExpiredReservedReservations는 RESERVED 예약의 startTime이 null이라 어떤 행도 반환하지 못하는 죽은 쿼리이며, 실제 만료 판정은 reservedAt 기준의 ReservationRepositoryCustomImpl.findExpiredReservations가 담당한다. countActiveReservationsByMachine도 호출부가 없어 함께 제거한다. Closes #113 Claude-Session: https://claude.ai/code/session_01VVnM26TwXTAKPNa7HxHCJP --- .../reservation/repository/ReservationRepository.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java b/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java index 18670491..5369b250 100644 --- a/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java +++ b/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java @@ -1,6 +1,5 @@ package team.washer.server.v2.domain.reservation.repository; -import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -72,14 +71,6 @@ default Optional findActiveReservationByMachineId(Long machineId) { List.of(ReservationStatus.RESERVED, ReservationStatus.RUNNING))); } - @Query("SELECT r FROM Reservation r WHERE r.status = :status AND r.startTime < :threshold") - List findExpiredReservedReservations(@Param("status") ReservationStatus status, - @Param("threshold") LocalDateTime threshold); - - @Query("SELECT COUNT(r) FROM Reservation r WHERE r.machine = :machine AND r.status IN :statuses") - long countActiveReservationsByMachine(@Param("machine") Machine machine, - @Param("statuses") List statuses); - @Query("SELECT r FROM Reservation r WHERE r.user = :user ORDER BY r.createdAt DESC") List findReservationHistoryByUser(@Param("user") User user); From dfe939ba58570218c52a7222209ee6e98fa2e094 Mon Sep 17 00:00:00 2001 From: d1ng1724 Date: Thu, 3 Sep 2026 17:46:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20PR=20#123=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=A4=91=EC=9D=B8=20countActiveReservatio?= =?UTF-8?q?nsByMachine=20=EB=B3=B5=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 열린 PR #123의 WasherTubCleanMachineGuard가 통세척 시작·종료 직전 활성 예약 재확인에 이 메서드를 사용하고 있어, 삭제 시 머지 순서와 무관하게 컴파일이 실패한다. 조건 자체가 잘못된 findExpiredReservedReservations 삭제만 유지한다. Claude-Session: https://claude.ai/code/session_01VVnM26TwXTAKPNa7HxHCJP --- .../domain/reservation/repository/ReservationRepository.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java b/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java index 5369b250..45522868 100644 --- a/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java +++ b/src/main/java/team/washer/server/v2/domain/reservation/repository/ReservationRepository.java @@ -71,6 +71,10 @@ default Optional findActiveReservationByMachineId(Long machineId) { List.of(ReservationStatus.RESERVED, ReservationStatus.RUNNING))); } + @Query("SELECT COUNT(r) FROM Reservation r WHERE r.machine = :machine AND r.status IN :statuses") + long countActiveReservationsByMachine(@Param("machine") Machine machine, + @Param("statuses") List statuses); + @Query("SELECT r FROM Reservation r WHERE r.user = :user ORDER BY r.createdAt DESC") List findReservationHistoryByUser(@Param("user") User user);