[4기 - 박세연] SpringBoot Part3 2차 Weekly Mission 제출합니다.

.gitignore

@@ -135,3 +135,5 @@ buildNumber.properties
 .classpath
 
 # End of https://www.toptal.com/developers/gitignore/api/java,intellij+all,maven
+
+docker/database

docker/db-init/schema.sql

@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS customers;
+CREATE TABLE customers
+(
+    customer_id BINARY(16) PRIMARY KEY,
+    name        varchar(20) NOT NULL,
+    email       varchar(50) NOT NULL,
+    create_at   datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP (6),
+    CONSTRAINT unq_user_email UNIQUE (email)
+);
+
+INSERT INTO customers(customer_id, name, email)
+VALUES (uuid_to_bin(UUID()), 'tester00', 'test00@gmail.com'),
+       (uuid_to_bin(UUID()), 'tester01', 'test01@gmail.com'),
+       (uuid_to_bin(UUID()), 'tester02', 'test02@gmail.com');
+
+
+
+DROP TABLE IF EXISTS vouchers;
+CREATE TABLE vouchers
+(
+    voucher_id        BINARY(16) PRIMARY KEY,
+    amount            bigint NOT NULL,
+    discount          enum('FIXED', 'PERCENT') NOT NULL,
+    registration_date datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP (6),
+    expiration_date   datetime(6) NOT NULL
+);
+
+INSERT INTO vouchers (voucher_id, amount, discount, expiration_date)
+VALUES (uuid_to_bin(UUID()), 50, 'PERCENT', DATE_ADD(CURRENT_TIMESTAMP(6), INTERVAL 7 DAY)),
+       (uuid_to_bin(UUID()), 100000, 'FIXED', DATE_ADD(CURRENT_TIMESTAMP(6), INTERVAL 7 DAY)),
+       (uuid_to_bin(UUID()), 80, 'PERCENT', DATE_ADD(CURRENT_TIMESTAMP(6), INTERVAL 7 DAY));

docker/docker-compose.yml

@@ -0,0 +1,21 @@
+version: "3.7"
+
+services:
+  vacation-db:
+    image: mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: "qwe123"
+      MYSQL_DATABASE: "voucher_mgmt"
+      MYSQL_USER: "test"
+      MYSQL_PASSWORD: "test"
+      TZ: Asia/Seoul
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+    volumes:
+      - ./db-init:/docker-entrypoint-initdb.d
+      - ./database/datadir/:/var/lib/mysql
+    platform: linux/x86_64
+    ports:
+      - 3306:3306

pom.xml

@@ -11,12 +11,12 @@
 	<groupId>org.weekly</groupId>
 	<artifactId>weekly</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>weekly</name>
+	<name>weekly</name>21	
+	<packaging>war</packaging>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>17</java.version>
 	</properties>
-	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -35,7 +35,23 @@
 		</dependency>
 
 		<dependency>
-			<groupId>mysql</groupId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+		`	<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.28</version>
 		</dependency>
@@ -58,6 +74,13 @@
 			<version>1.18.3</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
+
+
 	</dependencies>
 
 

src/main/java/org/weekly/weekly/VoucherManageApplication.java

@@ -6,9 +6,9 @@
 
 @SpringBootApplication
 public class VoucherManageApplication {
-	public static void main(String[] args) {
 
-		ApplicationContext context = SpringApplication.run(VoucherManageApplication.class, args);
-		context.getBean(VoucherManagementController.class).start();
-	}
-}
+    public static void main(String[] args) {
+        ApplicationContext context = SpringApplication.run(VoucherManageApplication.class, args);
+        context.getBean(VoucherManagementController.class).start();
+    }
+}

src/main/java/org/weekly/weekly/VoucherManagementController.java

@@ -8,19 +8,19 @@
 import org.weekly.weekly.customer.dto.request.CustomerUpdateRequest;
 import org.weekly.weekly.customer.dto.response.CustomerResponse;
 import org.weekly.weekly.customer.dto.response.CustomersResponse;
+import org.weekly.weekly.global.util.CustomerMenu;
+import org.weekly.weekly.global.util.ManageMenu;
+import org.weekly.weekly.global.util.PrintMessageType;
+import org.weekly.weekly.global.util.VoucherMenu;
 import org.weekly.weekly.ui.CommandLineApplication;
-import org.weekly.weekly.util.CustomerMenu;
-import org.weekly.weekly.util.ManageMenu;
-import org.weekly.weekly.util.PrintMessageType;
-import org.weekly.weekly.util.VoucherMenu;
 import org.weekly.weekly.voucher.controller.VoucherController;
-import org.weekly.weekly.voucher.dto.Response;
 import org.weekly.weekly.voucher.dto.request.VoucherCreationRequest;
-
-import java.util.List;
+import org.weekly.weekly.voucher.dto.response.VoucherCreationResponse;
+import org.weekly.weekly.voucher.dto.response.VouchersResponse;
 
 @Component
 public class VoucherManagementController {
+
     private final Logger logger = LoggerFactory.getLogger(VoucherManagementController.class);
     private final CommandLineApplication commandLineApplication;
     private final VoucherController voucherController;
@@ -33,98 +33,63 @@ public VoucherManagementController(CommandLineApplication commandLineApplication
     }
 
     public void start() {
-        boolean isExit = false;
+        boolean isRunning = true;
 
-        while(!isExit) {
+        while (isRunning) {
             try {
                 ManageMenu manageMenu = commandLineApplication.readManageMenu();
-                isExit = processManageMenuSelection(manageMenu);
+                isRunning = processManageMenuSelection(manageMenu);
             } catch (RuntimeException runtimeException) {
                 commandLineApplication.printErrorMsg(runtimeException.getMessage());
             }
         }
     }
 
     private boolean processManageMenuSelection(ManageMenu manageMenu) {
-        if (ManageMenu.EXIT.equals(manageMenu)) {
-            return true;
-        }
-
-        if (ManageMenu.VOUCHER.equals(manageMenu)) {
-            VoucherMenu voucherMenu = commandLineApplication.readVoucherMenu();
-            processVoucherMenuSelection(voucherMenu);
-            return false;
-        }
-
-        if (ManageMenu.CUSTOMER.equals(manageMenu)){
-            CustomerMenu customerMenu = commandLineApplication.readCustomerMenu();
-            processCustomerMenuSelection(customerMenu);
-            return false;
-        }
-
-        return true;
+        return switch (manageMenu) {
+            case VOUCHER -> {
+                VoucherMenu voucherMenu = commandLineApplication.readVoucherMenu();
+                processVoucherMenuSelection(voucherMenu);
+                yield false;
+            }
+            case CUSTOMER -> {
+                CustomerMenu customerMenu = commandLineApplication.readCustomerMenu();
+                processCustomerMenuSelection(customerMenu);
+                yield false;
+            }
+            default -> true;
+        };
     }
 
-    private boolean processVoucherMenuSelection(VoucherMenu selectMenu) {
-        if (VoucherMenu.CREATE.equals(selectMenu)) {
-            handleVoucherCreation();
-            return false;
-        }
-
-        if (VoucherMenu.LIST.equals(selectMenu)) {
-            handleVoucherSearch();
-            return false;
+    private void processVoucherMenuSelection(VoucherMenu selectMenu) {
+        switch (selectMenu) {
+            case CREATE -> handleVoucherCreation();
+            case LIST -> handleVoucherSearch();
         }
-
-
-        return true;
     }
 
     private void handleVoucherCreation() {
         VoucherCreationRequest voucherCreationRequest = commandLineApplication.createVoucherFromInput();
-        Response response = voucherController.createVoucher(voucherCreationRequest);
-        logger.info("{}{}", PrintMessageType.CREATE_VOUCHER_SUCCESS.getMessage(),response.getResult());
+        VoucherCreationResponse response = voucherController.createVoucher(voucherCreationRequest);
+        logger.info("{}{}", PrintMessageType.CREATE_VOUCHER_SUCCESS.getMessage(), response.result());
         commandLineApplication.printResult(response);
     }
 
     private void handleVoucherSearch() {
-        Response response = voucherController.getVouchers();
-        logger.info("{}{}", PrintMessageType.FIND_ALL_VOUCHER_SUCCESS.getMessage(), response.getResult());
+        VouchersResponse response = voucherController.getVouchers();
+        logger.info("{}{}", PrintMessageType.FIND_ALL_VOUCHER_SUCCESS.getMessage(), response.result());
         commandLineApplication.printResult(response);
     }
 
-    private boolean processCustomerMenuSelection(CustomerMenu selectMenu) {
-        if (CustomerMenu.CREATE.equals(selectMenu)) {
-            handleCustomerCreation();
-            return false;
+    private void processCustomerMenuSelection(CustomerMenu selectMenu) {
+        switch (selectMenu) {
+            case CREATE -> handleCustomerCreation();
+            case DELETE -> handleCustomerDelete();
+            case DELETE_ALL -> handleCustomerDeleteAll();
+            case FIND_ALL -> handleCustomerFindAll();
+            case FIND_DETAIL -> handleFindDetail();
+            case UPDATE -> handleUpdateCustomer();
         }
-
-        if (CustomerMenu.DELETE.equals(selectMenu)) {
-            handleCustomerDelete();
-            return false;
-        }
-
-        if (CustomerMenu.DELETE_ALL.equals(selectMenu)) {
-            handleCustomerDeleteAll();
-            return false;
-        }
-
-        if (CustomerMenu.FIND_ALL.equals(selectMenu)) {
-            handleCustomerFindAll();
-            return false;
-        }
-
-        if (CustomerMenu.FIND_DETAIL.equals(selectMenu)) {
-            handleFindDetail();
-            return false;
-        }
-
-        if (CustomerMenu.UPDATE.equals(selectMenu)) {
-            handleUpdateCustomer();
-            return false;
-        }
-
-        return true;
     }
 
     private void handleCustomerCreation() {
@@ -160,5 +125,4 @@ private void handleUpdateCustomer() {
         CustomerResponse customerResponse = customerController.updateCustomer(customerUpdateRequest);
         commandLineApplication.printResult(customerResponse);
     }
-
 }

src/main/java/org/weekly/weekly/customer/controller/CustomerController.java

@@ -7,8 +7,6 @@
 import org.weekly.weekly.customer.dto.response.CustomersResponse;
 import org.weekly.weekly.customer.service.CustomerService;
 
-import java.util.List;
-
 @Controller
 public class CustomerController {
 

src/main/java/org/weekly/weekly/customer/controller/api/CustomerAPIController.java

@@ -0,0 +1,59 @@
+package org.weekly.weekly.customer.controller.api;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.weekly.weekly.customer.dto.request.CustomerCreationRequest;
+import org.weekly.weekly.customer.dto.request.CustomerUpdateRequest;
+import org.weekly.weekly.customer.dto.response.CustomerResponse;
+import org.weekly.weekly.customer.dto.response.CustomersResponse;
+import org.weekly.weekly.customer.service.CustomerService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/customers")
+public class CustomerAPIController {
+
+    private final CustomerService customerService;
+
+    public CustomerAPIController(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    @PostMapping
+    public ResponseEntity<CustomerResponse> create(@RequestBody CustomerCreationRequest creationRequest) {
+        CustomerResponse customerResponse = customerService.createCustomer(creationRequest);
+        return new ResponseEntity<>(customerResponse, HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<CustomerResponse>> customers() {
+        CustomersResponse customersResponse = customerService.findAllCustomer();
+        return new ResponseEntity<>(customersResponse.getCustomerResponses(), HttpStatus.OK);
+    }
+
+    @GetMapping("/{customerEmail}")
+    public ResponseEntity<CustomerResponse> findCustomer(@PathVariable String customerEmail) {
+        CustomerResponse customerResponse = customerService.findDetailCustomer(customerEmail);
+        return new ResponseEntity<>(customerResponse, HttpStatus.OK);
+    }
+
+    @PatchMapping
+    public ResponseEntity<CustomerResponse> updateCustomer(@RequestBody CustomerUpdateRequest customerUpdateRequest) {
+        CustomerResponse customerResponse = customerService.updateCustomer(customerUpdateRequest);
+        return new ResponseEntity<>(customerResponse, HttpStatus.OK);
+    }
+
+    @DeleteMapping("/{customerEmail}")
+    public ResponseEntity<Void> deleteCustomer(@PathVariable String customerEmail) {
+        customerService.deleteCustomer(customerEmail);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @DeleteMapping("/delete-all")
+    public ResponseEntity<Void> deleteAll() {
+        customerService.deleteAllCustomers();
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+}