From 483e128a915758fa1f3783a6e47aa028655cb4be Mon Sep 17 00:00:00 2001 From: Park Sejin Date: Wed, 29 Nov 2023 23:20:03 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20UpdateReservationReq=20Request=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/ReservationServiceImpl.java | 2 +- .../domain/reservation/domain/Reservation.java | 8 ++++---- .../reservation/dto/UpdateReservationReq.java | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/shallwe/domain/reservation/application/ReservationServiceImpl.java b/src/main/java/com/shallwe/domain/reservation/application/ReservationServiceImpl.java index e08313b4..17f1d9d1 100644 --- a/src/main/java/com/shallwe/domain/reservation/application/ReservationServiceImpl.java +++ b/src/main/java/com/shallwe/domain/reservation/application/ReservationServiceImpl.java @@ -123,7 +123,7 @@ public ReservationResponse updateReservation(UpdateReservationReq updateReq, UserPrincipal userPrincipal) { Reservation updateReservation = reservationRepository.findById( - updateReq.getId()).map( + updateReq.getReservationId()).map( reservation -> { reservation.updateReservation(updateReq); return reservationRepository.save(reservation); diff --git a/src/main/java/com/shallwe/domain/reservation/domain/Reservation.java b/src/main/java/com/shallwe/domain/reservation/domain/Reservation.java index 2ef55586..90ff6d7f 100644 --- a/src/main/java/com/shallwe/domain/reservation/domain/Reservation.java +++ b/src/main/java/com/shallwe/domain/reservation/domain/Reservation.java @@ -74,12 +74,12 @@ public class Reservation extends BaseEntity { List memoryPhotos = new ArrayList<>(); public void updateReservation(UpdateReservationReq updateReq) { - this.persons = Optional.ofNullable(updateReq.getPersons()).orElse(this.persons); +// this.persons = Optional.ofNullable(updateReq.getPersons()).orElse(this.persons); this.date = Optional.ofNullable(updateReq.getDate()).orElse(this.date); this.time = Optional.ofNullable(updateReq.getTime()).orElse(this.time); - this.phoneNumber = Optional.ofNullable(updateReq.getPhone_number()).orElse(this.phoneNumber); - this.invitationImg = Optional.ofNullable(updateReq.getInvitation_img()).orElse(this.invitationImg); - this.invitationComment = Optional.ofNullable(updateReq.getInvitation_comment()).orElse(this.invitationComment); +// this.phoneNumber = Optional.ofNullable(updateReq.getPhone_number()).orElse(this.phoneNumber); +// this.invitationImg = Optional.ofNullable(updateReq.getInvitation_img()).orElse(this.invitationImg); +// this.invitationComment = Optional.ofNullable(updateReq.getInvitation_comment()).orElse(this.invitationComment); } public void updateUserReservationRequest(ReservationUserReq reservationRequest,User sender, User receiver){ diff --git a/src/main/java/com/shallwe/domain/reservation/dto/UpdateReservationReq.java b/src/main/java/com/shallwe/domain/reservation/dto/UpdateReservationReq.java index b0c60b90..d2dce7c2 100644 --- a/src/main/java/com/shallwe/domain/reservation/dto/UpdateReservationReq.java +++ b/src/main/java/com/shallwe/domain/reservation/dto/UpdateReservationReq.java @@ -2,18 +2,26 @@ import java.time.LocalDate; import java.time.LocalTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class UpdateReservationReq { - private Long id; - private Long persons; + @Schema(type = "long", example = "2", description = "예약 날짜") + private Long reservationId; +// private Long persons; + + @Schema(type = "string", example = "2023-08-25", description = "예약 날짜") private LocalDate date; + + @Schema(type = "string", example = "13:00", description = "예약 시간") private LocalTime time; - private String phone_number; - private String invitation_img; - private String invitation_comment; +// private String phone_number; +// private String invitation_img; +// private String invitation_comment; }