feat : voucher 정보 view dto 생성

Author: eugene225

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

@@ -3,11 +3,13 @@
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
 import org.prgrms.kdtspringdemo.voucher.domain.VoucherTypeFunction;
 import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherRequestDto;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.voucher.service.VoucherService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -29,14 +31,17 @@ public String getAllVouchers(@RequestParam(name = "policy", required = false) St
             vouchers = voucherService.findAll();
         }
 
-        model.addAttribute("vouchers", vouchers);
+        List<VoucherViewDto> voucherViewDtos = new ArrayList<>();
+        vouchers.stream().forEach(voucher -> voucherViewDtos.add(new VoucherViewDto(voucher)));
+
+        model.addAttribute("vouchers", voucherViewDtos);
         return "voucher";
     }
 
     @GetMapping("/{voucherId}")
     public String viewVoucher(@PathVariable UUID voucherId, Model model) {
-        Voucher voucher = voucherService.findById(voucherId);
-        model.addAttribute("voucher", voucher);
+        VoucherViewDto voucherViewDto = new VoucherViewDto(voucherService.findById(voucherId));
+        model.addAttribute("voucher", voucherViewDto);
         return "voucher_details";
     }
 

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

@@ -1,6 +1,7 @@
 package org.prgrms.kdtspringdemo.wallet.controller;
 
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 import org.prgrms.kdtspringdemo.voucher.service.VoucherService;
 import org.prgrms.kdtspringdemo.wallet.domain.Wallet;
 import org.prgrms.kdtspringdemo.wallet.domain.dto.AddVoucherToWalletDto;
@@ -10,6 +11,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -35,7 +37,10 @@ public String listWallets(Model model) {
     public String viewWallet(@PathVariable UUID walletId, Model model) {
         Wallet wallet = walletService.findById(walletId).orElse(null);
         List<Voucher> vouchers = walletService.findVouchersById(wallet.getCustomerId());
-        WalletDetailsDto walletDetailsDto = new WalletDetailsDto(walletId, wallet.getCustomerId(), vouchers);
+        List<VoucherViewDto> voucherViewDtos = new ArrayList<>();
+        vouchers.stream().forEach(voucher -> voucherViewDtos.add(new VoucherViewDto(voucher)));
+
+        WalletDetailsDto walletDetailsDto = new WalletDetailsDto(walletId, wallet.getCustomerId(), voucherViewDtos);
 
         List<Voucher> unallocatedVouchers = voucherService.findUnallocatedVoucher();
 

src/main/java/org/prgrms/kdtspringdemo/wallet/domain/dto/WalletDetailsDto.java

@@ -1,16 +1,17 @@
 package org.prgrms.kdtspringdemo.wallet.domain.dto;
 
 import org.prgrms.kdtspringdemo.voucher.domain.Voucher;
+import org.prgrms.kdtspringdemo.voucher.domain.dto.VoucherViewDto;
 
 import java.util.List;
 import java.util.UUID;
 
 public class WalletDetailsDto {
     private UUID walletId;
     private UUID customerId;
-    private List<Voucher> voucherList;
+    private List<VoucherViewDto> voucherList;
 
-    public WalletDetailsDto(UUID walletId, UUID customerId, List<Voucher> voucherList) {
+    public WalletDetailsDto(UUID walletId, UUID customerId, List<VoucherViewDto> voucherList) {
         this.walletId = walletId;
         this.customerId = customerId;
         this.voucherList = voucherList;
@@ -32,11 +33,11 @@ public void setCustomerId(UUID customerId) {
         this.customerId = customerId;
     }
 
-    public List<Voucher> getVoucherList() {
+    public List<VoucherViewDto> getVoucherList() {
         return voucherList;
     }
 
-    public void setVoucherList(List<Voucher> voucherList) {
+    public void setVoucherList(List<VoucherViewDto> voucherList) {
         this.voucherList = voucherList;
     }
 }

src/main/resources/templates/voucher.html

@@ -37,16 +37,16 @@ <h1 class="mt-5">Voucher Management</h1>
         <div class="form-group">
             <label for="policyFilter">Filter by Policy:</label>
             <select class="form-control" id="policyFilter" name="policy">
-                <option value="">All Policies</option>
-                <option value="fixedDiscount">Fixed Discount</option>
-                <option value="percentDiscount">Percent Discount</option>
+                <option value="">All Vouchers</option>
+                <option value="fixedDiscount">Fixed Discount Vouchers</option>
+                <option value="percentDiscount">Percent Discount Vouchers</option>
             </select>
         </div>
         <button type="submit" class="btn btn-primary">Apply Filter</button>
     </form>
 
     <!-- Voucher List -->
-    <h2 class="mt-3">All Vouchers</h2>
+    <h2 class="mt-3">Voucher List</h2>
     <table class="table table-striped">
         <thead class="thead-dark">
         <tr>
@@ -59,8 +59,8 @@ <h2 class="mt-3">All Vouchers</h2>
         <tbody>
         <tr th:each="voucher : ${vouchers}">
             <td th:text="${voucher.voucherId}">Voucher ID</td>
-            <td th:text="${voucher.voucherPolicy.voucherType}">Voucher Policy</td>
-            <td th:text="${voucher.voucherPolicy.amount}">Discount Amount</td>
+            <td th:text="${voucher.voucherPolicy}">Voucher Policy</td>
+            <td th:text="${voucher.amount}">Discount Amount</td>
             <td>
                 <a th:href="@{'/vouchers/' + ${voucher.voucherId}}">Details</a>
                 <a th:href="@{'/vouchers/' + ${voucher.voucherId} + '/edit'}">Edit</a>

src/main/resources/templates/voucher_details.html

@@ -18,11 +18,11 @@ <h2 class="mt-3">Voucher Information</h2>
         </tr>
         <tr>
             <th>Voucher Policy:</th>
-            <td th:text="${voucher.voucherPolicy.voucherType}">Voucher Policy</td>
+            <td th:text="${voucher.voucherPolicy}">Voucher Policy</td>
         </tr>
         <tr>
             <th>Discount Amount:</th>
-            <td th:text="${voucher.voucherPolicy.amount}">Discount Amount</td>
+            <td th:text="${voucher.amount}">Discount Amount</td>
         </tr>
     </table>
 

src/main/resources/templates/wallet_details.html

@@ -66,7 +66,7 @@ <h2>Add Voucher to Wallet</h2>
                 </th:block>
             </select>
         </div>
-        <button type="submit" class="btn btn-primary">Add Voucher</button>
+        <button type="submit" class="btn btn-warning">Add Voucher</button>
     </form>