Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 14 commits into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 6 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ docker compose -p kitchenpos up -d
* `손님 수`는 `0명 이상`이어야 한다.
* `빈 테이블`은 변경할 수 없다.

---

### 메뉴 등록 프로세스
```mermaid
Expand Down Expand Up @@ -296,37 +297,11 @@ sequenceDiagram
손님->>메뉴: 메뉴 확인
메뉴-->>손님: 노출된 메뉴 목록 반환
```
---

### 주문 프로세스
```mermaid
%% Sequence Diagram: 주문 프로세스
sequenceDiagram
title 주문 프로세스
actor 손님 as 손님
participant 메뉴
participant 주문
actor 점주 as 점주

손님->>메뉴: 메뉴 확인
메뉴-->>손님: 노출된 메뉴 목록 반환

손님->>주문: 주문 대기(배달 주문)
점주-->>주문: 주문 수락
주문-->>손님: 배달 주문 완료

손님->>주문: 주문 대기(포장 주문)
점주-->>주문: 주문 수락
주문-->>손님: 포장 주문 완료

손님->>주문: 주문 대기(매장 주문)
점주-->>주문: 주문 수락
주문-->>손님: 매장 주문 완료
```

### 주문 유형별 주문 프로세스

```mermaid
%% Flowchart: 주문 유형별 주문 프로세스
%% Flowchart: 주문 프로세스
graph TD
%% 주문 공통 단계
A[주문 대기] -->|주문이 접수됨| B[주문 수락]
Expand All @@ -343,6 +318,9 @@ graph TD
C -->|포장 주문| E3[고객이 픽업 완료] --> F3[주문 완료]
```

---

### 주문 유형별 주문 프로세스
#### 배달 주문
```mermaid
%% Sequence Diagram: 배달 주문 프로세스
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: kitchenpos
services:
db:
image: mysql:8.0.30
platform: linux/x86_64
platform: linux/arm64
restart: always
ports:
- "33306:3306"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package kitchenpos.infra;
package kitchenpos.global.infrastructure.external;

import java.math.BigDecimal;
import java.util.UUID;
import kitchenpos.order.delivery.domain.service.DeliveryKitchenridersClient;
import org.springframework.stereotype.Component;

@Component
public class DefaultKitchenridersClient implements KitchenridersClient {
public class DefaultKitchenridersClient implements DeliveryKitchenridersClient {

@Override
public void requestDelivery(final UUID orderId, final BigDecimal amount,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package kitchenpos.infra;
package kitchenpos.global.infrastructure.external;

import java.net.URI;
import kitchenpos.menu.domain.service.MenuPurgomalumClient;
import kitchenpos.product.domain.service.ProductPurgomalumClient;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;

@Component
public class DefaultPurgomalumClient implements PurgomalumClient {
public class DefaultPurgomalumClient implements MenuPurgomalumClient, ProductPurgomalumClient {

private final RestTemplate restTemplate;

Expand Down
6 changes: 0 additions & 6 deletions src/main/java/kitchenpos/infra/PurgomalumClient.java

This file was deleted.

21 changes: 21 additions & 0 deletions src/main/java/kitchenpos/menu/application/facade/MenuFacade.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package kitchenpos.menu.application.facade;

import kitchenpos.menu.domain.service.MenuGroupService;
import kitchenpos.menu.domain.service.MenuPurgomalumClient;
import kitchenpos.menu.domain.service.MenuService;
import org.springframework.stereotype.Component;

@Component
public class MenuFacade {

private final MenuService menuService;
private final MenuGroupService menuGroupService;
private final MenuPurgomalumClient purgomalumClient;

public MenuFacade(MenuService menuService, MenuGroupService menuGroupService,
MenuPurgomalumClient purgomalumClient) {
this.menuService = menuService;
this.menuGroupService = menuGroupService;
this.purgomalumClient = purgomalumClient;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
restinbeat marked this conversation as resolved.
Show resolved Hide resolved
package kitchenpos.menu.domain.entity;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.menu.domain.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.menu.domain.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand All @@ -11,6 +11,7 @@
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import java.util.UUID;
import kitchenpos.product.domain.entity.Product;

@Table(name = "menu_product")
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package kitchenpos.domain;
package kitchenpos.menu.domain.repository;

import java.util.List;
import java.util.Optional;
import java.util.UUID;
import kitchenpos.menu.domain.entity.MenuGroup;

public interface MenuGroupRepository {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package kitchenpos.domain;
package kitchenpos.menu.domain.repository;

import java.util.List;
import java.util.Optional;
import java.util.UUID;
import kitchenpos.menu.domain.entity.Menu;

public interface MenuRepository {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package kitchenpos.menu.domain.service;

import java.util.List;
import kitchenpos.menu.domain.entity.MenuGroup;

public interface MenuGroupService {
MenuGroup create(final MenuGroup request);
List<MenuGroup> findAll();
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package kitchenpos.application;
package kitchenpos.menu.domain.service;

import java.util.List;
import java.util.Objects;
import java.util.UUID;
import kitchenpos.domain.MenuGroup;
import kitchenpos.domain.MenuGroupRepository;
import kitchenpos.menu.domain.entity.MenuGroup;
import kitchenpos.menu.domain.repository.MenuGroupRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
public class MenuGroupService {
public class MenuGroupServiceImpl implements MenuGroupService {

private final MenuGroupRepository menuGroupRepository;

public MenuGroupService(final MenuGroupRepository menuGroupRepository) {
public MenuGroupServiceImpl(final MenuGroupRepository menuGroupRepository) {
this.menuGroupRepository = menuGroupRepository;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package kitchenpos.menu.domain.service;

public interface MenuPurgomalumClient {

boolean containsProfanity(String text);
}
13 changes: 13 additions & 0 deletions src/main/java/kitchenpos/menu/domain/service/MenuService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package kitchenpos.menu.domain.service;

import java.util.List;
import java.util.UUID;
import kitchenpos.menu.domain.entity.Menu;

public interface MenuService {
Menu create(final Menu request);
Menu changePrice(final UUID menuId, final Menu request);
Menu display(final UUID menuId);
Menu hide(final UUID menuId);
List<Menu> findAll();
}
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
package kitchenpos.application;
package kitchenpos.menu.domain.service;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.UUID;
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.entity.Menu;
import kitchenpos.menu.domain.entity.MenuGroup;
import kitchenpos.menu.domain.entity.MenuProduct;
import kitchenpos.menu.domain.repository.MenuGroupRepository;
import kitchenpos.menu.domain.repository.MenuRepository;
import kitchenpos.product.domain.entity.Product;
import kitchenpos.product.domain.repository.ProductRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
public class MenuService {
public class MenuServiceImpl implements MenuService {

private final MenuRepository menuRepository;
private final MenuGroupRepository menuGroupRepository;
private final ProductRepository productRepository;
private final PurgomalumClient purgomalumClient;
private final MenuPurgomalumClient purgomalumClient;

public MenuService(
public MenuServiceImpl(
final MenuRepository menuRepository,
final MenuGroupRepository menuGroupRepository,
final ProductRepository productRepository,
final PurgomalumClient purgomalumClient
final MenuPurgomalumClient purgomalumClient
) {
this.menuRepository = menuRepository;
this.menuGroupRepository = menuGroupRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package kitchenpos.domain;
package kitchenpos.menu.infrastructure.persistence;

import java.util.UUID;
import kitchenpos.menu.domain.entity.MenuGroup;
import kitchenpos.menu.domain.repository.MenuGroupRepository;
import org.springframework.data.jpa.repository.JpaRepository;

public interface JpaMenuGroupRepository extends MenuGroupRepository,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package kitchenpos.domain;
package kitchenpos.menu.infrastructure.persistence;

import java.util.List;
import java.util.UUID;
import kitchenpos.menu.domain.entity.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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package kitchenpos.ui;
package kitchenpos.menu.presentation.controller;

import java.net.URI;
import java.util.List;
import kitchenpos.application.MenuGroupService;
import kitchenpos.domain.MenuGroup;
import kitchenpos.menu.domain.service.MenuGroupService;
import kitchenpos.menu.domain.entity.MenuGroup;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package kitchenpos.ui;
package kitchenpos.menu.presentation.controller;

import java.net.URI;
import java.util.List;
import java.util.UUID;
import kitchenpos.application.MenuService;
import kitchenpos.domain.Menu;
import kitchenpos.menu.domain.service.MenuService;
import kitchenpos.menu.domain.entity.Menu;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package kitchenpos.order.common.application.facade;

import kitchenpos.order.delivery.application.DeliveryUsecase;
import kitchenpos.order.eatin.application.EatinUsecase;
import kitchenpos.order.takeout.application.TakeoutUsecase;
import org.springframework.stereotype.Component;

@Component
public class OrderFacade {
private final TakeoutUsecase takeoutUsecase;
private final DeliveryUsecase deliveryUsecase;
private final EatinUsecase eatinUsecase;

public OrderFacade(TakeoutUsecase takeoutUsecase, DeliveryUsecase deliveryUsecase,
EatinUsecase eatinUsecase) {
this.takeoutUsecase = takeoutUsecase;
this.deliveryUsecase = deliveryUsecase;
this.eatinUsecase = eatinUsecase;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.order.common.domain.entity;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
Expand All @@ -15,6 +15,7 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
import kitchenpos.order.eatin.domain.entity.OrderTable;

@Table(name = "orders")
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.order.common.domain.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand All @@ -12,6 +12,7 @@
import jakarta.persistence.Transient;
import java.math.BigDecimal;
import java.util.UUID;
import kitchenpos.menu.domain.entity.Menu;

@Table(name = "order_line_item")
@Entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.order.common.domain.entity;

public enum OrderStatus {
WAITING, ACCEPTED, SERVED, DELIVERING, DELIVERED, COMPLETED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kitchenpos.domain;
package kitchenpos.order.common.domain.entity;

public enum OrderType {
DELIVERY, TAKEOUT, EAT_IN
Expand Down
Loading