pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#34] 회원 / 인증 도메인 재정의 #43

Merged
pricelees merged 73 commits from refactor/#34 into main 2025-09-13 10:13:45 +00:00
Conversation 0 Commits 73 Files Changed 150 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5724aaecb6 - Show all commits

4
src/main/kotlin/roomescape/payment/web/PaymentDTO.kt
View File

@ -34,12 +34,12 @@ data class PaymentRetrieveResponse(
val status: PaymentStatus, val status: PaymentStatus,
val requestedAt: OffsetDateTime, val requestedAt: OffsetDateTime,
val approvedAt: OffsetDateTime, val approvedAt: OffsetDateTime,
val detail: PaymentDetailResponse, val detail: PaymentDetailResponse?,
val cancel: PaymentCancelDetailResponse?, val cancel: PaymentCancelDetailResponse?,
) )
fun PaymentEntity.toRetrieveResponse( fun PaymentEntity.toRetrieveResponse(
detail: PaymentDetailResponse, detail: PaymentDetailResponse?,
cancel: PaymentCancelDetailResponse? cancel: PaymentCancelDetailResponse?
): PaymentRetrieveResponse { ): PaymentRetrieveResponse {
return PaymentRetrieveResponse( return PaymentRetrieveResponse(

2
src/main/kotlin/roomescape/reservation/business/ReservationService.kt
View File

@ -118,7 +118,7 @@ class ReservationService(
val reservation: ReservationEntity = findOrThrow(id) val reservation: ReservationEntity = findOrThrow(id)
val user: UserContactRetrieveResponse = userService.findContactById(reservation.userId) val user: UserContactRetrieveResponse = userService.findContactById(reservation.userId)
val paymentDetail: PaymentRetrieveResponse = paymentService.findDetailByReservationId(id) val paymentDetail: PaymentRetrieveResponse? = paymentService.findDetailByReservationId(id)
return reservation.toReservationDetailRetrieveResponse( return reservation.toReservationDetailRetrieveResponse(
user = user, user = user,

4
src/main/kotlin/roomescape/reservation/web/ReservationDto.kt
View File

@ -50,12 +50,12 @@ data class ReservationDetailRetrieveResponse(
val id: Long, val id: Long,
val user: UserContactRetrieveResponse, val user: UserContactRetrieveResponse,
val applicationDateTime: LocalDateTime, val applicationDateTime: LocalDateTime,
val payment: PaymentRetrieveResponse, val payment: PaymentRetrieveResponse?,
) )
fun ReservationEntity.toReservationDetailRetrieveResponse( fun ReservationEntity.toReservationDetailRetrieveResponse(
user: UserContactRetrieveResponse, user: UserContactRetrieveResponse,
payment: PaymentRetrieveResponse, payment: PaymentRetrieveResponse?,
): ReservationDetailRetrieveResponse { ): ReservationDetailRetrieveResponse {
return ReservationDetailRetrieveResponse( return ReservationDetailRetrieveResponse(
id = this.id, id = this.id,