refactor : wallet controller - domain 분리

Author: eugene225

src/main/java/org/prgrms/kdtspringdemo/customer/controller/CustomerController.java

@@ -34,7 +34,7 @@ public void insert() {
             outputConsole.getCustomerName();
             String name = inputConsole.getString();
             outputConsole.getCustomerIsBlack();
-            Boolean isBlack = Boolean.parseBoolean(inputConsole.getString());
+            boolean isBlack = Boolean.parseBoolean(inputConsole.getString());
 
             customerService.insert(new CustomerRequestDto(name, isBlack));
             walletService.create(customerId); // 고객 생성 시 지갑 자동 생성
@@ -46,16 +46,13 @@ public void insert() {
     }
 
     public void printAllCustomers() {
-        List<Customer> customerList = customerService.findAll();
-        customerList.stream().forEach(customer -> {
-            CustomerViewDto customerViewDto = new CustomerViewDto(customer);
-            outputConsole.printCustomer(customerViewDto);
-        });
+        customerService.getCustomerViewDtoLists()
+                .forEach(outputConsole::printCustomer);
     }
 
     public void printAllBlackListCustomer() throws IOException {
         List<Customer> customerList = customerService.getBlackListCustomers();
-        customerList.stream().forEach(customer -> {
+        customerList.forEach(customer -> {
             CustomerViewDto customerViewDto = new CustomerViewDto(customer);
             outputConsole.printCustomer(customerViewDto);
         });    }

src/main/java/org/prgrms/kdtspringdemo/customer/service/CustomerService.java

@@ -3,8 +3,10 @@
 import org.prgrms.kdtspringdemo.customer.domain.Customer;
 import org.prgrms.kdtspringdemo.dto.CustomerRequestDto;
 import org.prgrms.kdtspringdemo.customer.repository.CustomerRepository;
+import org.prgrms.kdtspringdemo.dto.CustomerViewDto;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -25,6 +27,13 @@ public List<Customer> findAll() {
         return customerRepository.findAll();
     }
 
+    public List<CustomerViewDto> getCustomerViewDtoLists() {
+        List<Customer> customerList = this.findAll();
+        List<CustomerViewDto> customerViewDtoList = new ArrayList<>();
+        customerList.forEach(customer -> customerViewDtoList.add(new CustomerViewDto(customer)));
+        return customerViewDtoList;
+    }
+
     public List<Customer> findNoneHaveWalletCustomer() {
         return customerRepository.findNotHaveWalletCustomers();
     }

src/main/java/org/prgrms/kdtspringdemo/voucher/controller/VoucherController.java

@@ -41,19 +41,13 @@ public void createVoucher() {
             voucherService.createVoucher(voucherType, amount);
         } catch (NumberFormatException e) {
             logger.error("올바른 숫자 형식이 아닙니다.");
-        } catch (IOException e) {
-            logger.error(e.getMessage());
-        } catch (RuntimeException e) {
+        } catch (IOException | RuntimeException e) {
             logger.error(e.getMessage());
         }
     }
 
     public void showAllVouchers() {
-        List<Voucher> voucherList = voucherService.findAll();
-        voucherList.forEach(voucher -> {
-            VoucherViewDto voucherViewDto = new VoucherViewDto(voucher);
-            outputConsole.printVoucher(voucherViewDto);
-        });
+        voucherService.getVoucherViewDtoList().forEach(outputConsole::printVoucher);
     }
 
     public void endVoucherMode() {

src/main/java/org/prgrms/kdtspringdemo/voucher/service/VoucherService.java

@@ -1,5 +1,6 @@
 package org.prgrms.kdtspringdemo.voucher.service;
 
+import org.prgrms.kdtspringdemo.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
 import org.prgrms.kdtspringdemo.voucher.domain.VoucherTypeFunction;
 import org.prgrms.kdtspringdemo.dto.VoucherRequestDto;
@@ -9,6 +10,7 @@
 import org.springframework.stereotype.Service;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -40,6 +42,13 @@ public List<Voucher> findAll() {
         return voucherRepository.findAll();
     }
 
+    public List<VoucherViewDto> getVoucherViewDtoList() {
+        List<Voucher> voucherList = this.findAll();
+        List<VoucherViewDto> voucherViewDtoList = new ArrayList<>();
+        voucherList.forEach(voucher -> voucherViewDtoList.add(new VoucherViewDto(voucher)));
+        return voucherViewDtoList;
+    }
+
     public List<Voucher> findByPolicy(String policy) {
         return voucherRepository.findByPolicy(policy);
     }

src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletController.java

@@ -30,11 +30,8 @@ public void printVouchersByCustomerId() {
         try {
             outputConsole.getCustomerId();
             UUID customerId = UUID.fromString(inputConsole.getString());
-            List<Voucher> vouchers = walletService.findVouchersById(customerId);
-            vouchers.stream().forEach(voucher -> {
-                VoucherViewDto voucherViewDto = new VoucherViewDto(voucher);
-                outputConsole.printVoucher(voucherViewDto);
-            });
+            List<VoucherViewDto> vouchers = walletService.findVouchersById(customerId);
+            vouchers.forEach(outputConsole::printVoucher);
         } catch (IOException e) {
             logger.error(e.getMessage());
         }
@@ -67,11 +64,7 @@ public void deleteVoucherByVoucherId() {
     }
 
     public void printAllWallet() {
-        List<Wallet> walletList = walletService.findAll();
-        walletList.stream().forEach(wallet -> {
-            WalletViewDto walletViewDto = new WalletViewDto(wallet);
-            outputConsole.printWallet(walletViewDto);
-        });
+        walletService.getWalletViewDtoList().forEach(outputConsole::printWallet);
     }
 
     public void endWalletMode() {

src/main/java/org/prgrms/kdtspringdemo/wallet/controller/WalletWebController.java

@@ -28,23 +28,19 @@ public WalletWebController(WalletService walletService, VoucherService voucherSe
 
     @GetMapping
     public String listWallets(Model model) {
-        List<Wallet> walletList = walletService.findAll();
-        model.addAttribute("walletList", walletList);
+        List<WalletViewDto> walletViewDtoList = walletService.getWalletViewDtoList();
+        model.addAttribute("walletList", walletViewDtoList);
         return "wallet";
     }
 
     @GetMapping("/{walletId}")
     public String viewWallet(@PathVariable UUID walletId, Model model) {
-        Wallet wallet = walletService.findById(walletId).orElse(null);
-        List<Voucher> vouchers = walletService.findVouchersById(wallet.getCustomerId());
-        List<VoucherViewDto> voucherViewDtos = new ArrayList<>();
-        vouchers.stream().forEach(voucher -> voucherViewDtos.add(new VoucherViewDto(voucher)));
-
-        WalletViewDto walletDetailsDto = new WalletViewDto(walletId, wallet.getCustomerId(), voucherViewDtos);
-
+        WalletViewDto walletViewDto = walletService.findById(walletId).orElseThrow(NoSuchFieldError::new);
+        List<VoucherViewDto> voucherViewDtoList = walletService.findVouchersById(walletViewDto.getCustomerId());
+        walletViewDto.setVoucherList(voucherViewDtoList);
         List<Voucher> unallocatedVouchers = voucherService.findUnallocatedVoucher();
 
-        model.addAttribute("wallet", walletDetailsDto);
+        model.addAttribute("wallet", walletViewDto);
         model.addAttribute("voucherList", unallocatedVouchers);
         model.addAttribute("addVoucherToWalletDto", new AddVoucherToWalletDto());
         return "wallet_details";
@@ -57,11 +53,11 @@ public String addVoucherToWallet(
 
         UUID selectedVoucherId = addVoucherToWalletDto.getSelectedVoucherId();
         if (selectedVoucherId != null) {
-            Wallet wallet = walletService.findById(walletId).orElse(null);
+            WalletViewDto walletViewDto = walletService.findById(walletId).orElse(null);
             Voucher selectedVoucher = voucherService.findById(selectedVoucherId);
 
-            if (wallet != null && selectedVoucher != null) {
-                walletService.addVoucherByCustomerId(wallet.getWalletId(), wallet.getCustomerId(), selectedVoucherId);
+            if (walletViewDto != null && selectedVoucher != null) {
+                walletService.addVoucherByCustomerId(walletViewDto.getWalletId(), walletViewDto.getCustomerId(), selectedVoucherId);
             }
         }
 

src/main/java/org/prgrms/kdtspringdemo/wallet/service/WalletService.java

@@ -1,10 +1,13 @@
 package org.prgrms.kdtspringdemo.wallet.service;
 
+import org.prgrms.kdtspringdemo.dto.VoucherViewDto;
+import org.prgrms.kdtspringdemo.dto.WalletViewDto;
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
 import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
 import org.prgrms.kdtspringdemo.wallet.repository.WalletRepository;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.List;
@@ -22,12 +25,14 @@ public Wallet create(UUID customerId) {
         return walletRepository.insert(wallet);
     }
 
-    public Optional<Wallet> findById(UUID walletId){
-        return walletRepository.findById(walletId);
+    public Optional<WalletViewDto> findById(UUID walletId){
+        return Optional.of(new WalletViewDto(walletRepository.findById(walletId).get()));
     }
 
-    public List<Voucher> findVouchersById(UUID customerId) {
-        return walletRepository.findVouchersByCustomerId(customerId);
+    public List<VoucherViewDto> findVouchersById(UUID customerId) {
+        List<VoucherViewDto> voucherViewDtoList = new ArrayList<>();
+        walletRepository.findVouchersByCustomerId(customerId).forEach(voucher -> voucherViewDtoList.add(new VoucherViewDto(voucher)));
+        return voucherViewDtoList;
     }
 
     public void addVoucherByCustomerId(UUID walletId, UUID customerId, UUID voucherId) {
@@ -41,6 +46,12 @@ public void deleteVoucherByVoucherId(UUID customerId, UUID voucherId) {
     public List<Wallet> findAll() {
         return walletRepository.findAll();
     }
+    public List<WalletViewDto> getWalletViewDtoList() {
+        List<Wallet> walletList = this.findAll();
+        List<WalletViewDto> walletViewDtoList = new ArrayList<>();
+        walletList.forEach(wallet -> walletViewDtoList.add(new WalletViewDto(wallet)));
+        return walletViewDtoList;
+    }
 
     public void deleteById(UUID walletId) {
         walletRepository.deleteById(walletId);