[5기 - 이중원] SpringBoot Part3 Weekly Mission 제출합니다.

.gitignore

@@ -12,6 +12,8 @@
 .idea/**/dictionaries
 .idea/**/shelf
 
+**/csv/**
+
 # AWS User-specific
 .idea/**/aws.xml
 

README.md

@@ -2,3 +2,13 @@
 스프링부트 basic 위클리미션을 코드리뷰하는 Repository입니다.
 
 주차별 과제는 데브코스 노션에서 확인하세요!
+
+
+### 사용방법
+1. pull 받는다.
+2. docker를 띄운다.
+3. `docker build -t mysql-image .`
+4. `docker run -dit --name mysql-container -p 3300:3306 mysql-image`
+5. docker 올라온 것을 확인 후 프로젝트 실행 
+
+기존 3000포트 -> 3300포트로 변경(react 충돌)

build.gradle

@@ -18,10 +18,9 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.5'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'com.mysql:mysql-connector-j:8.1.0'
-    // https://mvnrepository.com/artifact/com.wix/wix-embedded-mysql
-    testImplementation 'com.wix:wix-embedded-mysql:4.6.1'
 }
 
 tasks.named('test') {

mysql/init.sql

@@ -6,6 +6,8 @@ CREATE TABLE customers (
                            customer_id BINARY(16),
                            customer_name VARCHAR(30),
                            customer_type VARCHAR(30),
+                           created_at datetime(6) not null ,
+                           updated_at datetime(6) DEFAULT null,
                            CONSTRAINT customer_pk PRIMARY KEY(customer_id)
 );
 
@@ -14,6 +16,8 @@ CREATE TABLE vouchers (
                           discount_value BIGINT,
                           voucher_type VARCHAR(30),
                           customer_id BINARY(16),
+                          created_at datetime(6) not null ,
+                          updated_at datetime(6) DEFAULT null,
                           CONSTRAINT voucher_pk PRIMARY KEY(voucher_id),
                           CONSTRAINT voucher_fk FOREIGN KEY (customer_id) REFERENCES customers (customer_id)
 );
@@ -26,6 +30,8 @@ CREATE TABLE customers (
                            customer_id BINARY(16),
                            customer_name VARCHAR(30),
                            customer_type VARCHAR(30),
+                           created_at datetime(6) not null ,
+                           updated_at datetime(6) DEFAULT null,
                            CONSTRAINT customer_pk PRIMARY KEY(customer_id)
 );
 
@@ -34,6 +40,8 @@ CREATE TABLE vouchers (
                           discount_value BIGINT,
                           voucher_type VARCHAR(30),
                           customer_id BINARY(16),
+                          created_at datetime(6) not null ,
+                          updated_at datetime(6) DEFAULT null,
                           CONSTRAINT voucher_pk PRIMARY KEY(voucher_id),
                           CONSTRAINT voucher_fk FOREIGN KEY (customer_id) REFERENCES customers (customer_id)
 );

src/main/java/org/programmers/springorder/HomeController.java

@@ -0,0 +1,12 @@
+package org.programmers.springorder;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class HomeController {
+    @GetMapping("/")
+    public String home(){
+        return "index";
+    }
+}

src/main/java/org/programmers/springorder/SpringOrderApplication.java

@@ -1,17 +1,21 @@
 package org.programmers.springorder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
 
 @SpringBootApplication
-public class SpringOrderApplication {
-	private static final Logger log = LoggerFactory.getLogger(SpringOrderApplication.class);
+public class SpringOrderApplication implements WebMvcConfigurer {
 
-	public static void main(String[] args) {
-		log.info("Voucher 관리 애플리케이션 구동");
-		SpringApplication.run(SpringOrderApplication.class, args).close();
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringOrderApplication.class, args);
+    }
 
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        WebMvcConfigurer.super.configureMessageConverters(converters);
+    }
 }

src/main/java/org/programmers/springorder/VoucherApplication.java

@@ -1,46 +1,65 @@
 package org.programmers.springorder;
 
 import org.programmers.springorder.console.Console;
+import org.programmers.springorder.consts.ErrorMessage;
 import org.programmers.springorder.consts.Message;
 import org.programmers.springorder.customer.controller.CustomerController;
 import org.programmers.springorder.utils.MenuType;
-import org.programmers.springorder.voucher.controller.VoucherController;
+import org.programmers.springorder.voucher.controller.VoucherConsoleController;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+@Profile("test")
 @Component
 public class VoucherApplication implements CommandLineRunner {
 
     private final Console console;
-    private final VoucherController voucherController;
+    private final VoucherConsoleController voucherConsoleController;
     private final CustomerController customerController;
-    public VoucherApplication(Console console, VoucherController voucherController, CustomerController customerController) {
+    public VoucherApplication(Console console, VoucherConsoleController voucherConsoleController, CustomerController customerController) {
         this.console = console;
-        this.voucherController = voucherController;
+        this.voucherConsoleController = voucherConsoleController;
         this.customerController = customerController;
     }
 
     @Override
     public void run(String... args) {
-        boolean isRunning = true;
 
+        boolean isRunning = true;
+        boolean isWeb = false;
+        if(chooseMedia()){
+            isWeb = true;
+        };
         while(isRunning) {
+            if(isWeb) break;
             MenuType menu = console.inputMenu();
 
             switch (menu) {
                 case EXIT -> {
                     isRunning = false;
                     console.printMessage(Message.EXIT_PROGRAM_MESSAGE);
                 }
-                case CREATE -> voucherController.createVoucher();
-                case LIST -> voucherController.getVoucherList();
+                case CREATE -> voucherConsoleController.createVoucher();
+                case LIST -> voucherConsoleController.getVoucherList();
                 case BLACK -> customerController.printBlackList();
-                case ALLOCATE -> voucherController.giveVoucher();
-                case GET_OWNER_VOUCHER -> voucherController.getVouchersOfOwner();
-                case DELETE_VOUCHER -> voucherController.deleteVoucher();
+                case ALLOCATE -> voucherConsoleController.giveVoucher();
+                case GET_OWNER_VOUCHER -> voucherConsoleController.getVouchersOfOwner();
+                case DELETE_VOUCHER -> voucherConsoleController.deleteVoucher();
                 case SEARCH_VOUCHER_OWNER -> customerController.getVoucherOwner();
             }
         }
     }
 
+    private boolean chooseMedia() {
+        String media = console.chooseMedia();
+        if(media.equals("1")){
+            return true;
+        }
+        if(media.equals("2")){
+            return false;
+        };
+        throw new RuntimeException(ErrorMessage.INVALID_VALUE_MESSAGE);
+    }
+
 }

src/main/java/org/programmers/springorder/console/Console.java

@@ -15,7 +15,6 @@
 
 import java.util.InputMismatchException;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 @Component
@@ -122,4 +121,9 @@ public UUID getVoucherId() {
     public void showCustomer(CustomerResponseDto customer) {
         printMessage(customer.toString());
     }
+
+    public String chooseMedia() {
+        printMessage(Message.CHOOSING_MEDIA);
+        return input.getInput();
+    }
 }

src/main/java/org/programmers/springorder/console/Input.java

@@ -1,6 +1,5 @@
 package org.programmers.springorder.console;
 
-import org.programmers.springorder.utils.Validation;
 
 import java.util.Scanner;
 

src/main/java/org/programmers/springorder/consts/ErrorMessage.java

@@ -4,6 +4,8 @@ public class ErrorMessage {
 
     private ErrorMessage(){}
 
+    public static final String CUSTOMER_NOT_FOUND = "등록된 회원이 존재하지 않습니다.";
+
     public static final String VOUCHER_NOT_EXIST_MESSAGE = "등록된 바우처가 존재하지 않습니다.";
 
     public static final String EMPTY_VALUE_MESSAGE = "값이 존재하지 않습니다. 다시 입력해주세요.";

src/main/java/org/programmers/springorder/consts/Message.java

@@ -2,6 +2,12 @@
 
 public class Message {
 
+    public static final String CHOOSING_MEDIA = """
+            어떤 방식으로 구동하시겠습니까?
+            1. web 방식
+            2. console 방식
+            """;
+
     private Message(){}
     public static final String MENU_SELECT_MESSAGE = """
             === Voucher Program ===

src/main/java/org/programmers/springorder/customer/controller/CustomerController.java

@@ -2,10 +2,12 @@
 
 import org.programmers.springorder.console.Console;
 import org.programmers.springorder.customer.service.CustomerService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
 
 import java.util.UUID;
 
+@Profile("test")
 @Controller
 public class CustomerController {
     private final Console console;

src/main/java/org/programmers/springorder/customer/controller/CustomerPageController.java

@@ -0,0 +1,64 @@
+package org.programmers.springorder.customer.controller;
+
+import org.programmers.springorder.customer.dto.CustomerRequestDto;
+import org.programmers.springorder.customer.dto.CustomerResponseDto;
+import org.programmers.springorder.customer.service.CustomerService;
+import org.programmers.springorder.voucher.dto.VoucherResponseDto;
+import org.programmers.springorder.voucher.service.VoucherService;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+import java.util.UUID;
+
+@Profile("prod")
+@Controller
+public class CustomerPageController {
+
+    private final CustomerService customerService;
+    private final VoucherService voucherService;
+
+    public CustomerPageController(CustomerService customerService, VoucherService voucherService) {
+        this.customerService = customerService;
+        this.voucherService = voucherService;
+    }
+
+    @GetMapping("/customers")
+    public String getCustomerListPage(Model model){
+        List<CustomerResponseDto> allCustomers = customerService.getAllCustomers();
+        model.addAttribute("customerList", allCustomers);
+        return "customers";
+    }
+
+    @GetMapping("/blackCustomers")
+    public String getBlackCustomerListPage(Model model){
+        List<CustomerResponseDto> allCustomers = customerService.getBlackList();
+        model.addAttribute("customerList", allCustomers);
+        return "customers";
+    }
+
+    @GetMapping("/customers/{customerId}")
+    public String getCustomerListPage(@PathVariable UUID customerId, Model model){
+        CustomerResponseDto customer = customerService.findCustomer(customerId);
+        List<VoucherResponseDto> customerOwnedVouchers = voucherService.getCustomerOwnedVouchers(customerId);
+        model.addAttribute("customer", customer);
+        model.addAttribute("customerVoucherList", customerOwnedVouchers);
+        return "customer-detail";
+    }
+
+    @GetMapping("/new-customer")
+    public String getNewCustomerPage(){
+        return "new-customer";
+    }
+
+    @PostMapping("/customers")
+    public String enrollCustomer(CustomerRequestDto requestDto){
+        customerService.newCustomer(requestDto);
+        return "redirect:/customers";
+    }
+
+}

src/main/java/org/programmers/springorder/customer/controller/CustomerRestController.java

@@ -0,0 +1,49 @@
+package org.programmers.springorder.customer.controller;
+
+import org.programmers.springorder.customer.dto.CustomerRequestDto;
+import org.programmers.springorder.customer.dto.CustomerResponseDto;
+import org.programmers.springorder.customer.service.CustomerService;
+import org.programmers.springorder.voucher.dto.Response;
+import org.springframework.context.annotation.Profile;
+import org.springframework.ui.Model;
+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.RestController;
+
+import java.util.List;
+import java.util.UUID;
+
+@Profile("default")
+@RestController
+public class CustomerRestController {
+
+    private final CustomerService customerService;
+
+    public CustomerRestController(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    @GetMapping("api/v1/customers")
+    public Response<List<CustomerResponseDto>> getCustomerListPage(){
+        return Response.success(customerService.getAllCustomers());
+    }
+
+    @GetMapping("api/v1/blackCustomers")
+    public Response<List<CustomerResponseDto>> getBlackCustomerListPage(){
+        return Response.success(customerService.getBlackList());
+    }
+
+    @GetMapping("api/v1/customers/{customerId}")
+    public Response<CustomerResponseDto> getCustomerDetail(@PathVariable UUID customerId, Model model){
+        return Response.success(customerService.findCustomer(customerId));
+    }
+
+
+    @PostMapping("api/v1/customers")
+    public Response<Void> enrollCustomer(CustomerRequestDto requestDto){
+        customerService.newCustomer(requestDto);
+        return Response.success();
+    }
+
+}

src/main/java/org/programmers/springorder/customer/dto/CustomerRequestDto.java

@@ -0,0 +1,9 @@
+package org.programmers.springorder.customer.dto;
+
+import org.programmers.springorder.customer.model.CustomerType;
+import org.springframework.lang.NonNull;
+
+public record CustomerRequestDto(
+        @NonNull String name,
+        @NonNull CustomerType customerType) {
+}

src/main/java/org/programmers/springorder/customer/dto/CustomerResponseDto.java

@@ -24,6 +24,14 @@ public UUID getCustomerId() {
         return customerId;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public String getCustomerType() {
+        return customerType;
+    }
+
     @Override
     public String toString() {
         return "customerId : " + customerId +'\n' +