[5기 - 김현우] Spring Boot Part3 Weekly Mission 제출합니다.

README.md

@@ -54,10 +54,10 @@ $ gradle test
 
 ## Run Locally
 
-Clone the project branch `ASak1104/week2`
+Clone the project branch `ASak1104/week3`
 
 ```bash
-$ git clone -b ASak1104/week2 https://github.com/ASak1104/voucher-management-system.git
+$ git clone -b ASak1104/week3 https://github.com/ASak1104/voucher-management-system.git
 ```
 
 Go to the project directory

build.gradle

@@ -18,11 +18,16 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
     implementation 'org.springframework.boot:spring-boot-starter-aop'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
     implementation 'com.mysql:mysql-connector-j:8.1.0'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.github.javafaker:javafaker:1.0.2'
 }
 
 tasks.named('test') {

src/main/java/team/marco/voucher_management_system/VoucherManagementSystemApplication.java

@@ -1,28 +1,40 @@
 package team.marco.voucher_management_system;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import java.util.function.Consumer;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.context.ApplicationContext;
-import org.springframework.core.env.Environment;
-import team.marco.voucher_management_system.application.CommandMainApplication;
+import org.springframework.context.annotation.ComponentScan;
+import team.marco.voucher_management_system.type_enum.ApplicationType;
+import team.marco.voucher_management_system.util.Console;
 
-@SpringBootApplication
+@ComponentScan
 @ConfigurationPropertiesScan
 public class VoucherManagementSystemApplication {
-    private static final Logger logger = LoggerFactory.getLogger(VoucherManagementSystemApplication.class);
-
     public static void main(String[] args) {
-        ApplicationContext context = SpringApplication.run(VoucherManagementSystemApplication.class, args);
-        Environment environment = context.getEnvironment();
+        Console.print("""
+                === 실행할 애플리케이션을 선택해주세요. ===
+                0. Console Application
+                1. Web Application""");
+
+        selectApplication(args);
+
+        Console.close();
+    }
+
+    private static void selectApplication(String[] args) {
+        Consumer<String[]> mainMethod = getMainMethod();
+
+        mainMethod.accept(args);
+    }
 
-        logger.info("Program start (profile: {})", environment.getActiveProfiles()[0]);
+    private static Consumer<String[]> getMainMethod() {
+        try {
+            int input = Console.readInt();
 
-        CommandMainApplication application = context.getBean(CommandMainApplication.class);
-        application.run();
+            return ApplicationType.getMainMethod(input);
+        } catch (IllegalArgumentException e) {
+            Console.print("사용할 수 없는 애플리케이션 입니다.");
 
-        logger.info("Program exit");
+            return getMainMethod();
+        }
     }
 }

src/main/java/team/marco/voucher_management_system/aspect/LoggingPointCut.java

@@ -6,15 +6,15 @@ public final class LoggingPointCut {
     private LoggingPointCut() {
     }
 
-    @Pointcut("execution(* team.marco.voucher_management_system.controller..*(..))")
+    @Pointcut("execution(* team.marco.voucher_management_system..controller..*(..))")
     public static void controllerMethodPointcut() {
     }
 
     @Pointcut("execution(* team.marco.voucher_management_system.service..*(..))")
     public static void serviceMethodPointcut() {
     }
 
-    @Pointcut("execution(* team.marco.voucher_management_system.repository..*(..))")
+    @Pointcut("execution(* team.marco.voucher_management_system..repository..*(..))")
     public static void repositorySavePointcut() {
     }
 }

src/main/java/team/marco/voucher_management_system/console_app/ConsoleApplication.java

@@ -0,0 +1,23 @@
+package team.marco.voucher_management_system.console_app;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Import;
+import team.marco.voucher_management_system.VoucherManagementSystemApplication;
+import team.marco.voucher_management_system.console_app.application.CommandMainApplication;
+
+@Import(VoucherManagementSystemApplication.class)
+@SpringBootApplication
+public class ConsoleApplication {
+    public static void main(String[] args) {
+        SpringApplication springApplication = new SpringApplication(ConsoleApplication.class);
+        springApplication.setWebApplicationType(WebApplicationType.NONE);
+
+        ConfigurableApplicationContext context = springApplication.run(args);
+        CommandMainApplication application = context.getBean(CommandMainApplication.class);
+
+        application.run();
+    }
+}

src/main/java/team/marco/voucher_management_system/application/CommandCustomerApplication.java → src/main/java/team/marco/voucher_management_system/console_app/application/CommandCustomerApplication.java

@@ -1,13 +1,13 @@
-package team.marco.voucher_management_system.application;
+package team.marco.voucher_management_system.console_app.application;
 
 import java.util.NoSuchElementException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.jdbc.datasource.lookup.DataSourceLookupFailureException;
 import org.springframework.stereotype.Component;
-import team.marco.voucher_management_system.controller.ConsoleCustomerController;
-import team.marco.voucher_management_system.type_enum.CustomerCommandType;
+import team.marco.voucher_management_system.console_app.command_enum.CustomerCommandType;
+import team.marco.voucher_management_system.console_app.controller.ConsoleCustomerController;
 import team.marco.voucher_management_system.util.Console;
 
 @Component
@@ -48,12 +48,15 @@ private void executeCommand(int userInput) {
         } catch (IllegalArgumentException e) {
             logger.warn(e.toString());
             Console.print(e.getMessage());
-        } catch (EmptyResultDataAccessException | NoSuchElementException e) {
-            logger.error(e.toString());
-            Console.print("존재하지 않는 ID 입니다.");
-        } catch (DataAccessResourceFailureException e) {
+        } catch (DataSourceLookupFailureException e) {
             logger.error(e.toString());
             Console.print(e.getMessage());
+        } catch (DuplicateKeyException e) {
+            logger.error(e.toString());
+            Console.print("이미 존재하는 이메일 입니다.");
+        } catch (NoSuchElementException e) {
+            logger.error(e.toString());
+            Console.print("존재하지 않는 ID 입니다.");
         }
     }
 

src/main/java/team/marco/voucher_management_system/application/CommandMainApplication.java → src/main/java/team/marco/voucher_management_system/console_app/application/CommandMainApplication.java

@@ -1,11 +1,12 @@
-package team.marco.voucher_management_system.application;
+package team.marco.voucher_management_system.console_app.application;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.CannotGetJdbcConnectionException;
 import org.springframework.stereotype.Component;
-import team.marco.voucher_management_system.controller.ConsoleBlacklistController;
-import team.marco.voucher_management_system.controller.ConsoleVoucherController;
-import team.marco.voucher_management_system.type_enum.MainCommandType;
+import team.marco.voucher_management_system.console_app.command_enum.MainCommandType;
+import team.marco.voucher_management_system.console_app.controller.ConsoleBlacklistController;
+import team.marco.voucher_management_system.console_app.controller.ConsoleVoucherController;
 import team.marco.voucher_management_system.util.Console;
 
 @Component
@@ -31,11 +32,10 @@ public CommandMainApplication(ConsoleVoucherController voucherController,
     protected void start() {
         try {
             selectCommand();
+        } catch (CannotGetJdbcConnectionException e) {
+            errorHandler(e, "데이터베이스에 연결할 수 없습니다.");
         } catch (Exception e) {
-            logger.error(e.toString());
-            Console.print("프로그램에 에러가 발생했습니다.");
-
-            runningFlag = false;
+            errorHandler(e, "프로그램에 에러가 발생했습니다.");
         }
     }
 
@@ -79,6 +79,13 @@ private void switchCommand(MainCommandType commandType) {
         }
     }
 
+    private void errorHandler(Exception e, String message) {
+        logger.error(e.toString());
+        Console.print(message);
+
+        runningFlag = false;
+    }
+
     @Override
     protected void close() {
         Console.print("프로그램이 종료되었습니다.");

src/main/java/team/marco/voucher_management_system/application/CommandWalletApplication.java → src/main/java/team/marco/voucher_management_system/console_app/application/CommandWalletApplication.java

@@ -1,15 +1,12 @@
-package team.marco.voucher_management_system.application;
+package team.marco.voucher_management_system.console_app.application;
 
 import java.util.NoSuchElementException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.stereotype.Component;
-import team.marco.voucher_management_system.controller.ConsoleWalletController;
-import team.marco.voucher_management_system.type_enum.WalletCommandType;
+import team.marco.voucher_management_system.console_app.command_enum.WalletCommandType;
+import team.marco.voucher_management_system.console_app.controller.ConsoleWalletController;
 import team.marco.voucher_management_system.util.Console;
 
 @Component
@@ -48,13 +45,10 @@ private void executeCommand(int userInput) {
         } catch (IllegalArgumentException e) {
             logger.warn(e.toString());
             Console.print(e.getMessage());
-        } catch (DataAccessResourceFailureException e) {
-            logger.error(e.toString());
-            Console.print(e.getMessage());
         } catch (DuplicateKeyException e) {
             logger.error(e.toString());
             Console.print("이미 존재하는 쿠폰입니다.");
-        } catch (EmptyResultDataAccessException | NoSuchElementException | UncategorizedSQLException e) {
+        } catch (NoSuchElementException e) {
             logger.error(e.toString());
             Console.print("존재하지 않는 ID 입니다.");
         }

src/main/java/team/marco/voucher_management_system/application/RunnableCommandApplication.java → src/main/java/team/marco/voucher_management_system/console_app/application/RunnableCommandApplication.java

@@ -1,4 +1,4 @@
-package team.marco.voucher_management_system.application;
+package team.marco.voucher_management_system.console_app.application;
 
 public abstract class RunnableCommandApplication {
     protected boolean runningFlag;

src/main/java/team/marco/voucher_management_system/type_enum/CustomerCommandType.java → src/main/java/team/marco/voucher_management_system/console_app/command_enum/CustomerCommandType.java

@@ -1,4 +1,4 @@
-package team.marco.voucher_management_system.type_enum;
+package team.marco.voucher_management_system.console_app.command_enum;
 
 public enum CustomerCommandType {
     EXIT, CREATE, LIST, UPDATE, FIND_BY_ID, FIND_BY_NAME, FIND_BY_EMAIL;

src/main/java/team/marco/voucher_management_system/type_enum/MainCommandType.java → src/main/java/team/marco/voucher_management_system/console_app/command_enum/MainCommandType.java

@@ -1,4 +1,4 @@
-package team.marco.voucher_management_system.type_enum;
+package team.marco.voucher_management_system.console_app.command_enum;
 
 import static java.text.MessageFormat.format;
 

src/main/java/team/marco/voucher_management_system/type_enum/WalletCommandType.java → src/main/java/team/marco/voucher_management_system/console_app/command_enum/WalletCommandType.java

@@ -1,4 +1,4 @@
-package team.marco.voucher_management_system.type_enum;
+package team.marco.voucher_management_system.console_app.command_enum;
 
 public enum WalletCommandType {
     EXIT, SUPPLY, VOUCHER_LIST, RETURN, CUSTOMER_LIST;

src/main/java/team/marco/voucher_management_system/controller/ConsoleBlacklistController.java → src/main/java/team/marco/voucher_management_system/console_app/controller/ConsoleBlacklistController.java

@@ -1,12 +1,12 @@
-package team.marco.voucher_management_system.controller;
+package team.marco.voucher_management_system.console_app.controller;
 
 import java.util.List;
-import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Component;
 import team.marco.voucher_management_system.model.BlacklistUser;
 import team.marco.voucher_management_system.service.BlacklistService;
 import team.marco.voucher_management_system.util.Console;
 
-@Controller
+@Component
 public class ConsoleBlacklistController {
     private static final String INFO_DELIMINATOR = "\n";
 

src/main/java/team/marco/voucher_management_system/controller/ConsoleCustomerController.java → src/main/java/team/marco/voucher_management_system/console_app/controller/ConsoleCustomerController.java

@@ -1,13 +1,15 @@
-package team.marco.voucher_management_system.controller;
+package team.marco.voucher_management_system.console_app.controller;
 
 import java.text.MessageFormat;
 import java.util.List;
-import org.springframework.stereotype.Controller;
+import java.util.UUID;
+import org.springframework.stereotype.Component;
 import team.marco.voucher_management_system.model.Customer;
 import team.marco.voucher_management_system.service.CustomerService;
 import team.marco.voucher_management_system.util.Console;
+import team.marco.voucher_management_system.util.UUIDConverter;
 
-@Controller
+@Component
 public class ConsoleCustomerController {
     private static final String INFO_DELIMINATOR = MessageFormat.format("\n{0}\n", "-".repeat(42));
 
@@ -37,7 +39,8 @@ public void customerList() {
 
     public void updateCustomer() {
         Console.print("수정할 고객의 ID를 입력해 주세요.");
-        String id = Console.readString();
+        String input = Console.readString();
+        UUID id = UUIDConverter.convert(input);
 
         customerService.findById(id);
 
@@ -51,7 +54,8 @@ public void updateCustomer() {
 
     public void findCustomerById() {
         Console.print("조회할 고객의 ID를 입력해 주세요.");
-        String id = Console.readString();
+        String input = Console.readString();
+        UUID id = UUIDConverter.convert(input);
 
         Customer customer = customerService.findById(id);
 

src/main/java/team/marco/voucher_management_system/controller/ConsoleVoucherController.java → src/main/java/team/marco/voucher_management_system/console_app/controller/ConsoleVoucherController.java

@@ -1,13 +1,13 @@
-package team.marco.voucher_management_system.controller;
+package team.marco.voucher_management_system.console_app.controller;
 
 import java.text.MessageFormat;
 import java.util.List;
-import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Component;
 import team.marco.voucher_management_system.model.Voucher;
 import team.marco.voucher_management_system.service.VoucherService;
 import team.marco.voucher_management_system.util.Console;
 
-@Controller
+@Component
 public class ConsoleVoucherController {
     private static final String INFO_DELIMINATOR = MessageFormat.format("\n{0}\n", "-".repeat(42));
 
@@ -32,7 +32,7 @@ public void selectVoucher() {
     }
 
     public void voucherList() {
-        List<String> vouchers = voucherService.getVouchersInfo()
+        List<String> vouchers = voucherService.getVouchers()
                 .stream()
                 .map(Voucher::getInfo)
                 .toList();