refactor : 코드 라인 정리

eugene225 · eugene225 · commit 58dac4f06723 · 2023-11-07T01:12:06.000+09:00
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/CustomerFunction.java b/src/main/java/org/prgrms/kdtspringdemo/customer/CustomerFunction.java
@@ -1,7 +1,6 @@
 package org.prgrms.kdtspringdemo.customer;
 
 import org.prgrms.kdtspringdemo.customer.controller.CustomerController;
-import org.prgrms.kdtspringdemo.voucher.controller.VoucherController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/controller/CustomerController.java b/src/main/java/org/prgrms/kdtspringdemo/customer/controller/CustomerController.java
@@ -2,6 +2,7 @@
 
 import org.prgrms.kdtspringdemo.customer.domain.Customer;
 import org.prgrms.kdtspringdemo.customer.domain.dto.CustomerRequestDto;
+import org.prgrms.kdtspringdemo.customer.domain.dto.CustomerViewDto;
 import org.prgrms.kdtspringdemo.customer.service.CustomerService;
 import org.prgrms.kdtspringdemo.view.InputConsole;
 import org.prgrms.kdtspringdemo.view.OutputConsole;
@@ -46,12 +47,18 @@ public void insert() {
 
     public void printAllCustomers() {
         List<Customer> customerList = customerService.findAll();
-        customerList.stream().forEach(customer -> outputConsole.printCustomer(customer));
+        customerList.stream().forEach(customer -> {
+            CustomerViewDto customerViewDto = new CustomerViewDto(customer);
+            outputConsole.printCustomer(customerViewDto);
+        });
     }
+
     public void printAllBlackListCustomer() throws IOException {
         List<Customer> customerList = customerService.getBlackListCustomers();
-        customerList.stream().forEach(customer -> outputConsole.printCustomer(customer));
-    }
+        customerList.stream().forEach(customer -> {
+            CustomerViewDto customerViewDto = new CustomerViewDto(customer);
+            outputConsole.printCustomer(customerViewDto);
+        });    }
 
     public void endCustomerMode() {
         outputConsole.printCustomerModeEnd();
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/controller/CustomerWebController.java b/src/main/java/org/prgrms/kdtspringdemo/customer/controller/CustomerWebController.java
@@ -28,7 +28,7 @@ public CustomerWebController(CustomerService customerService, WalletService wall
     public String getAllCustomers(Model model) {
         List<Customer> customerList = customerService.findAll();
         List<CustomerViewDto> customerViewDtos = new ArrayList<>();
-        customerList.stream().forEach(customer -> customerViewDtos.add(new CustomerViewDto(customer)));
+        customerList.forEach(customer -> customerViewDtos.add(new CustomerViewDto(customer)));
         List<Customer> noneHaveWalletCustomers = customerService.findNoneHaveWalletCustomer();
 
         model.addAttribute("customerList", customerViewDtos);
@@ -50,11 +50,9 @@ public String createWalletForCustomer(@PathVariable UUID customerId) {
         return "redirect:/customers";
     }
 
-
     @GetMapping("/{customerId}/delete")
     public String deleteVoucher(@PathVariable UUID customerId) {
         customerService.deleteById(customerId);
         return "redirect:/customers";
     }
-
 }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/domain/dto/CustomerRequestDto.java b/src/main/java/org/prgrms/kdtspringdemo/customer/domain/dto/CustomerRequestDto.java
@@ -12,15 +12,12 @@ public CustomerRequestDto(String name, boolean isBlack) {
     public String getName() {
         return name;
     }
-
     public void setName(String name) {
         this.name = name;
     }
-
     public boolean isBlack() {
         return isBlack;
     }
-
     public void setBlack(boolean black) {
         isBlack = black;
     }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/domain/dto/CustomerViewDto.java b/src/main/java/org/prgrms/kdtspringdemo/customer/domain/dto/CustomerViewDto.java
@@ -31,23 +31,18 @@ public String toString() {
     public UUID getCustomerId() {
         return customerId;
     }
-
     public void setCustomerId(UUID customerId) {
         this.customerId = customerId;
     }
-
     public String getName() {
         return name;
     }
-
     public void setName(String name) {
         this.name = name;
     }
-
     public boolean isBlack() {
         return isBlack;
     }
-
     public void setBlack(boolean black) {
         isBlack = black;
     }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/repository/FileCustomerRepository.java b/src/main/java/org/prgrms/kdtspringdemo/customer/repository/FileCustomerRepository.java
@@ -34,12 +34,10 @@ public Customer insert(Customer customer) {
 
     @Override
     public void deleteAll() {
-
     }
 
     @Override
     public void deleteById(UUID customerId) {
-
     }
 
     @Override
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/repository/JdbcCustomerRepository.java b/src/main/java/org/prgrms/kdtspringdemo/customer/repository/JdbcCustomerRepository.java
@@ -10,10 +10,8 @@
 import org.springframework.stereotype.Repository;
 
 import javax.sql.DataSource;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 @Repository
diff --git a/src/main/java/org/prgrms/kdtspringdemo/customer/service/CustomerService.java b/src/main/java/org/prgrms/kdtspringdemo/customer/service/CustomerService.java
@@ -3,12 +3,9 @@
 import org.prgrms.kdtspringdemo.customer.domain.Customer;
 import org.prgrms.kdtspringdemo.customer.domain.dto.CustomerRequestDto;
 import org.prgrms.kdtspringdemo.customer.repository.CustomerRepository;
-import org.prgrms.kdtspringdemo.customer.repository.FileCustomerRepository;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 @Service
@@ -32,7 +29,7 @@ public List<Customer> findNoneHaveWalletCustomer() {
         return customerRepository.findNotHaveWalletCustomers();
     }
 
-    public List<Customer> getBlackListCustomers() throws IOException {
+    public List<Customer> getBlackListCustomers() {
         return customerRepository.getAllBlackList();
     }
 
diff --git a/src/main/java/org/prgrms/kdtspringdemo/view/OutputConsole.java b/src/main/java/org/prgrms/kdtspringdemo/view/OutputConsole.java
@@ -1,8 +1,11 @@
 package org.prgrms.kdtspringdemo.view;
 
 import org.prgrms.kdtspringdemo.customer.domain.Customer;
+import org.prgrms.kdtspringdemo.customer.domain.dto.CustomerViewDto;
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
+import org.prgrms.kdtspringdemo.wallet.domain.dto.WalletViewDto;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -48,16 +51,16 @@ public void startVoucherMode() {
         System.out.print(start_string);
     }
 
-    public void printVoucher(Voucher voucher) {
-        System.out.println(voucher.toString());
+    public void printVoucher(VoucherViewDto voucherViewDto) {
+        System.out.println(voucherViewDto.toString());
     }
 
-    public void printCustomer(Customer customer) {
-        System.out.println(customer.toString());
+    public void printCustomer(CustomerViewDto customerViewDto) {
+        System.out.println(customerViewDto.toString());
     }
 
-    public void printWallet(Wallet wallet) {
-        System.out.println(wallet.toString());
+    public void printWallet(WalletViewDto walletViewDto) {
+        System.out.println(walletViewDto.toString());
     }
 
     public void getVoucherType() {
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherController.java
@@ -4,14 +4,14 @@
 import org.prgrms.kdtspringdemo.view.OutputConsole;
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
 import org.prgrms.kdtspringdemo.voucher.domain.VoucherTypeFunction;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.voucher.service.VoucherService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.UUID;
 
 @Controller
 public class VoucherController {
@@ -50,7 +50,10 @@ public void createVoucher() {
 
     public void showAllVouchers() {
         List<Voucher> voucherList = voucherService.findAll();
-        voucherList.forEach(voucher -> outputConsole.printVoucher(voucher));
+        voucherList.forEach(voucher -> {
+            VoucherViewDto voucherViewDto = new VoucherViewDto(voucher);
+            outputConsole.printVoucher(voucherViewDto);
+        });
     }
 
     public void endVoucherMode() {
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherRestController.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherRestController.java
@@ -13,22 +13,22 @@
 import java.util.UUID;
 
 @RestController
-@RequestMapping("/api/v1/voucher")
+@RequestMapping("/api/v1/vouchers")
 public class VoucherRestController {
     private final VoucherService voucherService;
 
     public VoucherRestController(VoucherService voucherService) {
         this.voucherService = voucherService;
     }
 
-    @GetMapping("/vouchers")
+    @GetMapping
     ResponseEntity<List<VoucherViewDto>> showAllVouchers() {
         List<VoucherViewDto> vouchers = voucherService.findAll().stream()
                 .map(VoucherViewDto::new).toList();
         return new ResponseEntity<>(vouchers, HttpStatus.OK);
     }
 
-    @PostMapping("/create")
+    @PostMapping
     ResponseEntity<Voucher> create(@ModelAttribute VoucherRequestDto voucherRequestDto) {
         VoucherTypeFunction voucherTypeFunction = VoucherTypeFunction.findByCode(voucherRequestDto.getVoucherPolicy());
         long amount = voucherRequestDto.getAmount();
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherWebController.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherWebController.java
@@ -72,6 +72,4 @@ public String editVoucher(@PathVariable UUID voucherId, @ModelAttribute VoucherR
         voucherService.updateVoucher(voucherId, voucherRequestDto);
         return "redirect:/vouchers/" + voucherId;
     }
-
-
 }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/domain/dto/VoucherRequestDto.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/domain/dto/VoucherRequestDto.java
@@ -1,9 +1,5 @@
 package org.prgrms.kdtspringdemo.voucher.domain.dto;
 
-import org.prgrms.kdtspringdemo.voucher.domain.VoucherPolicy;
-
-import java.util.UUID;
-
 public class VoucherRequestDto {
     private String voucherPolicy;
     private Long amount;
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/repository/JdbcVoucherRepository.java
@@ -43,6 +43,7 @@ public JdbcVoucherRepository(DataSource dataSource) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
+    @Override
     public Voucher insert(Voucher voucher) {
         var update = jdbcTemplate.update("INSERT INTO voucher(voucher_id, voucher_type, amount) VALUES (UUID_TO_BIN(?), ?, ?)",
                 voucher.getVoucherId().toString().getBytes(),
diff --git a/src/main/java/org/prgrms/kdtspringdemo/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdtspringdemo/voucher/repository/MemoryVoucherRepository.java
@@ -26,7 +26,6 @@ public Voucher insert(Voucher voucher) {
 
     @Override
     public void update(UUID voucherId, VoucherRequestDto voucherRequestDto) {
-
     }
 
     @Override
@@ -52,11 +51,9 @@ public List<Voucher> findUnallocatedVoucher() {
 
     @Override
     public void deleteById(UUID voucherId) {
-
     }
 
     @Override
     public void deleteAll() {
-
     }
 }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletController.java b/src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletController.java
@@ -3,7 +3,9 @@
 import org.prgrms.kdtspringdemo.view.InputConsole;
 import org.prgrms.kdtspringdemo.view.OutputConsole;
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
+import org.prgrms.kdtspringdemo.wallet.domain.dto.WalletViewDto;
 import org.prgrms.kdtspringdemo.wallet.service.WalletService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +22,6 @@ public class WalletController {
     private final InputConsole inputConsole = new InputConsole();
     private final Logger logger = LoggerFactory.getLogger(WalletController.class);
 
-
     public WalletController(WalletService walletService) {
         this.walletService = walletService;
     }
@@ -30,7 +31,10 @@ public void printVouchersByCustomerId() {
             outputConsole.getCustomerId();
             UUID customerId = UUID.fromString(inputConsole.getString());
             List<Voucher> vouchers = walletService.findVouchersById(customerId);
-            vouchers.stream().forEach(outputConsole::printVoucher);
+            vouchers.stream().forEach(voucher -> {
+                VoucherViewDto voucherViewDto = new VoucherViewDto(voucher);
+                outputConsole.printVoucher(voucherViewDto);
+            });
         } catch (IOException e) {
             logger.error(e.getMessage());
         }
@@ -50,9 +54,6 @@ public void insertVoucherByCustomerId() {
         }
     }
 
-    // customer park2 : 6378ec61-9de8-4448-aebf-283c0d66d0be
-    // voucher : 61013580-6aae-40bd-aa89-2ed4bc61f1c0
-
     public void deleteVoucherByVoucherId() {
         try {
             outputConsole.getCustomerId();
@@ -67,7 +68,10 @@ public void deleteVoucherByVoucherId() {
 
     public void printAllWallet() {
         List<Wallet> walletList = walletService.findAll();
-        walletList.stream().forEach(outputConsole::printWallet);
+        walletList.stream().forEach(wallet -> {
+            WalletViewDto walletViewDto = new WalletViewDto(wallet);
+            outputConsole.printWallet(walletViewDto);
+        });
     }
 
     public void endWalletMode() {
diff --git a/src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletWebController.java b/src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletWebController.java
@@ -5,7 +5,7 @@
 import org.prgrms.kdtspringdemo.voucher.service.VoucherService;
 import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
 import org.prgrms.kdtspringdemo.wallet.domain.dto.AddVoucherToWalletDto;
-import org.prgrms.kdtspringdemo.wallet.domain.dto.WalletDetailsDto;
+import org.prgrms.kdtspringdemo.wallet.domain.dto.WalletViewDto;
 import org.prgrms.kdtspringdemo.wallet.service.WalletService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -40,7 +40,7 @@ public String viewWallet(@PathVariable UUID walletId, Model model) {
         List<VoucherViewDto> voucherViewDtos = new ArrayList<>();
         vouchers.stream().forEach(voucher -> voucherViewDtos.add(new VoucherViewDto(voucher)));
 
-        WalletDetailsDto walletDetailsDto = new WalletDetailsDto(walletId, wallet.getCustomerId(), voucherViewDtos);
+        WalletViewDto walletDetailsDto = new WalletViewDto(walletId, wallet.getCustomerId(), voucherViewDtos);
 
         List<Voucher> unallocatedVouchers = voucherService.findUnallocatedVoucher();
 
@@ -79,6 +79,4 @@ public String deleteVoucher(@PathVariable UUID walletId, @PathVariable UUID vouc
         walletService.deleteVoucherByVoucherId(walletId, voucherId);
         return "redirect:/wallets";
     }
-
-
 }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/wallet/domain/dto/AddVoucherToWalletDto.java b/src/main/java/org/prgrms/kdtspringdemo/wallet/domain/dto/AddVoucherToWalletDto.java
@@ -1,8 +1,5 @@
 package org.prgrms.kdtspringdemo.wallet.domain.dto;
 
-import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
-
-import java.util.List;
 import java.util.UUID;
 
 public class AddVoucherToWalletDto {
diff --git a/src/main/java/org/prgrms/kdtspringdemo/wallet/domain/dto/WalletViewDto.java b/src/main/java/org/prgrms/kdtspringdemo/wallet/domain/dto/WalletViewDto.java
@@ -1,22 +1,27 @@
 package org.prgrms.kdtspringdemo.wallet.domain.dto;
 
-import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
 import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
+import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
 
 import java.util.List;
 import java.util.UUID;
 
-public class WalletDetailsDto {
+public class WalletViewDto {
     private UUID walletId;
     private UUID customerId;
     private List<VoucherViewDto> voucherList;
 
-    public WalletDetailsDto(UUID walletId, UUID customerId, List<VoucherViewDto> voucherList) {
+    public WalletViewDto(UUID walletId, UUID customerId, List<VoucherViewDto> voucherList) {
         this.walletId = walletId;
         this.customerId = customerId;
         this.voucherList = voucherList;
     }
 
+    public WalletViewDto(Wallet wallet) {
+        this.walletId = wallet.getWalletId();
+        this.customerId = wallet.getCustomerId();
+    }
+
     public UUID getWalletId() {
         return walletId;
     }
diff --git a/src/main/java/org/prgrms/kdtspringdemo/wallet/service/WalletService.java b/src/main/java/org/prgrms/kdtspringdemo/wallet/service/WalletService.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public CustomerWebController(CustomerService customerService, WalletService wall`
`28`	`28`	`public String getAllCustomers(Model model) {`
`29`	`29`	`List<Customer> customerList = customerService.findAll();`
`30`	`30`	`List<CustomerViewDto> customerViewDtos = new ArrayList<>();`
`31`		`- customerList.stream().forEach(customer -> customerViewDtos.add(new CustomerViewDto(customer)));`
	`31`	`+ customerList.forEach(customer -> customerViewDtos.add(new CustomerViewDto(customer)));`
`32`	`32`	`List<Customer> noneHaveWalletCustomers = customerService.findNoneHaveWalletCustomer();`
`33`	`33`
`34`	`34`	`model.addAttribute("customerList", customerViewDtos);`
`@@ -50,11 +50,9 @@ public String createWalletForCustomer(@PathVariable UUID customerId) {`
`50`	`50`	`return "redirect:/customers";`
`51`	`51`	`}`
`52`	`52`
`53`		`-`
`54`	`53`	`@GetMapping("/{customerId}/delete")`
`55`	`54`	`public String deleteVoucher(@PathVariable UUID customerId) {`
`56`	`55`	`customerService.deleteById(customerId);`
`57`	`56`	`return "redirect:/customers";`
`58`	`57`	`}`
`59`		`-`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,12 @@ public CustomerRequestDto(String name, boolean isBlack) {`
`12`	`12`	`public String getName() {`
`13`	`13`	`return name;`
`14`	`14`	`}`
`15`		`-`
`16`	`15`	`public void setName(String name) {`
`17`	`16`	`this.name = name;`
`18`	`17`	`}`
`19`		`-`
`20`	`18`	`public boolean isBlack() {`
`21`	`19`	`return isBlack;`
`22`	`20`	`}`
`23`		`-`
`24`	`21`	`public void setBlack(boolean black) {`
`25`	`22`	`isBlack = black;`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,23 +31,18 @@ public String toString() {`
`31`	`31`	`public UUID getCustomerId() {`
`32`	`32`	`return customerId;`
`33`	`33`	`}`
`34`		`-`
`35`	`34`	`public void setCustomerId(UUID customerId) {`
`36`	`35`	`this.customerId = customerId;`
`37`	`36`	`}`
`38`		`-`
`39`	`37`	`public String getName() {`
`40`	`38`	`return name;`
`41`	`39`	`}`
`42`		`-`
`43`	`40`	`public void setName(String name) {`
`44`	`41`	`this.name = name;`
`45`	`42`	`}`
`46`		`-`
`47`	`43`	`public boolean isBlack() {`
`48`	`44`	`return isBlack;`
`49`	`45`	`}`
`50`		`-`
`51`	`46`	`public void setBlack(boolean black) {`
`52`	`47`	`isBlack = black;`
`53`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,10 @@ public Customer insert(Customer customer) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public void deleteAll() {`
`37`		`-`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`@Override`
`41`	`40`	`public void deleteById(UUID customerId) {`
`42`		`-`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`@Override`