Skip to content

Commit 6aff6d4

Browse files
committed
🚀 3단계 - 기능 우선 패키지 구성하기
1 parent cefc661 commit 6aff6d4

File tree

63 files changed

+213
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+213
-122
lines changed

Diff for: src/main/java/kitchenpos/infra/DefaultPurgomalumClient.java renamed to src/main/java/kitchenpos/common/infra/DefaultPurgomalumClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.infra;
1+
package kitchenpos.common.infra;
22

33
import org.springframework.boot.web.client.RestTemplateBuilder;
44
import org.springframework.stereotype.Component;

Diff for: src/main/java/kitchenpos/infra/PurgomalumClient.java renamed to src/main/java/kitchenpos/common/infra/PurgomalumClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.infra;
1+
package kitchenpos.common.infra;
22

33
public interface PurgomalumClient {
44
boolean containsProfanity(String text);

Diff for: src/main/java/kitchenpos/application/OrderService.java renamed to src/main/java/kitchenpos/legacy/application/OrderService.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package kitchenpos.application;
1+
package kitchenpos.legacy.application;
22

3-
import kitchenpos.domain.Menu;
4-
import kitchenpos.domain.MenuRepository;
5-
import kitchenpos.domain.Order;
6-
import kitchenpos.domain.OrderLineItem;
7-
import kitchenpos.domain.OrderRepository;
8-
import kitchenpos.domain.OrderStatus;
9-
import kitchenpos.domain.OrderTable;
10-
import kitchenpos.domain.OrderTableRepository;
11-
import kitchenpos.domain.OrderType;
12-
import kitchenpos.infra.KitchenridersClient;
3+
import kitchenpos.menu.domain.Menu;
4+
import kitchenpos.menu.domain.MenuRepository;
5+
import kitchenpos.legacy.domain.Order;
6+
import kitchenpos.legacy.domain.OrderLineItem;
7+
import kitchenpos.legacy.domain.OrderRepository;
8+
import kitchenpos.legacy.domain.OrderStatus;
9+
import kitchenpos.order.delivery_order.domain.OrderTable;
10+
import kitchenpos.order.delivery_order.domain.OrderTableRepository;
11+
import kitchenpos.legacy.domain.OrderType;
12+
import kitchenpos.order.delivery_order.infra.KitchenridersClient;
1313
import org.springframework.stereotype.Service;
1414
import org.springframework.transaction.annotation.Transactional;
1515

Diff for: src/main/java/kitchenpos/domain/JpaOrderRepository.java renamed to src/main/java/kitchenpos/legacy/domain/JpaOrderRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

Diff for: src/main/java/kitchenpos/domain/Order.java renamed to src/main/java/kitchenpos/legacy/domain/Order.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
22

33
import jakarta.persistence.CascadeType;
44
import jakarta.persistence.Column;
@@ -12,6 +12,7 @@
1212
import jakarta.persistence.OneToMany;
1313
import jakarta.persistence.Table;
1414
import jakarta.persistence.Transient;
15+
import kitchenpos.order.delivery_order.domain.OrderTable;
1516

1617
import java.time.LocalDateTime;
1718
import java.util.List;

Diff for: src/main/java/kitchenpos/domain/OrderLineItem.java renamed to src/main/java/kitchenpos/legacy/domain/OrderLineItem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;
@@ -10,6 +10,7 @@
1010
import jakarta.persistence.ManyToOne;
1111
import jakarta.persistence.Table;
1212
import jakarta.persistence.Transient;
13+
import kitchenpos.menu.domain.Menu;
1314

1415
import java.math.BigDecimal;
1516
import java.util.UUID;

Diff for: src/main/java/kitchenpos/domain/OrderRepository.java renamed to src/main/java/kitchenpos/legacy/domain/OrderRepository.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
2+
3+
import kitchenpos.order.delivery_order.domain.OrderTable;
24

35
import java.util.List;
46
import java.util.Optional;

Diff for: src/main/java/kitchenpos/domain/OrderStatus.java renamed to src/main/java/kitchenpos/legacy/domain/OrderStatus.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
22

33
public enum OrderStatus {
44
WAITING, ACCEPTED, SERVED, DELIVERING, DELIVERED, COMPLETED

Diff for: src/main/java/kitchenpos/domain/OrderType.java renamed to src/main/java/kitchenpos/legacy/domain/OrderType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.legacy.domain;
22

33
public enum OrderType {
44
DELIVERY, TAKEOUT, EAT_IN

Diff for: src/main/java/kitchenpos/ui/OrderRestController.java renamed to src/main/java/kitchenpos/legacy/ui/OrderRestController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kitchenpos.ui;
1+
package kitchenpos.legacy.ui;
22

3-
import kitchenpos.application.OrderService;
4-
import kitchenpos.domain.Order;
3+
import kitchenpos.legacy.application.OrderService;
4+
import kitchenpos.legacy.domain.Order;
55
import org.springframework.http.ResponseEntity;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.PathVariable;

Diff for: src/main/java/kitchenpos/application/MenuGroupService.java renamed to src/main/java/kitchenpos/menu/application/MenuGroupService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kitchenpos.application;
1+
package kitchenpos.menu.application;
22

3-
import kitchenpos.domain.MenuGroup;
4-
import kitchenpos.domain.MenuGroupRepository;
3+
import kitchenpos.menu.domain.MenuGroup;
4+
import kitchenpos.menu.domain.MenuGroupRepository;
55
import org.springframework.stereotype.Service;
66
import org.springframework.transaction.annotation.Transactional;
77

Diff for: src/main/java/kitchenpos/application/MenuService.java renamed to src/main/java/kitchenpos/menu/application/MenuService.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package kitchenpos.application;
1+
package kitchenpos.menu.application;
22

3-
import kitchenpos.domain.Menu;
4-
import kitchenpos.domain.MenuGroup;
5-
import kitchenpos.domain.MenuGroupRepository;
6-
import kitchenpos.domain.MenuProduct;
7-
import kitchenpos.domain.MenuRepository;
8-
import kitchenpos.domain.Product;
9-
import kitchenpos.domain.ProductRepository;
10-
import kitchenpos.infra.PurgomalumClient;
3+
import kitchenpos.menu.domain.Menu;
4+
import kitchenpos.menu.domain.MenuGroup;
5+
import kitchenpos.menu.domain.MenuGroupRepository;
6+
import kitchenpos.menu.domain.MenuProduct;
7+
import kitchenpos.menu.domain.MenuRepository;
8+
import kitchenpos.product.domain.Product;
9+
import kitchenpos.product.domain.ProductRepository;
10+
import kitchenpos.common.infra.PurgomalumClient;
1111
import org.springframework.stereotype.Service;
1212
import org.springframework.transaction.annotation.Transactional;
1313

Diff for: src/main/java/kitchenpos/domain/JpaMenuGroupRepository.java renamed to src/main/java/kitchenpos/menu/domain/JpaMenuGroupRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

Diff for: src/main/java/kitchenpos/domain/JpaMenuRepository.java renamed to src/main/java/kitchenpos/menu/domain/JpaMenuRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44
import org.springframework.data.jpa.repository.Query;

Diff for: src/main/java/kitchenpos/domain/Menu.java renamed to src/main/java/kitchenpos/menu/domain/Menu.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import jakarta.persistence.CascadeType;
44
import jakarta.persistence.Column;

Diff for: src/main/java/kitchenpos/domain/MenuGroup.java renamed to src/main/java/kitchenpos/menu/domain/MenuGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;

Diff for: src/main/java/kitchenpos/domain/MenuGroupRepository.java renamed to src/main/java/kitchenpos/menu/domain/MenuGroupRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import java.util.List;
44
import java.util.Optional;

Diff for: src/main/java/kitchenpos/domain/MenuProduct.java renamed to src/main/java/kitchenpos/menu/domain/MenuProduct.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;
@@ -10,6 +10,7 @@
1010
import jakarta.persistence.ManyToOne;
1111
import jakarta.persistence.Table;
1212
import jakarta.persistence.Transient;
13+
import kitchenpos.product.domain.Product;
1314

1415
import java.util.UUID;
1516

Diff for: src/main/java/kitchenpos/domain/MenuRepository.java renamed to src/main/java/kitchenpos/menu/domain/MenuRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.menu.domain;
22

33
import java.util.List;
44
import java.util.Optional;

Diff for: src/main/java/kitchenpos/ui/MenuGroupRestController.java renamed to src/main/java/kitchenpos/menu/ui/MenuGroupRestController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kitchenpos.ui;
1+
package kitchenpos.menu.ui;
22

3-
import kitchenpos.application.MenuGroupService;
4-
import kitchenpos.domain.MenuGroup;
3+
import kitchenpos.menu.application.MenuGroupService;
4+
import kitchenpos.menu.domain.MenuGroup;
55
import org.springframework.http.ResponseEntity;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.PostMapping;

Diff for: src/main/java/kitchenpos/ui/MenuRestController.java renamed to src/main/java/kitchenpos/menu/ui/MenuRestController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kitchenpos.ui;
1+
package kitchenpos.menu.ui;
22

3-
import kitchenpos.application.MenuService;
4-
import kitchenpos.domain.Menu;
3+
import kitchenpos.menu.application.MenuService;
4+
import kitchenpos.menu.domain.Menu;
55
import org.springframework.http.ResponseEntity;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.PathVariable;
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package kitchenpos.order.common.domain;
2+
3+
import java.util.List;
4+
5+
public abstract class Order {
6+
7+
protected List<OrderLineItem> orderLineItems;
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.common.domain;
2+
3+
public class OrderLineItem {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.delivery_order.application;
2+
3+
public class DeliveryOrderService {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package kitchenpos.order.delivery_order.domain;
2+
3+
import kitchenpos.order.common.domain.Order;
4+
5+
public class DeliveryOrder extends Order {
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.delivery_order.domain;
2+
3+
public interface DeliveryOrderRepository {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package kitchenpos.order.delivery_order.domain;
2+
3+
public enum DeliveryOrderStatus {
4+
WAITING, ACCEPTED, SERVED, DELIVERING, DELIVERED, COMPLETED
5+
}

Diff for: src/main/java/kitchenpos/domain/JpaOrderTableRepository.java renamed to src/main/java/kitchenpos/order/delivery_order/domain/JpaOrderTableRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.order.delivery_order.domain;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

Diff for: src/main/java/kitchenpos/domain/OrderTable.java renamed to src/main/java/kitchenpos/order/delivery_order/domain/OrderTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.order.delivery_order.domain;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;

Diff for: src/main/java/kitchenpos/domain/OrderTableRepository.java renamed to src/main/java/kitchenpos/order/delivery_order/domain/OrderTableRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.order.delivery_order.domain;
22

33
import java.util.List;
44
import java.util.Optional;

Diff for: src/main/java/kitchenpos/infra/DefaultKitchenridersClient.java renamed to src/main/java/kitchenpos/order/delivery_order/infra/DefaultKitchenridersClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.infra;
1+
package kitchenpos.order.delivery_order.infra;
22

33
import org.springframework.stereotype.Component;
44

Diff for: src/main/java/kitchenpos/infra/KitchenridersClient.java renamed to src/main/java/kitchenpos/order/delivery_order/infra/KitchenridersClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.infra;
1+
package kitchenpos.order.delivery_order.infra;
22

33
import java.math.BigDecimal;
44
import java.util.UUID;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.delivery_order.ui;
2+
3+
public class DeliveryOrderRestController {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.eat_in_order.application;
2+
3+
public class EatInOrderService {
4+
}

Diff for: src/main/java/kitchenpos/application/OrderTableService.java renamed to src/main/java/kitchenpos/order/eat_in_order/application/OrderTableService.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package kitchenpos.application;
1+
package kitchenpos.order.eat_in_order.application;
22

3-
import kitchenpos.domain.OrderRepository;
4-
import kitchenpos.domain.OrderStatus;
5-
import kitchenpos.domain.OrderTable;
6-
import kitchenpos.domain.OrderTableRepository;
3+
import kitchenpos.legacy.domain.OrderRepository;
4+
import kitchenpos.legacy.domain.OrderStatus;
5+
import kitchenpos.order.delivery_order.domain.OrderTable;
6+
import kitchenpos.order.delivery_order.domain.OrderTableRepository;
77
import org.springframework.stereotype.Service;
88
import org.springframework.transaction.annotation.Transactional;
99

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package kitchenpos.order.eat_in_order.domain;
2+
3+
import kitchenpos.order.common.domain.Order;
4+
5+
public class EatInOrder extends Order {
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.eat_in_order.domain;
2+
3+
public interface EatInOrderRepository {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package kitchenpos.order.eat_in_order.domain;
2+
3+
public enum EatInOrderStatus {
4+
WAITING, ACCEPTED, SERVED, COMPLETED
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.eat_in_order.ui;
2+
3+
public class EatInOrderRestController {
4+
}

Diff for: src/main/java/kitchenpos/ui/OrderTableRestController.java renamed to src/main/java/kitchenpos/order/eat_in_order/ui/OrderTableRestController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kitchenpos.ui;
1+
package kitchenpos.order.eat_in_order.ui;
22

3-
import kitchenpos.application.OrderTableService;
4-
import kitchenpos.domain.OrderTable;
3+
import kitchenpos.order.eat_in_order.application.OrderTableService;
4+
import kitchenpos.order.delivery_order.domain.OrderTable;
55
import org.springframework.http.ResponseEntity;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.PathVariable;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.take_out_order.application;
2+
3+
public class TakeOutOrderService {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package kitchenpos.order.take_out_order.domain;
2+
3+
import kitchenpos.order.common.domain.Order;
4+
5+
public class TakeOutOrder extends Order {
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.take_out_order.domain;
2+
3+
public interface TakeOutOrderRepository {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package kitchenpos.order.take_out_order.domain;
2+
3+
public enum TakeOutOrderStatus {
4+
WAITING, ACCEPTED, SERVED, COMPLETED
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package kitchenpos.order.take_out_order.ui;
2+
3+
public class TakeOutOrderRestController {
4+
}

Diff for: src/main/java/kitchenpos/application/ProductService.java renamed to src/main/java/kitchenpos/product/application/ProductService.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package kitchenpos.application;
1+
package kitchenpos.product.application;
22

3-
import kitchenpos.domain.Menu;
4-
import kitchenpos.domain.MenuProduct;
5-
import kitchenpos.domain.MenuRepository;
6-
import kitchenpos.domain.Product;
7-
import kitchenpos.domain.ProductRepository;
8-
import kitchenpos.infra.PurgomalumClient;
3+
import kitchenpos.menu.domain.Menu;
4+
import kitchenpos.menu.domain.MenuProduct;
5+
import kitchenpos.menu.domain.MenuRepository;
6+
import kitchenpos.product.domain.Product;
7+
import kitchenpos.product.domain.ProductRepository;
8+
import kitchenpos.common.infra.PurgomalumClient;
99
import org.springframework.stereotype.Service;
1010
import org.springframework.transaction.annotation.Transactional;
1111

Diff for: src/main/java/kitchenpos/domain/JpaProductRepository.java renamed to src/main/java/kitchenpos/product/domain/JpaProductRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.product.domain;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

Diff for: src/main/java/kitchenpos/domain/Product.java renamed to src/main/java/kitchenpos/product/domain/Product.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kitchenpos.domain;
1+
package kitchenpos.product.domain;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;

0 commit comments

Comments
 (0)