3단계 - 기능 우선 패키지 구성하기

src/main/java/kitchenpos/infra/DefaultKitchenridersClient.java → src/main/java/kitchenpos/common/domain/model/kitchenriders/DefaultKitchenridersClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.common.domain.model.kitchenriders;
 
 import org.springframework.stereotype.Component;
 

src/main/java/kitchenpos/infra/KitchenridersClient.java → src/main/java/kitchenpos/common/domain/model/kitchenriders/KitchenridersClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.common.domain.model.kitchenriders;
 
 import java.math.BigDecimal;
 import java.util.UUID;

src/main/java/kitchenpos/infra/DefaultPurgomalumClient.java → src/main/java/kitchenpos/common/domain/model/purgomalum/DefaultPurgomalumClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.common.domain.model.purgomalum;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Component;

src/main/java/kitchenpos/infra/PurgomalumClient.java → src/main/java/kitchenpos/common/domain/model/purgomalum/PurgomalumClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.common.domain.model.purgomalum;
 
 public interface PurgomalumClient {
     boolean containsProfanity(String text);

src/main/java/kitchenpos/application/MenuGroupService.java → src/main/java/kitchenpos/menu/application/MenuGroupService.java

@@ -1,7 +1,7 @@
-package kitchenpos.application;
+package kitchenpos.menu.application;
 
-import kitchenpos.domain.MenuGroup;
-import kitchenpos.domain.MenuGroupRepository;
+import kitchenpos.menu.domain.model.MenuGroup;
+import kitchenpos.menu.domain.repository.MenuGroupRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/application/MenuService.java → src/main/java/kitchenpos/menu/application/MenuService.java

@@ -1,13 +1,13 @@
-package kitchenpos.application;
+package kitchenpos.menu.application;
 
-import kitchenpos.domain.Menu;
-import kitchenpos.domain.MenuGroup;
-import kitchenpos.domain.MenuGroupRepository;
-import kitchenpos.domain.MenuProduct;
-import kitchenpos.domain.MenuRepository;
-import kitchenpos.domain.Product;
-import kitchenpos.domain.ProductRepository;
-import kitchenpos.infra.PurgomalumClient;
+import kitchenpos.menu.domain.model.Menu;
+import kitchenpos.menu.domain.model.MenuGroup;
+import kitchenpos.menu.domain.repository.MenuGroupRepository;
+import kitchenpos.menu.domain.model.MenuProduct;
+import kitchenpos.menu.domain.repository.MenuRepository;
+import kitchenpos.common.domain.model.purgomalum.PurgomalumClient;
+import kitchenpos.product.domain.model.Product;
+import kitchenpos.product.domain.repository.ProductRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/domain/Menu.java → src/main/java/kitchenpos/menu/domain/model/Menu.java

@@ -1,15 +1,6 @@
-package kitchenpos.domain;
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.ForeignKey;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
+package kitchenpos.menu.domain.model;
+
+import jakarta.persistence.*;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/kitchenpos/domain/MenuGroup.java → src/main/java/kitchenpos/menu/domain/model/MenuGroup.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/kitchenpos/domain/MenuProduct.java → src/main/java/kitchenpos/menu/domain/model/MenuProduct.java

@@ -1,15 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.ForeignKey;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
+import jakarta.persistence.*;
+import kitchenpos.product.domain.model.Product;
 
 import java.util.UUID;
 

src/main/java/kitchenpos/domain/MenuGroupRepository.java → src/main/java/kitchenpos/menu/domain/repository/MenuGroupRepository.java

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain.repository;
+
+import kitchenpos.menu.domain.model.MenuGroup;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/MenuRepository.java → src/main/java/kitchenpos/menu/domain/repository/MenuRepository.java

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain.repository;
+
+import kitchenpos.menu.domain.model.Menu;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/JpaMenuGroupRepository.java → src/main/java/kitchenpos/menu/infra/JpaMenuGroupRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.menu.infra;
 
+import kitchenpos.menu.domain.model.MenuGroup;
+import kitchenpos.menu.domain.repository.MenuGroupRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

src/main/java/kitchenpos/domain/JpaMenuRepository.java → src/main/java/kitchenpos/menu/infra/JpaMenuRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.menu.infra;
 
+import kitchenpos.menu.domain.model.Menu;
+import kitchenpos.menu.domain.repository.MenuRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/kitchenpos/ui/MenuGroupRestController.java → src/main/java/kitchenpos/menu/ui/MenuGroupRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.menu.ui;
 
-import kitchenpos.application.MenuGroupService;
-import kitchenpos.domain.MenuGroup;
+import kitchenpos.menu.application.MenuGroupService;
+import kitchenpos.menu.domain.model.MenuGroup;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/kitchenpos/ui/MenuRestController.java → src/main/java/kitchenpos/menu/ui/MenuRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.menu.ui;
 
-import kitchenpos.application.MenuService;
-import kitchenpos.domain.Menu;
+import kitchenpos.menu.application.MenuService;
+import kitchenpos.menu.domain.model.Menu;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/kitchenpos/application/OrderService.java → src/main/java/kitchenpos/order/common/application/OrderService.java

@@ -1,25 +1,20 @@
-package kitchenpos.application;
+package kitchenpos.order.common.application;
 
-import kitchenpos.domain.Menu;
-import kitchenpos.domain.MenuRepository;
-import kitchenpos.domain.Order;
-import kitchenpos.domain.OrderLineItem;
-import kitchenpos.domain.OrderRepository;
-import kitchenpos.domain.OrderStatus;
-import kitchenpos.domain.OrderTable;
-import kitchenpos.domain.OrderTableRepository;
-import kitchenpos.domain.OrderType;
-import kitchenpos.infra.KitchenridersClient;
+import kitchenpos.menu.domain.model.Menu;
+import kitchenpos.menu.domain.repository.MenuRepository;
+import kitchenpos.order.common.domain.*;
+import kitchenpos.order.common.domain.model.Order;
+import kitchenpos.order.common.domain.model.OrderLineItem;
+import kitchenpos.order.common.domain.repository.OrderRepository;
+import kitchenpos.common.domain.model.kitchenriders.KitchenridersClient;
+import kitchenpos.order.eatinorder.domain.model.OrderTable;
+import kitchenpos.order.eatinorder.domain.repository.OrderTableRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class OrderService {
@@ -29,10 +24,10 @@ public class OrderService {
     private final KitchenridersClient kitchenridersClient;
 
     public OrderService(
-        final OrderRepository orderRepository,
-        final MenuRepository menuRepository,
-        final OrderTableRepository orderTableRepository,
-        final KitchenridersClient kitchenridersClient
+            final OrderRepository orderRepository,
+            final MenuRepository menuRepository,
+            final OrderTableRepository orderTableRepository,
+            final KitchenridersClient kitchenridersClient
     ) {
         this.orderRepository = orderRepository;
         this.menuRepository = menuRepository;
@@ -51,9 +46,9 @@ public Order create(final Order request) {
             throw new IllegalArgumentException();
         }
         final List<Menu> menus = menuRepository.findAllByIdIn(
-            orderLineItemRequests.stream()
-                .map(OrderLineItem::getMenuId)
-                .toList()
+                orderLineItemRequests.stream()
+                        .map(OrderLineItem::getMenuId)
+                        .toList()
         );
         if (menus.size() != orderLineItemRequests.size()) {
             throw new IllegalArgumentException();
@@ -67,7 +62,7 @@ public Order create(final Order request) {
                 }
             }
             final Menu menu = menuRepository.findById(orderLineItemRequest.getMenuId())
-                .orElseThrow(NoSuchElementException::new);
+                    .orElseThrow(NoSuchElementException::new);
             if (!menu.isDisplayed()) {
                 throw new IllegalStateException();
             }
@@ -94,7 +89,7 @@ public Order create(final Order request) {
         }
         if (type == OrderType.EAT_IN) {
             final OrderTable orderTable = orderTableRepository.findById(request.getOrderTableId())
-                .orElseThrow(NoSuchElementException::new);
+                    .orElseThrow(NoSuchElementException::new);
             if (!orderTable.isOccupied()) {
                 throw new IllegalStateException();
             }
@@ -106,16 +101,16 @@ public Order create(final Order request) {
     @Transactional
     public Order accept(final UUID orderId) {
         final Order order = orderRepository.findById(orderId)
-            .orElseThrow(NoSuchElementException::new);
+                .orElseThrow(NoSuchElementException::new);
         if (order.getStatus() != OrderStatus.WAITING) {
             throw new IllegalStateException();
         }
         if (order.getType() == OrderType.DELIVERY) {
             BigDecimal sum = BigDecimal.ZERO;
             for (final OrderLineItem orderLineItem : order.getOrderLineItems()) {
                 sum = orderLineItem.getMenu()
-                    .getPrice()
-                    .multiply(BigDecimal.valueOf(orderLineItem.getQuantity()));
+                        .getPrice()
+                        .multiply(BigDecimal.valueOf(orderLineItem.getQuantity()));
             }
             kitchenridersClient.requestDelivery(orderId, sum, order.getDeliveryAddress());
         }
@@ -126,7 +121,7 @@ public Order accept(final UUID orderId) {
     @Transactional
     public Order serve(final UUID orderId) {
         final Order order = orderRepository.findById(orderId)
-            .orElseThrow(NoSuchElementException::new);
+                .orElseThrow(NoSuchElementException::new);
         if (order.getStatus() != OrderStatus.ACCEPTED) {
             throw new IllegalStateException();
         }
@@ -137,7 +132,7 @@ public Order serve(final UUID orderId) {
     @Transactional
     public Order startDelivery(final UUID orderId) {
         final Order order = orderRepository.findById(orderId)
-            .orElseThrow(NoSuchElementException::new);
+                .orElseThrow(NoSuchElementException::new);
         if (order.getType() != OrderType.DELIVERY) {
             throw new IllegalStateException();
         }
@@ -151,7 +146,7 @@ public Order startDelivery(final UUID orderId) {
     @Transactional
     public Order completeDelivery(final UUID orderId) {
         final Order order = orderRepository.findById(orderId)
-            .orElseThrow(NoSuchElementException::new);
+                .orElseThrow(NoSuchElementException::new);
         if (order.getStatus() != OrderStatus.DELIVERING) {
             throw new IllegalStateException();
         }
@@ -162,7 +157,7 @@ public Order completeDelivery(final UUID orderId) {
     @Transactional
     public Order complete(final UUID orderId) {
         final Order order = orderRepository.findById(orderId)
-            .orElseThrow(NoSuchElementException::new);
+                .orElseThrow(NoSuchElementException::new);
         final OrderType type = order.getType();
         final OrderStatus status = order.getStatus();
         if (type == OrderType.DELIVERY) {

src/main/java/kitchenpos/domain/OrderStatus.java → src/main/java/kitchenpos/order/common/domain/OrderStatus.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.domain;
 
 public enum OrderStatus {
     WAITING, ACCEPTED, SERVED, DELIVERING, DELIVERED, COMPLETED

src/main/java/kitchenpos/domain/OrderType.java → src/main/java/kitchenpos/order/common/domain/OrderType.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.domain;
 
 public enum OrderType {
     DELIVERY, TAKEOUT, EAT_IN

src/main/java/kitchenpos/domain/Order.java → src/main/java/kitchenpos/order/common/domain/model/Order.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.domain.model;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -12,6 +12,9 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+import kitchenpos.order.common.domain.OrderStatus;
+import kitchenpos.order.common.domain.OrderType;
+import kitchenpos.order.eatinorder.domain.model.OrderTable;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/kitchenpos/domain/OrderLineItem.java → src/main/java/kitchenpos/order/common/domain/model/OrderLineItem.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.domain.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -10,6 +10,7 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+import kitchenpos.menu.domain.model.Menu;
 
 import java.math.BigDecimal;
 import java.util.UUID;

src/main/java/kitchenpos/domain/OrderRepository.java → src/main/java/kitchenpos/order/common/domain/repository/OrderRepository.java

@@ -1,4 +1,8 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.domain.repository;
+
+import kitchenpos.order.common.domain.OrderStatus;
+import kitchenpos.order.common.domain.model.Order;
+import kitchenpos.order.eatinorder.domain.model.OrderTable;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/JpaOrderRepository.java → src/main/java/kitchenpos/order/common/infra/JpaOrderRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.order.common.infra;
 
+import kitchenpos.order.common.domain.model.Order;
+import kitchenpos.order.common.domain.repository.OrderRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

src/main/java/kitchenpos/ui/OrderRestController.java → src/main/java/kitchenpos/order/common/ui/OrderRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.order.common.ui;
 
-import kitchenpos.application.OrderService;
-import kitchenpos.domain.Order;
+import kitchenpos.order.common.application.OrderService;
+import kitchenpos.order.common.domain.model.Order;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;