feat : 지갑을 가지지 않은 사용자 처리

Author: eugene225

src/main/java/org/prgrms/kdtspringdemo/WebController.java

@@ -29,7 +29,11 @@ public String getAllCustomers(Model model) {
         List<Customer> customerList = customerService.findAll();
         List<CustomerViewDto> customerViewDtos = new ArrayList<>();
         customerList.stream().forEach(customer -> customerViewDtos.add(new CustomerViewDto(customer)));
+        List<Customer> noneHaveWalletCustomers = customerService.findNoneHaveWalletCustomer();
+
         model.addAttribute("customerList", customerViewDtos);
+        model.addAttribute("customers", noneHaveWalletCustomers);
+
         return "customer";
     }
 
@@ -40,6 +44,13 @@ public String createCustomer(@ModelAttribute CustomerRequestDto customerRequestD
         return "redirect:/customers";
     }
 
+    @GetMapping("/{customerId}/createWallet")
+    public String createWalletForCustomer(@PathVariable UUID customerId) {
+        walletService.create(customerId);
+        return "redirect:/customers";
+    }
+
+
     @GetMapping("/{customerId}/delete")
     public String deleteVoucher(@PathVariable UUID customerId) {
         customerService.deleteById(customerId);

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

@@ -12,5 +12,6 @@ public interface CustomerRepository {
     void deleteAll();
     void deleteById(UUID customerId);
     List<Customer> findAll();
-    List<Customer> getAllBlackList() throws IOException;
+    List<Customer> findNotHaveWalletCustomers();
+    List<Customer> getAllBlackList();
 }

src/main/java/org/prgrms/kdtspringdemo/customer/repository/CustomerRepository.java

@@ -3,6 +3,8 @@
 import org.apache.commons.csv.CSVRecord;
 import org.prgrms.kdtspringdemo.customer.domain.Customer;
 import org.prgrms.kdtspringdemo.file.CsvFileHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
@@ -19,6 +21,7 @@ public class FileCustomerRepository implements CustomerRepository{
     private CsvFileHandler csvFileHandler;
     @Value("${blackList_file}")
     private String blackListFilePath;
+    private final Logger logger = LoggerFactory.getLogger(FileCustomerRepository.class);
 
     public FileCustomerRepository() {
         this.csvFileHandler = new CsvFileHandler();
@@ -45,20 +48,28 @@ public List<Customer> findAll() {
     }
 
     @Override
-    public List<Customer> getAllBlackList() throws IOException {
-        List<Customer> customerList = new ArrayList<>();
+    public List<Customer> findNotHaveWalletCustomers() {
+        return null;
+    }
 
-        List<CSVRecord> data = csvFileHandler.readCSV(blackListFilePath);
-        data.stream()
-                .filter(line -> line.get("isBlack").equals("true"))
-                .forEach(line -> {
-                    UUID customerId = UUID.fromString(line.get("customerId"));
-                    String name = line.get("name");
-                    boolean isBlack = true;
+    @Override
+    public List<Customer> getAllBlackList() {
+        List<Customer> customerList = new ArrayList<>();
+        try {
+            List<CSVRecord> data = csvFileHandler.readCSV(blackListFilePath);
+            data.stream()
+                    .filter(line -> line.get("isBlack").equals("true"))
+                    .forEach(line -> {
+                        UUID customerId = UUID.fromString(line.get("customerId"));
+                        String name = line.get("name");
+                        boolean isBlack = true;
 
-                    Customer customer = new Customer(customerId, name, isBlack);
-                    customerList.add(customer);
-                });
+                        Customer customer = new Customer(customerId, name, isBlack);
+                        customerList.add(customer);
+                    });
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+        }
         return customerList;
     }
 }

src/main/java/org/prgrms/kdtspringdemo/customer/repository/FileCustomerRepository.java

@@ -57,6 +57,12 @@ public List<Customer> findAll() {
         return jdbcTemplate.query("select * from customers", customerRowMapper);
     }
 
+    @Override
+    public List<Customer> findNotHaveWalletCustomers() {
+        return jdbcTemplate.query("SELECT c.customer_id, c.name, c.is_black FROM customers c LEFT JOIN wallet w ON c.customer_id = w.customer_id WHERE w.customer_id IS NULL",
+                customerRowMapper);
+    }
+
     @Override
     public void deleteAll() {
         jdbcTemplate.update("DELETE FROM customers");

src/main/java/org/prgrms/kdtspringdemo/customer/repository/JdbcCustomerRepository.java

@@ -14,11 +14,9 @@
 @Service
 public class WalletService {
     private final WalletRepository walletRepository;
-    private final VoucherService voucherService;
 
-    public WalletService(WalletRepository walletRepository, VoucherService voucherService) {
+    public WalletService(WalletRepository walletRepository) {
         this.walletRepository = walletRepository;
-        this.voucherService = voucherService;
     }
 
     public Wallet create(UUID customerId) {

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

@@ -73,6 +73,34 @@ <h2 class="mt-5">Add Customer</h2>
         <button type="submit" class="btn btn-primary">Add Customer</button>
     </form>
 
+    <!--None Have Wallet Customers-->
+    <h2 class="mt-5">Customers : None Have Wallet</h2>
+    <table class="table">
+        <thead class="thead-dark">
+        <tr>
+            <th>Customer ID</th>
+            <th>Name</th>
+            <th>Is Black</th>
+            <th>Action</th>
+        </tr>
+        </thead>
+        <tbody>
+        <th:block th:each="customer : ${customers}">
+            <tr>
+                <td th:text="${customer.customerId}">Customer ID</td>
+                <td th:text="${customer.name}">Name</td>
+                <td th:text="${customer.isBlack}">Is Black</td>
+                <td>
+                    <a th:href="@{'/customers/' + ${customer.customerId} + '/createWallet'}">
+                        <button class="btn btn-primary">Create Wallet</button>
+                    </a>
+                </td>
+            </tr>
+        </th:block>
+        </tbody>
+    </table>
+
+
 </div>
 
 <!-- Include Bootstrap JS -->