[4기 - 소재훈] Week2-1 바우처 관리 애플리케이션 테스트 코드 작성(재 PR 작업)

src/main/java/com/prgrms/springbootbasic/ConsoleApplication.java

@@ -1,7 +1,7 @@
 package com.prgrms.springbootbasic;
 
-import com.prgrms.springbootbasic.controller.VoucherController;
-import com.prgrms.springbootbasic.domain.Voucher;
+import com.prgrms.springbootbasic.controller.voucher.VoucherController;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
 import com.prgrms.springbootbasic.enums.Command;
 import com.prgrms.springbootbasic.enums.VoucherType;
 import com.prgrms.springbootbasic.view.Console;
@@ -25,31 +25,41 @@ public void run(String... args) throws Exception {
         console.consoleMenu();
 
         while (true) {
-            String command = console.inputCommand();
-            Command inputCommand = Command.checkInputCommand(command);
-
-            switch (inputCommand) {
-                case CREATE -> createVoucher();
-                case LIST -> getVoucherList();
-                case EXIT -> {
-                    console.printMessage("프로그램을 종료합니다.");
-                    return;
+            try {
+                String command = console.inputCommand();
+                Command inputCommand = Command.of(command);
+
+                switch (inputCommand) {
+                    case CREATE -> createVoucher();
+                    case LIST -> getVoucherList();
+                    case EXIT -> {
+                        console.printMessage("프로그램을 종료합니다.");
+                        return;
+                    }
                 }
+            } catch (IllegalArgumentException e) {
+                log.error("명령어가 잘못 입력되었습니다. ", e.getMessage());
+            } catch (Exception e) {
+                log.error("프로그램에서 오류가 발생하였습니다.", e.getMessage());
             }
         }
     }
 
-    private void createVoucher() {
+    public void createVoucher() {
         String voucherTypeInput = console.inputVoucherType();
-        VoucherType voucherType = VoucherType.checkVoucherType(voucherTypeInput);
+        VoucherType voucherType = VoucherType.of(voucherTypeInput);
 
         long voucherDiscount = console.inputVoucherDiscount();
 
-        voucherController.createVoucher(voucherType, voucherDiscount);
-        console.printMessage("바우처가 생성되었습니다!");
+        try {
+            voucherController.createVoucher(voucherType, voucherDiscount);
+            console.printMessage("바우처가 생성되었습니다!");
+        } catch (IllegalArgumentException e) {
+            console.printMessage("생성할 바우처의 금액의 범위를 다시 한번 확인해주세요!");
+        }
     }
 
-    private void getVoucherList() {
+    public void getVoucherList() {
         Map<UUID, Voucher> voucherMap = voucherController.printVoucherList();
         console.printlnVoucherList(voucherMap);
     }

src/main/java/com/prgrms/springbootbasic/controller/VoucherController.java → src/main/java/com/prgrms/springbootbasic/controller/voucher/VoucherController.java

@@ -1,8 +1,8 @@
-package com.prgrms.springbootbasic.controller;
+package com.prgrms.springbootbasic.controller.voucher;
 
-import com.prgrms.springbootbasic.domain.Voucher;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
 import com.prgrms.springbootbasic.enums.VoucherType;
-import com.prgrms.springbootbasic.service.VoucherService;
+import com.prgrms.springbootbasic.service.voucher.VoucherService;
 import java.util.Map;
 import java.util.UUID;
 import lombok.AllArgsConstructor;

src/main/java/com/prgrms/springbootbasic/domain/FixedDiscountVoucher.java → src/main/java/com/prgrms/springbootbasic/domain/voucher/FixedDiscountVoucher.java

@@ -1,4 +1,4 @@
-package com.prgrms.springbootbasic.domain;
+package com.prgrms.springbootbasic.domain.voucher;
 
 import com.prgrms.springbootbasic.enums.VoucherType;
 import java.util.UUID;
@@ -14,7 +14,7 @@ public FixedDiscountVoucher(long discount) {
         this.voucherId = UUID.randomUUID();
         this.discount = discount;
     }
-
+    
     @Override
     public VoucherType getVoucherType() {
         return VoucherType.FIXED;

src/main/java/com/prgrms/springbootbasic/domain/PercentDiscountVoucher.java → src/main/java/com/prgrms/springbootbasic/domain/voucher/PercentDiscountVoucher.java

@@ -1,4 +1,4 @@
-package com.prgrms.springbootbasic.domain;
+package com.prgrms.springbootbasic.domain.voucher;
 
 import com.prgrms.springbootbasic.enums.VoucherType;
 import java.util.UUID;

src/main/java/com/prgrms/springbootbasic/domain/Voucher.java → src/main/java/com/prgrms/springbootbasic/domain/voucher/Voucher.java

@@ -1,4 +1,4 @@
-package com.prgrms.springbootbasic.domain;
+package com.prgrms.springbootbasic.domain.voucher;
 
 import com.prgrms.springbootbasic.enums.VoucherType;
 import java.util.UUID;

src/main/java/com/prgrms/springbootbasic/enums/Command.java

@@ -9,7 +9,7 @@ public static Command of(String inputCommand) {
         try {
             return Command.valueOf(inputCommand.toUpperCase());
         } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("잘못된 명령어 입력입니다. 다시 입력해주세요. " + inputCommand);
+            throw new IllegalArgumentException("잘못된 명령어 입력입니다. 프로그램 종료(exit),바우처 생성(create), 바우처 목록 조회(list) 중 하나를 입력해주세요.");
         }
     }
 }

src/main/java/com/prgrms/springbootbasic/enums/VoucherType.java

@@ -9,7 +9,7 @@ public static VoucherType of(String voucherType) {
         try {
             return VoucherType.valueOf(voucherType.toUpperCase());
         } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("잘못된 바우처 타입입니다." + voucherType);
+            throw new IllegalArgumentException("잘못된 바우처 타입을 입력하셨습니다. 고정 할인 바우처(fixed) 또는 비율 할인 바우처(percent)를 선택해서 다시 입력해주세요!");
         }
     }
 }

src/main/java/com/prgrms/springbootbasic/repository/MemoryVoucherRepository.java → src/main/java/com/prgrms/springbootbasic/repository/voucher/MemoryVoucherRepository.java

@@ -1,6 +1,6 @@
-package com.prgrms.springbootbasic.repository;
+package com.prgrms.springbootbasic.repository.voucher;
 
-import com.prgrms.springbootbasic.domain.Voucher;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/com/prgrms/springbootbasic/repository/voucher/VoucherJdbcRepository.java

@@ -0,0 +1,5 @@
+package com.prgrms.springbootbasic.repository.voucher;
+
+public class VoucherJdbcRepository {
+
+}

src/main/java/com/prgrms/springbootbasic/repository/voucher/VoucherRepository.java

@@ -0,0 +1,12 @@
+package com.prgrms.springbootbasic.repository.voucher;
+
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
+import java.util.Map;
+import java.util.UUID;
+
+public interface VoucherRepository {
+
+    Voucher insert(Voucher voucher);
+
+    Map<UUID, Voucher> getAllVouchersList();
+}

src/main/java/com/prgrms/springbootbasic/service/voucher/VoucherService.java

@@ -0,0 +1,53 @@
+package com.prgrms.springbootbasic.service.voucher;
+
+import com.prgrms.springbootbasic.domain.voucher.FixedDiscountVoucher;
+import com.prgrms.springbootbasic.domain.voucher.PercentDiscountVoucher;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
+import com.prgrms.springbootbasic.enums.VoucherType;
+import com.prgrms.springbootbasic.repository.voucher.VoucherRepository;
+import java.util.Map;
+import java.util.UUID;
+import org.springframework.stereotype.Service;
+
+@Service
+public class VoucherService {
+
+    private final VoucherRepository voucherRepository;
+
+    public VoucherService(VoucherRepository voucherRepository) {
+        this.voucherRepository = voucherRepository;
+    }
+
+    public Voucher createVoucher(VoucherType type, long discount) {
+        try {
+            isValidDiscount(type, discount);
+            Voucher voucher = switch (type) {
+                case FIXED -> new FixedDiscountVoucher(discount);
+                case PERCENT -> new PercentDiscountVoucher(discount);
+            };
+            return voucherRepository.insert(voucher);
+        } catch (IllegalArgumentException e) {
+            System.out.println(e.getMessage());
+            throw e;
+        }
+    }
+
+    public void isValidDiscount(VoucherType type, long discount) {
+        switch (type) {
+            case FIXED:
+                if (discount <= 0) {
+                    throw new IllegalArgumentException("고정 할인 바우처의 입력 금액은 0 이하를 입력할 수 없습니다.");
+                }
+                break;
+            case PERCENT:
+                if (discount < 1 || discount > 99) {
+                    throw new IllegalArgumentException("퍼센트 할인 바우처의 할인 퍼센트는 1 ~ 99까지의 숫자를 입력해야 합니다.");
+                }
+                break;
+        }
+    }
+
+    public Map<UUID, Voucher> fetchAllVouchers() {
+        return voucherRepository.getAllVouchersList();
+    }
+}

src/main/java/com/prgrms/springbootbasic/view/Console.java

@@ -1,6 +1,6 @@
 package com.prgrms.springbootbasic.view;
 
-import com.prgrms.springbootbasic.domain.Voucher;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.UUID;
@@ -26,13 +26,14 @@ public String inputCommand() {
 
     @Override
     public String inputVoucherType() {
-        System.out.print("생성할 voucher의 종류를 입력해주세요.(FixedDiscountVoucher, PercentDiscountVoucher) : ");
+        System.out.print("생성할 voucher의 종류를 입력해주세요.(fixed(고정 할인 바우처) , percent(퍼센트 할인 바우처) : ");
         return input.nextLine();
     }
 
     @Override
     public long inputVoucherDiscount() {
         System.out.println("생성할 voucher의 금액을 입력해주세요!");
+        System.out.print("Discount : ");
         return Long.parseLong(input.nextLine());
     }
 
@@ -49,7 +50,7 @@ public void printlnVoucherList(Map<UUID, Voucher> voucherMap) {
         }
         System.out.println("생성된 Voucher의 목록은 다음과 같습니다.");
         for (Voucher voucher : voucherMap.values()) {
-            System.out.println("Voucher Type: " + voucher.getVoucherType() + " + Discount" + voucher.getDiscount());
+            System.out.println("Voucher Type: " + voucher.getVoucherType() + ", 해당 Voucher의 Discount: " + voucher.getDiscount() + " 입니다.");
         }
     }
 }

src/main/java/com/prgrms/springbootbasic/view/Output.java

@@ -1,6 +1,6 @@
 package com.prgrms.springbootbasic.view;
 
-import com.prgrms.springbootbasic.domain.Voucher;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
 import java.util.Map;
 import java.util.UUID;
 

src/test/java/com/prgrms/springbootbasic/controller/VoucherControllerTest.java

@@ -0,0 +1,63 @@
+package com.prgrms.springbootbasic.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.prgrms.springbootbasic.controller.voucher.VoucherController;
+import com.prgrms.springbootbasic.domain.voucher.Voucher;
+import com.prgrms.springbootbasic.enums.VoucherType;
+import com.prgrms.springbootbasic.service.voucher.VoucherService;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+class VoucherControllerTest {
+
+    @Mock
+    private VoucherService voucherService;
+
+    private VoucherController voucherController;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        voucherController = new VoucherController(voucherService);
+    }
+
+    @Test
+    @DisplayName("바우처 목록 validation 테스트")
+    void getVoucherListControllerTest() {
+        // given
+        Map<UUID, Voucher> voucherMap = Collections.emptyMap();
+        when(voucherService.fetchAllVouchers()).thenReturn(voucherMap);
+
+        // when
+        Map<UUID, Voucher> voucherList = voucherController.printVoucherList();
+
+        // then
+        assertThat(voucherList).isEmpty();
+        verify(voucherService, times(1)).fetchAllVouchers();
+    }
+
+    @Test
+    @DisplayName("바우처 생성 validation 테스트")
+    void getVoucherCreateControllerTest() {
+        // given
+        long discount = 10000;
+
+        // when
+        voucherController.createVoucher(VoucherType.FIXED, discount);
+
+        // then
+        verify(voucherService, times(1)).createVoucher(VoucherType.FIXED, discount);
+    }
+}
+
+