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

README.md

@@ -171,20 +171,23 @@ docker compose -p kitchenpos up -d
 | 포장 주문 | TakeOut  | 대기 -> 접수 -> 음식 제공 -> 완료         |
 | 매장 주문 | Eatin    | 대기 -> 접수 -> 서빙 -> 테이블정리         |
 
+
+
+
+
 ## 모델링
 
 ### 상품 (Product)
 #### 속성
   - id : 상품 의 고유 식별자
   - name : 상품명
   - price : 상품의 가격
-    - 상품 가격 은 0 이상 이다.
 
 #### 행위
   - 상품 등록 : 새로운 상품을 등록할 수 있다
     - 상품명 은 비속어를 포함해선 안된다
   - 가격 변경 : 상품의 가격을 변경될 수 있다
-    - 상품의 가격이 변경될 때 메뉴의 가격이 메뉴에 속한 상품 금액의 합보다 크면 메뉴가 숨겨진다.
+    - 상품 가격 은 0 보다 커야 한다 
 
 ### 메뉴 (Menu)
 #### 속성
@@ -194,13 +197,6 @@ docker compose -p kitchenpos up -d
 - menuGroup: 메뉴 항목이 속하는 그룹
 - displayed: 메뉴 항목이 현재 표시되는지 여부
 - menuProducts: 메뉴 항목에 연결된 제품 목록
-  - seq: 매뉴상품 의 생성 ID
-  - product: 메뉴 상품이 가지고 있는 상품
-    - id: 상품의 고유 식별자
-    - name: 상품의 이름
-    - price: 상품의 가격
-  - quantity: 메뉴 상품의 재고
-  - productId: 메뉴 상품의 고유 식별자
 
 #### 행위
 - 메뉴 등록
@@ -212,13 +208,12 @@ docker compose -p kitchenpos up -d
 - 메뉴 가격 변경
   - 변경된 가격이 메뉴 상품들의 총 가격보다 높을 경우, 해당 메뉴는 비공개 한다
   - 메뉴는 존재해야 한다
-  - 메뉴 상품들의 총 가격은 변경된 메뉴의 가격보다 커야 한다
+  - 메뉴 상품들의 총 가격은 변경된 메뉴의 가격보다 높아야 한다
 - 메뉴 공개
   - 메뉴가 존재해야 한다
   - 메뉴 상품들의 총 가격이 메뉴의 가격과 동일해야 한다
 - 메뉴 비공개
   - 해당 메뉴가 존재해야 한다
-  - 해당 메뉴의 상품 각각의 가격이 합이 메뉴가격 보다 클 수 없다
 
 ### 메뉴 그룹 (Menu Group)
 #### 속성
@@ -248,8 +243,7 @@ docker compose -p kitchenpos up -d
 - 포장 주문은 `포장 주문 생성` -> `포장 주문 대기` -> `포장 주문 접수` -> `포장 주문 제공` -> `포장 주문 완료` 순으로 진행된다.
 
 #### 정책
-- 포장 주문의 경우, 주문 항목이 0보다 커야 포장 주문을 등록할 수 있다.
-- 숨겨진 메뉴는 주문할 수 없다.
+- 포장 주문의 주문 항목이 0보다 커야 포장 주문을 등록할 수 있다.
 
 ### 배달 주문 (Order - Delivery)
 #### 속성
@@ -268,8 +262,6 @@ docker compose -p kitchenpos up -d
 
 #### 정책
 - 배달 주문은 주소가 필수로 요구된다.
-- 접수된 주문만 서빙할 수 있다.
-- 숨겨진 메뉴는 주문할 수 없다.
 
 ### 매장 주문 (Order - EatIn)
 #### 속성
@@ -284,7 +276,6 @@ docker compose -p kitchenpos up -d
 
 #### 정책
 - 테이블 정리시 완료 되지 않은 매장 주문이 있는 경우, 주문 테이블을 정리할 수 없다.
-- 숨겨진 메뉴는 주문할 수 없다.
 
 ### 주문 테이블 (Order Table)
 #### 속성

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

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

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

@@ -1,7 +1,8 @@
-package kitchenpos.application;
+package kitchenpos.menus.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.PurgomalumClient;
+import kitchenpos.menus.domain.*;
+import kitchenpos.products.domain.ProductRepository;
+import kitchenpos.products.infra.PurgomalumClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/domain/JpaMenuGroupRepository.java → src/main/java/kitchenpos/menus/domain/JpaMenuGroupRepository.java

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

src/main/java/kitchenpos/domain/JpaMenuRepository.java → src/main/java/kitchenpos/menus/domain/JpaMenuRepository.java

@@ -1,5 +1,7 @@
-package kitchenpos.domain;
+package kitchenpos.menus.domain;
 
+import kitchenpos.menus.domain.Menu;
+import kitchenpos.menus.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/domain/Menu.java → src/main/java/kitchenpos/menus/domain/Menu.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.menus.domain;
 
 import javax.persistence.*;
 import java.math.BigDecimal;

src/main/java/kitchenpos/domain/MenuGroup.java → src/main/java/kitchenpos/menus/domain/MenuGroup.java

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

src/main/java/kitchenpos/domain/MenuGroupRepository.java → src/main/java/kitchenpos/menus/domain/MenuGroupRepository.java

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

src/main/java/kitchenpos/domain/MenuProduct.java → src/main/java/kitchenpos/menus/domain/MenuProduct.java

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

src/main/java/kitchenpos/domain/MenuRepository.java → src/main/java/kitchenpos/menus/domain/MenuRepository.java

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

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

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

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

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.menus.ui;
 
-import kitchenpos.application.MenuService;
-import kitchenpos.domain.Menu;
+import kitchenpos.menus.application.MenuService;
+import kitchenpos.menus.domain.Menu;
 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,9 @@
-package kitchenpos.application;
+package kitchenpos.order.application;
 
-import kitchenpos.domain.*;
-import kitchenpos.infra.KitchenridersClient;
+import kitchenpos.order.infra.delivery.KitchenridersClient;
+import kitchenpos.menus.domain.Menu;
+import kitchenpos.menus.domain.MenuRepository;
+import kitchenpos.order.domain.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/kitchenpos/application/OrderTableService.java → src/main/java/kitchenpos/order/application/OrderTableService.java

@@ -1,9 +1,9 @@
-package kitchenpos.application;
+package kitchenpos.order.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.order.domain.OrderTable;
+import kitchenpos.order.domain.OrderTableRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/kitchenpos/domain/JpaOrderTableRepository.java → src/main/java/kitchenpos/order/domain/JpaOrderTableRepository.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

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

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
 
 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.menus.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,4 @@
-package kitchenpos.domain;
+package kitchenpos.order.domain;
 
 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/OrderTable.java → src/main/java/kitchenpos/order/domain/OrderTable.java

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

src/main/java/kitchenpos/domain/OrderTableRepository.java → src/main/java/kitchenpos/order/domain/OrderTableRepository.java

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

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/infra/DefaultKitchenridersClient.java → src/main/java/kitchenpos/order/infra/delivery/DefaultKitchenridersClient.java

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

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

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

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

@@ -1,7 +1,7 @@
-package kitchenpos.ui;
+package kitchenpos.order.ui;
 
-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/ui/OrderTableRestController.java → src/main/java/kitchenpos/order/ui/OrderTableRestController.java

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

src/main/java/kitchenpos/application/ProductService.java → src/main/java/kitchenpos/products/application/ProductService.java

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

src/main/java/kitchenpos/domain/JpaProductRepository.java → src/main/java/kitchenpos/products/domain/JpaProductRepository.java

@@ -1,4 +1,4 @@
-package kitchenpos.domain;
+package kitchenpos.products.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/kitchenpos/domain/Product.java → src/main/java/kitchenpos/products/domain/Product.java

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

src/main/java/kitchenpos/domain/ProductRepository.java → src/main/java/kitchenpos/products/domain/ProductRepository.java

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

src/main/java/kitchenpos/infra/DefaultPurgomalumClient.java → src/main/java/kitchenpos/products/infra/DefaultPurgomalumClient.java

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

src/main/java/kitchenpos/infra/PurgomalumClient.java → src/main/java/kitchenpos/products/infra/PurgomalumClient.java

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

src/main/java/kitchenpos/ui/ProductRestController.java → src/main/java/kitchenpos/products/ui/ProductRestController.java

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

src/test/java/kitchenpos/Fixtures.java

@@ -1,6 +1,9 @@
 package kitchenpos;
 
-import kitchenpos.domain.*;
+import kitchenpos.menus.domain.Menu;
+import kitchenpos.menus.domain.MenuGroup;
+import kitchenpos.menus.domain.MenuProduct;
+import kitchenpos.order.domain.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

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

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

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

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

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

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