refactor : controller - domain 분리

Author: eugene225

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

@@ -43,8 +43,8 @@ ResponseEntity<Voucher> findById(@PathVariable UUID voucherId) {
     }
 
     @GetMapping("/vouchers/policy")
-    ResponseEntity<List<Voucher>> findByPolicy(@RequestParam String policy) {
-        List<Voucher> vouchers = voucherService.findByPolicy(policy);
+    ResponseEntity<List<VoucherViewDto>> findByPolicy(@RequestParam String policy) {
+        List<VoucherViewDto> vouchers = voucherService.findByPolicy(policy);
         return new ResponseEntity<>(vouchers, HttpStatus.OK);
     }
 

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

@@ -24,17 +24,14 @@ public VoucherWebController(VoucherService voucherService) {
 
     @GetMapping
     public String getAllVouchers(@RequestParam(name = "policy", required = false) String policy, Model model) {
-        List<Voucher> vouchers;
+        List<VoucherViewDto> vouchers;
         if (policy != null && !policy.isEmpty()) {
             vouchers = voucherService.findByPolicy(policy);
         } else {
-            vouchers = voucherService.findAll();
+            vouchers = voucherService.getVoucherViewDtoList();
         }
 
-        List<VoucherViewDto> voucherViewDtos = new ArrayList<>();
-        vouchers.stream().forEach(voucher -> voucherViewDtos.add(new VoucherViewDto(voucher)));
-
-        model.addAttribute("vouchers", voucherViewDtos);
+        model.addAttribute("vouchers", vouchers);
         return "voucher";
     }
 

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

@@ -49,8 +49,11 @@ public List<VoucherViewDto> getVoucherViewDtoList() {
         return voucherViewDtoList;
     }
 
-    public List<Voucher> findByPolicy(String policy) {
-        return voucherRepository.findByPolicy(policy);
+    public List<VoucherViewDto> findByPolicy(String policy) {
+        List<Voucher> voucherList = voucherRepository.findByPolicy(policy);
+        List<VoucherViewDto> voucherViewDtoList = new ArrayList<>();
+        voucherList.forEach(voucher -> voucherViewDtoList.add(new VoucherViewDto(voucher)));
+        return voucherViewDtoList;
     }
 
     public List<Voucher> findUnallocatedVoucher() {