From a46ef3c485b6fffb80c1bcc4b3a8b02f28b868d6 Mon Sep 17 00:00:00 2001 From: hyowon Date: Fri, 15 Aug 2025 15:51:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[fix/#79]=20=EC=98=88=EC=95=BD=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sumte/reservation/converter/ReservationConverter.java | 2 +- .../java/com/sumte/reservation/dto/ReservationResponseDTO.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sumte/reservation/converter/ReservationConverter.java b/src/main/java/com/sumte/reservation/converter/ReservationConverter.java index ed73b0a..4ce336e 100644 --- a/src/main/java/com/sumte/reservation/converter/ReservationConverter.java +++ b/src/main/java/com/sumte/reservation/converter/ReservationConverter.java @@ -49,7 +49,7 @@ public ReservationResponseDTO.MyReservationDTO toMyReservationDTO(Reservation re .endDate(reservation.getEndDate()) .adultCount(reservation.getAdultCount()) .childCount(reservation.getChildCount()) - .nightCount(nightCount) + .nightCount(nightCount).roomId(room.getId()) .status(reservation.getReservationStatus()) .canWriteReview(canWriteReview) .reviewWritten(reviewWritten) diff --git a/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java b/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java index bd9a63a..32dd589 100644 --- a/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java +++ b/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java @@ -33,6 +33,7 @@ public static class MyReservationDTO { private int nightCount; private ReservationStatus status; + private Long roomId; private boolean canWriteReview; private boolean reviewWritten; } From 6fbc8dcc40a1f6532eb9d4a97e4f43d8bbc2cf1e Mon Sep 17 00:00:00 2001 From: hyowon Date: Fri, 15 Aug 2025 15:51:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[fix/#79]=20=EC=97=90=EB=9F=AC=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/controller/KakaoRedirectController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sumte/payment/controller/KakaoRedirectController.java b/src/main/java/com/sumte/payment/controller/KakaoRedirectController.java index d53916c..078d584 100644 --- a/src/main/java/com/sumte/payment/controller/KakaoRedirectController.java +++ b/src/main/java/com/sumte/payment/controller/KakaoRedirectController.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -38,14 +39,19 @@ public ResponseEntity> success( @RequestParam Long paymentId, @RequestParam("pg_token") String pgToken) { + log.info("[KAKAO SUCCESS] paymentId={}, pg_token={}", paymentId, pgToken); + String deepLink = UriComponentsBuilder.newInstance() - .scheme(scheme).host(host).path("/success") + .scheme("myapp").host("pay").path("/success") .queryParam("paymentId", paymentId) .queryParam("pg_token", pgToken) - .build().toUriString(); + .build(true).toUriString(); + + log.info("DeepLink constructed: {}", deepLink); HttpHeaders headers = new HttpHeaders(); headers.setLocation(URI.create(deepLink)); + log.info("Responding 302 with Location: {}", headers.getLocation()); return ResponseEntity.status(HttpStatus.FOUND) .headers(headers) .body(ApiResponse.success(deepLink)); From b61395e0a2551ffcfb7649f390285b7173ced33b Mon Sep 17 00:00:00 2001 From: hyowon Date: Fri, 15 Aug 2025 15:57:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[fix/#79]=20roomId=20=EC=A0=9C=EA=B1=B0(?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=20=EC=88=98=EC=A0=95=EC=99=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sumte/reservation/converter/ReservationConverter.java | 2 +- .../java/com/sumte/reservation/dto/ReservationResponseDTO.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/sumte/reservation/converter/ReservationConverter.java b/src/main/java/com/sumte/reservation/converter/ReservationConverter.java index 4ce336e..ed73b0a 100644 --- a/src/main/java/com/sumte/reservation/converter/ReservationConverter.java +++ b/src/main/java/com/sumte/reservation/converter/ReservationConverter.java @@ -49,7 +49,7 @@ public ReservationResponseDTO.MyReservationDTO toMyReservationDTO(Reservation re .endDate(reservation.getEndDate()) .adultCount(reservation.getAdultCount()) .childCount(reservation.getChildCount()) - .nightCount(nightCount).roomId(room.getId()) + .nightCount(nightCount) .status(reservation.getReservationStatus()) .canWriteReview(canWriteReview) .reviewWritten(reviewWritten) diff --git a/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java b/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java index 32dd589..87483f6 100644 --- a/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java +++ b/src/main/java/com/sumte/reservation/dto/ReservationResponseDTO.java @@ -32,8 +32,6 @@ public static class MyReservationDTO { private Long childCount; private int nightCount; private ReservationStatus status; - - private Long roomId; private boolean canWriteReview; private boolean reviewWritten; }