Skip to content

feat(Order): order 조회 칼럼 추가 #68

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 2 commits into from
Jul 8, 2025
Merged

feat(Order): order 조회 칼럼 추가 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baad7ff
feat(Order): order 조회 칼럼 추가
HyemIin Jul 8, 2025
7e65302
feat(Order): order 조회 칼럼 추가
HyemIin Jul 8, 2025
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
13 changes: 13 additions & 0 deletions ...t-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.nowait.applicationadmin.order.dto;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

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

Expand All @@ -16,15 +20,24 @@ public class OrderResponseDto {
private String depositorName;
private Integer totalPrice;
private OrderStatus status;
private Map<String, Integer> menuNamesAndQuantities;
private LocalDateTime createdAt;

public static OrderResponseDto fromEntity(UserOrder userOrder) {
Map<String, Integer> menuNamesAndQuantities = userOrder.getOrderItems().stream()
.collect(Collectors.toMap(
orderItem -> orderItem.getMenu().getName(),
OrderItem::getQuantity,
Integer::sum // 메뉴명이 중복일 때 수량 합침
));

return OrderResponseDto.builder()
.id(userOrder.getId())
.tableId(userOrder.getTableId())
.depositorName(userOrder.getDepositorName())
.totalPrice(userOrder.getTotalPrice())
.status(userOrder.getStatus())
.menuNamesAndQuantities(menuNamesAndQuantities)
.createdAt(userOrder.getCreatedAt())
.build();
}
Expand Down
9 changes: 9 additions & 0 deletions ...t-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@
import com.nowait.applicationadmin.order.dto.OrderResponseDto;
import com.nowait.applicationadmin.order.dto.OrderStatusUpdateResponseDto;
import com.nowait.common.enums.Role;
import com.nowait.domaincorerdb.menu.entity.Menu;
import com.nowait.domaincorerdb.menu.exception.MenuNotFoundException;
import com.nowait.domaincorerdb.menu.repository.MenuRepository;
import com.nowait.domaincorerdb.order.entity.OrderStatus;
import com.nowait.domaincorerdb.order.entity.UserOrder;
import com.nowait.domaincorerdb.order.exception.OrderNotFoundException;
import com.nowait.domaincorerdb.order.exception.OrderUpdateUnauthorizedException;
import com.nowait.domaincorerdb.order.exception.OrderViewUnauthorizedException;
import com.nowait.domaincorerdb.order.repository.OrderRepository;
import com.nowait.domaincorerdb.store.entity.Store;
import com.nowait.domaincorerdb.store.exception.StoreNotFoundException;
import com.nowait.domaincorerdb.store.repository.StoreRepository;
import com.nowait.domaincorerdb.user.entity.MemberDetails;
import com.nowait.domaincorerdb.user.entity.User;
import com.nowait.domaincorerdb.user.exception.UserNotFoundException;
Expand All @@ -27,10 +33,13 @@
public class OrderService {
private final OrderRepository orderRepository;
private final UserRepository userRepository;
private final StoreRepository storeRepository;

@Transactional(readOnly = true)
public List<OrderResponseDto> findAllOrders(Long storeId, MemberDetails memberDetails) {
User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
storeRepository.findByStoreIdAndDeletedFalse(storeId)
.orElseThrow(StoreNotFoundException::new);
if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(storeId)) {
throw new OrderViewUnauthorizedException();
}
Expand Down