[레거시 코드 리팩터링 - 4단계] 이프(송인봉) 미션 제출합니다.

build.gradle

@@ -1,28 +1,37 @@
 plugins {
+    id 'java'
     id 'org.springframework.boot' version '2.3.3.RELEASE'
     id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-    id 'java'
 }
 
-group = 'camp.nextstep.edu'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
-
 repositories {
     mavenCentral()
 }
 
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.flywaydb:flyway-core'
-    runtimeOnly 'com.h2database:h2'
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+subprojects {
+    group = 'camp.nextstep.edu'
+    version = '0.0.1-SNAPSHOT'
+
+    apply plugin: 'java'
+    apply plugin: 'org.springframework.boot'
+    apply plugin: 'io.spring.dependency-management'
+
+    sourceCompatibility = '11'
+
+    repositories {
+        mavenCentral()
     }
-}
 
-test {
-    useJUnitPlatform()
+    dependencies {
+        implementation 'org.springframework.boot:spring-boot-starter-actuator'
+        implementation 'org.springframework.boot:spring-boot-starter-web'
+
+        testImplementation('org.springframework.boot:spring-boot-starter-test') {
+            exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+        }
+    }
+
+    test {
+        useJUnitPlatform()
+    }
 }

module-api/build.gradle

@@ -0,0 +1,11 @@
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
+}
+
+dependencies {
+    implementation project(':module-core')
+}

src/main/java/kitchenpos/menu/ui/MenuGroupRestController.java → module-api/src/main/java/kitchenpos/menu/MenuGroupRestController.java

@@ -1,16 +1,17 @@
-package kitchenpos.menu.ui;
+package kitchenpos.menu;
+
+import java.net.URI;
+import java.util.List;
 
-import kitchenpos.menu.application.MenuGroupService;
-import kitchenpos.menu.application.dto.request.menugroup.MenuGroupRequest;
-import kitchenpos.menu.application.dto.response.MenuGroupResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.net.URI;
-import java.util.List;
+import kitchenpos.menu.application.MenuGroupService;
+import kitchenpos.menu.application.dto.request.menugroup.MenuGroupRequest;
+import kitchenpos.menu.application.dto.response.MenuGroupResponse;
 
 @RestController
 public class MenuGroupRestController {

src/main/java/kitchenpos/menu/ui/MenuRestController.java → module-api/src/main/java/kitchenpos/menu/MenuRestController.java

@@ -1,16 +1,17 @@
-package kitchenpos.menu.ui;
+package kitchenpos.menu;
+
+import java.net.URI;
+import java.util.List;
 
-import kitchenpos.menu.application.MenuService;
-import kitchenpos.menu.application.dto.request.menu.MenuRequest;
-import kitchenpos.menu.application.dto.response.MenuResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.net.URI;
-import java.util.List;
+import kitchenpos.menu.application.MenuService;
+import kitchenpos.menu.application.dto.request.menu.MenuRequest;
+import kitchenpos.menu.application.dto.response.MenuResponse;
 
 @RestController
 public class MenuRestController {

src/main/java/kitchenpos/menu/ui/ProductRestController.java → module-api/src/main/java/kitchenpos/menu/ProductRestController.java

@@ -1,16 +1,17 @@
-package kitchenpos.menu.ui;
+package kitchenpos.menu;
+
+import java.net.URI;
+import java.util.List;
 
-import kitchenpos.menu.application.ProductService;
-import kitchenpos.menu.application.dto.request.product.ProductRequest;
-import kitchenpos.menu.application.dto.response.ProductResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.net.URI;
-import java.util.List;
+import kitchenpos.menu.application.ProductService;
+import kitchenpos.menu.application.dto.request.product.ProductRequest;
+import kitchenpos.menu.application.dto.response.ProductResponse;
 
 @RestController
 public class ProductRestController {

src/main/java/kitchenpos/order/ui/OrderRestController.java → module-api/src/main/java/kitchenpos/order/OrderRestController.java

@@ -1,14 +1,20 @@
-package kitchenpos.order.ui;
+package kitchenpos.order;
+
+import java.net.URI;
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import kitchenpos.order.application.OrderService;
 import kitchenpos.order.application.dto.request.order.ChangeOrderStatusRequest;
 import kitchenpos.order.application.dto.request.order.OrderRequest;
 import kitchenpos.order.application.dto.response.OrderResponse;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.net.URI;
-import java.util.List;
 
 @RestController
 public class OrderRestController {

src/main/java/kitchenpos/order/ui/TableGroupRestController.java → module-api/src/main/java/kitchenpos/order/TableGroupRestController.java

@@ -1,12 +1,17 @@
-package kitchenpos.order.ui;
+package kitchenpos.order;
+
+import java.net.URI;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import kitchenpos.order.application.TableGroupService;
 import kitchenpos.order.application.dto.request.tablegroup.TableGroupRequest;
 import kitchenpos.order.application.dto.response.TableGroupResponse;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.net.URI;
 
 @RestController
 public class TableGroupRestController {

src/main/java/kitchenpos/order/ui/TableRestController.java → module-api/src/main/java/kitchenpos/order/TableRestController.java

@@ -1,15 +1,21 @@
-package kitchenpos.order.ui;
+package kitchenpos.order;
+
+import java.net.URI;
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import kitchenpos.order.application.TableService;
 import kitchenpos.order.application.dto.request.table.ChangeEmptyRequest;
 import kitchenpos.order.application.dto.request.table.ChangeNumberOfGuestsRequest;
 import kitchenpos.order.application.dto.request.table.OrderTableRequest;
 import kitchenpos.order.application.dto.response.OrderTableResponse;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.net.URI;
-import java.util.List;
 
 @RestController
 public class TableRestController {

module-core/build.gradle

@@ -0,0 +1,14 @@
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    implementation 'org.flywaydb:flyway-core'
+    runtimeOnly 'com.h2database:h2'
+}

src/main/java/kitchenpos/menu/application/MenuGroupService.java → module-core/src/main/java/kitchenpos/menu/application/MenuGroupService.java

@@ -1,14 +1,15 @@
 package kitchenpos.menu.application;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import kitchenpos.menu.application.dto.request.MenuRequestAssembler;
 import kitchenpos.menu.application.dto.request.menugroup.MenuGroupRequest;
 import kitchenpos.menu.application.dto.response.MenuGroupResponse;
 import kitchenpos.menu.application.dto.response.MenuResponseAssembler;
 import kitchenpos.menu.domain.repository.MenuGroupRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 @Transactional(readOnly = true)
 @Service

src/main/java/kitchenpos/menu/application/MenuService.java → module-core/src/main/java/kitchenpos/menu/application/MenuService.java

@@ -1,5 +1,12 @@
 package kitchenpos.menu.application;
 
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import kitchenpos.menu.application.dto.request.MenuRequestAssembler;
 import kitchenpos.menu.application.dto.request.menu.MenuRequest;
 import kitchenpos.menu.application.dto.response.MenuResponse;
@@ -10,12 +17,6 @@
 import kitchenpos.menu.domain.repository.MenuGroupRepository;
 import kitchenpos.menu.domain.repository.MenuRepository;
 import kitchenpos.menu.domain.repository.ProductRepository;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.List;
 
 @Transactional(readOnly = true)
 @Service

src/main/java/kitchenpos/menu/application/ProductService.java → module-core/src/main/java/kitchenpos/menu/application/ProductService.java

@@ -1,14 +1,15 @@
 package kitchenpos.menu.application;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import kitchenpos.menu.application.dto.request.MenuRequestAssembler;
 import kitchenpos.menu.application.dto.request.product.ProductRequest;
 import kitchenpos.menu.application.dto.response.MenuResponseAssembler;
 import kitchenpos.menu.application.dto.response.ProductResponse;
 import kitchenpos.menu.domain.repository.ProductRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 @Transactional(readOnly = true)
 @Service

src/main/java/kitchenpos/menu/application/dto/request/MenuRequestAssembler.java → module-core/src/main/java/kitchenpos/menu/application/dto/request/MenuRequestAssembler.java

@@ -1,5 +1,10 @@
 package kitchenpos.menu.application.dto.request;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
 import kitchenpos.menu.application.dto.request.menu.MenuProductRequest;
 import kitchenpos.menu.application.dto.request.menu.MenuRequest;
 import kitchenpos.menu.application.dto.request.menugroup.MenuGroupRequest;
@@ -8,10 +13,6 @@
 import kitchenpos.menu.domain.MenuGroup;
 import kitchenpos.menu.domain.MenuProduct;
 import kitchenpos.menu.domain.Product;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 public class MenuRequestAssembler {

src/main/java/kitchenpos/menu/application/dto/request/menu/MenuRequest.java → module-core/src/main/java/kitchenpos/menu/application/dto/request/menu/MenuRequest.java

@@ -1,10 +1,10 @@
 package kitchenpos.menu.application.dto.request.menu;
 
-import kitchenpos.menu.domain.Price;
-
 import java.math.BigDecimal;
 import java.util.List;
 
+import kitchenpos.menu.domain.Price;
+
 public class MenuRequest {
 
     private String name;

src/main/java/kitchenpos/menu/application/dto/request/product/ProductRequest.java → module-core/src/main/java/kitchenpos/menu/application/dto/request/product/ProductRequest.java

@@ -1,9 +1,9 @@
 package kitchenpos.menu.application.dto.request.product;
 
-import kitchenpos.menu.domain.Price;
-
 import java.math.BigDecimal;
 
+import kitchenpos.menu.domain.Price;
+
 public class ProductRequest {
 
     private String name;

src/main/java/kitchenpos/menu/application/dto/response/MenuResponseAssembler.java → module-core/src/main/java/kitchenpos/menu/application/dto/response/MenuResponseAssembler.java

@@ -1,13 +1,14 @@
 package kitchenpos.menu.application.dto.response;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
 import kitchenpos.menu.domain.Menu;
 import kitchenpos.menu.domain.MenuGroup;
 import kitchenpos.menu.domain.MenuProduct;
 import kitchenpos.menu.domain.Product;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 public class MenuResponseAssembler {

src/main/java/kitchenpos/menu/domain/Menu.java → module-core/src/main/java/kitchenpos/menu/domain/Menu.java

@@ -1,8 +1,17 @@
 package kitchenpos.menu.domain;
 
-import javax.persistence.*;
 import java.util.List;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+
 @Entity
 public class Menu {
 

src/main/java/kitchenpos/menu/domain/MenuGroup.java → module-core/src/main/java/kitchenpos/menu/domain/MenuGroup.java

@@ -1,6 +1,10 @@
 package kitchenpos.menu.domain;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 
 @Entity
 public class MenuGroup {