From 5724aaecb69f24f86dd2364f5096a7c16f5ea90e Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 13 Sep 2025 18:16:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=9A=8C=EC=9B=90=EC=9D=98=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20=EA=B2=B0=EC=A0=9C=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20?= =?UTF-8?q?nullable=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/roomescape/payment/web/PaymentDTO.kt | 4 ++-- .../roomescape/reservation/business/ReservationService.kt | 2 +- src/main/kotlin/roomescape/reservation/web/ReservationDto.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt b/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt index 4f6089c6..b632cbb3 100644 --- a/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt +++ b/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt @@ -34,12 +34,12 @@ data class PaymentRetrieveResponse( val status: PaymentStatus, val requestedAt: OffsetDateTime, val approvedAt: OffsetDateTime, - val detail: PaymentDetailResponse, + val detail: PaymentDetailResponse?, val cancel: PaymentCancelDetailResponse?, ) fun PaymentEntity.toRetrieveResponse( - detail: PaymentDetailResponse, + detail: PaymentDetailResponse?, cancel: PaymentCancelDetailResponse? ): PaymentRetrieveResponse { return PaymentRetrieveResponse( diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt index 653317a7..4b4b6f6f 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt @@ -118,7 +118,7 @@ class ReservationService( val reservation: ReservationEntity = findOrThrow(id) val user: UserContactRetrieveResponse = userService.findContactById(reservation.userId) - val paymentDetail: PaymentRetrieveResponse = paymentService.findDetailByReservationId(id) + val paymentDetail: PaymentRetrieveResponse? = paymentService.findDetailByReservationId(id) return reservation.toReservationDetailRetrieveResponse( user = user, diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt index c7f6ff92..9593483e 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt @@ -50,12 +50,12 @@ data class ReservationDetailRetrieveResponse( val id: Long, val user: UserContactRetrieveResponse, val applicationDateTime: LocalDateTime, - val payment: PaymentRetrieveResponse, + val payment: PaymentRetrieveResponse?, ) fun ReservationEntity.toReservationDetailRetrieveResponse( user: UserContactRetrieveResponse, - payment: PaymentRetrieveResponse, + payment: PaymentRetrieveResponse?, ): ReservationDetailRetrieveResponse { return ReservationDetailRetrieveResponse( id = this.id,