From 32c67ffe1a943543e381510a7581245435bb4af8 Mon Sep 17 00:00:00 2001 From: jeonghyemin Date: Tue, 22 Jul 2025 19:10:53 +0900 Subject: [PATCH] =?UTF-8?q?feat(Order):=20=EC=A3=BC=EB=AC=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=9D=91=EB=8B=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - order 조회 응답 데이터 totalPrice 추가 --- .../reservation/dto/WaitingUserResponse.java | 19 +++++++++++++++++-- .../service/ReservationService.java | 3 ++- .../order/dto/OrderResponseDto.java | 1 + .../order/service/OrderService.java | 1 + 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java index 982e821c..eb8d3d37 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java @@ -4,20 +4,35 @@ import com.nowait.domaincorerdb.reservation.entity.Reservation; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; + @Getter @AllArgsConstructor @Builder +@Schema(description = "대기 사용자 응답 DTO") public class WaitingUserResponse { - private String id; // userId + + @Schema(description = "유저 ID", example = "1201") + private String id; // userId + + @Schema(description = "파티 인원", example = "3") private Integer partySize; + + @Schema(description = "사용자 이름(닉네임)", example = "혜민이") private String userName; + + @Schema(description = "대기 등록 시각", example = "2025-07-22T16:00:00") private LocalDateTime createdAt; + + @Schema(description = "대기 상태", example = "CALLING") private String status; - private Double score; // (필요시, 대기열 정렬 등) + + @Schema(description = "대기 순번/점수", example = "2.0") + private Double score; public static WaitingUserResponse fromEntity(Reservation reservation) { return WaitingUserResponse.builder() diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java index 53d47098..caa97d81 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java @@ -131,7 +131,7 @@ public List getCompletedWaitingUserDetails(Long storeId) { .toList(); } - + // 대기 객체 호출 (WAITING -> CALLING) @Transactional public CallingWaitingResponseDto callWaiting(Long storeId, String userId, MemberDetails memberDetails) { User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new); @@ -163,6 +163,7 @@ public CallingWaitingResponseDto callWaiting(Long storeId, String userId, Member .calledAt(reservation.getRequestedAt()) .build(); } + // 대기 객체 상태 변경 @Transactional public String processEntryStatus(Long storeId, String userId, MemberDetails memberDetails, ReservationStatus status) { // (권한 체크 필요시 여기에 추가) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderResponseDto.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderResponseDto.java index 2f94cf31..117c598e 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderResponseDto.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderResponseDto.java @@ -19,4 +19,5 @@ public class OrderResponseDto { private OrderStatus status; private LocalDateTime createdAt; private List items; + private Integer totalPrice; } diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java index e8aa4493..254caac4 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java @@ -110,6 +110,7 @@ public List getOrderItemsGroupByOrderId( .map(OrderMenuDto::fromEntity) .toList() ) + .totalPrice(order.getTotalPrice()) .build()) .toList(); }