Skip to content

feat(Order): order 조회 시 주문상태 반환값 추가 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HyemIin merged 1 commit into from
Jul 17, 2025
Merged

feat(Order): order 조회 시 주문상태 반환값 추가 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...r-api/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import com.nowait.domaincorerdb.order.entity.OrderItem;
import com.nowait.domaincorerdb.order.entity.OrderStatus;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -17,13 +18,15 @@ public class OrderItemListGetResponseDto {
private String menuName;
private Integer quantity;
private Integer price;
private OrderStatus status;

public static OrderItemListGetResponseDto fromEntity(OrderItem orderItem) {
public static OrderItemListGetResponseDto fromEntity(OrderItem orderItem,OrderStatus status) {
return OrderItemListGetResponseDto.builder()
.orderId(orderItem.getUserOrder().getId())
.menuName(orderItem.getMenu().getName())
.quantity(orderItem.getQuantity())
.price(orderItem.getMenu().getPrice())
.status(status)
.build();

}
Expand Down
4 changes: 2 additions & 2 deletions nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ public List<OrderItemListGetResponseDto> getOrderItems(Long storeId, Long tableI

// 2. OrderItem으로 변환
return userOrders.stream()
.flatMap(order -> order.getOrderItems().stream())
.map(OrderItemListGetResponseDto::fromEntity)
.flatMap(order -> order.getOrderItems().stream()
.map(orderItem -> OrderItemListGetResponseDto.fromEntity(orderItem, order.getStatus())))
.toList();
}

Expand Down