Merge pull request #101 from 4bujak-4bujak/develop

hotfix: #71 일정 상세 좌석 번호 실수로 뺀거 추가2
4bujak-4bujak · Jun 7, 2024 · 68880da · 68880da
2 parents 5a5c3ad + fac5892
commit 68880da
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/example/sabujak/reservation/dto/response/ReservationHistoryResponse.java b/src/main/java/com/example/sabujak/reservation/dto/response/ReservationHistoryResponse.java
@@ -78,16 +78,16 @@ public static class ReservationDetails {
         public static ReservationDetails of(Reservation reservation, Space space, Member representative, List<Member> participants, MemberReservationType myMemberType, ReservationProgress reservationProgress) {
             ReservationDetails reservationDetails = new ReservationDetails();
             reservationDetails.reservationId = reservation.getReservationId();
+            reservationDetails.reservationName = reservation.getReservationName();
+            reservationDetails.startAt = reservation.getReservationStartDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            reservationDetails.endAt = reservation.getReservationEndDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            reservationDetails.branchName = space.getBranch().getBranchName();
 
             reservationDetails.spaceName = space.getSpaceName();
             if (space instanceof FocusDesk) {
                 reservationDetails.spaceName += " " + ((FocusDesk) space).getFocusDeskNumber();
             }
 
-            reservationDetails.startAt = reservation.getReservationStartDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-            reservationDetails.endAt = reservation.getReservationEndDateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-            reservationDetails.branchName = space.getBranch().getBranchName();
-            reservationDetails.spaceName = space.getSpaceName();
             reservationDetails.spaceFloor = space.getSpaceFloor();
             reservationDetails.branchAddress = space.getBranch().getBranchAddress();