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,