refactor: 기능 우선 패키지 분리

Author: jordy-torvalds

src/main/java/kitchenpos/infra/DefaultPurgomalumClient.java src/main/java/kitchenpos/common/infra/DefaultPurgomalumClient.java

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

src/main/java/kitchenpos/infra/PurgomalumClient.java src/main/java/kitchenpos/common/infra/PurgomalumClient.java

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

src/main/java/kitchenpos/infra/DefaultKitchenridersClient.java src/main/java/kitchenpos/delivery/infra/DefaultKitchenridersClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.delivery.infra;
 
 import org.springframework.stereotype.Component;
 

src/main/java/kitchenpos/infra/KitchenridersClient.java src/main/java/kitchenpos/delivery/infra/KitchenridersClient.java

@@ -1,4 +1,4 @@
-package kitchenpos.infra;
+package kitchenpos.delivery.infra;
 
 import java.math.BigDecimal;
 import java.util.UUID;

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

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

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

@@ -1,7 +1,13 @@
-package kitchenpos.application;
+package kitchenpos.menu.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.PurgomalumClient;
+import kitchenpos.common.infra.PurgomalumClient;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuProduct;
+import kitchenpos.menu.domain.MenuRepository;
+import kitchenpos.menugroup.domain.MenuGroup;
+import kitchenpos.menugroup.domain.MenuGroupRepository;
+import kitchenpos.product.domain.Product;
+import kitchenpos.product.domain.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/Menu.java

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain;
+
+import kitchenpos.menugroup.domain.MenuGroup;
 
 import javax.persistence.*;
 import java.math.BigDecimal;

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

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.menu.domain;
+
+import kitchenpos.product.domain.Product;
 
 import javax.persistence.*;
 import java.util.UUID;

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

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

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.Menu;
+import kitchenpos.menu.domain.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/menugroup/api/MenuGroupRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.menugroup.api;
 
-import kitchenpos.application.MenuGroupService;
-import kitchenpos.domain.MenuGroup;
+import kitchenpos.menugroup.application.MenuGroupService;
+import kitchenpos.menugroup.domain.MenuGroup;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/kitchenpos/application/MenuGroupService.java src/main/java/kitchenpos/menugroup/application/MenuGroupService.java

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

src/main/java/kitchenpos/domain/MenuGroup.java src/main/java/kitchenpos/menugroup/domain/MenuGroup.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.menugroup.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/kitchenpos/domain/MenuGroupRepository.java src/main/java/kitchenpos/menugroup/domain/MenuGroupRepository.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.menugroup.domain;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/JpaMenuGroupRepository.java src/main/java/kitchenpos/menugroup/infra/JpaMenuGroupRepository.java

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

src/main/java/kitchenpos/ui/OrderRestController.java src/main/java/kitchenpos/order/api/OrderRestController.java

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

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

@@ -1,7 +1,11 @@
-package kitchenpos.application;
+package kitchenpos.order.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.KitchenridersClient;
+import kitchenpos.delivery.infra.KitchenridersClient;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuRepository;
+import kitchenpos.order.domain.*;
+import kitchenpos.ordertable.domain.OrderTable;
+import kitchenpos.ordertable.domain.OrderTableRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
+
+import kitchenpos.ordertable.domain.OrderTable;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;

src/main/java/kitchenpos/domain/OrderLineItem.java src/main/java/kitchenpos/order/domain/OrderLineItem.java

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
+
+import kitchenpos.menu.domain.Menu;
 
 import javax.persistence.*;
 import java.math.BigDecimal;

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

@@ -1,4 +1,6 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
+
+import kitchenpos.ordertable.domain.OrderTable;
 
 import java.util.List;
 import java.util.Optional;

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

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

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

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

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

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

src/main/java/kitchenpos/ui/OrderTableRestController.java src/main/java/kitchenpos/ordertable/api/OrderTableRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.ordertable.api;
 
-import kitchenpos.application.OrderTableService;
-import kitchenpos.domain.OrderTable;
+import kitchenpos.ordertable.application.OrderTableService;
+import kitchenpos.ordertable.domain.OrderTable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,9 +1,9 @@
-package kitchenpos.application;
+package kitchenpos.ordertable.application;
 
-import kitchenpos.domain.OrderRepository;
-import kitchenpos.domain.OrderStatus;
-import kitchenpos.domain.OrderTable;
-import kitchenpos.domain.OrderTableRepository;
+import kitchenpos.order.domain.OrderRepository;
+import kitchenpos.order.domain.OrderStatus;
+import kitchenpos.ordertable.domain.OrderTable;
+import kitchenpos.ordertable.domain.OrderTableRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/domain/OrderTable.java src/main/java/kitchenpos/ordertable/domain/OrderTable.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.ordertable.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/kitchenpos/domain/OrderTableRepository.java src/main/java/kitchenpos/ordertable/domain/OrderTableRepository.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.ordertable.domain;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/JpaOrderTableRepository.java src/main/java/kitchenpos/ordertable/infra/JpaOrderTableRepository.java

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

src/main/java/kitchenpos/ui/ProductRestController.java src/main/java/kitchenpos/product/api/ProductRestController.java

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.product.api;
 
-import kitchenpos.application.ProductService;
-import kitchenpos.domain.Product;
+import kitchenpos.product.application.ProductService;
+import kitchenpos.product.domain.Product;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/kitchenpos/application/ProductService.java src/main/java/kitchenpos/product/application/ProductService.java

@@ -1,7 +1,11 @@
-package kitchenpos.application;
+package kitchenpos.product.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.PurgomalumClient;
+import kitchenpos.common.infra.PurgomalumClient;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuProduct;
+import kitchenpos.menu.domain.MenuRepository;
+import kitchenpos.product.domain.Product;
+import kitchenpos.product.domain.ProductRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/domain/Product.java src/main/java/kitchenpos/product/domain/Product.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.product.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/kitchenpos/domain/ProductRepository.java src/main/java/kitchenpos/product/domain/ProductRepository.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.product.domain;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/kitchenpos/domain/JpaProductRepository.java src/main/java/kitchenpos/product/infra/JpaProductRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.product.infra;
 
+import kitchenpos.product.domain.Product;
+import kitchenpos.product.domain.ProductRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

src/test/java/kitchenpos/Fixtures.java

@@ -1,6 +1,14 @@
 package kitchenpos;
 
-import kitchenpos.domain.*;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuProduct;
+import kitchenpos.menugroup.domain.MenuGroup;
+import kitchenpos.order.domain.Order;
+import kitchenpos.order.domain.OrderLineItem;
+import kitchenpos.order.domain.OrderStatus;
+import kitchenpos.order.domain.OrderType;
+import kitchenpos.ordertable.domain.OrderTable;
+import kitchenpos.product.domain.Product;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

src/test/java/kitchenpos/application/FakePurgomalumClient.java src/test/java/kitchenpos/common/infra/FakePurgomalumClient.java

@@ -1,6 +1,4 @@
-package kitchenpos.application;
-
-import kitchenpos.infra.PurgomalumClient;
+package kitchenpos.common.infra;
 
 import java.util.Arrays;
 import java.util.List;

src/test/java/kitchenpos/application/FakeKitchenridersClient.java src/test/java/kitchenpos/delivery/infra/FakeKitchenridersClient.java

@@ -1,6 +1,4 @@
-package kitchenpos.application;
-
-import kitchenpos.infra.KitchenridersClient;
+package kitchenpos.delivery.infra;
 
 import java.math.BigDecimal;
 import java.util.UUID;

src/test/java/kitchenpos/application/MenuServiceTest.java src/test/java/kitchenpos/menu/application/MenuServiceTest.java

@@ -1,7 +1,16 @@
-package kitchenpos.application;
+package kitchenpos.menu.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.PurgomalumClient;
+import kitchenpos.common.infra.FakePurgomalumClient;
+import kitchenpos.common.infra.PurgomalumClient;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuProduct;
+import kitchenpos.menu.domain.MenuRepository;
+import kitchenpos.menu.infra.InMemoryMenuRepository;
+import kitchenpos.menugroup.domain.MenuGroupRepository;
+import kitchenpos.menugroup.infra.InMemoryMenuGroupRepository;
+import kitchenpos.product.domain.Product;
+import kitchenpos.product.domain.ProductRepository;
+import kitchenpos.product.infra.InMemoryProductRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/kitchenpos/application/InMemoryMenuRepository.java src/test/java/kitchenpos/menu/infra/InMemoryMenuRepository.java

@@ -1,7 +1,7 @@
-package kitchenpos.application;
+package kitchenpos.menu.infra;
 
-import kitchenpos.domain.Menu;
-import kitchenpos.domain.MenuRepository;
+import kitchenpos.menu.domain.Menu;
+import kitchenpos.menu.domain.MenuRepository;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/test/java/kitchenpos/application/MenuGroupServiceTest.java src/test/java/kitchenpos/menugroup/application/MenuGroupServiceTest.java

@@ -1,7 +1,8 @@
-package kitchenpos.application;
+package kitchenpos.menugroup.application;
 
-import kitchenpos.domain.MenuGroup;
-import kitchenpos.domain.MenuGroupRepository;
+import kitchenpos.menugroup.domain.MenuGroup;
+import kitchenpos.menugroup.domain.MenuGroupRepository;
+import kitchenpos.menugroup.infra.InMemoryMenuGroupRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

src/test/java/kitchenpos/application/InMemoryMenuGroupRepository.java src/test/java/kitchenpos/menugroup/infra/InMemoryMenuGroupRepository.java

@@ -1,7 +1,7 @@
-package kitchenpos.application;
+package kitchenpos.menugroup.infra;
 
-import kitchenpos.domain.MenuGroup;
-import kitchenpos.domain.MenuGroupRepository;
+import kitchenpos.menugroup.domain.MenuGroup;
+import kitchenpos.menugroup.domain.MenuGroupRepository;
 
 import java.util.*;
 

src/test/java/kitchenpos/application/OrderServiceTest.java src/test/java/kitchenpos/order/application/OrderServiceTest.java

@@ -1,6 +1,13 @@
-package kitchenpos.application;
-
-import kitchenpos.domain.*;
+package kitchenpos.order.application;
+
+import kitchenpos.delivery.infra.FakeKitchenridersClient;
+import kitchenpos.menu.domain.MenuRepository;
+import kitchenpos.menu.infra.InMemoryMenuRepository;
+import kitchenpos.order.domain.*;
+import kitchenpos.order.infra.InMemoryOrderRepository;
+import kitchenpos.ordertable.domain.OrderTable;
+import kitchenpos.ordertable.domain.OrderTableRepository;
+import kitchenpos.ordertable.infra.InMemoryOrderTableRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;