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

hotfix: #71 일정 상세 좌석 번호 실수로 뺀거 추가
4bujak-4bujak · Jun 7, 2024 · 5a5c3ad · 5a5c3ad
2 parents f59f3fa + 9791096
commit 5a5c3ad
Showing 1 changed file with 6 additions and 1 deletion.
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,7 +78,12 @@ 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.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();