[FEAT] 예약 불가한 날짜 반환 API(#73)

src/main/java/com/sumte/payment/controller/RefundController.java

@@ -1,5 +1,6 @@
 package com.sumte.payment.controller;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -17,6 +18,7 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
+@Hidden
 @RestController
 @RequestMapping("/refunds")
 @RequiredArgsConstructor

src/main/java/com/sumte/payment/converter/PaymentConverter.java

@@ -22,10 +22,11 @@ public static Payment toEntity(PaymentRequestDTO.PaymentRequestCreate dto, Reser
                 .build();
     }
 
-    public static PaymentResponseDTO.PaymentReadyResponse toCreateResponse(Payment payment, String paymentUrl) {
+    public static PaymentResponseDTO.PaymentReadyResponse toCreateResponse(Payment payment, String paymentUrl, String appScheme) {
         return PaymentResponseDTO.PaymentReadyResponse.builder()
                 .paymentId(payment.getId())
                 .paymentUrl(paymentUrl)
+                .appScheme(appScheme)
                 .build();
     }
 

src/main/java/com/sumte/payment/dto/KakaoPayReadyResponseDTO.java

@@ -9,5 +9,6 @@ public class KakaoPayReadyResponseDTO {
     private String tid;
     private String next_redirect_app_url;
     private String next_redirect_pc_url;
+    private String android_app_scheme;
     private String created_at;
 }

src/main/java/com/sumte/payment/dto/PaymentResponseDTO.java

@@ -14,5 +14,6 @@ public class PaymentResponseDTO {
     public static class PaymentReadyResponse {
         private Long paymentId;
         private String paymentUrl;
+        private String appScheme;
     }
 }

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

@@ -1,94 +1,94 @@
-    package com.sumte.payment.service;
-
-    import com.sumte.apiPayload.code.error.PaymentErrorCode;
-    import com.sumte.apiPayload.exception.SumteException;
-    import com.sumte.payment.converter.PaymentConverter;
-    import com.sumte.payment.dto.*;
-    import com.sumte.payment.entity.Payment;
-    import com.sumte.payment.entity.PaymentStatus;
-    import com.sumte.payment.kakaopay.KakaoPayClient;
-    import com.sumte.payment.repository.PaymentRepository;
-    import com.sumte.reservation.entity.Reservation;
-    import com.sumte.reservation.repository.ReservationRepository;
-    import lombok.RequiredArgsConstructor;
-    import org.springframework.beans.factory.annotation.Value;
-    import org.springframework.stereotype.Service;
-    import org.springframework.transaction.annotation.Transactional;
-
-    @Service
-    @RequiredArgsConstructor
-    public class PaymentServiceImpl implements PaymentService {
-
-        private final ReservationRepository reservationRepository;
-        private final PaymentRepository paymentRepository;
-        private final PaymentTransactionHelper transactionHelper;
-        private final KakaoPayClient kakaoPayClient;
-
-        @Value("${kakao.pay.redirect.domain}")
-        private String redirectDomain;
-
-        @Override
-        @Transactional
-        public PaymentResponseDTO.PaymentReadyResponse requestPayment(PaymentRequestDTO.PaymentRequestCreate dto) {
-            Reservation reservation = reservationRepository.findById(dto.getReservationId())
-                    .orElseThrow(() -> new SumteException(PaymentErrorCode.RESERVATION_NOT_FOUND));
-
-            Payment payment;
-            try {
-                payment = PaymentConverter.toEntity(dto, reservation);
-            } catch (IllegalArgumentException e) {
-                throw new SumteException(PaymentErrorCode.INVALID_PAYMENT_METHOD);
-            }
-            paymentRepository.save(payment);
-
-
-            String itemName = reservation.getRoom().getName();
-
-            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(dto.getAmount()))
-                    .tax_free_amount("0")
-                    .approval_url(redirectDomain + "/pay/success")
-                    .cancel_url(redirectDomain  + "/pay/cancel")
-                    .fail_url(redirectDomain  + "/pay/fail")
-                    .build();
-
-            KakaoPayReadyResponseDTO kakaoResponse = kakaoPayClient.requestPayment(request);
-            payment.setTid(kakaoResponse.getTid());
-
-            return PaymentConverter.toCreateResponse(payment, kakaoResponse.getNext_redirect_app_url());
+package com.sumte.payment.service;
+
+import com.sumte.apiPayload.code.error.PaymentErrorCode;
+import com.sumte.apiPayload.exception.SumteException;
+import com.sumte.payment.converter.PaymentConverter;
+import com.sumte.payment.dto.*;
+import com.sumte.payment.entity.Payment;
+import com.sumte.payment.entity.PaymentStatus;
+import com.sumte.payment.kakaopay.KakaoPayClient;
+import com.sumte.payment.repository.PaymentRepository;
+import com.sumte.reservation.entity.Reservation;
+import com.sumte.reservation.repository.ReservationRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class PaymentServiceImpl implements PaymentService {
+
+    private final ReservationRepository reservationRepository;
+    private final PaymentRepository paymentRepository;
+    private final PaymentTransactionHelper transactionHelper;
+    private final KakaoPayClient kakaoPayClient;
+
+    @Value("${kakao.pay.redirect.domain}")
+    private String redirectDomain;
+
+    @Override
+    @Transactional
+    public PaymentResponseDTO.PaymentReadyResponse requestPayment(PaymentRequestDTO.PaymentRequestCreate dto) {
+        Reservation reservation = reservationRepository.findById(dto.getReservationId())
+                .orElseThrow(() -> new SumteException(PaymentErrorCode.RESERVATION_NOT_FOUND));
+
+        Payment payment;
+        try {
+            payment = PaymentConverter.toEntity(dto, reservation);
+        } catch (IllegalArgumentException e) {
+            throw new SumteException(PaymentErrorCode.INVALID_PAYMENT_METHOD);
         }
+        paymentRepository.save(payment);
 
-        @Override
-        @Transactional
-        public KakaoPayApproveResponseDTO approvePayment(Long paymentId, String pgToken) {
-            Payment payment = paymentRepository.findById(paymentId)
-                    .orElseThrow(() -> new SumteException(PaymentErrorCode.PAYMENT_NOT_FOUND));
-
-            if (payment.getPaymentStatus() == PaymentStatus.PAID) {
-                throw new SumteException(PaymentErrorCode.ALREADY_APPROVED_PAYMENT);
-            }
-
-            if (pgToken == null || pgToken.isBlank()) {
-                transactionHelper.markPaymentFailed(payment);
-                throw new SumteException(PaymentErrorCode.PG_TOKEN_MISSING);
-            }
-
-            KakaoPayApproveRequestDTO request = KakaoPayApproveRequestDTO.builder()
-                    .cid("TC0ONETIME")
-                    .tid(payment.getTid())
-                    .partner_order_id("reservation_" + payment.getReservation().getId())
-                    .partner_user_id("user_" + payment.getReservation().getUser().getId())
-                    .pg_token(pgToken)
-                    .build();
-
-            KakaoPayApproveResponseDTO response = kakaoPayClient.approvePayment(request);
-            payment.markAsPaid();
-
-            return response;
+
+        String itemName = reservation.getRoom().getName();
+
+        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(dto.getAmount()))
+                .tax_free_amount("0")
+                .approval_url(redirectDomain + "/pay/success")
+                .cancel_url(redirectDomain  + "/pay/cancel")
+                .fail_url(redirectDomain  + "/pay/fail")
+                .build();
+
+        KakaoPayReadyResponseDTO kakaoResponse = kakaoPayClient.requestPayment(request);
+        payment.setTid(kakaoResponse.getTid());
+
+        return PaymentConverter.toCreateResponse(payment, kakaoResponse.getNext_redirect_app_url(),kakaoResponse.getAndroid_app_scheme());
+    }
+
+    @Override
+    @Transactional
+    public KakaoPayApproveResponseDTO approvePayment(Long paymentId, String pgToken) {
+        Payment payment = paymentRepository.findById(paymentId)
+                .orElseThrow(() -> new SumteException(PaymentErrorCode.PAYMENT_NOT_FOUND));
+
+        if (payment.getPaymentStatus() == PaymentStatus.PAID) {
+            throw new SumteException(PaymentErrorCode.ALREADY_APPROVED_PAYMENT);
+        }
+
+        if (pgToken == null || pgToken.isBlank()) {
+            transactionHelper.markPaymentFailed(payment);
+            throw new SumteException(PaymentErrorCode.PG_TOKEN_MISSING);
         }
+
+        KakaoPayApproveRequestDTO request = KakaoPayApproveRequestDTO.builder()
+                .cid("TC0ONETIME")
+                .tid(payment.getTid())
+                .partner_order_id("reservation_" + payment.getReservation().getId())
+                .partner_user_id("user_" + payment.getReservation().getUser().getId())
+                .pg_token(pgToken)
+                .build();
+
+        KakaoPayApproveResponseDTO response = kakaoPayClient.approvePayment(request);
+        payment.markAsPaid();
+
+        return response;
     }
+}

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

@@ -40,4 +40,42 @@ and exists (
 """)
 	Page<Reservation> findAllPaidByUser(@Param("user") User user, Pageable pageable);
 
+	@Query("""
+    select r from Reservation r
+    where r.room.guesthouse.id = :guesthouseId
+      and r.reservationStatus <> com.sumte.reservation.entity.ReservationStatus.CANCELED
+      and exists (
+          select 1
+          from Payment p
+          where p.reservation = r
+            and p.paymentStatus = com.sumte.payment.entity.PaymentStatus.PAID
+      )
+      and r.startDate < :endExclusive
+      and r.endDate > :startInclusive
+    """)
+	List<Reservation> findActivePaidByGuesthouseAndOverlap(
+			@Param("guesthouseId") Long guesthouseId,
+			@Param("startInclusive") java.time.LocalDate startInclusive,
+			@Param("endExclusive") java.time.LocalDate endExclusive
+	);
+
+	@Query("""
+    select r from Reservation r
+    where r.room = :room
+      and r.reservationStatus <> com.sumte.reservation.entity.ReservationStatus.CANCELED
+      and exists (
+          select 1
+          from Payment p
+          where p.reservation = r
+            and p.paymentStatus = com.sumte.payment.entity.PaymentStatus.PAID
+      )
+      and r.startDate < :endExclusive
+      and r.endDate > :startInclusive
+    """)
+	List<Reservation> findActivePaidByRoomAndOverlap(
+			@Param("room") com.sumte.room.entity.Room room,
+			@Param("startInclusive") java.time.LocalDate startInclusive,
+			@Param("endExclusive") java.time.LocalDate endExclusive
+	);
+
 }

src/main/java/com/sumte/room/controller/RoomController.java

@@ -150,4 +150,24 @@ public ApiResponse<List<RoomResponseDTO.RoomSummary>> getRoomsByGuesthouse(
 		return ApiResponse.success(roomQueryService.getRoomsByGuesthouse(guesthouseId, startDate, endDate));
 	}
 
+	// 1) 게스트하우스: 앞으로 3개월간 모든 객실 매진일
+	@GetMapping("/{guesthouseId}/fully-booked-dates")
+	@Operation(summary = "게스트하우스 3개월 매진일 조회",
+			description = "현재 날짜부터 3개월 동안 해당 게스트하우스의 모든 객실이 점유된 날짜 목록을 반환합니다.")
+	public ApiResponse<List<LocalDate>> getFullyBookedDatesOfGuesthouse(
+			@PathVariable Long guesthouseId
+	) {
+		return ApiResponse.success(roomQueryService.getFullyBookedDatesOfGuesthouse(guesthouseId));
+	}
+
+	// 2) 객실: 앞으로 3개월간 예약 불가일
+	@GetMapping("/room/{roomId}/unavailable-dates")
+	@Operation(summary = "객실 3개월 예약 불가일 조회",
+			description = "현재 날짜부터 3개월 동안 해당 객실이 예약 불가한 날짜 목록을 반환합니다.")
+	public ApiResponse<List<LocalDate>> getUnavailableDatesOfRoom(
+			@PathVariable Long roomId
+	) {
+		return ApiResponse.success(roomQueryService.getUnavailableDatesOfRoom(roomId));
+	}
+
 }

src/main/java/com/sumte/room/repository/RoomRepository.java

@@ -25,4 +25,5 @@ public interface RoomRepository extends JpaRepository<Room, Long> {
 	//객실 조회
 	List<Room> findAllByGuesthouseId(Long guesthouseId);
 
+	long countByGuesthouseId(Long guesthouseId);
 }

src/main/java/com/sumte/room/service/RoomQueryService.java

@@ -8,4 +8,6 @@
 public interface RoomQueryService {
 	List<RoomResponseDTO.RoomSummary> getRoomsByGuesthouse(Long guesthouseId, LocalDate startDate, LocalDate endDate);
 	RoomResponseDTO.GetRoomResponse getRoomById(Long roomId);
+	List<LocalDate> getFullyBookedDatesOfGuesthouse(Long guesthouseId);
+	List<LocalDate> getUnavailableDatesOfRoom(Long roomId);
 }

src/main/java/com/sumte/room/service/RoomQueryServiceImpl.java

@@ -1,11 +1,10 @@
 package com.sumte.room.service;
 
 import java.time.LocalDate;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.sumte.reservation.entity.Reservation;
 import org.springframework.stereotype.Service;
 
 import com.sumte.apiPayload.code.error.CommonErrorCode;
@@ -88,4 +87,59 @@ public List<RoomResponseDTO.RoomSummary> getRoomsByGuesthouse(Long guesthouseId,
 			})
 			.collect(Collectors.toList());
 	}
+
+	@Override
+	@Transactional
+	public List<LocalDate> getFullyBookedDatesOfGuesthouse(Long guesthouseId) {
+		LocalDate start = LocalDate.now();
+		LocalDate endExclusive = start.plusMonths(3);
+
+		long totalRooms = roomRepository.countByGuesthouseId(guesthouseId);
+		if (totalRooms == 0) return List.of();
+
+		List<Reservation> reservations =
+				reservationRepository.findActivePaidByGuesthouseAndOverlap(guesthouseId, start, endExclusive);
+
+		Map<LocalDate, Integer> occupiedCountByDate = new HashMap<>();
+		for (Reservation r : reservations) {
+			LocalDate s = r.getStartDate().isBefore(start) ? start : r.getStartDate();
+			LocalDate e = r.getEndDate().isAfter(endExclusive) ? endExclusive : r.getEndDate();
+
+			for (LocalDate d = s; d.isBefore(e); d = d.plusDays(1)) {
+				occupiedCountByDate.merge(d, 1, Integer::sum);
+			}
+		}
+
+		List<LocalDate> fullyBooked = new ArrayList<>();
+		for (LocalDate d = start; d.isBefore(endExclusive); d = d.plusDays(1)) {
+			if (occupiedCountByDate.getOrDefault(d, 0) >= totalRooms) {
+				fullyBooked.add(d);
+			}
+		}
+		return fullyBooked;
+	}
+
+	@Override
+	@Transactional
+	public List<LocalDate> getUnavailableDatesOfRoom(Long roomId) {
+		Room room = roomRepository.findById(roomId)
+				.orElseThrow(() -> new SumteException(CommonErrorCode.NOT_EXIST_ROOM));
+
+		LocalDate start = LocalDate.now();
+		LocalDate endExclusive = start.plusMonths(3);
+
+		List<Reservation> reservations =
+				reservationRepository.findActivePaidByRoomAndOverlap(room, start, endExclusive);
+
+		Set<LocalDate> unavailable = new LinkedHashSet<>();
+		for (Reservation r : reservations) {
+			LocalDate s = r.getStartDate().isBefore(start) ? start : r.getStartDate();
+			LocalDate e = r.getEndDate().isAfter(endExclusive) ? endExclusive : r.getEndDate();
+
+			for (LocalDate d = s; d.isBefore(e); d = d.plusDays(1)) {
+				unavailable.add(d);
+			}
+		}
+		return new ArrayList<>(unavailable);
+	}
 }