[FIX] 내 예약 목록 수정 (#70)

src/main/java/com/sumte/payment/service/PaymentServiceImpl.java

@@ -43,15 +43,14 @@ public PaymentResponseDTO.PaymentReadyResponse requestPayment(PaymentRequestDTO.
 
 
             String itemName = reservation.getRoom().getName();
-            Long totalAmount = reservation.getRoom().getPrice();
 
             KakaoPayReadyRequestDTO request = KakaoPayReadyRequestDTO.builder()
                     .cid("TC0ONETIME")
                     .partner_order_id("reservation_" + reservation.getId())
                     .partner_user_id("user_" + reservation.getUser().getId())
                     .item_name(itemName)
                     .quantity("1")
-                    .total_amount(String.valueOf(totalAmount))
+                    .total_amount(String.valueOf(dto.getAmount()))
                     .tax_free_amount("0")
                     .approval_url(redirectDomain + "/pay/success")
                     .cancel_url(redirectDomain  + "/pay/cancel")

src/main/java/com/sumte/reservation/repository/ReservationRepository.java

@@ -25,8 +25,19 @@ boolean existsOverlappingReservation(@Param("room") Room room,
                                          @Param("startDate") LocalDate startDate,
                                          @Param("endDate") LocalDate endDate);
 
-	Page<Reservation> findAllByUser(User user, Pageable pageable);
-
 	List<Reservation> findByReservationStatusNot(ReservationStatus status);
 
+	@Query("""
+select r
+from Reservation r
+where r.user = :user
+  and exists (
+    select 1
+    from Payment p
+    where p.reservation = r
+      and p.paymentStatus = com.sumte.payment.entity.PaymentStatus.PAID
+  )
+""")
+	Page<Reservation> findAllPaidByUser(@Param("user") User user, Pageable pageable);
+
 }

src/main/java/com/sumte/reservation/service/ReservationServiceImpl.java

@@ -97,24 +97,24 @@ public Page<ReservationResponseDTO.MyReservationDTO> getMyReservations(Pageable
 		User user = userRepository.findById(userId)
 			.orElseThrow(() -> new SumteException(CommonErrorCode.USER_NOT_FOUND));
 
-		Page<Reservation> reservations = reservationRepository.findAllByUser(user, pageable);
+		Page<Reservation> reservations = reservationRepository.findAllPaidByUser(user, pageable);
+
 		return reservations.map(reservation -> {
 			boolean isComplete = reservation.getReservationStatus().equals(ReservationStatus.COMPLETED);
 
-			boolean reviewWritten = reviewRepository.existsByUserIdAndRoomGuesthouseId(user.getId(),
-				reservation.getRoom().getGuesthouse().getId());
+			boolean reviewWritten = reviewRepository.existsByUserIdAndRoomGuesthouseId(
+					user.getId(), reservation.getRoom().getGuesthouse().getId()
+			);
 			boolean canWriteReview = isComplete && !reviewWritten;
 
-			// 첫 번째 방 이미지 URL 조회
 			String firstImageUrl = imageRepository
-				.findByOwnerTypeAndOwnerIdOrderBySortOrderAsc(
-					OwnerType.ROOM,
-					reservation.getRoom().getId()
-				)
-				.stream()
-				.map(Image::getUrl)
-				.findFirst()
-				.orElse(null);
+					.findByOwnerTypeAndOwnerIdOrderBySortOrderAsc(
+							OwnerType.ROOM, reservation.getRoom().getId()
+					)
+					.stream()
+					.map(Image::getUrl)
+					.findFirst()
+					.orElse(null);
 
 			return reservationConverter.toMyReservationDTO(reservation, firstImageUrl, canWriteReview, reviewWritten);
 		});