step3 (매장 식사 주문)

src/main/java/kitchenpos/deliveryorders/application/DeliveryOrderService.java

@@ -65,15 +65,13 @@ public DeliveryOrderDto accept(final UUID orderId) {
         DeliveryOrder deliveryOrder = deliveryOrderRepository.findById(orderId)
                 .orElseThrow(NoSuchElementException::new);
         deliveryOrder.accept(kitchenridersClient);
-
         return ConvertUtil.convert(deliveryOrder, DeliveryOrderDto.class);
     }
 
     @Transactional
     public DeliveryOrderDto serve(final UUID orderId) {
         DeliveryOrder deliveryOrder = deliveryOrderRepository.findById(orderId)
                 .orElseThrow(NoSuchElementException::new);
-
         deliveryOrder.serve();
         return ConvertUtil.convert(deliveryOrder, DeliveryOrderDto.class);
     }
@@ -82,7 +80,6 @@ public DeliveryOrderDto serve(final UUID orderId) {
     public DeliveryOrderDto startDelivery(final UUID orderId) {
         DeliveryOrder deliveryOrder = deliveryOrderRepository.findById(orderId)
                 .orElseThrow(NoSuchElementException::new);
-
         deliveryOrder.startDelivery();
         return ConvertUtil.convert(deliveryOrder, DeliveryOrderDto.class);
     }
@@ -91,7 +88,6 @@ public DeliveryOrderDto startDelivery(final UUID orderId) {
     public DeliveryOrderDto completeDelivery(final UUID orderId) {
         DeliveryOrder deliveryOrder = deliveryOrderRepository.findById(orderId)
                 .orElseThrow(NoSuchElementException::new);
-
         deliveryOrder.completeDelivery();
         return ConvertUtil.convert(deliveryOrder, DeliveryOrderDto.class);
     }
@@ -100,7 +96,6 @@ public DeliveryOrderDto completeDelivery(final UUID orderId) {
     public DeliveryOrderDto complete(final UUID orderId) {
         DeliveryOrder deliveryOrder = deliveryOrderRepository.findById(orderId)
                 .orElseThrow(NoSuchElementException::new);
-
         deliveryOrder.complete();
         return ConvertUtil.convert(deliveryOrder, DeliveryOrderDto.class);
     }

src/main/java/kitchenpos/deliveryorders/domain/DeliveryOrderLineItems.java

@@ -4,7 +4,6 @@
 import javax.persistence.Embeddable;
 import javax.persistence.ForeignKey;
 import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/kitchenpos/eatinorders/application/EatInOrderService.java

@@ -0,0 +1,105 @@
+package kitchenpos.eatinorders.application;
+
+import kitchenpos.eatinorders.tobe.domain.order.EatInMenuClient;
+import kitchenpos.eatinorders.domain.OrderStatus;
+import kitchenpos.eatinorders.shared.dto.EatInOrderDto;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderLineItems;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderRepository;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTableRepository;
+import kitchenpos.eatinorders.shared.dto.EatInOrderLineItemDto;
+import kitchenpos.eatinorders.shared.dto.request.EatInOrderCreateRequest;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrder;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderLineItem;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderLineItemPrice;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderLineItemQuantity;
+import kitchenpos.menus.tobe.domain.menu.MenuRepository;
+import kitchenpos.shared.util.ConvertUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+public class EatInOrderService {
+    private final EatInOrderRepository eatInOrderRepository;
+    private final MenuRepository menuRepository;
+    private final OrderTableRepository orderTableRepository;
+    private final EatInMenuClient eatInMenuClient;
+
+    public EatInOrderService(EatInOrderRepository eatInOrderRepository, MenuRepository menuRepository, OrderTableRepository orderTableRepository, EatInMenuClient eatInMenuClient) {
+        this.eatInOrderRepository = eatInOrderRepository;
+        this.menuRepository = menuRepository;
+        this.orderTableRepository = orderTableRepository;
+        this.eatInMenuClient = eatInMenuClient;
+    }
+
+    @Transactional
+    public EatInOrderDto create(final EatInOrderCreateRequest request) {
+        List<EatInOrderLineItemDto> orderLineItemRequests = request.getOrderLineItems();
+        if (Objects.isNull(orderLineItemRequests) || orderLineItemRequests.isEmpty()) {
+            throw new IllegalArgumentException();
+        }
+
+        List<EatInOrderLineItem> orderLineItems = request.getOrderLineItems().stream()
+                .map(eatInOrderLineItemDto -> EatInOrderLineItem.of(
+                        eatInOrderLineItemDto.getMenuId(),
+                        new EatInOrderLineItemQuantity(eatInOrderLineItemDto.getQuantity()),
+                        new EatInOrderLineItemPrice(eatInOrderLineItemDto.getPrice()),
+                        eatInMenuClient
+                ))
+                .collect(Collectors.toList());
+
+        OrderTable orderTable = orderTableRepository.findById(request.getOrderTableId())
+                .orElseThrow(NoSuchElementException::new);
+
+        EatInOrder eatInOrder = EatInOrder.of(
+                new EatInOrderLineItems(orderLineItems),
+                orderTable,
+                eatInMenuClient
+        );
+
+        return ConvertUtil.convert(eatInOrderRepository.save(eatInOrder), EatInOrderDto.class);
+    }
+
+    @Transactional
+    public EatInOrderDto accept(UUID orderId) {
+        EatInOrder eatInOrder = eatInOrderRepository.findById(orderId)
+                .orElseThrow(NoSuchElementException::new);
+        eatInOrder.accept();
+        return ConvertUtil.convert(eatInOrder, EatInOrderDto.class);
+    }
+
+    @Transactional
+    public EatInOrderDto serve(UUID orderId) {
+        EatInOrder eatInOrder = eatInOrderRepository.findById(orderId)
+                .orElseThrow(NoSuchElementException::new);
+        eatInOrder.serve();
+        return ConvertUtil.convert(eatInOrder, EatInOrderDto.class);
+    }
+
+    @Transactional
+    public EatInOrderDto complete(UUID orderId) {
+        EatInOrder eatInOrder = eatInOrderRepository.findById(orderId)
+                .orElseThrow(NoSuchElementException::new);
+        eatInOrder.complete();
+
+        OrderTable orderTable = orderTableRepository.findById(eatInOrder.getOrderTable().getId())
+                .orElseThrow(NoSuchElementException::new);
+        if (!eatInOrderRepository.existsByOrderTableAndStatusNot(orderTable, OrderStatus.COMPLETED)) {
+            orderTable.clear();
+        }
+        return ConvertUtil.convert(eatInOrder, EatInOrderDto.class);
+    }
+
+
+    @Transactional
+    public List<EatInOrderDto> findAll() {
+        return ConvertUtil.convertList(eatInOrderRepository.findAll(), EatInOrderDto.class);
+    }
+
+}

src/main/java/kitchenpos/eatinorders/application/OrderService.java

@@ -2,6 +2,8 @@
 
 import kitchenpos.deliveryorders.domain.KitchenridersClient;
 import kitchenpos.eatinorders.domain.*;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTableRepository;
 import kitchenpos.menus.tobe.domain.menu.Menu;
 import kitchenpos.menus.tobe.domain.menu.MenuRepository;
 import org.springframework.stereotype.Service;
@@ -170,8 +172,7 @@ public Order complete(final UUID orderId) {
         if (type == OrderType.EAT_IN) {
             final OrderTable orderTable = order.getOrderTable();
             if (!orderRepository.existsByOrderTableAndStatusNot(orderTable, OrderStatus.COMPLETED)) {
-                orderTable.setNumberOfGuests(0);
-                orderTable.setOccupied(false);
+                orderTable.clear();
             }
         }
         return order;

src/main/java/kitchenpos/eatinorders/application/OrderTableService.java

@@ -2,8 +2,13 @@
 
 import kitchenpos.eatinorders.domain.OrderRepository;
 import kitchenpos.eatinorders.domain.OrderStatus;
-import kitchenpos.eatinorders.domain.OrderTable;
-import kitchenpos.eatinorders.domain.OrderTableRepository;
+import kitchenpos.eatinorders.shared.dto.request.EatInOrderTableChangeNumberOfGuestsRequest;
+import kitchenpos.eatinorders.shared.dto.request.OrderTableCreateRequest;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderRepository;
+import kitchenpos.eatinorders.tobe.domain.ordertable.NumberOfGuests;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTableName;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTableRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,59 +20,47 @@
 @Service
 public class OrderTableService {
     private final OrderTableRepository orderTableRepository;
-    private final OrderRepository orderRepository;
+    private final EatInOrderRepository eatInOrderRepository;
 
-    public OrderTableService(final OrderTableRepository orderTableRepository, final OrderRepository orderRepository) {
+    public OrderTableService(OrderTableRepository orderTableRepository, EatInOrderRepository eatInOrderRepository) {
         this.orderTableRepository = orderTableRepository;
-        this.orderRepository = orderRepository;
+        this.eatInOrderRepository = eatInOrderRepository;
     }
 
     @Transactional
-    public OrderTable create(final OrderTable request) {
-        final String name = request.getName();
-        if (Objects.isNull(name) || name.isEmpty()) {
-            throw new IllegalArgumentException();
-        }
-        final OrderTable orderTable = new OrderTable();
-        orderTable.setId(UUID.randomUUID());
-        orderTable.setName(name);
-        orderTable.setNumberOfGuests(0);
-        orderTable.setOccupied(false);
+    public OrderTable create(final OrderTableCreateRequest request) {
+        final OrderTable orderTable = OrderTable.of(
+                new OrderTableName(request.getName()),
+                new NumberOfGuests(0),
+                false
+        );
         return orderTableRepository.save(orderTable);
     }
 
     @Transactional
     public OrderTable sit(final UUID orderTableId) {
         final OrderTable orderTable = orderTableRepository.findById(orderTableId)
             .orElseThrow(NoSuchElementException::new);
-        orderTable.setOccupied(true);
+        orderTable.sit();
         return orderTable;
     }
 
     @Transactional
     public OrderTable clear(final UUID orderTableId) {
         final OrderTable orderTable = orderTableRepository.findById(orderTableId)
             .orElseThrow(NoSuchElementException::new);
-        if (orderRepository.existsByOrderTableAndStatusNot(orderTable, OrderStatus.COMPLETED)) {
+        if (eatInOrderRepository.existsByOrderTableAndStatusNot(orderTable, OrderStatus.COMPLETED)) {
             throw new IllegalStateException();
         }
-        orderTable.setNumberOfGuests(0);
-        orderTable.setOccupied(false);
+        orderTable.clear();
         return orderTable;
     }
 
     @Transactional
-    public OrderTable changeNumberOfGuests(final UUID orderTableId, final OrderTable request) {
-        final int numberOfGuests = request.getNumberOfGuests();
-        if (numberOfGuests < 0) {
-            throw new IllegalArgumentException();
-        }
+    public OrderTable changeNumberOfGuests(final UUID orderTableId, final EatInOrderTableChangeNumberOfGuestsRequest request) {
         final OrderTable orderTable = orderTableRepository.findById(orderTableId)
             .orElseThrow(NoSuchElementException::new);
-        if (!orderTable.isOccupied()) {
-            throw new IllegalStateException();
-        }
-        orderTable.setNumberOfGuests(numberOfGuests);
+        orderTable.changeNumberOfGuests(request.getNumberOfGuests());
         return orderTable;
     }
 

src/main/java/kitchenpos/eatinorders/domain/Order.java

@@ -1,5 +1,7 @@
 package kitchenpos.eatinorders.domain;
 
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+
 import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/kitchenpos/eatinorders/domain/OrderRepository.java

@@ -1,5 +1,7 @@
 package kitchenpos.eatinorders.domain;
 
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

src/main/java/kitchenpos/eatinorders/infra/EatInMenuClientImpl.java

@@ -0,0 +1,30 @@
+package kitchenpos.eatinorders.infra;
+
+import kitchenpos.eatinorders.tobe.domain.order.EatInMenuClient;
+import kitchenpos.menus.tobe.domain.menu.Menu;
+import kitchenpos.menus.tobe.domain.menu.MenuRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+public class EatInMenuClientImpl implements EatInMenuClient {
+
+    private final MenuRepository menuRepository;
+
+    public EatInMenuClientImpl(MenuRepository menuRepository) {
+        this.menuRepository = menuRepository;
+    }
+
+    @Override
+    public Optional<Menu> findById(UUID id) {
+        return menuRepository.findById(id);
+    }
+
+    @Override
+    public List<Menu> findAllByIdIn(List<UUID> ids) {
+        return menuRepository.findAllByIdIn(ids);
+    }
+}

src/main/java/kitchenpos/eatinorders/infra/JpaEatInOrderRepositoryImpl.java

@@ -0,0 +1,11 @@
+package kitchenpos.eatinorders.infra;
+
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrder;
+import kitchenpos.eatinorders.tobe.domain.order.EatInOrderRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface JpaEatInOrderRepositoryImpl extends EatInOrderRepository, JpaRepository<EatInOrder, UUID> {
+
+}

src/main/java/kitchenpos/eatinorders/domain/JpaOrderTableRepository.java → src/main/java/kitchenpos/eatinorders/infra/JpaOrderTableRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.eatinorders.domain;
+package kitchenpos.eatinorders.infra;
 
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTable;
+import kitchenpos.eatinorders.tobe.domain.ordertable.OrderTableRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;