[4기 - 안재영] SpringBoot Part3 Weekly Mission PR 제출합니다.

pom.xml

@@ -57,6 +57,25 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

restrequest/json-request.http

@@ -0,0 +1,26 @@
+GET http://localhost:8080/api/json/v1/vouchers
+
+###
+
+GET http://localhost:8080/api/json/v1/vouchers/search?startDate=2023-07-16T00:00:00&endDate=2023-07-19T23:59:59&
+    discountType=fixed
+
+###
+
+POST http://localhost:8080/api/json/v1/vouchers
+Content-Type: application/json
+
+{
+  "discountType": "fixed",
+  "discountStringValue": "123"
+}
+
+###
+
+DELETE http://localhost:8080/api/json/v1/vouchers/f3ac7182-4f80-470a-99e7-478c29c41b0f
+
+###
+
+GET http://localhost:8080/api/json/v1/vouchers/cc295caf-cdb1-4fe6-8360-a2149a74f1b9
+
+###

restrequest/xml-request.http

@@ -0,0 +1,26 @@
+GET http://localhost:8080/api/xml/v1/vouchers
+
+###
+
+GET http://localhost:8080/api/xml/v1/vouchers/search?startDate=2023-07-16T00:00:00&endDate=2023-07-19T23:59:59&
+    discountType=fixed
+
+###
+
+POST http://localhost:8080/api/xml/v1/vouchers
+Content-Type: application/xml
+
+<VoucherRequest>
+    <discountType>fixed</discountType>
+    <discountStringValue>123</discountStringValue>
+</VoucherRequest>
+
+###
+
+DELETE http://localhost:8080/api/xml/v1/vouchers/ea50d33d-d668-4dcd-b2b2-980b184ff003
+
+###
+
+GET http://localhost:8080/api/xml/v1/vouchers/fef87c80-ee1c-4aca-bf14-375930aff54c
+
+###

src/main/java/com/prgmrs/voucher/view/ConsoleApplication.java → src/main/java/com/prgmrs/voucher/ConsoleApplication.java

@@ -1,12 +1,13 @@
-package com.prgmrs.voucher.view;
+package com.prgmrs.voucher;
 
-import com.prgmrs.voucher.controller.BlacklistController;
-import com.prgmrs.voucher.controller.UserController;
-import com.prgmrs.voucher.controller.VoucherController;
-import com.prgmrs.voucher.controller.WalletController;
-import com.prgmrs.voucher.dto.ResponseDTO;
+import com.prgmrs.voucher.controller.console.BlacklistController;
+import com.prgmrs.voucher.controller.console.UserController;
+import com.prgmrs.voucher.controller.console.VoucherController;
+import com.prgmrs.voucher.controller.console.WalletController;
+import com.prgmrs.voucher.controller.console.wrapper.ResponseDTO;
 import com.prgmrs.voucher.exception.WrongRangeFormatException;
 import com.prgmrs.voucher.setting.BlacklistProperties;
+import com.prgmrs.voucher.view.RequestBodyCreator;
 import com.prgmrs.voucher.view.io.ConsoleReader;
 import com.prgmrs.voucher.view.io.ConsoleWriter;
 import com.prgmrs.voucher.view.io.ManagementType;

src/main/java/com/prgmrs/voucher/controller/BlacklistController.java → src/main/java/com/prgmrs/voucher/controller/console/BlacklistController.java

@@ -1,6 +1,6 @@
-package com.prgmrs.voucher.controller;
+package com.prgmrs.voucher.controller.console;
 
-import com.prgmrs.voucher.dto.ResponseDTO;
+import com.prgmrs.voucher.controller.console.wrapper.ResponseDTO;
 import com.prgmrs.voucher.enums.StatusCode;
 import com.prgmrs.voucher.exception.WrongRangeFormatException;
 import com.prgmrs.voucher.service.BlacklistService;

src/main/java/com/prgmrs/voucher/controller/UserController.java → src/main/java/com/prgmrs/voucher/controller/console/UserController.java

@@ -1,6 +1,6 @@
-package com.prgmrs.voucher.controller;
+package com.prgmrs.voucher.controller.console;
 
-import com.prgmrs.voucher.dto.ResponseDTO;
+import com.prgmrs.voucher.controller.console.wrapper.ResponseDTO;
 import com.prgmrs.voucher.dto.request.UserRequest;
 import com.prgmrs.voucher.dto.request.VoucherIdRequest;
 import com.prgmrs.voucher.enums.StatusCode;

src/main/java/com/prgmrs/voucher/controller/VoucherController.java → src/main/java/com/prgmrs/voucher/controller/console/VoucherController.java

@@ -1,6 +1,6 @@
-package com.prgmrs.voucher.controller;
+package com.prgmrs.voucher.controller.console;
 
-import com.prgmrs.voucher.dto.ResponseDTO;
+import com.prgmrs.voucher.controller.console.wrapper.ResponseDTO;
 import com.prgmrs.voucher.dto.request.UsernameRequest;
 import com.prgmrs.voucher.dto.request.VoucherRequest;
 import com.prgmrs.voucher.enums.StatusCode;

src/main/java/com/prgmrs/voucher/controller/WalletController.java → src/main/java/com/prgmrs/voucher/controller/console/WalletController.java

@@ -1,6 +1,6 @@
-package com.prgmrs.voucher.controller;
+package com.prgmrs.voucher.controller.console;
 
-import com.prgmrs.voucher.dto.ResponseDTO;
+import com.prgmrs.voucher.controller.console.wrapper.ResponseDTO;
 import com.prgmrs.voucher.dto.request.AssignVoucherRequest;
 import com.prgmrs.voucher.dto.request.RemoveVoucherRequest;
 import com.prgmrs.voucher.enums.StatusCode;

src/main/java/com/prgmrs/voucher/dto/ResponseDTO.java → src/main/java/com/prgmrs/voucher/controller/console/wrapper/ResponseDTO.java

@@ -1,4 +1,4 @@
-package com.prgmrs.voucher.dto;
+package com.prgmrs.voucher.controller.console.wrapper;
 
 import com.prgmrs.voucher.enums.StatusCode;
 

src/main/java/com/prgmrs/voucher/controller/json/VoucherJsonController.java

@@ -0,0 +1,47 @@
+package com.prgmrs.voucher.controller.json;
+
+import com.prgmrs.voucher.dto.request.VoucherIdRequest;
+import com.prgmrs.voucher.dto.request.VoucherRequest;
+import com.prgmrs.voucher.dto.request.VoucherSearchRequest;
+import com.prgmrs.voucher.dto.response.RemoveResponse;
+import com.prgmrs.voucher.dto.response.VoucherListResponse;
+import com.prgmrs.voucher.dto.response.VoucherResponse;
+import com.prgmrs.voucher.service.VoucherService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/json/v1")
+public class VoucherJsonController {
+
+    private final VoucherService voucherService;
+
+    public VoucherJsonController(VoucherService voucherService) {
+        this.voucherService = voucherService;
+    }
+
+    @GetMapping("/vouchers")
+    public ResponseEntity<VoucherListResponse> findAll() {
+        return ResponseEntity.ok(voucherService.findAll());
+    }
+
+    @GetMapping("/vouchers/search")
+    public ResponseEntity<VoucherListResponse> findByCreationTimeAndDiscountType(VoucherSearchRequest voucherSearchRequest) {
+        return ResponseEntity.ok(voucherService.findByCreationTimeAndDiscountType(voucherSearchRequest));
+    }
+
+    @PostMapping("/vouchers")
+    public ResponseEntity<VoucherResponse> createVoucher(@RequestBody VoucherRequest voucherRequest) {
+        return ResponseEntity.ok(voucherService.createVoucher(voucherRequest));
+    }
+
+    @DeleteMapping("/vouchers/{voucherId}")
+    public ResponseEntity<RemoveResponse> removeVoucher(@PathVariable("voucherId") VoucherIdRequest voucherIdRequest) {
+        return ResponseEntity.ok(voucherService.removeVoucher(voucherIdRequest));
+    }
+
+    @GetMapping("/vouchers/{voucherId}")
+    public ResponseEntity<VoucherResponse> findById(@PathVariable("voucherId") VoucherIdRequest voucherIdRequest) {
+        return ResponseEntity.ok(voucherService.findById(voucherIdRequest));
+    }
+}

src/main/java/com/prgmrs/voucher/controller/mvc/VoucherMvcController.java

@@ -0,0 +1,67 @@
+package com.prgmrs.voucher.controller.mvc;
+
+import com.prgmrs.voucher.controller.mvc.dto.VoucherMvcCreateRequest;
+import com.prgmrs.voucher.controller.mvc.dto.VoucherMvcRemoveRequest;
+import com.prgmrs.voucher.dto.request.VoucherIdRequest;
+import com.prgmrs.voucher.dto.request.VoucherRequest;
+import com.prgmrs.voucher.dto.response.VoucherListResponse;
+import com.prgmrs.voucher.model.Voucher;
+import com.prgmrs.voucher.service.VoucherService;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/vouchers")
+public class VoucherMvcController {
+    private final VoucherService voucherService;
+
+    public VoucherMvcController(VoucherService voucherService) {
+        this.voucherService = voucherService;
+    }
+
+    @GetMapping("/")
+    public String showMainPage() {
+        return "voucher-main";
+    }
+
+    @GetMapping("/list")
+    public String showListPage(Model model) {
+        VoucherListResponse voucherListResponse = voucherService.findAll();
+        List<Voucher> voucherList = voucherListResponse.voucherList();
+        model.addAttribute("voucherList", voucherList);
+        return "voucher-list";
+    }
+
+    @GetMapping("/create")
+    public String showCreatePage(Model model) {
+        model.addAttribute("voucherCreateRequest", new VoucherMvcCreateRequest());
+        return "voucher-create";
+    }
+
+    @PostMapping("/create")
+    public String createVoucher(@ModelAttribute VoucherMvcCreateRequest voucherMvcCreateRequest) {
+        voucherService.createVoucher(new VoucherRequest(voucherMvcCreateRequest.getDiscountType(), voucherMvcCreateRequest.getDiscountStringValue()));
+        return "voucher-request-success";
+    }
+
+    @GetMapping("/remove")
+    public String showRemovePage(Model model) {
+        VoucherListResponse voucherListResponse = voucherService.findAll();
+        List<Voucher> voucherList = voucherListResponse.voucherList();
+        model.addAttribute("voucherList", voucherList);
+        model.addAttribute("voucherRemoveRequest", new VoucherMvcRemoveRequest());
+        return "voucher-remove";
+    }
+
+    @PostMapping("/remove")
+    public String removeVoucher(@ModelAttribute VoucherMvcRemoveRequest voucherMvcRemoveRequest) {
+        voucherService.removeVoucher(new VoucherIdRequest(voucherMvcRemoveRequest.getVoucherId()));
+        return "voucher-request-success";
+    }
+}

src/main/java/com/prgmrs/voucher/controller/mvc/dto/VoucherMvcCreateRequest.java

@@ -0,0 +1,26 @@
+package com.prgmrs.voucher.controller.mvc.dto;
+
+public class VoucherMvcCreateRequest {
+    private String discountType;
+    private String discountStringValue;
+
+    public VoucherMvcCreateRequest() {
+        // Do nothing for thymeleaf support purpose
+    }
+
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
+
+    public String getDiscountStringValue() {
+        return discountStringValue;
+    }
+
+    public void setDiscountStringValue(String discountStringValue) {
+        this.discountStringValue = discountStringValue;
+    }
+}

src/main/java/com/prgmrs/voucher/controller/mvc/dto/VoucherMvcRemoveRequest.java

@@ -0,0 +1,17 @@
+package com.prgmrs.voucher.controller.mvc.dto;
+
+public class VoucherMvcRemoveRequest {
+    private String voucherId;
+
+    public VoucherMvcRemoveRequest() {
+        // Do nothing for thymeleaf support purpose
+    }
+
+    public String getVoucherId() {
+        return voucherId;
+    }
+
+    public void setVoucherId(String voucherId) {
+        this.voucherId = voucherId;
+    }
+}

src/main/java/com/prgmrs/voucher/controller/xml/VoucherXmlController.java

@@ -0,0 +1,47 @@
+package com.prgmrs.voucher.controller.xml;
+
+import com.prgmrs.voucher.dto.request.VoucherIdRequest;
+import com.prgmrs.voucher.dto.request.VoucherRequest;
+import com.prgmrs.voucher.dto.request.VoucherSearchRequest;
+import com.prgmrs.voucher.dto.response.RemoveResponse;
+import com.prgmrs.voucher.dto.response.VoucherListResponse;
+import com.prgmrs.voucher.dto.response.VoucherResponse;
+import com.prgmrs.voucher.service.VoucherService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/xml/v1")
+public class VoucherXmlController {
+    private final VoucherService voucherService;
+
+    public VoucherXmlController(VoucherService voucherService) {
+        this.voucherService = voucherService;
+    }
+
+    @GetMapping(value = "/vouchers", produces = "application/xml")
+    public ResponseEntity<VoucherListResponse> findAll() {
+        return ResponseEntity.ok(voucherService.findAll());
+    }
+
+    @GetMapping(value = "/vouchers/search", produces = "application/xml")
+    public ResponseEntity<VoucherListResponse> findByCreationTimeAndDiscountType(VoucherSearchRequest voucherSearchRequest) {
+        return ResponseEntity.ok(voucherService.findByCreationTimeAndDiscountType(voucherSearchRequest));
+    }
+
+    @PostMapping(value = "/vouchers", consumes = "application/xml", produces = "application/xml")
+    public ResponseEntity<VoucherResponse> createVoucher(@RequestBody VoucherRequest voucherRequest) {
+        System.out.println(voucherRequest); // or use a logger
+        return ResponseEntity.ok(voucherService.createVoucher(voucherRequest));
+    }
+
+    @DeleteMapping(value = "/vouchers/{voucherId}", produces = "application/xml")
+    public ResponseEntity<RemoveResponse> removeVoucher(@PathVariable("voucherId") VoucherIdRequest voucherIdRequest) {
+        return ResponseEntity.ok(voucherService.removeVoucher(voucherIdRequest));
+    }
+
+    @GetMapping(value = "/vouchers/{voucherId}", produces = "application/xml")
+    public ResponseEntity<VoucherResponse> findById(@PathVariable("voucherId") VoucherIdRequest voucherIdRequest) {
+        return ResponseEntity.ok(voucherService.findById(voucherIdRequest));
+    }
+}

src/main/java/com/prgmrs/voucher/dto/request/VoucherRequest.java

@@ -1,5 +1,4 @@
 package com.prgmrs.voucher.dto.request;
 
 public record VoucherRequest(String discountType, String discountStringValue) {
-
 }

src/main/java/com/prgmrs/voucher/dto/request/VoucherSearchRequest.java

@@ -0,0 +1,19 @@
+package com.prgmrs.voucher.dto.request;
+
+import com.prgmrs.voucher.exception.WrongRangeFormatException;
+
+import java.time.LocalDateTime;
+
+public record VoucherSearchRequest(LocalDateTime startDate, LocalDateTime endDate, String discountType) {
+    public VoucherSearchRequest {
+        if (startDate == null) {
+            throw new WrongRangeFormatException("startDate cannot be null");
+        }
+        if (endDate == null) {
+            throw new WrongRangeFormatException("endDate cannot be null");
+        }
+        if (discountType == null || discountType.isBlank()) {
+            throw new WrongRangeFormatException("discountType cannot be null or blank");
+        }
+    }
+}

src/main/java/com/prgmrs/voucher/dto/response/RemoveResponse.java

@@ -0,0 +1,4 @@
+package com.prgmrs.voucher.dto.response;
+
+public record RemoveResponse(int rowsDeleted) {
+}

src/main/java/com/prgmrs/voucher/dto/response/VoucherResponse.java

@@ -5,4 +5,4 @@
 import java.util.UUID;
 
 public record VoucherResponse(UUID voucherUuid, DiscountStrategy discountStrategy) {
-}
+}