diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripItemRepository.java b/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripItemRepository.java index af5ae9e..b6cfcda 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripItemRepository.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripItemRepository.java @@ -16,12 +16,12 @@ public interface TripItemRepository extends JpaRepository { @Lock(PESSIMISTIC_WRITE) @Query("SELECT ti FROM TripItem ti JOIN FETCH ti.tourItem WHERE ti.trip.encryptedId = :tripId AND ti.visitDate = :visitDate ORDER BY ti.seqNum ASC") List findTripItemByTripIdAndVisitDate(@Param("tripId") String tripId, @Param("visitDate") LocalDate visitDate); - @Query("SELECT CAST(COALESCE(SUM(ti.price),0) as long) FROM TripItem ti WHERE ti.trip.encryptedId = :tripId AND ti.visitDate = :visitDate") - Long findTripItemPriceSumByTripIdAndVisitDate(@Param("tripId") String tripId, @Param("visitDate") LocalDate visitDate); @Lock(PESSIMISTIC_WRITE) @Query("SELECT ti FROM TripItem ti JOIN FETCH ti.trip WHERE ti.id = :tripItemId") Optional findTripItemForUpdate(@Param("tripItemId") Long tripItemId); @Lock(PESSIMISTIC_WRITE) @Query("SELECT ti FROM TripItem ti JOIN FETCH ti.trip WHERE ti.id = :tripItemId") Optional findTripItemForDelete(@Param("tripItemId") Long tripItemId); + @Query("SELECT CAST(COALESCE(SUM(ti.price),0) as long) FROM TripItem ti WHERE ti.trip.encryptedId = :tripId AND ti.visitDate = :visitDate") + Long findTripItemPriceSumByTripIdAndVisitDate(@Param("tripId") String tripId, @Param("visitDate") LocalDate visitDate); } diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripRepository.java b/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripRepository.java index 59a43c9..17d91fd 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripRepository.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/repository/TripRepository.java @@ -14,10 +14,6 @@ public interface TripRepository extends JpaRepository { Optional findByEncryptedId(String encryptedId); - @Lock(PESSIMISTIC_WRITE) - @Query("SELECT t FROM Trip t LEFT OUTER JOIN FETCH t.tripItems WHERE t.id = :tripId") - Optional findTripForUpdate(@Param("tripId") Long tripId); - @Lock(PESSIMISTIC_WRITE) @Query("SELECT t FROM Trip t LEFT OUTER JOIN FETCH t.tripItems WHERE t.encryptedId = :tripId") Optional findTripForUpdate(@Param("tripId") String tripId);