merge : w2-3 to w2-4

Author: Hchanghyeon

src/main/java/com/programmers/springweekly/ConsoleApplication.java

@@ -45,4 +45,5 @@ public void run(String... args) {
             }
         }
     }
+
 }

src/main/java/com/programmers/springweekly/ConsoleCustomer.java

@@ -83,4 +83,5 @@ private void getBlackList() {
 
         console.outputGetCustomerList(customerBlacklistResponse);
     }
+
 }

src/main/java/com/programmers/springweekly/ConsoleVoucher.java

@@ -77,4 +77,5 @@ private void selectVoucher() {
 
         console.outputGetVoucherAll(voucherListResponse);
     }
+
 }

src/main/java/com/programmers/springweekly/VoucherProgramApplication.java

@@ -9,5 +9,5 @@ public class VoucherProgramApplication {
     public static void main(String[] args) {
         SpringApplication.run(VoucherProgramApplication.class, args);
     }
+    
 }
- 

src/main/java/com/programmers/springweekly/domain/CustomerMenu.java

@@ -14,4 +14,5 @@ public static CustomerMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 고객 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/ProgramMenu.java

@@ -13,4 +13,5 @@ public static ProgramMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 프로그램 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/VoucherMenu.java

@@ -13,4 +13,5 @@ public static VoucherMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 바우처 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/customer/Customer.java

@@ -1,10 +1,9 @@
 package com.programmers.springweekly.domain.customer;
 
+import java.util.UUID;
 import lombok.Builder;
 import lombok.Getter;
 
-import java.util.UUID;
-
 @Getter
 public class Customer {
 
@@ -20,4 +19,5 @@ public Customer(UUID customerId, String customerName, String customerEmail, Cust
         this.customerEmail = customerEmail;
         this.customerType = customerType;
     }
+
 }

src/main/java/com/programmers/springweekly/domain/customer/CustomerType.java

@@ -15,4 +15,5 @@ public static CustomerType from(String type) {
     public static boolean isBlacklistedCustomer(CustomerType customerType) {
         return customerType == CustomerType.BLACKLIST;
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/voucher/FixedAmountVoucher.java

@@ -31,4 +31,5 @@ public long getVoucherAmount() {
     public VoucherType getVoucherType() {
         return VoucherType.FIXED;
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/voucher/PercentDiscountVoucher.java

@@ -31,4 +31,5 @@ public long getVoucherAmount() {
     public VoucherType getVoucherType() {
         return VoucherType.PERCENT;
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/voucher/Voucher.java

@@ -11,4 +11,5 @@ public interface Voucher {
     long getVoucherAmount();
 
     VoucherType getVoucherType();
+    
 }

src/main/java/com/programmers/springweekly/domain/voucher/VoucherFactory.java

@@ -6,14 +6,9 @@ public class VoucherFactory {
 
     public static Voucher createVoucher(UUID voucherId, VoucherType voucherType, long discount) {
 
-        switch (voucherType) {
-            case FIXED -> {
-                return new FixedAmountVoucher(voucherId, discount);
-            }
-            case PERCENT -> {
-                return new PercentDiscountVoucher(voucherId, discount);
-            }
-            default -> throw new IllegalArgumentException("Input: " + voucherType + "바우처 타입이 없습니다.");
-        }
+        return switch (voucherType) {
+            case FIXED -> new FixedAmountVoucher(voucherId, discount);
+            case PERCENT -> new PercentDiscountVoucher(voucherId, discount);
+        };
     }
 }

src/main/java/com/programmers/springweekly/domain/voucher/VoucherType.java

@@ -11,4 +11,5 @@ public static VoucherType from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 바우처 타입이 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/customer/request/CustomerCreateRequest.java

@@ -17,4 +17,5 @@ public CustomerCreateRequest(String customerName, String customerEmail, Customer
         this.customerEmail = customerEmail;
         this.customerType = customerType;
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/customer/request/CustomerUpdateRequest.java

@@ -20,4 +20,5 @@ public CustomerUpdateRequest(UUID customerId, String customerName, String custom
         this.customerEmail = customerEmail;
         this.customerType = customerType;
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/customer/response/CustomerListResponse.java

@@ -1,8 +1,7 @@
 package com.programmers.springweekly.dto.customer.response;
 
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @Getter
 public class CustomerListResponse {
@@ -12,4 +11,5 @@ public class CustomerListResponse {
     public CustomerListResponse(List<CustomerResponse> customerList) {
         this.customerList = customerList;
     }
+
 }

src/main/java/com/programmers/springweekly/dto/customer/response/CustomerResponse.java

@@ -19,4 +19,5 @@ public CustomerResponse(Customer customer) {
         this.customerEmail = customer.getCustomerEmail();
         this.customerType = customer.getCustomerType();
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/voucher/request/VoucherCreateRequest.java

@@ -15,4 +15,5 @@ public VoucherCreateRequest(long discountAmount, VoucherType voucherType) {
         this.discountAmount = discountAmount;
         this.voucherType = voucherType;
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/voucher/request/VoucherUpdateRequest.java

@@ -18,4 +18,5 @@ public VoucherUpdateRequest(UUID voucherId, long discountAmount, VoucherType vou
         this.discountAmount = discountAmount;
         this.voucherType = voucherType;
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/voucher/response/VoucherListResponse.java

@@ -11,4 +11,5 @@ public class VoucherListResponse {
     public VoucherListResponse(List<VoucherResponse> voucherList) {
         this.voucherList = voucherList;
     }
+    
 }

src/main/java/com/programmers/springweekly/dto/voucher/response/VoucherResponse.java

@@ -17,4 +17,5 @@ public VoucherResponse(Voucher voucher) {
         this.discountAmount = voucher.getVoucherAmount();
         this.voucherType = voucher.getVoucherType();
     }
+    
 }

src/main/java/com/programmers/springweekly/repository/customer/FileCustomerRepository.java

@@ -56,4 +56,5 @@ public void loadingBlackListToMemory() {
             log.error("error message: {}", e.getMessage());
         }
     }
+
 }

src/main/java/com/programmers/springweekly/repository/customer/JdbcTemplateCustomerRepository.java

@@ -131,4 +131,5 @@ private RowMapper<Customer> customerRowMapper() {
                         .build()
         );
     }
+
 }

src/main/java/com/programmers/springweekly/repository/voucher/FileVoucherRepository.java

@@ -68,4 +68,5 @@ public Map<UUID, Voucher> findAll() {
 
         return Collections.unmodifiableMap(voucherMap);
     }
+
 }

src/main/java/com/programmers/springweekly/repository/voucher/JdbcTemplateVoucherRepository.java

@@ -10,7 +10,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
-import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -118,4 +117,5 @@ private RowMapper<Voucher> voucherRowMapper() {
                 )
         );
     }
+
 }

src/main/java/com/programmers/springweekly/service/VoucherService.java

@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +48,7 @@ public VoucherResponse findById(UUID voucherId) {
 
     public VoucherListResponse findAll() {
         List<Voucher> voucherList = voucherRepository.findAll();
-        return new VoucherListResponse(voucherList.stream().map(VoucherResponse::new).collect(Collectors.toList()));
+        return new VoucherListResponse(voucherList.stream().map(VoucherResponse::new).toList());
     }
 
     public void deleteById(UUID voucherId) {

src/main/java/com/programmers/springweekly/util/Validator.java

@@ -61,4 +61,5 @@ private static void validateRange(String inputPercent) {
             throw new IllegalArgumentException("Input : " + inputPercent + ", 입력하신 숫자는 범위를 벗어납니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/view/Input.java

@@ -20,4 +20,5 @@ public interface Input {
     CustomerUpdateRequest inputCustomerUpdate(UUID customerId);
 
     UUID inputUUID();
+    
 }

src/test/java/com/programmers/springweekly/domain/EnumTest.java

@@ -36,4 +36,5 @@ void customerTypeTest(String input) {
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Input: " + input + ", 찾으시는 고객 타입이 없습니다.");
     }
+
 }

src/test/java/com/programmers/springweekly/domain/customer/CustomerTest.java

@@ -18,4 +18,5 @@ void createCustomer() {
         // then
         assertThat(customer).isInstanceOf(Customer.class);
     }
+    
 }

src/test/java/com/programmers/springweekly/domain/voucher/VoucherTest.java

@@ -58,4 +58,5 @@ void proceedPercentDiscount(long discountAmount, long inputPrice, long expectedD
         // then
         assertThat(discountPrice).isEqualTo(expectedDiscount);
     }
+    
 }

src/test/java/com/programmers/springweekly/repository/customer/FileCustomerRepositoryTest.java

@@ -53,6 +53,6 @@ void getBlacklistOfFileRepository() {
 
         // then
         assertThat(actualBlacklist).usingRecursiveFieldByFieldElementComparator().isEqualTo(expectBlacklist);
-
     }
+
 }

src/test/java/com/programmers/springweekly/repository/customer/JdbcTemplateCustomerRepositoryTest.java

@@ -233,4 +233,5 @@ void deleteAll() {
         assertThat(jdbcTemplateCustomerRepository.findAll().size()).isEqualTo(0);
 
     }
+
 }

src/test/java/com/programmers/springweekly/repository/voucher/FileVoucherRepositoryTest.java

@@ -48,4 +48,5 @@ void savePercentVoucherToFileRepository() {
                 .usingRecursiveComparison()
                 .isEqualTo(voucher);
     }
+
 }

src/test/java/com/programmers/springweekly/repository/voucher/JdbcTemplateVoucherRepositoryTest.java

@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -139,4 +140,5 @@ void deleteAll() {
         // then
         assertThat(voucherRepository.findAll().size()).isEqualTo(0);
     }
+
 }

src/test/java/com/programmers/springweekly/repository/voucher/MemoryVoucherRepositoryTest.java

@@ -75,4 +75,5 @@ void getVoucherList() {
         // then
         assertThat(voucherRepository.findAll()).contains(voucher1, voucher2, voucher3, voucher4);
     }
+
 }

src/test/java/com/programmers/springweekly/service/customer/CustomerServiceTest.java

@@ -192,4 +192,5 @@ void deleteAll() {
         // then
         assertThat(customerListAfter.getCustomerList().size()).isEqualTo(0);
     }
+
 }