From d62112c4bb64afcf7bdc96c92dd873a8fabc9397 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Fri, 15 Mar 2024 22:55:34 +0900
Subject: [PATCH 001/147] feat: object mapper custom

---
 .../mybooks/front/config/RedisConfig.java     | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/store/mybooks/front/config/RedisConfig.java b/src/main/java/store/mybooks/front/config/RedisConfig.java
index 734cc232..461016f7 100644
--- a/src/main/java/store/mybooks/front/config/RedisConfig.java
+++ b/src/main/java/store/mybooks/front/config/RedisConfig.java
@@ -33,7 +33,6 @@
 @EnableCaching
 public class RedisConfig {
     private final RedisProperties redisProperties;
-    private final ObjectMapper objectMapper;
 
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
@@ -59,26 +58,27 @@ public <T> RedisTemplate<String, T> redisTemplate() {
         return redisTemplate;
     }
 
-//    @Bean
-//    public RedisCacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) {
-//        PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator
-//                .builder()
-//                .allowIfSubType(Object.class)
-//                .build();
-//
-//        objectMapper.activateDefaultTyping(typeValidator, ObjectMapper.DefaultTyping.NON_FINAL);
-//
-//        GenericJackson2JsonRedisSerializer redisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
-//
-//        RedisCacheConfiguration cacheConfiguration = RedisCacheConfiguration
-//                .defaultCacheConfig()
-//                .disableCachingNullValues()
-//                .serializeKeysWith(RedisSerializationContext.SerializationPair
-//                        .fromSerializer(new StringRedisSerializer()))
-//                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer));
-//
-//        return RedisCacheManager.builder(redisConnectionFactory)
-//                .cacheDefaults(cacheConfiguration)
-//                .build();
-//    }
+    @Bean
+    public RedisCacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) {
+        PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator
+                .builder()
+                .allowIfSubType(Object.class)
+                .build();
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        objectMapper.activateDefaultTyping(typeValidator, ObjectMapper.DefaultTyping.NON_FINAL);
+
+        GenericJackson2JsonRedisSerializer redisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
+
+        RedisCacheConfiguration cacheConfiguration = RedisCacheConfiguration
+                .defaultCacheConfig()
+                .disableCachingNullValues()
+                .serializeKeysWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer));
+
+        return RedisCacheManager.builder(redisConnectionFactory)
+                .cacheDefaults(cacheConfiguration)
+                .build();
+    }
 }

From b0f563c6f7caddcef596da9cc0f8c44d8cb8930c Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 04:01:11 +0900
Subject: [PATCH 002/147] =?UTF-8?q?feat:=20dto=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     |   7 +
 .../order/dto/request/BookOrderRequest.java   |  25 +
 .../order/dto/request/OrderInfoRequest.java   |  29 ++
 .../payment/controller/PayController.java     |   2 +
 .../templates/assets/js/order/order.js        |  13 +-
 src/main/resources/templates/checkout.html    | 429 +++++++++---------
 src/main/resources/templates/test.html        |  16 +
 7 files changed, 300 insertions(+), 221 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
 create mode 100644 src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
 create mode 100644 src/main/resources/templates/test.html

diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index b65e7656..5ebc6339 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -16,6 +16,7 @@
 import store.mybooks.front.cart.service.CartNonUserService;
 import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
+import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.service.OrderService;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
@@ -167,4 +168,10 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
         modelMap.put("quantity", request.getQuantity());
         return "checkout";
     }
+
+    @PostMapping("/order")
+    public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
+        log.info("값이 들어가나? {}", orderRequest.toString());
+        return "test";
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
new file mode 100644
index 00000000..750cfb94
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -0,0 +1,25 @@
+package store.mybooks.front.order.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.request<br>
+ * fileName       : BookOrderRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+@Getter
+@NoArgsConstructor
+@Setter
+@ToString
+public class BookOrderRequest {
+    private OrderInfoRequest order;
+}
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
new file mode 100644
index 00000000..789f2ce3
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -0,0 +1,29 @@
+package store.mybooks.front.order.dto.request;
+
+import lombok.*;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.request<br>
+ * fileName       : OrderRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class OrderInfoRequest {
+    private String userId;
+    private String email;
+    private String phoneNumber;
+    private String recipientName;
+    private String recipientPhoneNumber;
+    private String recipientAddress;
+
+}
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayController.java b/src/main/java/store/mybooks/front/payment/controller/PayController.java
index 07cd268e..c401f786 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayController.java
@@ -10,6 +10,7 @@
 import java.util.Base64;
 import javax.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -35,6 +36,7 @@
  * -----------------------------------------------------------<br>
  * 3/13/24        minsu11       최초 생성<br>
  */
+@Slf4j
 @Controller
 @RequiredArgsConstructor
 @RequestMapping("/pay")
diff --git a/src/main/resources/templates/assets/js/order/order.js b/src/main/resources/templates/assets/js/order/order.js
index 6f7ec14c..773a01ec 100644
--- a/src/main/resources/templates/assets/js/order/order.js
+++ b/src/main/resources/templates/assets/js/order/order.js
@@ -8,7 +8,6 @@ document.addEventListener('DOMContentLoaded', function (event
     const point = document.querySelector('input[id="user-point"][type="number"]')
     const wrapCost = document.querySelector('input[id="wrap-cost"]')
     // const input = document.querySelectorAll(".select-wrap")
-    const payBtn = document.querySelector('.pay-btn')
     const date = document.getElementById('delivery-date-id');
     let data = 0;
 
@@ -44,17 +43,6 @@ document.addEventListener('DOMContentLoaded', function (event
             data = inputValue;
         }
     })
-    payBtn.addEventListener('submit', function () {
-        const form = document.getElementById('order-pay-form');
-        const xhr = new XMLHttpRequest();
-        xhr.open('GET', form.action)
-        xhr.onload = function () {
-            if (xhr.status === 200) {
-
-            }
-        }
-    })
-
 
     date.addEventListener('change', function () {
         document.getElementById('delivery-date-label').textContent = date.value;
@@ -111,3 +99,4 @@ function updateTotalCost(total, num) {
 
 
 
+
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index 5012a649..471718c6 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -42,257 +42,268 @@ <h1 class="page-title">주문/결제</h1>
         <div class="container w-1000">
             <div class="row justify-content-center">
                 <div class="col-lg-8">
-                    <div class="checkout-steps-form-style-1">
-                        <ul id="accordionExample">
-                            <li>
-                                <h5>구매자 정보 </h5>
-                                <section>
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <div class="single-form form-default">
-                                                <!-- 로그인 된 회원의 데이터 -->
-                                                <label>이름</label>
-                                                <div class="row">
-                                                    <div class="col-md-6 form-input form">
-                                                        <label>
-                                                            <input name="userId" type="text" th:value="${user.name}"
-                                                                   readonly>
-                                                        </label>
+                    <form id="order-pay-form" action="/order" method="post">
+                        <div class="checkout-steps-form-style-1">
+                            <ul id="accordionExample">
+                                <li>
+                                    <h5>구매자 정보 </h5>
+                                    <section>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="single-form form-default">
+                                                    <!-- 로그인 된 회원의 데이터 -->
+                                                    <label>이름</label>
+                                                    <div class="row">
+                                                        <div class="col-md-6 form-input form">
+                                                            <label>
+                                                                <input name="order.userId" type="text"
+                                                                       th:value="${user.name}"
+                                                                       readonly>
+                                                            </label>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="single-form form-default">
-                                                <label>이메일</label>
-                                                <div class="col-md-6 form-input form">
-                                                    <input type="text" th:value="${user.email}" readonly>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="single-form form-default">
-                                                <label>휴대폰 번호</label>
-                                                <div class="col-md-6 form-input form">
-                                                    <input type="text" th:value="${user.phoneNumber}" readonly>
+                                            <div class="col-md-12">
+                                                <div class="single-form form-default">
+                                                    <label>이메일</label>
+                                                    <div class="col-md-6 form-input form">
+                                                        <input type="text" name="order.email" th:value="${user.email}"
+                                                               readonly>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </section>
-                            </li>
-                            <li>
-                                <h5>받는 사람 정보</h5>
-                                <hr>
-                                <section>
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <div class="single-form form-default">
-                                                <label>이름</label>
-                                                <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="single-form form-default">
+                                                    <label>휴대폰 번호</label>
                                                     <div class="col-md-6 form-input form">
-                                                        <input name="recipientName" type="text" placeholder="이름">
+                                                        <input type="text" th:value="${user.phoneNumber}"
+                                                               name="order.phoneNumber" readonly>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-6">
-                                            <div class="single-form form-default">
-                                                <label>휴대폰 번호</label>
-                                                <div class="form-input form">
-                                                    <input name="recipientPhoneNumber" type="text" placeholder="휴대폰 번호">
+                                    </section>
+                                </li>
+                                <li>
+                                    <h5>받는 사람 정보</h5>
+                                    <hr>
+                                    <section>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="single-form form-default">
+                                                    <label>이름</label>
+                                                    <div class="row">
+                                                        <div class="col-md-6 form-input form">
+                                                            <input name="order.recipientName" type="text"
+                                                                   placeholder="이름">
+                                                        </div>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
-
-                                        <div>
-                                            <div class="col-md-8">
+                                            <div class="col-md-6">
                                                 <div class="single-form form-default">
-                                                    <label>받는 주소
-                                                        <button class="btn btn-outline-secondary btn-sm" type="button"
-                                                                onclick="address()">배송지
-                                                        </button>
-                                                    </label>
+                                                    <label>휴대폰 번호</label>
                                                     <div class="form-input form">
-                                                        <input id="delivery-address" name="recipientAddress" type="text"
-                                                               placeholder="배송지"
-                                                               readonly>
+                                                        <input name="order.recipientPhoneNumber" type="text"
+                                                               placeholder="휴대폰 번호">
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            <div>
+                                                <div class="col-md-8">
+                                                    <div class="single-form form-default">
+                                                        <label>받는 주소
+                                                            <button class="btn btn-outline-secondary btn-sm"
+                                                                    type="button"
+                                                                    onclick="address()">배송지
+                                                            </button>
+                                                        </label>
+                                                        <div class="form-input form">
+                                                            <input id="delivery-address" name="order.recipientAddress"
+                                                                   type="text"
+                                                                   placeholder="배송지"
+                                                                   readonly>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </section>
-                            </li>
-                            <li>
-                                <h5>주문 내역
-                                </h5>
-                                <section class="form-content">
-                                    <div class="row">
-                                        <div class="col-12">
-                                            <div class="p-3 m-3">
-                                                <table class="table">
-                                                    <thead>
-                                                    <tr>
+                                    </section>
+                                </li>
+                                <li>
+                                    <h5>주문 내역
+                                    </h5>
+                                    <section class="form-content">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="p-3 m-3">
+                                                    <table class="table">
+                                                        <thead>
+                                                        <tr>
 
-                                                        <th class="col-4">책 이름</th>
-                                                        <th class="col-1">정가</th>
-                                                        <th class="col-1">판매가</th>
-                                                        <th class="col-1">수량</th>
-                                                        <th class="col-1">합계</th>
-                                                        <th class="col-1">포장</th>
-                                                        <th class="col-1">쿠폰</th>
-                                                        <th class="col-1"></th>
-                                                        <th class="col-1"></th>
-                                                    </tr>
-                                                    </thead>
-                                                    <tbody th:each="book, index:${bookLists}">
-                                                    <tr th:id="${index.index}" class="name">
-                                                        <td>
-                                                            <label>
-                                                                <img th:src="${book.bookImage}" alt="#" width="50"
-                                                                     height="50">
-                                                                <span th:text="${book.name}">
+                                                            <th class="col-4">책 이름</th>
+                                                            <th class="col-1">정가</th>
+                                                            <th class="col-1">판매가</th>
+                                                            <th class="col-1">수량</th>
+                                                            <th class="col-1">합계</th>
+                                                            <th class="col-1">포장</th>
+                                                            <th class="col-1">쿠폰</th>
+                                                            <th class="col-1"></th>
+                                                            <th class="col-1"></th>
+                                                        </tr>
+                                                        </thead>
+                                                        <tbody th:each="book, index:${bookLists}">
+                                                        <tr th:id="${index.index}" class="name">
+                                                            <td>
+                                                                <label>
+                                                                    <img th:src="${book.bookImage}" alt="#" width="50"
+                                                                         height="50">
+                                                                    <span th:text="${book.name}">
 
                                                                 </span>
-                                                            </label>
-                                                        </td>
-                                                        <td></td>
-                                                        <!--                                                        <td th:text="${book.originalCost}"></td>-->
-                                                        <td th:text="${book.saleCost}"></td>
-                                                        <td th:text="${book.cartDetailAmount}"></td>
+                                                                </label>
+                                                            </td>
+                                                            <td></td>
+                                                            <!--                                                        <td th:text="${book.originalCost}"></td>-->
+                                                            <td th:text="${book.saleCost}"></td>
+                                                            <td th:text="${book.cartDetailAmount}"></td>
 
-                                                        <td>
-                                                            <div th:each="bookCost:${bookCostList}">
-                                                                <div th:if="${bookCost == book.saleCost}">
-                                                                    <p class="book-sale-cost" th:text="${bookCost}"></p>
+                                                            <td>
+                                                                <div th:each="bookCost:${bookCostList}">
+                                                                    <div th:if="${bookCost == book.saleCost}">
+                                                                        <p class="book-sale-cost"
+                                                                           th:text="${bookCost}"></p>
+                                                                    </div>
                                                                 </div>
-                                                            </div>
-                                                        </td>
-                                                        <td class="form-input">
-                                                            <input class="select-wrap"
-                                                                   name="select-wrap-id"
-                                                                   type="hidden">
-                                                            <p class="select-wrap-name"></p>
+                                                            </td>
+                                                            <td class="form-input">
+                                                                <input class="select-wrap"
+                                                                       name="select-wrap-id"
+                                                                       type="hidden">
+                                                                <p class="select-wrap-name"></p>
 
-                                                            <!-- 포장지 가격 -->
-                                                            <input class="select-wrap-cost" name="select-wrap-cost"
-                                                                   type="hidden">
-                                                        </td>
+                                                                <!-- 포장지 가격 -->
+                                                                <input class="select-wrap-cost" name="select-wrap-cost"
+                                                                       type="hidden">
+                                                            </td>
 
-                                                        <td class="form-input">
-                                                            <input class="select-coupon-id"
-                                                                   name="select-coupon-id"
-                                                                   type="hidden">
-                                                            <p class="select-coupon-name"></p>
+                                                            <td class="form-input">
+                                                                <input class="select-coupon-id"
+                                                                       name="select-coupon-id"
+                                                                       type="hidden">
+                                                                <p class="select-coupon-name"></p>
 
-                                                            <input class="select-coupon-cost"
-                                                                   name="select-coupon-cost"
-                                                                   type="hidden">
-                                                        </td>
-                                                        <td>
-                                                            <button id="coupon-button" type="button"
-                                                                    class="button btn-primary btn-sm"
-                                                                    name="coupon-button"
-                                                                    th:value="${book.bookId}"
-                                                                    onclick="clickCoupon(this)">쿠폰
-                                                            </button>
-                                                        </td>
-                                                        <td>
-                                                            <button th:id="'wrap-botton-'+${index.index}" type="button"
-                                                                    onclick="wrap(this)"
-                                                                    class="button btn-primary btn-sm wt">포장
-                                                            </button>
-                                                        </td>
-                                                    </tr>
-                                                    </tbody>
-                                                </table>
+                                                                <input class="select-coupon-cost"
+                                                                       name="select-coupon-cost"
+                                                                       type="hidden">
+                                                            </td>
+                                                            <td>
+                                                                <button id="coupon-button" type="button"
+                                                                        class="button btn-primary btn-sm"
+                                                                        name="coupon-button"
+                                                                        th:value="${book.bookId}"
+                                                                        onclick="clickCoupon(this)">쿠폰
+                                                                </button>
+                                                            </td>
+                                                            <td>
+                                                                <button th:id="'wrap-botton-'+${index.index}"
+                                                                        type="button"
+                                                                        onclick="wrap(this)"
+                                                                        class="button btn-primary btn-sm wt">포장
+                                                                </button>
+                                                            </td>
+                                                        </tr>
+                                                        </tbody>
+                                                    </table>
 
+                                                </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </section>
-                            </li>
-                            <li>
-                                <h5>포인트 사용</h5>
-                                <section class="form-control">
-                                    <div class="row">
-                                        <div class="col-12">
-                                            <div>
-                                                <label>
-                                                    <p th:if="${point==null}" th:text="'보유 포인트: 0'"></p>
-                                                    <p th:if="${point!=null}" th:text="'보유 포인트: '+ ${point}"></p>
-                                                    <input id="user-point" type="number" placeholder="포인트 사용"
-                                                           min="0" value="0"
-                                                           th:max="${point}">
-                                                </label>
+                                    </section>
+                                </li>
+                                <li>
+                                    <h5>포인트 사용</h5>
+                                    <section class="form-control">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div>
+                                                    <label>
+                                                        <p th:if="${point==null}" th:text="'보유 포인트: 0'"></p>
+                                                        <p th:if="${point!=null}" th:text="'보유 포인트: '+ ${point}"></p>
+                                                        <input id="user-point" type="number" placeholder="포인트 사용"
+                                                               min="0" value="0"
+                                                               th:max="${point}">
+                                                    </label>
+                                                </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </section>
-                            </li>
-                            <li>
-                                <h5>배송 날짜</h5>
-                                <section class="form-control">
-                                    <div>
-                                        <label>
-                                            <input type="date" id="delivery-date-id" th:min="${localDate}">
-                                            <label for="delivery-date-id" id="delivery-date-label"></label>
-                                        </label>
-                                    </div>
-                                </section>
-                            </li>
-                            <li>
-                                <h5>결제</h5>
-                                <hr>
-                                <section class="form-content">
-                                    <div class="row">
-                                        <div class="col-12">
-                                            <div class="checkout-payment-form">
-                                                <div class="single-form form-default">
-                                                    <label>결제 금액</label>
-                                                    <div class="form-text">
-                                                        <span id="totalCost" th:text="${totalCost}"></span>
-                                                        <input id="input-total-cost" th:value="${totalCost}"
-                                                               type="hidden"/>
+                                    </section>
+                                </li>
+                                <li>
+                                    <h5>배송 날짜</h5>
+                                    <section class="form-control">
+                                        <div>
+                                            <label>
+                                                <input type="date" id="delivery-date-id" th:min="${localDate}">
+                                                <label for="delivery-date-id" id="delivery-date-label"></label>
+                                            </label>
+                                        </div>
+                                    </section>
+                                </li>
+                                <li>
+                                    <h5>결제</h5>
+                                    <hr>
+                                    <section class="form-content">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="checkout-payment-form">
+                                                    <div class="single-form form-default">
+                                                        <label>결제 금액</label>
+                                                        <div class="form-text">
+                                                            <span id="totalCost" th:text="${totalCost}"></span>
+                                                            <input id="input-total-cost" th:value="${totalCost}"
+                                                                   type="hidden"/>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                                <div class="single-form form-default">
-                                                    <label>포장 비용</label>
-                                                    <div class="form-text">
-                                                        <input type="number" id="wrap-cost" value="0"
-                                                               class="form-control w-25" readonly/>
+                                                    <div class="single-form form-default">
+                                                        <label>포장 비용</label>
+                                                        <div class="form-text">
+                                                            <input type="number" id="wrap-cost" value="0"
+                                                                   class="form-control w-25" readonly/>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                                <div class="single-form form-default">
-                                                    <label>쿠폰 적용 금액</label>
-                                                    <div class="form-text">
-                                                        <label>
-                                                            <input id="coupon-cost" type="number"
-                                                                   class="form-control w-50"
-                                                                   value="0" readonly>
-                                                        </label>
+                                                    <div class="single-form form-default">
+                                                        <label>쿠폰 적용 금액</label>
+                                                        <div class="form-text">
+                                                            <label>
+                                                                <input id="coupon-cost" type="number"
+                                                                       class="form-control w-50"
+                                                                       value="0" readonly>
+                                                            </label>
+                                                        </div>
                                                     </div>
-                                                </div>
 
-                                                <div class="single-form form-default button">
-                                                    <form id="order-pay-form" action="/pay">
-                                                        <button class="pay-btn">pay now</button>
-                                                    </form>
+                                                    <div class="single-form form-default button">
+
+
+                                                        <button type="submit" id="pay-btn">pay now
+                                                        </button>
+
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </section>
-                            </li>
-                        </ul>
-                    </div>
+                                    </section>
+                                </li>
+                            </ul>
+                        </div>
+                    </form>
                 </div>
-
             </div>
         </div>
     </section>
     <script src="/assets/js/order/order.js"></script>
-
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/test.html b/src/main/resources/templates/test.html
new file mode 100644
index 00000000..2e27c327
--- /dev/null
+++ b/src/main/resources/templates/test.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<p>테스트</p>
+<!--<div th:each="o:${order}">-->
+<!--    <span th:text="${o}">-->
+
+<!--    </span>-->
+
+<!--</div>-->
+</body>
+</html>
\ No newline at end of file

From 2d40dbf2359bf53add55c3c673ba778c0d2c9b8d Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 15:05:33 +0900
Subject: [PATCH 003/147] =?UTF-8?q?feat:=20=EA=B2=B0=EC=A0=9C=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EB=84=98=EC=96=B4=EC=98=A4=EB=8A=94=EC=A7=80=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     |  2 +
 .../order/dto/request/BookInfoRequest.java    | 30 +++++++++++++
 .../order/dto/request/BookOrderRequest.java   |  4 +-
 .../order/dto/request/OrderInfoRequest.java   | 10 ++++-
 .../front/order/service/OrderService.java     |  1 +
 .../mybooks/front/order/utils/OrderUtils.java | 42 +++++++++++++++++++
 .../templates/assets/js/order/order.js        |  7 ++++
 src/main/resources/templates/checkout.html    | 36 +++++++++++-----
 8 files changed, 118 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
 create mode 100644 src/main/java/store/mybooks/front/order/utils/OrderUtils.java

diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 5ebc6339..328d3d1f 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -18,6 +18,7 @@
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.service.OrderService;
+import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -172,6 +173,7 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
     @PostMapping("/order")
     public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
         log.info("값이 들어가나? {}", orderRequest.toString());
+        log.info(OrderUtils.createOrderNumber());
         return "test";
     }
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
new file mode 100644
index 00000000..b79358b1
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
@@ -0,0 +1,30 @@
+package store.mybooks.front.order.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.request<br>
+ * fileName       : BookInfoRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+@Getter
+@NoArgsConstructor
+@Setter
+@ToString
+public class BookInfoRequest {
+    private Long bookId;
+    private Integer saleCost;
+    private Integer bookCost;
+    private Integer selectWrapId;
+    private Integer selectCouponId;
+
+}
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 750cfb94..2bb07da9 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -1,5 +1,6 @@
 package store.mybooks.front.order.dto.request;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -21,5 +22,6 @@
 @Setter
 @ToString
 public class BookOrderRequest {
-    private OrderInfoRequest order;
+    private OrderInfoRequest orderInfo;
+    private List<BookInfoRequest> bookInfoList;
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index 789f2ce3..8c2b0af5 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -1,6 +1,9 @@
 package store.mybooks.front.order.dto.request;
 
-import lombok.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -16,7 +19,6 @@
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
 @ToString
 public class OrderInfoRequest {
     private String userId;
@@ -25,5 +27,9 @@ public class OrderInfoRequest {
     private String recipientName;
     private String recipientPhoneNumber;
     private String recipientAddress;
+    private String deliveryDate;
+    private Integer usingPoint;
+    private Integer wrapCost;
+    private Integer couponApplicationAmount;
 
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 3d32b6f9..7226bc3d 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -61,4 +61,5 @@ public List<Integer> calculateBooksCost(List<CartDetail> cartDetailList) {
                 .collect(Collectors.toList());
 
     }
+
 }
diff --git a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
new file mode 100644
index 00000000..e28fb662
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
@@ -0,0 +1,42 @@
+package store.mybooks.front.order.utils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Random;
+
+/**
+ * packageName    : store.mybooks.front.order.utils<br>
+ * fileName       : OrderUtils<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+public class OrderUtils {
+    private OrderUtils() {
+    }
+
+    /**
+     * 랜덤한 문자열 생성
+     *
+     * @return the string
+     */
+    public static String createOrderNumber() {
+        StringBuilder orderNumber = new StringBuilder();
+        String time = LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+        int leftLimit = 48;
+        int rightLimit = 122;
+        int targetStringLength = 13;
+        String randomStr = new Random()
+                .ints(leftLimit, rightLimit + 1)
+                .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97))
+                .limit(targetStringLength)
+                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .toString();
+        return orderNumber.append(time)
+                .append(randomStr).toString();
+    }
+}
diff --git a/src/main/resources/templates/assets/js/order/order.js b/src/main/resources/templates/assets/js/order/order.js
index 773a01ec..c45a27b8 100644
--- a/src/main/resources/templates/assets/js/order/order.js
+++ b/src/main/resources/templates/assets/js/order/order.js
@@ -9,8 +9,15 @@ document.addEventListener('DOMContentLoaded', function (event
     const wrapCost = document.querySelector('input[id="wrap-cost"]')
     // const input = document.querySelectorAll(".select-wrap")
     const date = document.getElementById('delivery-date-id');
+    const submitForm = document.getElementById('order-pay-form')
     let data = 0;
 
+    submitForm.addEventListener("keydown", function (event) {
+        if (event.keyCode === 13) {
+            event.preventDefault()
+        }
+    })
+
     radioInputs.forEach(function (input) {
         input.addEventListener('click', function () {
             const chkValue = document.getElementById('wrap-used').checked;
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index 471718c6..a7673d3d 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -56,7 +56,7 @@ <h5>구매자 정보 </h5>
                                                     <div class="row">
                                                         <div class="col-md-6 form-input form">
                                                             <label>
-                                                                <input name="order.userId" type="text"
+                                                                <input name="orderInfo.userId" type="text"
                                                                        th:value="${user.name}"
                                                                        readonly>
                                                             </label>
@@ -68,7 +68,8 @@ <h5>구매자 정보 </h5>
                                                 <div class="single-form form-default">
                                                     <label>이메일</label>
                                                     <div class="col-md-6 form-input form">
-                                                        <input type="text" name="order.email" th:value="${user.email}"
+                                                        <input type="text" name="orderInfo.email"
+                                                               th:value="${user.email}"
                                                                readonly>
                                                     </div>
                                                 </div>
@@ -78,7 +79,7 @@ <h5>구매자 정보 </h5>
                                                     <label>휴대폰 번호</label>
                                                     <div class="col-md-6 form-input form">
                                                         <input type="text" th:value="${user.phoneNumber}"
-                                                               name="order.phoneNumber" readonly>
+                                                               name="orderInfo.phoneNumber" readonly>
                                                     </div>
                                                 </div>
                                             </div>
@@ -95,7 +96,7 @@ <h5>받는 사람 정보</h5>
                                                     <label>이름</label>
                                                     <div class="row">
                                                         <div class="col-md-6 form-input form">
-                                                            <input name="order.recipientName" type="text"
+                                                            <input name="orderInfo.recipientName" type="text"
                                                                    placeholder="이름">
                                                         </div>
                                                     </div>
@@ -105,7 +106,7 @@ <h5>받는 사람 정보</h5>
                                                 <div class="single-form form-default">
                                                     <label>휴대폰 번호</label>
                                                     <div class="form-input form">
-                                                        <input name="order.recipientPhoneNumber" type="text"
+                                                        <input name="orderInfo.recipientPhoneNumber" type="text"
                                                                placeholder="휴대폰 번호">
                                                     </div>
                                                 </div>
@@ -121,7 +122,8 @@ <h5>받는 사람 정보</h5>
                                                             </button>
                                                         </label>
                                                         <div class="form-input form">
-                                                            <input id="delivery-address" name="order.recipientAddress"
+                                                            <input id="delivery-address"
+                                                                   name="orderInfo.recipientAddress"
                                                                    type="text"
                                                                    placeholder="배송지"
                                                                    readonly>
@@ -156,6 +158,13 @@ <h5>주문 내역
                                                         </thead>
                                                         <tbody th:each="book, index:${bookLists}">
                                                         <tr th:id="${index.index}" class="name">
+                                                            <input th:name="|bookInfoList[${index.index}].bookId|"
+                                                                   type="hidden"
+                                                                   th:value="${book.bookId}"/>
+                                                            <input th:name="|bookInfoList[${index.index}].saleCost|"
+                                                                   type="hidden"
+                                                                   th:value="${book.saleCost}"/>
+
                                                             <td>
                                                                 <label>
                                                                     <img th:src="${book.bookImage}" alt="#" width="50"
@@ -175,12 +184,14 @@ <h5>주문 내역
                                                                     <div th:if="${bookCost == book.saleCost}">
                                                                         <p class="book-sale-cost"
                                                                            th:text="${bookCost}"></p>
+                                                                        <input th:name="|bookInfoList[${index.index}].bookCost|"
+                                                                               th:value="${bookCost}">
                                                                     </div>
                                                                 </div>
                                                             </td>
                                                             <td class="form-input">
                                                                 <input class="select-wrap"
-                                                                       name="select-wrap-id"
+                                                                       th:name="|bookInfoList[${index.index}].selectWrapId|"
                                                                        type="hidden">
                                                                 <p class="select-wrap-name"></p>
 
@@ -191,7 +202,7 @@ <h5>주문 내역
 
                                                             <td class="form-input">
                                                                 <input class="select-coupon-id"
-                                                                       name="select-coupon-id"
+                                                                       th:name="|bookInfoList[${index.index}].seletCouponId]|"
                                                                        type="hidden">
                                                                 <p class="select-coupon-name"></p>
 
@@ -246,7 +257,8 @@ <h5>배송 날짜</h5>
                                     <section class="form-control">
                                         <div>
                                             <label>
-                                                <input type="date" id="delivery-date-id" th:min="${localDate}">
+                                                <input type="date" id="delivery-date-id" th:min="${localDate}"
+                                                       name="orderInfo.deliveryDate">
                                                 <label for="delivery-date-id" id="delivery-date-label"></label>
                                             </label>
                                         </div>
@@ -264,14 +276,15 @@ <h5>결제</h5>
                                                         <div class="form-text">
                                                             <span id="totalCost" th:text="${totalCost}"></span>
                                                             <input id="input-total-cost" th:value="${totalCost}"
-                                                                   type="hidden"/>
+                                                                   type="hidden" name="orderInfo.usingPoint"/>
                                                         </div>
                                                     </div>
                                                     <div class="single-form form-default">
                                                         <label>포장 비용</label>
                                                         <div class="form-text">
                                                             <input type="number" id="wrap-cost" value="0"
-                                                                   class="form-control w-25" readonly/>
+                                                                   class="form-control w-25" name="orderInfo.wrapCost"
+                                                                   readonly/>
                                                         </div>
                                                     </div>
                                                     <div class="single-form form-default">
@@ -280,6 +293,7 @@ <h5>결제</h5>
                                                             <label>
                                                                 <input id="coupon-cost" type="number"
                                                                        class="form-control w-50"
+                                                                       name="orderInfo.couponApplicationAmount"
                                                                        value="0" readonly>
                                                             </label>
                                                         </div>

From 885e6ce13948e2fcb2f4c9cb7bee543251bc7e37 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 15:22:13 +0900
Subject: [PATCH 004/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20dto,=20=EC=A3=BC=EB=AC=B8=20=EC=83=9D=EC=84=B1=20ad?=
 =?UTF-8?q?aptor=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/order/adaptor/OrderAdaptor.java    | 12 ++++++++++++
 .../front/order/dto/request/OrderCreateRequest.java  | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
new file mode 100644
index 00000000..8d941bd5
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -0,0 +1,12 @@
+package store.mybooks.front.order.adaptor;/**
+ *packageName    : store.mybooks.front.order.adaptor<br>
+ * fileName       : OrderAdaptor<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */public class OrderAdaptor {
+}
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
new file mode 100644
index 00000000..eaeebb34
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
@@ -0,0 +1,12 @@
+package store.mybooks.front.order.dto.request;/**
+ *packageName    : store.mybooks.front.order.dto.request<br>
+ * fileName       : OrderCreateRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */public class OrderCreateRequest {
+}

From 7153c57ad29ceec675892eb38f14375bc159d26c Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 16:04:20 +0900
Subject: [PATCH 005/147] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EC=9D=98=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=A0=95=EB=B3=B4=20=EB=B3=80=EC=A1=B0=20?=
 =?UTF-8?q?=EB=B0=A9=EC=A7=80=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/global/GlobalControllerAdvice.java  | 17 ++++---
 .../order/controller/OrderController.java     |  5 +--
 .../exception/OrderModulationException.java   | 19 ++++++++
 .../front/order/service/OrderService.java     | 45 +++++++++++++++++++
 src/main/resources/templates/checkout.html    |  3 ++
 .../resources/templates/mini-address.html     |  2 +-
 6 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/exception/OrderModulationException.java

diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index b277b39e..059566b1 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -4,11 +4,8 @@
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.client.HttpClientErrorException;
-import store.mybooks.front.auth.exception.AccessIdForbiddenException;
-import store.mybooks.front.auth.exception.AuthenticationIsNotValidException;
-import store.mybooks.front.auth.exception.StatusIsDormancyException;
-import store.mybooks.front.auth.exception.StatusIsLockException;
-import store.mybooks.front.auth.exception.TokenExpiredException;
+import store.mybooks.front.auth.exception.*;
+import store.mybooks.front.order.exception.OrderModulationException;
 
 /**
  * packageName    : store.mybooks.front.global
@@ -63,4 +60,14 @@ public String handleAuthException(RuntimeException ex) {
     }
 
 
+    @ExceptionHandler({OrderModulationException.class})
+    // 400 404 이게 리소스에서 나오는 모든 예외
+    public String handleOrderModulationException(Exception exception, HttpServletRequest request) {
+
+        String previousUrl = request.getHeader(REFERER);
+        request.getSession().setAttribute("error", exception.getMessage());
+        return previousUrl.replace(domain, "redirect:");
+    }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 328d3d1f..f8d3e561 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -18,7 +18,6 @@
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.service.OrderService;
-import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -172,8 +171,8 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
 
     @PostMapping("/order")
     public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
-        log.info("값이 들어가나? {}", orderRequest.toString());
-        log.info(OrderUtils.createOrderNumber());
+        orderService.checkModulation(orderRequest);
+        log.info("값 : {}", orderRequest.toString());
         return "test";
     }
 }
diff --git a/src/main/java/store/mybooks/front/order/exception/OrderModulationException.java b/src/main/java/store/mybooks/front/order/exception/OrderModulationException.java
new file mode 100644
index 00000000..2db19c81
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/exception/OrderModulationException.java
@@ -0,0 +1,19 @@
+package store.mybooks.front.order.exception;
+
+/**
+ * packageName    : store.mybooks.front.order.exception<br>
+ * fileName       : OrderModulationException<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+
+public class OrderModulationException extends RuntimeException {
+    public OrderModulationException() {
+        super("주문 정보의 내용이 변조");
+    }
+}
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 7226bc3d..9b53d10d 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -5,9 +5,22 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.book.model.response.BookDetailResponse;
+import store.mybooks.front.admin.wrap.adaptor.WrapAdaptor;
 import store.mybooks.front.book.adaptor.BookAdaptor;
 import store.mybooks.front.cart.domain.CartDetail;
+import store.mybooks.front.order.adaptor.OrderAdaptor;
+import store.mybooks.front.order.dto.request.BookInfoRequest;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
+import store.mybooks.front.order.dto.request.BookOrderRequest;
+import store.mybooks.front.order.dto.request.OrderInfoRequest;
+import store.mybooks.front.order.exception.OrderModulationException;
+import store.mybooks.front.user.adaptor.UserAdaptor;
+import store.mybooks.front.user.dto.response.UserGetResponse;
+import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
+import store.mybooks.front.user_address.response.UserAddressGetResponse;
+import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
+import store.mybooks.front.userpoint.adaptor.UserPointAdaptor;
+import store.mybooks.front.userpoint.dto.response.PointResponse;
 
 /**
  * packageName    : store.mybooks.front.order.service<br>
@@ -24,6 +37,12 @@
 @RequiredArgsConstructor
 public class OrderService {
     private final BookAdaptor bookAdaptor;
+    private final OrderAdaptor orderAdapter;
+    private final UserAddressAdaptor userAddressAdaptor;
+    private final UserAdaptor userAdaptor;
+    private final WrapAdaptor wrapAdaptor;
+    private final UserCouponAdaptor userCouponAdaptor;
+    private final UserPointAdaptor userPointAdaptor;
 
     /**
      * methodName : getBook<br>
@@ -62,4 +81,30 @@ public List<Integer> calculateBooksCost(List<CartDetail> cartDetailList) {
 
     }
 
+    public void checkModulation(BookOrderRequest bookOrderRequest) {
+        OrderInfoRequest orderInfoRequest = bookOrderRequest.getOrderInfo();
+        List<BookInfoRequest> bookInfoRequest = bookOrderRequest.getBookInfoList();
+
+
+    }
+
+    public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
+        UserGetResponse user = userAdaptor.findUser();
+        UserAddressGetResponse userAddress = checkAddress(orderInfoRequest.getAddressId());
+        PointResponse pointResponse = userPointAdaptor.getPointsHeld();
+
+
+    }
+
+    public UserAddressGetResponse checkAddress(Long addressId) {
+        List<UserAddressGetResponse> userAddressGetResponses = userAddressAdaptor.findAllUserAddress();
+
+        for (UserAddressGetResponse address : userAddressGetResponses) {
+            if (address.getId() == addressId) {
+                return address;
+            }
+        }
+        throw new OrderModulationException();
+    }
+
 }
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index a7673d3d..b29d8bc5 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -122,6 +122,9 @@ <h5>받는 사람 정보</h5>
                                                             </button>
                                                         </label>
                                                         <div class="form-input form">
+                                                            <input id="delivery-address-id"
+                                                                   name="orderInfo.addressId"
+                                                                   type="hidden">
                                                             <input id="delivery-address"
                                                                    name="orderInfo.recipientAddress"
                                                                    type="text"
diff --git a/src/main/resources/templates/mini-address.html b/src/main/resources/templates/mini-address.html
index 02195cb7..5704f0ff 100644
--- a/src/main/resources/templates/mini-address.html
+++ b/src/main/resources/templates/mini-address.html
@@ -278,7 +278,7 @@ <h2 class="accordion-header" id="headingTwo">
         const addressElement = document.getElementById(addressId).parentElement.parentElement.firstElementChild;
         const addressRoadName = addressElement.nextElementSibling.innerHTML;
         const addressDetail = addressElement.nextElementSibling.nextElementSibling.innerHTML;
-
+        opener.document.getElementById("delivery-address-id").value = addressId.replace("select-", "")
         opener.document.getElementById("delivery-address").value = addressRoadName + addressDetail;
         window.close()
     }

From 4fe743796d9d06dccd820dd539d8ae64ee7a5afe Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 16:12:40 +0900
Subject: [PATCH 006/147] =?UTF-8?q?feat:=20dto=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/dto/request/OrderCreateRequest.java      | 14 +++++++++++---
 .../front/order/dto/request/OrderInfoRequest.java  |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
index eaeebb34..57d526dd 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
@@ -1,5 +1,10 @@
-package store.mybooks.front.order.dto.request;/**
- *packageName    : store.mybooks.front.order.dto.request<br>
+package store.mybooks.front.order.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.request<br>
  * fileName       : OrderCreateRequest<br>
  * author         : minsu11<br>
  * date           : 3/16/24<br>
@@ -8,5 +13,8 @@
  * DATE              AUTHOR             NOTE<br>
  * -----------------------------------------------------------<br>
  * 3/16/24        minsu11       최초 생성<br>
- */public class OrderCreateRequest {
+ */
+@Getter
+@Setter
+public class OrderCreateRequest {
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index 8c2b0af5..50093ccb 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -26,6 +26,7 @@ public class OrderInfoRequest {
     private String phoneNumber;
     private String recipientName;
     private String recipientPhoneNumber;
+    private Long addressId;
     private String recipientAddress;
     private String deliveryDate;
     private Integer usingPoint;

From fc20c2def69c332ba71477847309dffe84158904 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 16:13:07 +0900
Subject: [PATCH 007/147] =?UTF-8?q?feat:=20order=20adaptor=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/adaptor/OrderAdaptor.java      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index 8d941bd5..b5c4c732 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -1,5 +1,12 @@
-package store.mybooks.front.order.adaptor;/**
- *packageName    : store.mybooks.front.order.adaptor<br>
+package store.mybooks.front.order.adaptor;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+
+/**
+ * packageName    : store.mybooks.front.order.adaptor<br>
  * fileName       : OrderAdaptor<br>
  * author         : minsu11<br>
  * date           : 3/16/24<br>
@@ -8,5 +15,10 @@
  * DATE              AUTHOR             NOTE<br>
  * -----------------------------------------------------------<br>
  * 3/16/24        minsu11       최초 생성<br>
- */public class OrderAdaptor {
+ */
+@Component
+@RequiredArgsConstructor
+public class OrderAdaptor {
+    private final RestTemplate restTemplate;
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
 }

From 7705dd8a52eed44b7a359a016d175048c0ef9f67 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 16:13:26 +0900
Subject: [PATCH 008/147] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B3=80=EC=A1=B0=20=EB=B0=A9=EC=A7=80=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/order/service/OrderService.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 9b53d10d..cfda3dab 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -1,6 +1,7 @@
 package store.mybooks.front.order.service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -89,7 +90,7 @@ public void checkModulation(BookOrderRequest bookOrderRequest) {
     }
 
     public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
-        UserGetResponse user = userAdaptor.findUser();
+        UserGetResponse user = checkUser(orderInfoRequest.getEmail());
         UserAddressGetResponse userAddress = checkAddress(orderInfoRequest.getAddressId());
         PointResponse pointResponse = userPointAdaptor.getPointsHeld();
 
@@ -100,11 +101,20 @@ public UserAddressGetResponse checkAddress(Long addressId) {
         List<UserAddressGetResponse> userAddressGetResponses = userAddressAdaptor.findAllUserAddress();
 
         for (UserAddressGetResponse address : userAddressGetResponses) {
-            if (address.getId() == addressId) {
+            if (Objects.equals(address.getId(), addressId)) {
                 return address;
             }
         }
         throw new OrderModulationException();
     }
 
+    public UserGetResponse checkUser(String email) {
+        UserGetResponse user = userAdaptor.findUser();
+        if (Objects.equals(user.getEmail(), email)) {
+            return user;
+        }
+        throw new OrderModulationException();
+    }
+
+
 }

From 38c8d14d8f5ab2852fc1eeb86d336463b3ae6cb3 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 16:48:25 +0900
Subject: [PATCH 009/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=B6=84=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/global/GlobalControllerAdvice.java    |  4 ++--
 ...ion.java => OrderInfoNotMatchException.java} |  8 ++++++--
 .../front/order/service/OrderService.java       | 17 ++++++++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)
 rename src/main/java/store/mybooks/front/order/exception/{OrderModulationException.java => OrderInfoNotMatchException.java} (73%)

diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index 059566b1..12e19650 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -5,7 +5,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.client.HttpClientErrorException;
 import store.mybooks.front.auth.exception.*;
-import store.mybooks.front.order.exception.OrderModulationException;
+import store.mybooks.front.order.exception.OrderInfoNotMatchException;
 
 /**
  * packageName    : store.mybooks.front.global
@@ -60,7 +60,7 @@ public String handleAuthException(RuntimeException ex) {
     }
 
 
-    @ExceptionHandler({OrderModulationException.class})
+    @ExceptionHandler({OrderInfoNotMatchException.class})
     // 400 404 이게 리소스에서 나오는 모든 예외
     public String handleOrderModulationException(Exception exception, HttpServletRequest request) {
 
diff --git a/src/main/java/store/mybooks/front/order/exception/OrderModulationException.java b/src/main/java/store/mybooks/front/order/exception/OrderInfoNotMatchException.java
similarity index 73%
rename from src/main/java/store/mybooks/front/order/exception/OrderModulationException.java
rename to src/main/java/store/mybooks/front/order/exception/OrderInfoNotMatchException.java
index 2db19c81..40d17199 100644
--- a/src/main/java/store/mybooks/front/order/exception/OrderModulationException.java
+++ b/src/main/java/store/mybooks/front/order/exception/OrderInfoNotMatchException.java
@@ -12,8 +12,12 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 
-public class OrderModulationException extends RuntimeException {
-    public OrderModulationException() {
+public class OrderInfoNotMatchException extends RuntimeException {
+    public OrderInfoNotMatchException() {
         super("주문 정보의 내용이 변조");
     }
+
+    public OrderInfoNotMatchException(String message) {
+        super(message);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index cfda3dab..c431b5bc 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -14,7 +14,7 @@
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
-import store.mybooks.front.order.exception.OrderModulationException;
+import store.mybooks.front.order.exception.OrderInfoNotMatchException;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -92,7 +92,7 @@ public void checkModulation(BookOrderRequest bookOrderRequest) {
     public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
         UserGetResponse user = checkUser(orderInfoRequest.getEmail());
         UserAddressGetResponse userAddress = checkAddress(orderInfoRequest.getAddressId());
-        PointResponse pointResponse = userPointAdaptor.getPointsHeld();
+        Integer point = checkPoint(orderInfoRequest.getUsingPoint());
 
 
     }
@@ -105,7 +105,7 @@ public UserAddressGetResponse checkAddress(Long addressId) {
                 return address;
             }
         }
-        throw new OrderModulationException();
+        throw new OrderInfoNotMatchException("회원 주소 정보 변조");
     }
 
     public UserGetResponse checkUser(String email) {
@@ -113,8 +113,15 @@ public UserGetResponse checkUser(String email) {
         if (Objects.equals(user.getEmail(), email)) {
             return user;
         }
-        throw new OrderModulationException();
+        throw new OrderInfoNotMatchException("회원 정보 변조");
     }
 
-
+    public Integer checkPoint(Integer usingPoint) {
+        PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
+        if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
+            throw new OrderInfoNotMatchException("포인트 정보");
+        }
+        return usingPoint;
+    }
+    public
 }

From 245f25105c108aaafbbc7a85c014c7b55ef4a098 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 17:20:45 +0900
Subject: [PATCH 010/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=9C=A0=EC=A0=80=20=EC=A0=95=EB=B3=B4=20dto=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/dto/request/BookOrderRequest.java   |  1 +
 .../dto/request/OrderUserInfoRequest.java     | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java

diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 2bb07da9..9c1974a5 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -24,4 +24,5 @@
 public class BookOrderRequest {
     private OrderInfoRequest orderInfo;
     private List<BookInfoRequest> bookInfoList;
+    private OrderUserInfoRequest userInfo;
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
new file mode 100644
index 00000000..d0b9af68
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
@@ -0,0 +1,25 @@
+package store.mybooks.front.order.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.request<br>
+ * fileName       : OrderUserInfoRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderUserInfoRequest {
+    private String userName;
+    private String email;
+    private String phoneNumber;
+}

From 2444a1f494ba8efa86f8e98397178b1353c81fb5 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 17:21:02 +0900
Subject: [PATCH 011/147] =?UTF-8?q?feat:=20dto=20=EC=88=98=EC=A0=95'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/order/dto/request/OrderInfoRequest.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index 50093ccb..b4160382 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -21,9 +21,7 @@
 @NoArgsConstructor
 @ToString
 public class OrderInfoRequest {
-    private String userId;
-    private String email;
-    private String phoneNumber;
+
     private String recipientName;
     private String recipientPhoneNumber;
     private Long addressId;

From 1e6a72053cfcbc95a7f7426f4cb4e62df19c72d1 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 19:56:10 +0900
Subject: [PATCH 012/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=84=EB=A5=BC=EB=95=8C=20?=
 =?UTF-8?q?=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/cart.html | 66 ++++++++++++++++++--------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index a95b0a8f..878b5987 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -81,7 +81,8 @@ <h1 class="page-title">Cart</h1>
                 </div>
                 <!-- End Cart List Title -->
                 <!-- Cart Single List list -->
-                <div th:each="cartDetail : ${cartDetailList}" class="cart-single-list">
+                <div th:each="cartDetail : ${cartDetailList}" class="cart-single-list"
+                     th:attr="data-book-id=${cartDetail.bookId}">
                     <div class="row align-items-center">
                         <div class="col-lg-1 col-md-1 col-12">
                             <a th:href="${cartDetail.bookImage}"><img th:src="${cartDetail.bookImage}" alt="#"></a>
@@ -104,8 +105,8 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         <div class="col-lg-2 col-md-2 col-12 ">
                             <p th:text="${#numbers.formatInteger(cartDetail.cost, 3, 'COMMA')}"></p>
                         </div>
-                        <div class="col-lg-2 col-md-2 col-12 "  id="cost">
-                            <p th:text="${#numbers.formatInteger(cartDetail.saleCost, 3, 'COMMA')}" ></p>
+                        <div class="col-lg-2 col-md-2 col-12 " id="cost">
+                            <p th:text="${#numbers.formatInteger(cartDetail.saleCost, 3, 'COMMA')}"></p>
 
                         </div>
                         <div class="col-lg-1 col-md-2 col-12">
@@ -122,15 +123,15 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                     }
 
                     function increaseCounter(button) {
-                        var counterElement = button.parentElement.querySelector('.counter');
-                        var counterValue = parseInt(counterElement.innerText);
+                        let counterElement = button.parentElement.querySelector('.counter');
+                        let counterValue = parseInt(counterElement.innerText);
                         counterValue++;
                         updateCounterDisplay(counterElement, counterValue);
                     }
 
                     function decreaseCounter(button) {
-                        var counterElement = button.parentElement.querySelector('.counter');
-                        var counterValue = parseInt(counterElement.innerText);
+                        let counterElement = button.parentElement.querySelector('.counter');
+                        let counterValue = parseInt(counterElement.innerText);
                         if (counterValue > 1) {
                             counterValue--;
                             updateCounterDisplay(counterElement, counterValue);
@@ -138,13 +139,13 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                     }
 
                     function updateTotalAmount() {
-                        var total = 0;
-                        var counters = document.querySelectorAll('.counter');
-                        var costs = document.querySelectorAll('#cost p');
+                        let total = 0;
+                        let counters = document.querySelectorAll('.counter');
+                        let costs = document.querySelectorAll('#cost p');
 
-                        for (var i = 0; i < counters.length; i++) {
-                            var counterValue = parseInt(counters[i].innerText);
-                            var costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
+                        for (let i = 0; i < counters.length; i++) {
+                            let counterValue = parseInt(counters[i].innerText);
+                            let costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
 
                             total += counterValue * costValue;
                         }
@@ -154,9 +155,35 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         document.getElementById('totalAmount').innerText = total + '원';
                     }
 
-                    // document.addEventListener('DOMContentLoaded', function (){
-                    //     updateTotalAmount();
-                    // });
+
+                    function orderItem() {
+                        let orderItems = [];
+                        let cartItems = document.querySelectorAll('.cart-single-list');
+
+                        cartItems.forEach(function (cartItem) {
+                            let bookId = cartItem.getAttribute('data-book-id');
+                            let amount = cartItem.querySelector('.counter').innerText;
+
+                            orderItems.push({
+                                bookId: bookId,
+                                amount: amount
+                            });
+                        });
+
+                        fetch('/cart/order', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify(orderItems)
+                        })
+                            .then(response => {
+                                if (!response.ok) {
+                                    throw new Error('response not ok');
+                                }
+                                return response.json();
+                            })
+                    }
                 </script>
 
 
@@ -181,22 +208,21 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                     <div class="right">
                                         <ul>
                                             <li class="last">총 주문금액
-                                                <span th:text="${totalAmount}" id="totalAmount"></span></li>
+                                                <span th:text="${totalAmount}" id="totalAmount"></span>
+                                            </li>
                                         </ul>
                                         <div class="button">
-                                            <a href="/cart/checkout" class="btn">주문</a>
+                                            <a href="/cart/checkout" class="btn" onclick="orderItem()">주문</a>
                                             <a href="/" class="btn btn-alt">계속 쇼핑하기</a>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <!--/ End Total Amount -->
                     </div>
                 </div>
             </div>
         </div>
-        <!--/ End Shopping Cart -->
 
     </div>
 

From 96cfa77a040ebb59ddf83b60798cdb395422e905 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 20:02:04 +0900
Subject: [PATCH 013/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=84=EB=A5=BC=EB=95=8C=20?=
 =?UTF-8?q?=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20con?=
 =?UTF-8?q?troller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/cart/controller/CartController.java | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/controller/CartController.java b/src/main/java/store/mybooks/front/cart/controller/CartController.java
index 6d7c71dd..0334070e 100644
--- a/src/main/java/store/mybooks/front/cart/controller/CartController.java
+++ b/src/main/java/store/mybooks/front/cart/controller/CartController.java
@@ -6,17 +6,21 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.CookieValue;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.domain.CartRegisterRequest;
-import store.mybooks.front.cart.service.CartUserService;
+import store.mybooks.front.cart.domain.OrderItemRequest;
 import store.mybooks.front.cart.service.CartNonUserService;
+import store.mybooks.front.cart.service.CartUserService;
+import store.mybooks.front.cart.service.CartUtil;
 import store.mybooks.front.utils.CookieUtils;
 
 /**
@@ -107,24 +111,16 @@ private boolean isUser(HttpServletRequest request) {
         return Objects.nonNull(CookieUtils.getIdentityCookieValue(request));
     }
 
+    @PostMapping("/cart/order")
+    public ResponseEntity<Void> cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
+                                    HttpServletResponse response, HttpServletRequest request,
+                                    @RequestBody List<OrderItemRequest> orderItemRequest) {
+        if (isUser(request)) {
+            cartUserService.orderBookInCart(orderItemRequest);
+        } else {
+            cartNonUserService.orderBookInCart(cartCookie, response, orderItemRequest);
+        }
 
-//    @PostMapping("/cart/order")
-//    public String cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
-//                            HttpServletResponse response, Model model) {
-//        try {
-//            List<CartDetail> cartDetailList = cartUtil.viewCart(cartCookie);
-//            if (cartDetailList.isEmpty()) {
-//                return "redirect:/cart";
-//            } else {
-//                model.addAttribute("cartItem", cartDetailList);
-//                String emptyCart = objectMapper.writeValueAsString(new ArrayList<CartDetail>());
-//                //TODO
-//            }
-//        } catch (JsonProcessingException e) {
-//            throw new RuntimeException(e);
-//        }
-//        return "";
-//    }
-
-
-}
+        return ResponseEntity.ok().build();
+    }
+}
\ No newline at end of file

From a81339871e47a544dcae0244f64069105f246184 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 20:07:52 +0900
Subject: [PATCH 014/147] =?UTF-8?q?feat:=20=EC=88=98=EB=9F=89=20=EC=97=85?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/store/mybooks/front/cart/domain/CartDetail.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
index a3632753..a2fe4ec8 100644
--- a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
+++ b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
@@ -28,10 +28,14 @@ public class CartDetail {
     private Integer cost;
     private Integer saleCost;
 
-    public void amountUpdate(int amount) {
+    public void addAmount(int amount) {
         this.cartDetailAmount = this.cartDetailAmount + amount;
     }
 
+    public void amountUpdate(int amount) {
+        this.cartDetailAmount = amount;
+    }
+
     public CartDetail saleUpdate(Integer amount) {
         this.saleCost *= amount;
         return this;

From 6c0116106c37edc9fcbecf4f04603ea220ee9215 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 20:08:10 +0900
Subject: [PATCH 015/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=84=EB=A5=BC=EB=95=8C=20?=
 =?UTF-8?q?=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20ser?=
 =?UTF-8?q?vice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cart/service/CartNonUserService.java      | 30 ++++++++++++++++++-
 .../front/cart/service/CartUserService.java   | 30 +++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
index 3ce23bc4..8816199c 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
@@ -19,6 +19,7 @@
 import store.mybooks.front.cart.controller.CartController;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.domain.CartRegisterRequest;
+import store.mybooks.front.cart.domain.OrderItemRequest;
 import store.mybooks.front.cart.exception.CookieParseException;
 
 /**
@@ -67,7 +68,7 @@ public void registerBookToCart(Cookie cookie, HttpServletResponse response,
             boolean isAlreadyCart = false;
             for (CartDetail cartDetail : cartDetailList) {
                 if (Objects.equals(cartBook.getId(), cartDetail.getBookId())) {
-                    cartDetail.amountUpdate(cartRegisterRequest.getQuantity());
+                    cartDetail.addAmount(cartRegisterRequest.getQuantity());
                     isAlreadyCart = true;
                     break;
                 }
@@ -91,6 +92,31 @@ public void registerBookToCart(Cookie cookie, HttpServletResponse response,
         }
     }
 
+
+    public void orderBookInCart(Cookie cartCookie, HttpServletResponse response,
+                                List<OrderItemRequest> orderItemRequestList) {
+        if (Objects.isNull(cartCookie)) {
+            return;
+        }
+        try {
+            List<CartDetail> cartDetailList = new ArrayList<>(viewCart(cartCookie));
+            for (OrderItemRequest orderItemRequest : orderItemRequestList) {
+                cartDetailList.forEach(cartDetail -> {
+                    if (Objects.equals(cartDetail.getBookId(), orderItemRequest.getBookId())) {
+                        cartDetail.amountUpdate(orderItemRequest.getAmount());
+                    }
+                });
+            }
+            String cartJson = objectMapper.writeValueAsString(cartDetailList);
+            String encode = URLEncoder.encode(cartJson, StandardCharsets.UTF_8);
+            Cookie saveCookie = new Cookie(CartController.CART_COOKIE_VALUE, encode);
+            response.addCookie(saveCookie);
+        } catch (JsonProcessingException e) {
+            throw new CookieParseException(e.getMessage());
+        }
+    }
+
+
     /**
      * Delete book from cart.
      *
@@ -129,4 +155,6 @@ private List<CartDetail> viewCart(Cookie cartCookie) throws JsonProcessingExcept
 
         return cartDetailList;
     }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/cart/service/CartUserService.java b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
index 429b9d16..d15bdbf4 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
@@ -11,6 +11,7 @@
 import store.mybooks.front.cart.controller.CartController;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.domain.CartRegisterRequest;
+import store.mybooks.front.cart.domain.OrderItemRequest;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
 
@@ -66,7 +67,7 @@ public void addBookToCart(CartRegisterRequest cartRegisterRequest) {
 
         for (CartDetail cartDetail : cartDetailList) {
             if (Objects.equals(cartRegisterRequest.getId(), cartDetail.getBookId())) {
-                cartDetail.amountUpdate(cartRegisterRequest.getQuantity());
+                cartDetail.addAmount(cartRegisterRequest.getQuantity());
                 isAlreadyInCart = true;
                 redisTemplate.opsForList().set(cartKey, cartDetailList.indexOf(cartDetail), cartDetail);
                 break;
@@ -76,7 +77,8 @@ public void addBookToCart(CartRegisterRequest cartRegisterRequest) {
         if (!isAlreadyInCart) {
             BookCartResponse cartBook = bookAdminAdaptor.getCartBook(cartRegisterRequest.getId());
             CartDetail cartDetail =
-                    new CartDetail(cartBook.getId(), cartRegisterRequest.getQuantity(), cartBook.getName(), cartBook.getBookImage(), cartBook.getCost(),
+                    new CartDetail(cartBook.getId(), cartRegisterRequest.getQuantity(), cartBook.getName(),
+                            cartBook.getBookImage(), cartBook.getCost(),
                             cartBook.getSaleCost());
             cartDetailList.add(cartDetail);
             redisTemplate.opsForList().rightPush(cartKey, cartDetail);
@@ -102,6 +104,30 @@ public void deleteBookFromCart(Long bookId) {
         }
     }
 
+    public void orderBookInCart(List<OrderItemRequest> orderItemRequestList) {
+        List<CartDetail> bookFromCart = getBookFromCart();
+        if (Objects.isNull(bookFromCart) || bookFromCart.isEmpty()) {
+            return;
+        }
+
+        for (OrderItemRequest orderItemRequest : orderItemRequestList) {
+            bookFromCart.forEach(cartDetail -> {
+                if (Objects.equals(cartDetail.getBookId(), orderItemRequest.getBookId())) {
+                    cartDetail.amountUpdate(orderItemRequest.getAmount());
+                }
+            });
+        }
+        deleteAllBookFromCart();
+
+        String carKey = cartKey();
+        bookFromCart.forEach(cartDetail -> redisTemplate.opsForList().rightPush(carKey, cartDetail));
+    }
+
+    public void deleteAllBookFromCart() {
+        String cartKey = cartKey();
+        redisTemplate.delete(cartKey);
+    }
+
     public String cartKey() {
         UserGetResponse user = userAdaptor.findUser();
         return CartController.CART_COOKIE_VALUE + ":" + user.getEmail();

From 057cae40ad0cda256b15123ef7574e36d2b37ecb Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 20:09:14 +0900
Subject: [PATCH 016/147] =?UTF-8?q?feat:=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=ED=95=A0=20=EC=88=98=EB=9F=89=EA=B3=BC=20?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=98=20book=20id=EB=A5=BC=20=EB=B0=9B=EC=95=84?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/cart/domain/OrderItemRequest.java   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/cart/domain/OrderItemRequest.java

diff --git a/src/main/java/store/mybooks/front/cart/domain/OrderItemRequest.java b/src/main/java/store/mybooks/front/cart/domain/OrderItemRequest.java
new file mode 100644
index 00000000..e936fc0f
--- /dev/null
+++ b/src/main/java/store/mybooks/front/cart/domain/OrderItemRequest.java
@@ -0,0 +1,22 @@
+package store.mybooks.front.cart.domain;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.front.cart.domain <br/>
+ * fileName       : OrderItemDto<br/>
+ * author         : Fiat_lux <br/>
+ * date           : 3/16/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 3/16/24        Fiat_lux       최초 생성<br/>
+ */
+@NoArgsConstructor
+@Getter
+public class OrderItemRequest {
+    private Long bookId;
+    private int amount;
+}

From a634d220b32987667c0c82b409d7a9e588725b5b Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 20:34:14 +0900
Subject: [PATCH 017/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=ED=95=98=EB=8A=94=20=EC=84=9C=EB=B9=84=EC=8A=A4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/OrderInfoCheckService.java  | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java

diff --git a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
new file mode 100644
index 00000000..3120683f
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
@@ -0,0 +1,123 @@
+package store.mybooks.front.order.service;
+
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import store.mybooks.front.admin.wrap.adaptor.WrapAdaptor;
+import store.mybooks.front.book.adaptor.BookAdaptor;
+import store.mybooks.front.cart.domain.CartDetail;
+import store.mybooks.front.order.adaptor.OrderAdaptor;
+import store.mybooks.front.order.dto.request.BookInfoRequest;
+import store.mybooks.front.order.dto.request.BookOrderRequest;
+import store.mybooks.front.order.dto.request.OrderInfoRequest;
+import store.mybooks.front.order.exception.OrderInfoNotMatchException;
+import store.mybooks.front.user.adaptor.UserAdaptor;
+import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
+import store.mybooks.front.user_address.response.UserAddressGetResponse;
+import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
+import store.mybooks.front.user_coupon.model.response.UserCouponGetResponseForOrder;
+import store.mybooks.front.userpoint.adaptor.UserPointAdaptor;
+import store.mybooks.front.userpoint.dto.response.PointResponse;
+
+/**
+ * packageName    : store.mybooks.front.order.service<br>
+ * fileName       : OrderService<br>
+ * author         : minsu11<br>
+ * date           : 3/5/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/5/24        minsu11       최초 생성<br>
+ */
+@Service
+@RequiredArgsConstructor
+public class OrderInfoCheckService {
+    private final BookAdaptor bookAdaptor;
+    private final OrderAdaptor orderAdapter;
+    private final UserAddressAdaptor userAddressAdaptor;
+    private final UserAdaptor userAdaptor;
+    private final WrapAdaptor wrapAdaptor;
+    private final UserCouponAdaptor userCouponAdaptor;
+    private final UserPointAdaptor userPointAdaptor;
+
+
+    public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail> cartInfo) {
+        OrderInfoRequest orderInfoRequest = bookOrderRequest.getOrderInfo();
+        List<BookInfoRequest> bookInfoRequest = bookOrderRequest.getBookInfoList();
+        checkOrderInfo(orderInfoRequest);
+        checkDuplicateCoupon(bookInfoRequest);
+        checkBookInfo(bookInfoRequest, cartInfo);
+
+    }
+
+    public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cartInfos) {
+        if (bookInfos.size() == cartInfos.size()) {
+            throw new OrderInfoNotMatchException("장바구니에 담긴 물품의 갯수가 다름");
+        }
+        for (int i = 0; i < bookInfos.size(); i++) {
+            BookInfoRequest bookInfo = bookInfos.get(i);
+            CartDetail cartInfo = cartInfos.get(i);
+            if (!bookInfo.getBookId().equals(cartInfo.getBookId())
+                    || !bookInfo.getSaleCost().equals(cartInfo.getSaleCost())) {
+                throw new OrderInfoNotMatchException("도서의 정보가 다름");
+            }
+            if (Objects.nonNull(bookInfo.getSelectWrapId())) {
+                wrapAdaptor.getWrap(bookInfo.getSelectWrapId());
+            }
+            if (Objects.nonNull(bookInfo.getSelectCouponId())) {
+                checkBookCoupon(bookInfo);
+            }
+        }
+    }
+
+    public void checkDuplicateCoupon(List<BookInfoRequest> bookInfos) {
+        for (int i = 0; i < bookInfos.size(); i++) {
+            for (int j = i + 1; j < bookInfos.size(); j++) {
+                if (Objects.equals(bookInfos.get(i).getSelectCouponId(), bookInfos.get(j).getSelectCouponId())) {
+                    throw new OrderInfoNotMatchException("같은 쿠폰이 입력됨");
+                }
+            }
+        }
+
+    }
+
+    public void checkBookCoupon(BookInfoRequest bookInfo) {
+        boolean isCheck = false;
+        List<UserCouponGetResponseForOrder> couponList = userCouponAdaptor.getUsableUserCoupon(bookInfo.getBookId());
+        for (int j = 0; j < couponList.size(); j++) {
+            if (Objects.equals(couponList.get(j), bookInfo.getSelectCouponId())) {
+                isCheck = true;
+            }
+        }
+        if (!isCheck) {
+            throw new OrderInfoNotMatchException("쿠폰 정보 다름");
+        }
+    }
+
+
+    public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
+        orderAdapter.checkOrderUserAddressInfo(orderInfoRequest.getAddressId());
+        checkPoint(orderInfoRequest.getUsingPoint());
+    }
+
+    public UserAddressGetResponse checkAddress(Long addressId) {
+        List<UserAddressGetResponse> userAddressGetResponses = userAddressAdaptor.findAllUserAddress();
+
+        for (UserAddressGetResponse address : userAddressGetResponses) {
+            if (Objects.equals(address.getId(), addressId)) {
+                return address;
+            }
+        }
+        throw new OrderInfoNotMatchException("회원 주소 정보 변조");
+    }
+
+    public Integer checkPoint(Integer usingPoint) {
+        PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
+        if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
+            throw new OrderInfoNotMatchException("포인트 정보");
+        }
+        return usingPoint;
+    }
+}

From 7f964b37d4514741a7ddc544a8f79dcdce977e61 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 20:35:32 +0900
Subject: [PATCH 018/147] =?UTF-8?q?feat:=20order=20adaptor=EC=97=90=20?=
 =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=A3=BC=EC=86=8C=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EA=B0=80=20=EB=A7=9E=EB=8A=94=EC=A7=80=20=ED=8C=90=EB=B3=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/global/GlobalControllerAdvice.java  |  4 +---
 .../front/order/adaptor/OrderAdaptor.java     | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index 12e19650..def23bff 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -61,13 +61,11 @@ public String handleAuthException(RuntimeException ex) {
 
 
     @ExceptionHandler({OrderInfoNotMatchException.class})
-    // 400 404 이게 리소스에서 나오는 모든 예외
     public String handleOrderModulationException(Exception exception, HttpServletRequest request) {
 
         String previousUrl = request.getHeader(REFERER);
-        request.getSession().setAttribute("error", exception.getMessage());
+        request.getSession().setAttribute("errosr", exception.getMessage());
         return previousUrl.replace(domain, "redirect:");
     }
 
-
 }
diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index b5c4c732..acedcb17 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -1,9 +1,14 @@
 package store.mybooks.front.order.adaptor;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.utils.Utils;
 
 /**
  * packageName    : store.mybooks.front.order.adaptor<br>
@@ -21,4 +26,23 @@
 public class OrderAdaptor {
     private final RestTemplate restTemplate;
     private final GatewayAdaptorProperties gatewayAdaptorProperties;
+    private static final String URL = "/api/order";
+
+    /**
+     * methodName : checkOrderUserAddressInfo<br>
+     * author : minsu11<br>
+     * description : 회원이 주문에서 선택한 주소가 실제로 회원이 등록된 주소인지 확인.
+     * <br> *
+     *
+     * @param id 주소 아이디
+     */
+    public void checkOrderUserAddressInfo(Long id) {
+        ResponseEntity<Object> exchange = restTemplate.exchange(URL + "/check/address/{id}",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<Object>() {
+                }, id);
+        Utils.getResponseEntity(exchange, HttpStatus.NO_CONTENT);
+    }
+
 }

From 4d4e164176394f7f45ab4c8a07d2ffafeeaaaa0b Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 20:41:20 +0900
Subject: [PATCH 019/147] =?UTF-8?q?feat:=20html=20=EB=B3=80=EC=A1=B0=20?=
 =?UTF-8?q?=EB=90=9C=20=EA=B0=92=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=EC=83=81=ED=99=A9=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/admin/wrap/adaptor/WrapAdaptor.java | 11 ++++
 .../mybooks/front/config/RedisConfig.java     |  2 +-
 .../order/controller/OrderController.java     |  5 +-
 .../order/dto/request/BookInfoRequest.java    |  2 +-
 .../order/service/OrderInfoCheckService.java  | 19 +------
 .../front/order/service/OrderService.java     | 51 -------------------
 src/main/resources/templates/checkout.html    |  9 ++--
 7 files changed, 24 insertions(+), 75 deletions(-)

diff --git a/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java b/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
index 8c41c298..a9bec665 100644
--- a/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
+++ b/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
@@ -34,6 +34,17 @@ public class WrapAdaptor {
     private final GatewayAdaptorProperties gatewayAdaptorProperties;
     private static final String URL = "/api/wraps";
 
+    public WrapResponse getWrap(Integer id) {
+        String url = gatewayAdaptorProperties.getAddress() + URL + "/{id}";
+        ResponseEntity<WrapResponse> exchange = restTemplate.exchange(url,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<WrapResponse>() {
+                }, id);
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+
     /**
      * methodName : getWrap<br>
      * author : minsu11<br>
diff --git a/src/main/java/store/mybooks/front/config/RedisConfig.java b/src/main/java/store/mybooks/front/config/RedisConfig.java
index 461016f7..5a5f688d 100644
--- a/src/main/java/store/mybooks/front/config/RedisConfig.java
+++ b/src/main/java/store/mybooks/front/config/RedisConfig.java
@@ -81,4 +81,4 @@ public RedisCacheManager redisCacheManager(RedisConnectionFactory redisConnectio
                 .cacheDefaults(cacheConfiguration)
                 .build();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index f8d3e561..b0e0f9ae 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -17,6 +17,7 @@
 import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
+import store.mybooks.front.order.service.OrderInfoCheckService;
 import store.mybooks.front.order.service.OrderService;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.response.UserGetResponse;
@@ -52,6 +53,7 @@ public class OrderController {
     private final UserCouponService userCouponService;
     private final CartNonUserService cartNonUserService;
     private final CartUserService cartUserService;
+    private final OrderInfoCheckService orderInfoCheckService;
 
     /**
      * methodName : viewOrderPage<br>
@@ -171,7 +173,8 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
 
     @PostMapping("/order")
     public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
-        orderService.checkModulation(orderRequest);
+        List<CartDetail> cart = cartUserService.getBookFromCart();
+        orderInfoCheckService.checkModulation(orderRequest, cart);
         log.info("값 : {}", orderRequest.toString());
         return "test";
     }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
index b79358b1..6367d265 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
@@ -25,6 +25,6 @@ public class BookInfoRequest {
     private Integer saleCost;
     private Integer bookCost;
     private Integer selectWrapId;
-    private Integer selectCouponId;
+    private Long selectCouponId;
 
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
index 3120683f..6f531284 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
@@ -12,9 +12,7 @@
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
 import store.mybooks.front.order.exception.OrderInfoNotMatchException;
-import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
-import store.mybooks.front.user_address.response.UserAddressGetResponse;
 import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
 import store.mybooks.front.user_coupon.model.response.UserCouponGetResponseForOrder;
 import store.mybooks.front.userpoint.adaptor.UserPointAdaptor;
@@ -37,7 +35,6 @@ public class OrderInfoCheckService {
     private final BookAdaptor bookAdaptor;
     private final OrderAdaptor orderAdapter;
     private final UserAddressAdaptor userAddressAdaptor;
-    private final UserAdaptor userAdaptor;
     private final WrapAdaptor wrapAdaptor;
     private final UserCouponAdaptor userCouponAdaptor;
     private final UserPointAdaptor userPointAdaptor;
@@ -52,6 +49,7 @@ public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail>
 
     }
 
+    //todo 수량 체크하는 부분 추가해야함
     public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cartInfos) {
         if (bookInfos.size() == cartInfos.size()) {
             throw new OrderInfoNotMatchException("장바구니에 담긴 물품의 갯수가 다름");
@@ -80,7 +78,6 @@ public void checkDuplicateCoupon(List<BookInfoRequest> bookInfos) {
                 }
             }
         }
-
     }
 
     public void checkBookCoupon(BookInfoRequest bookInfo) {
@@ -96,27 +93,15 @@ public void checkBookCoupon(BookInfoRequest bookInfo) {
         }
     }
 
-
     public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
         orderAdapter.checkOrderUserAddressInfo(orderInfoRequest.getAddressId());
         checkPoint(orderInfoRequest.getUsingPoint());
     }
 
-    public UserAddressGetResponse checkAddress(Long addressId) {
-        List<UserAddressGetResponse> userAddressGetResponses = userAddressAdaptor.findAllUserAddress();
-
-        for (UserAddressGetResponse address : userAddressGetResponses) {
-            if (Objects.equals(address.getId(), addressId)) {
-                return address;
-            }
-        }
-        throw new OrderInfoNotMatchException("회원 주소 정보 변조");
-    }
-
     public Integer checkPoint(Integer usingPoint) {
         PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
         if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
-            throw new OrderInfoNotMatchException("포인트 정보");
+            throw new OrderInfoNotMatchException("포인트 정보가 다름");
         }
         return usingPoint;
     }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index c431b5bc..f6887b10 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -1,7 +1,6 @@
 package store.mybooks.front.order.service;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -10,18 +9,11 @@
 import store.mybooks.front.book.adaptor.BookAdaptor;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.order.adaptor.OrderAdaptor;
-import store.mybooks.front.order.dto.request.BookInfoRequest;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
-import store.mybooks.front.order.dto.request.BookOrderRequest;
-import store.mybooks.front.order.dto.request.OrderInfoRequest;
-import store.mybooks.front.order.exception.OrderInfoNotMatchException;
 import store.mybooks.front.user.adaptor.UserAdaptor;
-import store.mybooks.front.user.dto.response.UserGetResponse;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
-import store.mybooks.front.user_address.response.UserAddressGetResponse;
 import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
 import store.mybooks.front.userpoint.adaptor.UserPointAdaptor;
-import store.mybooks.front.userpoint.dto.response.PointResponse;
 
 /**
  * packageName    : store.mybooks.front.order.service<br>
@@ -81,47 +73,4 @@ public List<Integer> calculateBooksCost(List<CartDetail> cartDetailList) {
                 .collect(Collectors.toList());
 
     }
-
-    public void checkModulation(BookOrderRequest bookOrderRequest) {
-        OrderInfoRequest orderInfoRequest = bookOrderRequest.getOrderInfo();
-        List<BookInfoRequest> bookInfoRequest = bookOrderRequest.getBookInfoList();
-
-
-    }
-
-    public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
-        UserGetResponse user = checkUser(orderInfoRequest.getEmail());
-        UserAddressGetResponse userAddress = checkAddress(orderInfoRequest.getAddressId());
-        Integer point = checkPoint(orderInfoRequest.getUsingPoint());
-
-
-    }
-
-    public UserAddressGetResponse checkAddress(Long addressId) {
-        List<UserAddressGetResponse> userAddressGetResponses = userAddressAdaptor.findAllUserAddress();
-
-        for (UserAddressGetResponse address : userAddressGetResponses) {
-            if (Objects.equals(address.getId(), addressId)) {
-                return address;
-            }
-        }
-        throw new OrderInfoNotMatchException("회원 주소 정보 변조");
-    }
-
-    public UserGetResponse checkUser(String email) {
-        UserGetResponse user = userAdaptor.findUser();
-        if (Objects.equals(user.getEmail(), email)) {
-            return user;
-        }
-        throw new OrderInfoNotMatchException("회원 정보 변조");
-    }
-
-    public Integer checkPoint(Integer usingPoint) {
-        PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
-        if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
-            throw new OrderInfoNotMatchException("포인트 정보");
-        }
-        return usingPoint;
-    }
-    public
 }
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index b29d8bc5..efbaeb43 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -56,7 +56,7 @@ <h5>구매자 정보 </h5>
                                                     <div class="row">
                                                         <div class="col-md-6 form-input form">
                                                             <label>
-                                                                <input name="orderInfo.userId" type="text"
+                                                                <input name="userInfo.userName" type="text"
                                                                        th:value="${user.name}"
                                                                        readonly>
                                                             </label>
@@ -68,7 +68,7 @@ <h5>구매자 정보 </h5>
                                                 <div class="single-form form-default">
                                                     <label>이메일</label>
                                                     <div class="col-md-6 form-input form">
-                                                        <input type="text" name="orderInfo.email"
+                                                        <input type="text" name="userInfo.email"
                                                                th:value="${user.email}"
                                                                readonly>
                                                     </div>
@@ -79,7 +79,7 @@ <h5>구매자 정보 </h5>
                                                     <label>휴대폰 번호</label>
                                                     <div class="col-md-6 form-input form">
                                                         <input type="text" th:value="${user.phoneNumber}"
-                                                               name="orderInfo.phoneNumber" readonly>
+                                                               name="userInfo.phoneNumber" readonly>
                                                     </div>
                                                 </div>
                                             </div>
@@ -188,7 +188,8 @@ <h5>주문 내역
                                                                         <p class="book-sale-cost"
                                                                            th:text="${bookCost}"></p>
                                                                         <input th:name="|bookInfoList[${index.index}].bookCost|"
-                                                                               th:value="${bookCost}">
+                                                                               th:value="${bookCost}"
+                                                                               type="hidden">
                                                                     </div>
                                                                 </div>
                                                             </td>

From 0672b0bb4ebe77c4c8eb89923e1c4ee670b03730 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 20:43:43 +0900
Subject: [PATCH 020/147] =?UTF-8?q?refactor:=20contorller=EC=97=90=20?=
 =?UTF-8?q?=EC=88=98=EB=9F=89=20=EB=84=98=EA=B8=B0=EB=8A=94=20input=20?=
 =?UTF-8?q?=ED=83=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/checkout.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index efbaeb43..30bfdb63 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -179,8 +179,13 @@ <h5>주문 내역
                                                             </td>
                                                             <td></td>
                                                             <!--                                                        <td th:text="${book.originalCost}"></td>-->
-                                                            <td th:text="${book.saleCost}"></td>
-                                                            <td th:text="${book.cartDetailAmount}"></td>
+                                                            <td th:text="${book.saleCost}">
+                                                            </td>
+                                                            <td th:text="${book.cartDetailAmount}">
+                                                                <input th:name="|bookInfoList${index.index}.amount|"
+                                                                       th:value="${book.cartDetailAmount}"
+                                                                       type="hidden">
+                                                            </td>
 
                                                             <td>
                                                                 <div th:each="bookCost:${bookCostList}">

From 803e877573c473a09bb69725ddfce78031daedb8 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 20:58:41 +0900
Subject: [PATCH 021/147] =?UTF-8?q?docs:=20java=20doc=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     |  2 +-
 .../order/dto/request/BookInfoRequest.java    |  1 +
 .../order/service/OrderInfoCheckService.java  | 63 +++++++++++++++++--
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index b0e0f9ae..6a31954d 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -83,7 +83,7 @@ public class OrderController {
      * methodName : viewCheckAddress<br>
      * author : minsu11<br>
      * description : 회원의 주소 목록만 나오는 view.
-     * <br> *
+     * <br>
      *
      * @param modelMap model
      * @return string
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
index 6367d265..4da7f350 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
@@ -24,6 +24,7 @@ public class BookInfoRequest {
     private Long bookId;
     private Integer saleCost;
     private Integer bookCost;
+    private Integer amount;
     private Integer selectWrapId;
     private Long selectCouponId;
 
diff --git a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
index 6f531284..651e6c8f 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
@@ -40,6 +40,15 @@ public class OrderInfoCheckService {
     private final UserPointAdaptor userPointAdaptor;
 
 
+    /**
+     * methodName : checkModulation<br>
+     * author : minsu11<br>
+     * description : {@Code html}에서 변조 데이터 들어왔는지 검사.
+     * <br>
+     *
+     * @param bookOrderRequest the book order request
+     * @param cartInfo         the cart info
+     */
     public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail> cartInfo) {
         OrderInfoRequest orderInfoRequest = bookOrderRequest.getOrderInfo();
         List<BookInfoRequest> bookInfoRequest = bookOrderRequest.getBookInfoList();
@@ -49,7 +58,16 @@ public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail>
 
     }
 
-    //todo 수량 체크하는 부분 추가해야함
+    /**
+     * methodName : checkBookInfo<br>
+     * author : minsu11<br>
+     * description : 장바구니에 담긴 정보랑 주문할 도서 정보가 같은지 확인.
+     * <br> *
+     *
+     * @param bookInfos 주문할 도서 정보
+     * @param cartInfos 장바구니 정보
+     */
+//todo 수량 체크하는 부분 추가해야함
     public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cartInfos) {
         if (bookInfos.size() == cartInfos.size()) {
             throw new OrderInfoNotMatchException("장바구니에 담긴 물품의 갯수가 다름");
@@ -57,8 +75,11 @@ public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cart
         for (int i = 0; i < bookInfos.size(); i++) {
             BookInfoRequest bookInfo = bookInfos.get(i);
             CartDetail cartInfo = cartInfos.get(i);
-            if (!bookInfo.getBookId().equals(cartInfo.getBookId())
-                    || !bookInfo.getSaleCost().equals(cartInfo.getSaleCost())) {
+            if (
+                    !bookInfo.getBookId().equals(cartInfo.getBookId())
+                            || !bookInfo.getSaleCost().equals(cartInfo.getSaleCost())
+                            || !Objects.equals(bookInfo.getAmount(), cartInfo.getCartDetailAmount())
+            ) {
                 throw new OrderInfoNotMatchException("도서의 정보가 다름");
             }
             if (Objects.nonNull(bookInfo.getSelectWrapId())) {
@@ -70,6 +91,14 @@ public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cart
         }
     }
 
+    /**
+     * methodName : checkDuplicateCoupon<br>
+     * author : minsu11<br>
+     * description : 같은 쿠폰이 있는지 확인.
+     * <br> *
+     *
+     * @param bookInfos the book infos
+     */
     public void checkDuplicateCoupon(List<BookInfoRequest> bookInfos) {
         for (int i = 0; i < bookInfos.size(); i++) {
             for (int j = i + 1; j < bookInfos.size(); j++) {
@@ -80,6 +109,14 @@ public void checkDuplicateCoupon(List<BookInfoRequest> bookInfos) {
         }
     }
 
+    /**
+     * methodName : checkBookCoupon<br>
+     * author : minsu11<br>
+     * description : 책에 적용된 쿠폰 검사. 본인이 소유한 쿠폰이 아니면 {@cod throw}를 던짐.
+     * <br> *
+     *
+     * @param bookInfo 도서관련 DTO
+     */
     public void checkBookCoupon(BookInfoRequest bookInfo) {
         boolean isCheck = false;
         List<UserCouponGetResponseForOrder> couponList = userCouponAdaptor.getUsableUserCoupon(bookInfo.getBookId());
@@ -93,16 +130,32 @@ public void checkBookCoupon(BookInfoRequest bookInfo) {
         }
     }
 
+    /**
+     * methodName : checkOrderInfo<br>
+     * author : minsu11<br>
+     * description : 회원의 주문 정보를 검사하는 메서드.
+     * <br> *
+     *
+     * @param orderInfoRequest 주문 정보가 담긴 DTO
+     */
     public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
         orderAdapter.checkOrderUserAddressInfo(orderInfoRequest.getAddressId());
         checkPoint(orderInfoRequest.getUsingPoint());
     }
 
-    public Integer checkPoint(Integer usingPoint) {
+    /**
+     * methodName : checkPoint<br>
+     * author : minsu11<br>
+     * description : 회원이 가진 포인트 검사. DB에 등록된 회원의 포인트 보다 높으면
+     * {@code OrderInfoNotMatchException}을 던짐.
+     * <br> *
+     *
+     * @param usingPoint 사용할 포인트
+     */
+    public void checkPoint(Integer usingPoint) {
         PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
         if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
             throw new OrderInfoNotMatchException("포인트 정보가 다름");
         }
-        return usingPoint;
     }
 }

From 21b08d92216ededc50e8f0284377f431e906b492 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sat, 16 Mar 2024 21:44:18 +0900
Subject: [PATCH 022/147] =?UTF-8?q?docs:=20=EC=9E=90=EB=B0=94=EB=8F=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/cart/service/CartNonUserService.java      |  7 +++++++
 .../mybooks/front/cart/service/CartUserService.java | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
index 8816199c..c439c6ec 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
@@ -93,6 +93,13 @@ public void registerBookToCart(Cookie cookie, HttpServletResponse response,
     }
 
 
+    /**
+     * Order book in cart.
+     *
+     * @param cartCookie           the cart cookie
+     * @param response             the response
+     * @param orderItemRequestList the order item request list
+     */
     public void orderBookInCart(Cookie cartCookie, HttpServletResponse response,
                                 List<OrderItemRequest> orderItemRequestList) {
         if (Objects.isNull(cartCookie)) {
diff --git a/src/main/java/store/mybooks/front/cart/service/CartUserService.java b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
index d15bdbf4..f5928abe 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
@@ -104,6 +104,11 @@ public void deleteBookFromCart(Long bookId) {
         }
     }
 
+    /**
+     * Order book in cart.
+     *
+     * @param orderItemRequestList the order item request list
+     */
     public void orderBookInCart(List<OrderItemRequest> orderItemRequestList) {
         List<CartDetail> bookFromCart = getBookFromCart();
         if (Objects.isNull(bookFromCart) || bookFromCart.isEmpty()) {
@@ -123,11 +128,19 @@ public void orderBookInCart(List<OrderItemRequest> orderItemRequestList) {
         bookFromCart.forEach(cartDetail -> redisTemplate.opsForList().rightPush(carKey, cartDetail));
     }
 
+    /**
+     * Delete all book from cart.
+     */
     public void deleteAllBookFromCart() {
         String cartKey = cartKey();
         redisTemplate.delete(cartKey);
     }
 
+    /**
+     * Cart key string.
+     *
+     * @return the string
+     */
     public String cartKey() {
         UserGetResponse user = userAdaptor.findUser();
         return CartController.CART_COOKIE_VALUE + ":" + user.getEmail();

From e5d7e05f303d7d6ee805ad0a684642bf82cd4035 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 23:35:15 +0900
Subject: [PATCH 023/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/dto/request/OrderCreateRequest.java | 15 ++++++++++--
 .../dto/response/BookOrderCreateResponse.java | 24 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java

diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
index 57d526dd..d74327f4 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
@@ -1,7 +1,9 @@
 package store.mybooks.front.order.dto.request;
 
+import java.time.LocalDate;
+import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -15,6 +17,15 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@Setter
+@AllArgsConstructor
 public class OrderCreateRequest {
+    private List<BookInfoRequest> bookInfoList;
+    private String deliveryName;
+    private LocalDate deliveryDate;
+    private Integer point;
+    private String recipientName;
+    private String recipientAddress;
+    private String recipientPhoneNumber;
+    private String receiverMessage;
+    private String orderNumber;
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
new file mode 100644
index 00000000..2d24ef76
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
@@ -0,0 +1,24 @@
+package store.mybooks.front.order.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.response<br>
+ * fileName       : BookOrderCreateResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/16/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/16/24        minsu11       최초 생성<br>
+ */
+@Getter
+@AllArgsConstructor
+public class BookOrderCreateResponse {
+    private String orderStatus;
+    private String number;
+    private Integer totalCost;
+
+}

From 8b7932001368a1ac6c803f1b483cab00f091da03 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sat, 16 Mar 2024 23:36:21 +0900
Subject: [PATCH 024/147] =?UTF-8?q?feat:=20=EB=B0=B0=EC=86=A1=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=EC=82=AC=ED=95=AD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/dto/request/OrderInfoRequest.java      |  2 ++
 src/main/resources/templates/checkout.html             | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index b4160382..4b4c2422 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -27,8 +27,10 @@ public class OrderInfoRequest {
     private Long addressId;
     private String recipientAddress;
     private String deliveryDate;
+    private String receiverMessage;
     private Integer usingPoint;
     private Integer wrapCost;
     private Integer couponApplicationAmount;
 
+
 }
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index 30bfdb63..8f6315fe 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -262,15 +262,23 @@ <h5>포인트 사용</h5>
                                     </section>
                                 </li>
                                 <li>
-                                    <h5>배송 날짜</h5>
+                                    <h5>배송</h5>
                                     <section class="form-control">
                                         <div>
+                                            <h6> 배송 날짜</h6>
                                             <label>
                                                 <input type="date" id="delivery-date-id" th:min="${localDate}"
                                                        name="orderInfo.deliveryDate">
                                                 <label for="delivery-date-id" id="delivery-date-label"></label>
                                             </label>
                                         </div>
+                                        <div class="md-form amber-textarea active-amber-textarea">
+                                            <h6>배송 시 요청 사항</h6>
+                                            <label class="form-label">
+                                                <textarea id="receiver-message" class="form-control" rows="3"
+                                                          name="orderInfo.receiverMessage"></textarea>
+                                            </label>
+                                        </div>
                                     </section>
                                 </li>
                                 <li>

From 3aacaebd5973a831775f9f5ec6b643d35dacf5e6 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 04:54:37 +0900
Subject: [PATCH 025/147] =?UTF-8?q?refactor:=20url=20=EC=9D=B4=EB=A6=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/cart/controller/CartController.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/controller/CartController.java b/src/main/java/store/mybooks/front/cart/controller/CartController.java
index 0334070e..e2727c7e 100644
--- a/src/main/java/store/mybooks/front/cart/controller/CartController.java
+++ b/src/main/java/store/mybooks/front/cart/controller/CartController.java
@@ -111,10 +111,11 @@ private boolean isUser(HttpServletRequest request) {
         return Objects.nonNull(CookieUtils.getIdentityCookieValue(request));
     }
 
-    @PostMapping("/cart/order")
-    public ResponseEntity<Void> cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
-                                    HttpServletResponse response, HttpServletRequest request,
-                                    @RequestBody List<OrderItemRequest> orderItemRequest) {
+    @PostMapping("/cart/update")
+    public ResponseEntity<Void> cartAmountUpdate(
+            @CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
+            HttpServletResponse response, HttpServletRequest request,
+            @RequestBody List<OrderItemRequest> orderItemRequest) {
         if (isUser(request)) {
             cartUserService.orderBookInCart(orderItemRequest);
         } else {

From f30974c7024fb13a4d83142769744fbb9016039f Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 04:55:41 +0900
Subject: [PATCH 026/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=8C=EB=A0=80=EC=9D=84?=
 =?UTF-8?q?=EB=95=8C=20=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=20=ED=96=88=EC=9D=84=EB=95=8C=20=EB=B9=84=EB=8F=99?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?->=20=EB=8F=99=EA=B8=B0=EB=A1=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=88=98=EB=9F=89=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/cart.html | 87 +++++++++++++++++++-------
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index 878b5987..7942ec50 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -145,6 +145,9 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                         for (let i = 0; i < counters.length; i++) {
                             let counterValue = parseInt(counters[i].innerText);
+                            if (counterValue <= 0) {
+
+                            }
                             let costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
 
                             total += counterValue * costValue;
@@ -155,35 +158,76 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         document.getElementById('totalAmount').innerText = total + '원';
                     }
 
+                    async function orderAndRedirect() {
+                        try {
+
+                            if (await validateQuantity()) {
+                                await orderItem();
+
+                                window.location.href = "/cart/checkout";
+                            } else {
+                                throw new Error("주문 수량이 0 이하입니다");
+                            }
+
+                        } catch (error) {
+                            console.error("주문 처리중에 에러가 벌생했다 : ", error.name);
+                            alert("수량을 다시 설정 하세요");
+                            window.location.href = "/cart";
+                        }
+                    }
+
 
                     function orderItem() {
-                        let orderItems = [];
-                        let cartItems = document.querySelectorAll('.cart-single-list');
+                        return new Promise((resolve, reject) => {
+                            let orderItems = [];
+                            let cartItems = document.querySelectorAll('.cart-single-list');
 
-                        cartItems.forEach(function (cartItem) {
-                            let bookId = cartItem.getAttribute('data-book-id');
-                            let amount = cartItem.querySelector('.counter').innerText;
+                            cartItems.forEach(function (cartItem) {
+                                let bookId = cartItem.getAttribute('data-book-id');
+                                let amount = cartItem.querySelector('.counter').innerText;
 
-                            orderItems.push({
-                                bookId: bookId,
-                                amount: amount
+                                orderItems.push({
+                                    bookId: bookId,
+                                    amount: amount
+                                });
                             });
+
+                            fetch('/cart/update', {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify(orderItems)
+                            })
+                                .then(response => {
+                                    if (!response.ok) {
+                                        throw new Error("수량을 업데이트 할때 에러가 발생했다");
+                                    }
+                                    resolve();
+                                })
+                                .catch(error => {
+                                    reject(error);
+                                });
                         });
+                    }
 
-                        fetch('/cart/order', {
-                            method: 'POST',
-                            headers: {
-                                'Content-Type': 'application/json'
-                            },
-                            body: JSON.stringify(orderItems)
-                        })
-                            .then(response => {
-                                if (!response.ok) {
-                                    throw new Error('response not ok');
+                    async function validateQuantity() {
+                        return new Promise((resolve, reject) => {
+                            let isValid = true;
+                            let cartItems = document.querySelectorAll('.cart-single-list');
+
+                            cartItems.forEach(function (cartItem) {
+                                let quantity = parseInt(cartItem.querySelector('.counter').innerText);
+                                if (quantity <= 0) {
+                                    isValid = false;
+                                    return;
                                 }
-                                return response.json();
-                            })
+                            });
+
+                            resolve(isValid);
+                        });
                     }
+
                 </script>
 
 
@@ -212,7 +256,8 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                             </li>
                                         </ul>
                                         <div class="button">
-                                            <a href="/cart/checkout" class="btn" onclick="orderItem()">주문</a>
+                                            <a href="javascript:void(0);" class="btn"
+                                               onclick="orderAndRedirect()">주문</a>
                                             <a href="/" class="btn btn-alt">계속 쇼핑하기</a>
                                         </div>
                                     </div>

From 20d0cf688f1ec5111f71846a4e3e7437303d66e5 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 04:58:51 +0900
Subject: [PATCH 027/147] =?UTF-8?q?Revert=20"feat:=20=EC=A3=BC=EB=AC=B8?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=8C=EB=A0=80?=
 =?UTF-8?q?=EC=9D=84=EB=95=8C=20=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=ED=96=88=EC=9D=84=EB=95=8C=20=EB=B9=84?=
 =?UTF-8?q?=EB=8F=99=EA=B8=B0=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20->=20=EB=8F=99=EA=B8=B0=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=88=98=EB=9F=89=20validation"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f30974c7024fb13a4d83142769744fbb9016039f.
---
 src/main/resources/templates/cart.html | 87 +++++++-------------------
 1 file changed, 21 insertions(+), 66 deletions(-)

diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index 7942ec50..878b5987 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -145,9 +145,6 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                         for (let i = 0; i < counters.length; i++) {
                             let counterValue = parseInt(counters[i].innerText);
-                            if (counterValue <= 0) {
-
-                            }
                             let costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
 
                             total += counterValue * costValue;
@@ -158,76 +155,35 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         document.getElementById('totalAmount').innerText = total + '원';
                     }
 
-                    async function orderAndRedirect() {
-                        try {
-
-                            if (await validateQuantity()) {
-                                await orderItem();
-
-                                window.location.href = "/cart/checkout";
-                            } else {
-                                throw new Error("주문 수량이 0 이하입니다");
-                            }
-
-                        } catch (error) {
-                            console.error("주문 처리중에 에러가 벌생했다 : ", error.name);
-                            alert("수량을 다시 설정 하세요");
-                            window.location.href = "/cart";
-                        }
-                    }
-
 
                     function orderItem() {
-                        return new Promise((resolve, reject) => {
-                            let orderItems = [];
-                            let cartItems = document.querySelectorAll('.cart-single-list');
+                        let orderItems = [];
+                        let cartItems = document.querySelectorAll('.cart-single-list');
 
-                            cartItems.forEach(function (cartItem) {
-                                let bookId = cartItem.getAttribute('data-book-id');
-                                let amount = cartItem.querySelector('.counter').innerText;
+                        cartItems.forEach(function (cartItem) {
+                            let bookId = cartItem.getAttribute('data-book-id');
+                            let amount = cartItem.querySelector('.counter').innerText;
 
-                                orderItems.push({
-                                    bookId: bookId,
-                                    amount: amount
-                                });
+                            orderItems.push({
+                                bookId: bookId,
+                                amount: amount
                             });
-
-                            fetch('/cart/update', {
-                                method: 'POST',
-                                headers: {
-                                    'Content-Type': 'application/json'
-                                },
-                                body: JSON.stringify(orderItems)
-                            })
-                                .then(response => {
-                                    if (!response.ok) {
-                                        throw new Error("수량을 업데이트 할때 에러가 발생했다");
-                                    }
-                                    resolve();
-                                })
-                                .catch(error => {
-                                    reject(error);
-                                });
                         });
-                    }
 
-                    async function validateQuantity() {
-                        return new Promise((resolve, reject) => {
-                            let isValid = true;
-                            let cartItems = document.querySelectorAll('.cart-single-list');
-
-                            cartItems.forEach(function (cartItem) {
-                                let quantity = parseInt(cartItem.querySelector('.counter').innerText);
-                                if (quantity <= 0) {
-                                    isValid = false;
-                                    return;
+                        fetch('/cart/order', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify(orderItems)
+                        })
+                            .then(response => {
+                                if (!response.ok) {
+                                    throw new Error('response not ok');
                                 }
-                            });
-
-                            resolve(isValid);
-                        });
+                                return response.json();
+                            })
                     }
-
                 </script>
 
 
@@ -256,8 +212,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                             </li>
                                         </ul>
                                         <div class="button">
-                                            <a href="javascript:void(0);" class="btn"
-                                               onclick="orderAndRedirect()">주문</a>
+                                            <a href="/cart/checkout" class="btn" onclick="orderItem()">주문</a>
                                             <a href="/" class="btn btn-alt">계속 쇼핑하기</a>
                                         </div>
                                     </div>

From 9e092f9fe7abfc8d35948bcd9634d798da249129 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 04:59:01 +0900
Subject: [PATCH 028/147] =?UTF-8?q?Revert=20"refactor:=20url=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3aacaebd5973a831775f9f5ec6b643d35dacf5e6.
---
 .../mybooks/front/cart/controller/CartController.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/controller/CartController.java b/src/main/java/store/mybooks/front/cart/controller/CartController.java
index e2727c7e..0334070e 100644
--- a/src/main/java/store/mybooks/front/cart/controller/CartController.java
+++ b/src/main/java/store/mybooks/front/cart/controller/CartController.java
@@ -111,11 +111,10 @@ private boolean isUser(HttpServletRequest request) {
         return Objects.nonNull(CookieUtils.getIdentityCookieValue(request));
     }
 
-    @PostMapping("/cart/update")
-    public ResponseEntity<Void> cartAmountUpdate(
-            @CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
-            HttpServletResponse response, HttpServletRequest request,
-            @RequestBody List<OrderItemRequest> orderItemRequest) {
+    @PostMapping("/cart/order")
+    public ResponseEntity<Void> cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
+                                    HttpServletResponse response, HttpServletRequest request,
+                                    @RequestBody List<OrderItemRequest> orderItemRequest) {
         if (isUser(request)) {
             cartUserService.orderBookInCart(orderItemRequest);
         } else {

From bfe4ece6d20069ec0096c7b5d287f9ddfe83adb3 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 05:03:37 +0900
Subject: [PATCH 029/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=8C=EB=A0=80=EC=9D=84?=
 =?UTF-8?q?=EB=95=8C=20=EC=88=98=EB=9F=89=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=20=ED=96=88=EC=9D=84=EB=95=8C=20=EB=B9=84=EB=8F=99?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?->=20=EB=8F=99=EA=B8=B0=EB=A1=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=88=98=EB=9F=89=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/cart.html | 147 ++++++++++++++++---------
 1 file changed, 92 insertions(+), 55 deletions(-)

diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index 878b5987..0daebacf 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -4,29 +4,28 @@
       layout:decorate="~{common/layout/my-books-layout}"
       xmlns:th="http://www.thymeleaf.org">
 <head>
-    <style>
-        .quantity-input {
-            display: flex;
-            align-items: center;
-        }
-
-        .quantity-input .form-control.quantity {
-            width: 60px; /* 입력 칸 크기 조정 */
-            text-align: center;
-            margin: 0 5px; /* 버튼과의 간격 */
-        }
-
-        .quantity-input button {
-            border: 1px solid #ddd;
-            background-color: #f5f5f5;
-            padding: 5px 10px;
-            cursor: pointer;
-        }
-
-        .quantity-input button:focus,
-        .quantity-input .form-control.quantity:focus {
-            outline: none;
-        }
+    <style>        .quantity-input {
+        display: flex;
+        align-items: center;
+    }
+
+    .quantity-input .form-control.quantity {
+        width: 60px; /* 입력 칸 크기 조정 */
+        text-align: center;
+        margin: 0 5px; /* 버튼과의 간격 */
+    }
+
+    .quantity-input button {
+        border: 1px solid #ddd;
+        background-color: #f5f5f5;
+        padding: 5px 10px;
+        cursor: pointer;
+    }
+
+    .quantity-input button:focus,
+    .quantity-input .form-control.quantity:focus {
+        outline: none;
+    }
 
     </style>
 </head>
@@ -49,8 +48,7 @@ <h1 class="page-title">Cart</h1>
                 </div>
             </div>
         </div>
-    </div>
-    <!-- End Breadcrumbs -->
+    </div>    <!-- End Breadcrumbs -->
 
     <!-- Shopping Cart -->
     <div class="shopping-cart section">
@@ -78,8 +76,7 @@ <h1 class="page-title">Cart</h1>
                             <p>삭제</p>
                         </div>
                     </div>
-                </div>
-                <!-- End Cart List Title -->
+                </div>                <!-- End Cart List Title -->
                 <!-- Cart Single List list -->
                 <div th:each="cartDetail : ${cartDetailList}" class="cart-single-list"
                      th:attr="data-book-id=${cartDetail.bookId}">
@@ -94,8 +91,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                             <p class="product-des">
                                 <span><em>Type:</em> Mirrorless</span>
                                 <span><em>Color:</em> Black</span>
-                            </p>
-                        </div>
+                            </p></div>
                         <div class="quantity-input col-lg-2 col-md-2 col-12">
                             <button onclick="decreaseCounter(this)" class="minus-btn">-</button>
                             <p class="counter form-control quantity"
@@ -115,7 +111,6 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         </div>
                     </div>
                 </div>
-
                 <script th:inline="javascript">
                     function updateCounterDisplay(element, value) {
                         element.innerText = value;
@@ -145,6 +140,9 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                         for (let i = 0; i < counters.length; i++) {
                             let counterValue = parseInt(counters[i].innerText);
+                            if (counterValue <= 0) {
+
+                            }
                             let costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
 
                             total += counterValue * costValue;
@@ -155,35 +153,76 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         document.getElementById('totalAmount').innerText = total + '원';
                     }
 
+                    async function orderAndRedirect() {
+                        try {
+
+                            if (await validateQuantity()) {
+                                await orderItem();
+
+                                window.location.href = "/cart/checkout";
+                            } else {
+                                throw new Error("주문 수량이 0 이하입니다");
+                            }
+
+                        } catch (error) {
+                            console.error("주문 처리중에 에러가 벌생했다 : ", error.name);
+                            alert("수량을 다시 설정 하세요");
+                            window.location.href = "/cart";
+                        }
+                    }
+
 
                     function orderItem() {
-                        let orderItems = [];
-                        let cartItems = document.querySelectorAll('.cart-single-list');
+                        return new Promise((resolve, reject) => {
+                            let orderItems = [];
+                            let cartItems = document.querySelectorAll('.cart-single-list');
 
-                        cartItems.forEach(function (cartItem) {
-                            let bookId = cartItem.getAttribute('data-book-id');
-                            let amount = cartItem.querySelector('.counter').innerText;
+                            cartItems.forEach(function (cartItem) {
+                                let bookId = cartItem.getAttribute('data-book-id');
+                                let amount = cartItem.querySelector('.counter').innerText;
 
-                            orderItems.push({
-                                bookId: bookId,
-                                amount: amount
+                                orderItems.push({
+                                    bookId: bookId,
+                                    amount: amount
+                                });
                             });
+
+                            fetch('/cart/update', {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify(orderItems)
+                            })
+                                .then(response => {
+                                    if (!response.ok) {
+                                        throw new Error("수량을 업데이트 할때 에러가 발생했다");
+                                    }
+                                    resolve();
+                                })
+                                .catch(error => {
+                                    reject(error);
+                                });
                         });
+                    }
 
-                        fetch('/cart/order', {
-                            method: 'POST',
-                            headers: {
-                                'Content-Type': 'application/json'
-                            },
-                            body: JSON.stringify(orderItems)
-                        })
-                            .then(response => {
-                                if (!response.ok) {
-                                    throw new Error('response not ok');
+                    async function validateQuantity() {
+                        return new Promise((resolve, reject) => {
+                            let isValid = true;
+                            let cartItems = document.querySelectorAll('.cart-single-list');
+
+                            cartItems.forEach(function (cartItem) {
+                                let quantity = parseInt(cartItem.querySelector('.counter').innerText);
+                                if (quantity <= 0) {
+                                    isValid = false;
+                                    return;
                                 }
-                                return response.json();
-                            })
+                            });
+
+                            resolve(isValid);
+                        });
                     }
+
                 </script>
 
 
@@ -202,8 +241,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                     <!--                                        </div>-->
                                     <!--                                    </form>-->
                                     <!--                                </div>-->
-                                    <!--                            </div>-->
-                                </div>
+                                    <!--                            </div>-->                                </div>
                                 <div class="col-lg-4 col-md-6 col-12">
                                     <div class="right">
                                         <ul>
@@ -212,7 +250,8 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                             </li>
                                         </ul>
                                         <div class="button">
-                                            <a href="/cart/checkout" class="btn" onclick="orderItem()">주문</a>
+                                            <a href="javascript:void(0);" class="btn"
+                                               onclick="orderAndRedirect()">주문</a>
                                             <a href="/" class="btn btn-alt">계속 쇼핑하기</a>
                                         </div>
                                     </div>
@@ -223,9 +262,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                 </div>
             </div>
         </div>
-
     </div>
-
     <script>        updateTotalAmount();
     </script>
 </div>

From 0462e230fa71a12ea1bef2ae98d740ebd00e11b9 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Sun, 17 Mar 2024 05:04:01 +0900
Subject: [PATCH 030/147] =?UTF-8?q?refactor:=20url=20=EC=9D=B4=EB=A6=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/cart/controller/CartController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/cart/controller/CartController.java b/src/main/java/store/mybooks/front/cart/controller/CartController.java
index 0334070e..57b3e15f 100644
--- a/src/main/java/store/mybooks/front/cart/controller/CartController.java
+++ b/src/main/java/store/mybooks/front/cart/controller/CartController.java
@@ -111,7 +111,7 @@ private boolean isUser(HttpServletRequest request) {
         return Objects.nonNull(CookieUtils.getIdentityCookieValue(request));
     }
 
-    @PostMapping("/cart/order")
+    @PostMapping("/cart/update")
     public ResponseEntity<Void> cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
                                     HttpServletResponse response, HttpServletRequest request,
                                     @RequestBody List<OrderItemRequest> orderItemRequest) {

From 93a9c8c6e693f7f25004f4dcf671160e8813521c Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Sun, 17 Mar 2024 12:29:45 +0900
Subject: [PATCH 031/147] =?UTF-8?q?refactor:=20AuthorizationAspect=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=EB=90=98=EB=8A=94=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/auth/aop/AuthorizationAspect.java   | 40 ++++++++-----------
 .../front/global/GlobalControllerAdvice.java  |  7 +++-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java b/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
index e1d4ebb7..3ff0c6eb 100644
--- a/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
+++ b/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
@@ -79,32 +79,26 @@ public Object aroundMethod(ProceedingJoinPoint joinPoint) throws Throwable {
                                 new RefreshTokenRequest((String) request.getAttribute("identity_cookie_value"),
                                         Utils.getUserIp(request), Utils.getUserAgent(request)));
 
-                // 리프래시 토큰 만료 아니고 유효해서 재발급 됐음
-                if (refreshTokenResponse.getIsValid()) {
-                    // 쿠키에 재발급한 엑세스토큰 넣어주고
-                    CookieUtils.addJwtCookie(Objects.requireNonNull(response), refreshTokenResponse.getAccessToken());
-                    // 헤더 설정해주고 기존 메서드 다시 불러
-                    RequestContextHolder.currentRequestAttributes()
-                            .setAttribute("authHeader", Utils.refreshAuthHeader(refreshTokenResponse.getAccessToken()),
-                                    RequestAttributes.SCOPE_REQUEST);
-                    // 어드민 쿠키를 체크하는 redis 만료시간 재설정
-                    String adminCookieValue = (String) request.getAttribute("admin_cookie_value");
-                    if (Objects.nonNull(adminCookieValue)) {
-                        redisAuthService.expireValues(adminCookieValue, redisProperties.getAdminExpiration());
-                        // 쿠키 만료시간 재설정
-                        CookieUtils.addAdminCookie(response,adminCookieValue);
-                    }
-                    return joinPoint.proceed();
-                } else {
-                    // 리프래시 토큰 만료됐거나 , 유효하지 않음
-                    CookieUtils.deleteJwtCookie(Objects.requireNonNull(response));
-                    CookieUtils.deleteAdminCookie(response);
-                    // 리프래시 토큰이 만료면 TokenExpiredException -> 로그인하세요
+                // 리프래시 토큰 만료 됐거나 유효하지않음
+                if (refreshTokenResponse.getAccessToken().isEmpty()) {
                     throw new TokenExpiredException();
                 }
+
+                // 쿠키에 재발급한 엑세스토큰 넣어주고
+                CookieUtils.addJwtCookie(Objects.requireNonNull(response), refreshTokenResponse.getAccessToken());
+                // 헤더 설정해주고 기존 메서드 다시 불러
+                RequestContextHolder.currentRequestAttributes()
+                        .setAttribute("authHeader", Utils.refreshAuthHeader(refreshTokenResponse.getAccessToken()),
+                                RequestAttributes.SCOPE_REQUEST);
+                // 어드민 쿠키를 체크하는 redis 만료시간 재설정
+                String adminCookieValue = (String) request.getAttribute("admin_cookie_value");
+                if (Objects.nonNull(adminCookieValue)) {
+                    redisAuthService.expireValues(adminCookieValue, redisProperties.getAdminExpiration());
+                    // 쿠키 만료시간 재설정
+                    CookieUtils.addAdminCookie(response, adminCookieValue);
+                }
+                return joinPoint.proceed();
             } else if (error.contains(ErrorMessage.INVALID_TOKEN.getMessage())) { // 토큰위조됨 쿠키삭제
-                CookieUtils.deleteJwtCookie(Objects.requireNonNull(response));
-                CookieUtils.deleteAdminCookie(response);
                 throw new AuthenticationIsNotValidException();
             } else if (error.contains(ErrorMessage.STATUS_IS_DORMANT_EXCEPTION.getMessage())) { // 휴면상태 -> 휴면인증사이트로
                 throw new StatusIsDormancyException();
diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index b277b39e..31b94ffc 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -1,6 +1,8 @@
 package store.mybooks.front.global;
 
+import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.client.HttpClientErrorException;
@@ -9,6 +11,7 @@
 import store.mybooks.front.auth.exception.StatusIsDormancyException;
 import store.mybooks.front.auth.exception.StatusIsLockException;
 import store.mybooks.front.auth.exception.TokenExpiredException;
+import store.mybooks.front.utils.CookieUtils;
 
 /**
  * packageName    : store.mybooks.front.global
@@ -48,9 +51,11 @@ public String handleBadRequestAndNotFoundException(Exception exception, HttpServ
     // 토큰 인증/인가와 관련된 모든 예외를 잡음
     @ExceptionHandler({AuthenticationIsNotValidException.class, AccessIdForbiddenException.class,
             StatusIsDormancyException.class, TokenExpiredException.class, StatusIsLockException.class})
-    public String handleAuthException(RuntimeException ex) {
+    public String handleAuthException(RuntimeException ex, HttpServletResponse response) {
 
         if (ex instanceof AuthenticationIsNotValidException | ex instanceof TokenExpiredException) {
+            CookieUtils.deleteJwtCookie(Objects.requireNonNull(response));
+            CookieUtils.deleteAdminCookie(response);
             return "redirect:/login"; // 토큰조작 됐거나 , 만료됐음 -> 다시 로그인
         } else if (ex instanceof StatusIsDormancyException) {
             return "redirect:/verification/dormancy";  // 유저계정 휴면상태

From 22a5fab3142ac9fe4fd7f5b64e91bc5b3a3c2f94 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Sun, 17 Mar 2024 12:30:01 +0900
Subject: [PATCH 032/147] =?UTF-8?q?refactor:=20RefreshTokenresponse=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/auth/dto/response/RefreshTokenResponse.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/auth/dto/response/RefreshTokenResponse.java b/src/main/java/store/mybooks/front/auth/dto/response/RefreshTokenResponse.java
index 7eba7003..f63be8c6 100644
--- a/src/main/java/store/mybooks/front/auth/dto/response/RefreshTokenResponse.java
+++ b/src/main/java/store/mybooks/front/auth/dto/response/RefreshTokenResponse.java
@@ -1,5 +1,6 @@
 package store.mybooks.front.auth.dto.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -16,9 +17,9 @@
  */
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 public class RefreshTokenResponse {
 
-    private Boolean isValid;
     private String accessToken;
 
 }

From 632863ef9bd39ad1cc1205812262f580e3bbf03f Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 14:50:17 +0900
Subject: [PATCH 033/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=EC=84=9C=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/adaptor/OrderAdaptor.java     | 22 +++++-
 .../order/controller/OrderController.java     | 11 ++-
 ...quest.java => BookOrderCreateRequest.java} | 16 ++--
 .../order/dto/request/OrderInfoRequest.java   |  1 -
 .../dto/request/OrderUserInfoRequest.java     |  4 +
 .../order/service/OrderInfoCheckService.java  | 29 ++++---
 .../front/order/service/OrderService.java     | 77 ++++++++++++++++++-
 .../mybooks/front/order/utils/OrderUtils.java |  2 +
 .../adaptor/UserCouponAdaptor.java            | 23 ++++++
 .../model/response/UserCouponResponse.java    | 31 ++++++++
 .../resources/templates/checkout-coupon.html  | 32 ++++----
 src/main/resources/templates/checkout.html    | 30 +++++---
 12 files changed, 226 insertions(+), 52 deletions(-)
 rename src/main/java/store/mybooks/front/order/dto/request/{OrderCreateRequest.java => BookOrderCreateRequest.java} (68%)
 create mode 100644 src/main/java/store/mybooks/front/user_coupon/model/response/UserCouponResponse.java

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index acedcb17..04db8a3d 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -2,12 +2,16 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
 import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -26,7 +30,8 @@
 public class OrderAdaptor {
     private final RestTemplate restTemplate;
     private final GatewayAdaptorProperties gatewayAdaptorProperties;
-    private static final String URL = "/api/order";
+    private static final String URL = "/api/orders";
+    private static final String MEMBER_URL = "/api/member/orders";
 
     /**
      * methodName : checkOrderUserAddressInfo<br>
@@ -37,7 +42,8 @@ public class OrderAdaptor {
      * @param id 주소 아이디
      */
     public void checkOrderUserAddressInfo(Long id) {
-        ResponseEntity<Object> exchange = restTemplate.exchange(URL + "/check/address/{id}",
+        ResponseEntity<Object> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/check/address/{id}",
                 HttpMethod.GET,
                 null,
                 new ParameterizedTypeReference<Object>() {
@@ -45,4 +51,16 @@ public void checkOrderUserAddressInfo(Long id) {
         Utils.getResponseEntity(exchange, HttpStatus.NO_CONTENT);
     }
 
+
+    @RequiredAuthorization
+    public BookOrderCreateResponse createBookOrder(BookOrderCreateRequest request) {
+        HttpEntity<BookOrderCreateRequest> httpEntity = new HttpEntity<>(request, Utils.getAuthHeader());
+        ResponseEntity<BookOrderCreateResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + MEMBER_URL,
+                HttpMethod.POST,
+                httpEntity,
+                new ParameterizedTypeReference<BookOrderCreateResponse>() {
+                });
+        return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 6a31954d..6bc982ae 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -17,6 +17,7 @@
 import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.order.service.OrderInfoCheckService;
 import store.mybooks.front.order.service.OrderService;
 import store.mybooks.front.user.adaptor.UserAdaptor;
@@ -160,7 +161,6 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
         LocalDate localDate = LocalDate.now();
         UserGetResponse user = userAdaptor.findUser();
         List<CartDetail> bookFromCart = cartUserService.getBookFromCart();
-        log.info("날짜: {}", localDate);
         modelMap.put("bookLists", bookFromCart);
         modelMap.put("totalCost", orderService.calculateTotalCost(bookFromCart));
         modelMap.put("point", pointResponse.getRemainingPoint());
@@ -173,9 +173,16 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
 
     @PostMapping("/order")
     public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
+        log.info("값 : {}", orderRequest.toString());
         List<CartDetail> cart = cartUserService.getBookFromCart();
         orderInfoCheckService.checkModulation(orderRequest, cart);
-        log.info("값 : {}", orderRequest.toString());
+        int point = orderService.getPoint(orderRequest.getOrderInfo());
+        int couponCost = orderService.calculateBookCouponCost(orderRequest.getBookInfoList());
+        int wrapCost = orderService.calculateBookWrapCost(orderRequest.getBookInfoList());
+        int totalCost = orderService.calculateTotalCost(cart);
+        BookOrderCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
+                orderRequest.getOrderInfo(), point, couponCost, wrapCost, totalCost);
+
         return "test";
     }
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
similarity index 68%
rename from src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
rename to src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
index d74327f4..6a7a621e 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
@@ -1,6 +1,5 @@
 package store.mybooks.front.order.dto.request;
 
-import java.time.LocalDate;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,14 +17,13 @@
  */
 @Getter
 @AllArgsConstructor
-public class OrderCreateRequest {
+public class BookOrderCreateRequest {
     private List<BookInfoRequest> bookInfoList;
-    private String deliveryName;
-    private LocalDate deliveryDate;
-    private Integer point;
-    private String recipientName;
-    private String recipientAddress;
-    private String recipientPhoneNumber;
-    private String receiverMessage;
+    private OrderInfoRequest orderInfoRequest;
     private String orderNumber;
+    private Integer pointCost;
+    private Integer couponCost;
+    private Integer wrapCost;
+    private Integer totalCost;
+
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index 4b4c2422..d86f34a9 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -24,7 +24,6 @@ public class OrderInfoRequest {
 
     private String recipientName;
     private String recipientPhoneNumber;
-    private Long addressId;
     private String recipientAddress;
     private String deliveryDate;
     private String receiverMessage;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
index d0b9af68..0d7b9bb3 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -18,8 +19,11 @@
 @Getter
 @Setter
 @NoArgsConstructor
+@ToString
 public class OrderUserInfoRequest {
     private String userName;
     private String email;
     private String phoneNumber;
+    private Long addressId;
+
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
index 651e6c8f..45b34613 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderInfoCheckService.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.wrap.adaptor.WrapAdaptor;
 import store.mybooks.front.book.adaptor.BookAdaptor;
@@ -11,6 +12,7 @@
 import store.mybooks.front.order.dto.request.BookInfoRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
+import store.mybooks.front.order.dto.request.OrderUserInfoRequest;
 import store.mybooks.front.order.exception.OrderInfoNotMatchException;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
 import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
@@ -29,6 +31,7 @@
  * -----------------------------------------------------------<br>
  * 3/5/24        minsu11       최초 생성<br>
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class OrderInfoCheckService {
@@ -52,9 +55,10 @@ public class OrderInfoCheckService {
     public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail> cartInfo) {
         OrderInfoRequest orderInfoRequest = bookOrderRequest.getOrderInfo();
         List<BookInfoRequest> bookInfoRequest = bookOrderRequest.getBookInfoList();
-        checkOrderInfo(orderInfoRequest);
+        checkOrderAddress(bookOrderRequest.getUserInfo());
         checkDuplicateCoupon(bookInfoRequest);
         checkBookInfo(bookInfoRequest, cartInfo);
+        checkPoint(orderInfoRequest.getUsingPoint());
 
     }
 
@@ -69,15 +73,15 @@ public void checkModulation(BookOrderRequest bookOrderRequest, List<CartDetail>
      */
 //todo 수량 체크하는 부분 추가해야함
     public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cartInfos) {
-        if (bookInfos.size() == cartInfos.size()) {
+        if (bookInfos.size() != cartInfos.size()) {
             throw new OrderInfoNotMatchException("장바구니에 담긴 물품의 갯수가 다름");
         }
         for (int i = 0; i < bookInfos.size(); i++) {
             BookInfoRequest bookInfo = bookInfos.get(i);
             CartDetail cartInfo = cartInfos.get(i);
             if (
-                    !bookInfo.getBookId().equals(cartInfo.getBookId())
-                            || !bookInfo.getSaleCost().equals(cartInfo.getSaleCost())
+                    !Objects.equals(bookInfo.getBookId(), cartInfo.getBookId())
+                            || !Objects.equals(bookInfo.getSaleCost(), cartInfo.getSaleCost())
                             || !Objects.equals(bookInfo.getAmount(), cartInfo.getCartDetailAmount())
             ) {
                 throw new OrderInfoNotMatchException("도서의 정보가 다름");
@@ -102,6 +106,10 @@ public void checkBookInfo(List<BookInfoRequest> bookInfos, List<CartDetail> cart
     public void checkDuplicateCoupon(List<BookInfoRequest> bookInfos) {
         for (int i = 0; i < bookInfos.size(); i++) {
             for (int j = i + 1; j < bookInfos.size(); j++) {
+                if (Objects.isNull(bookInfos.get(i).getSelectCouponId())) {
+                    break;
+                }
+
                 if (Objects.equals(bookInfos.get(i).getSelectCouponId(), bookInfos.get(j).getSelectCouponId())) {
                     throw new OrderInfoNotMatchException("같은 쿠폰이 입력됨");
                 }
@@ -121,7 +129,7 @@ public void checkBookCoupon(BookInfoRequest bookInfo) {
         boolean isCheck = false;
         List<UserCouponGetResponseForOrder> couponList = userCouponAdaptor.getUsableUserCoupon(bookInfo.getBookId());
         for (int j = 0; j < couponList.size(); j++) {
-            if (Objects.equals(couponList.get(j), bookInfo.getSelectCouponId())) {
+            if (Objects.equals(couponList.get(j).getUserCouponId(), bookInfo.getSelectCouponId())) {
                 isCheck = true;
             }
         }
@@ -136,11 +144,11 @@ public void checkBookCoupon(BookInfoRequest bookInfo) {
      * description : 회원의 주문 정보를 검사하는 메서드.
      * <br> *
      *
-     * @param orderInfoRequest 주문 정보가 담긴 DTO
+     * @param userInfoRequest 주문 정보가 담긴 DTO
      */
-    public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
-        orderAdapter.checkOrderUserAddressInfo(orderInfoRequest.getAddressId());
-        checkPoint(orderInfoRequest.getUsingPoint());
+    public void checkOrderAddress(OrderUserInfoRequest userInfoRequest) {
+        Long id = userInfoRequest.getAddressId();
+        orderAdapter.checkOrderUserAddressInfo(id);
     }
 
     /**
@@ -154,8 +162,11 @@ public void checkOrderInfo(OrderInfoRequest orderInfoRequest) {
      */
     public void checkPoint(Integer usingPoint) {
         PointResponse pointsHeld = userPointAdaptor.getPointsHeld();
+
         if (usingPoint < 0 || pointsHeld.getRemainingPoint() < usingPoint) {
             throw new OrderInfoNotMatchException("포인트 정보가 다름");
         }
     }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index f6887b10..c20b1790 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -1,19 +1,26 @@
 package store.mybooks.front.order.service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.book.model.response.BookDetailResponse;
 import store.mybooks.front.admin.wrap.adaptor.WrapAdaptor;
+import store.mybooks.front.admin.wrap.dto.response.WrapResponse;
 import store.mybooks.front.book.adaptor.BookAdaptor;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.order.adaptor.OrderAdaptor;
+import store.mybooks.front.order.dto.request.BookInfoRequest;
+import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
+import store.mybooks.front.order.dto.request.OrderInfoRequest;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
 import store.mybooks.front.user_coupon.adaptor.UserCouponAdaptor;
-import store.mybooks.front.userpoint.adaptor.UserPointAdaptor;
+import store.mybooks.front.user_coupon.model.response.UserCouponResponse;
 
 /**
  * packageName    : store.mybooks.front.order.service<br>
@@ -35,7 +42,6 @@ public class OrderService {
     private final UserAdaptor userAdaptor;
     private final WrapAdaptor wrapAdaptor;
     private final UserCouponAdaptor userCouponAdaptor;
-    private final UserPointAdaptor userPointAdaptor;
 
     /**
      * methodName : getBook<br>
@@ -73,4 +79,71 @@ public List<Integer> calculateBooksCost(List<CartDetail> cartDetailList) {
                 .collect(Collectors.toList());
 
     }
+
+    public Integer calculateBookCouponCost(List<BookInfoRequest> bookInfoRequests) {
+        int result = 0;
+        for (int i = 0; i < bookInfoRequests.size(); i++) {
+            int saleCost = bookInfoRequests.get(i).getSaleCost();
+            int amount = bookInfoRequests.get(i).getAmount();
+            int couponCost = 0;
+            Long couponId = bookInfoRequests.get(i).getSelectCouponId();
+            if (Objects.nonNull(couponId)) {
+
+                UserCouponResponse coupon = userCouponAdaptor.getUserCouponResponse(couponId);
+                if (coupon.isRate()) { // true 시 할인 률
+                    couponCost = (saleCost * amount) * coupon.getDiscountRate() / 100;
+                } else {
+                    couponCost = coupon.getDiscountCost();
+                }
+
+                if (coupon.isRate() && couponCost > coupon.getMaxDiscountCost()) {
+                    couponCost = coupon.getMaxDiscountCost();
+                }
+            }
+            result += couponCost;
+        }
+
+        return result;
+    }
+
+    /**
+     * methodName : calculateBookWrapCost<br>
+     * author : minsu11<br>
+     * description : 도서에 적용된 총 포장지 가격 계산.
+     * <br>
+     *
+     * @param bookInfoRequests the book info requests
+     * @return the integer
+     */
+    public Integer calculateBookWrapCost(List<BookInfoRequest> bookInfoRequests) {
+        int result = 0;
+        for (int i = 0; i < bookInfoRequests.size(); i++) {
+            Integer wrapId = bookInfoRequests.get(i).getSelectWrapId();
+            if (Objects.nonNull(wrapId)) {
+
+                WrapResponse wrapResponse = wrapAdaptor.getWrap(wrapId);
+                result += wrapResponse.getCost();
+            }
+        }
+        return result;
+    }
+
+    public Integer getPoint(OrderInfoRequest orderInfoRequest) {
+        return orderInfoRequest.getUsingPoint();
+    }
+
+    public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
+                                               OrderInfoRequest orderInfo,
+                                               Integer point,
+                                               Integer couponCost,
+                                               Integer wrapCost,
+                                               Integer totalCost) {
+        totalCost += wrapCost - point - couponCost;
+        //todo 해당 주문 번호가 있는지 확인하는 메서드 필요
+        String orderNumber = OrderUtils.createOrderNumber();
+
+        BookOrderCreateRequest request = new BookOrderCreateRequest(bookInfo, orderInfo,
+                orderNumber, point, couponCost, wrapCost, totalCost);
+        return orderAdapter.createBookOrder(request);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
index e28fb662..a877f29e 100644
--- a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
+++ b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
@@ -39,4 +39,6 @@ public static String createOrderNumber() {
         return orderNumber.append(time)
                 .append(randomStr).toString();
     }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java b/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
index 26cd9cb5..bb9bc2a6 100644
--- a/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
+++ b/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
@@ -15,6 +15,7 @@
 import store.mybooks.front.pageable.dto.response.PageResponse;
 import store.mybooks.front.user_coupon.model.response.UserCouponGetResponse;
 import store.mybooks.front.user_coupon.model.response.UserCouponGetResponseForOrder;
+import store.mybooks.front.user_coupon.model.response.UserCouponResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -105,4 +106,26 @@ public List<UserCouponGetResponseForOrder> getUsableUserTotalCoupon() {
 
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
+
+
+    /**
+     * methodName : getUserCouponResponse <br>
+     * author : minsu11<br>
+     * description : 회원 쿠폰 아이디로 쿠폰 조회.
+     *
+     * @param id the id
+     * @return the user coupon response
+     */
+    @RequiredAuthorization
+    public UserCouponResponse getUserCouponResponse(Long id) {
+        HttpEntity<Object> requestEntity = new HttpEntity<>(Utils.getAuthHeader());
+
+        ResponseEntity<UserCouponResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL_USER + "/" + id,
+                HttpMethod.GET,
+                requestEntity,
+                new ParameterizedTypeReference<UserCouponResponse>() {
+                }, id);
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/user_coupon/model/response/UserCouponResponse.java b/src/main/java/store/mybooks/front/user_coupon/model/response/UserCouponResponse.java
new file mode 100644
index 00000000..42332665
--- /dev/null
+++ b/src/main/java/store/mybooks/front/user_coupon/model/response/UserCouponResponse.java
@@ -0,0 +1,31 @@
+package store.mybooks.front.user_coupon.model.response;
+
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.front.user_coupon.model.response<br>
+ * fileName       : UserCouponResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/17/24        minsu11       최초 생성<br>
+ */
+@Getter
+@NoArgsConstructor
+public class UserCouponResponse {
+    private Long userCouponId;
+    private String name;
+    private Integer orderMin;
+    private Integer discountRate;
+    private Integer discountCost;
+    private Integer maxDiscountCost;
+    private boolean rate;
+    private LocalDate startDate;
+    private LocalDate endDate;
+
+}
diff --git a/src/main/resources/templates/checkout-coupon.html b/src/main/resources/templates/checkout-coupon.html
index a877f10d..517c80c7 100644
--- a/src/main/resources/templates/checkout-coupon.html
+++ b/src/main/resources/templates/checkout-coupon.html
@@ -19,20 +19,25 @@
                     <span th:text="'쿠폰이름: '+${coupon.name}"></span>
                     <span class="coupon-order-min" th:text="'최소 주문 금액: '+${coupon.orderMin}"
                           th:data-min="${coupon.orderMin}"></span>
-                    <th:block th:if="${coupon.isRate == true}">
+                    <th:block th:if="${coupon.rate == true}">
                         <label>
                             <span class="price" th:data-check="${coupon.rate}"
                                   th:text="${coupon.discountRateOrCost}"></span>
                             <span>%</span>
+
+                            <span class="max-discount-cost" th:text="'최대 할인 금액:'+${coupon.maxDiscountCost}"
+                                  th:data-maxDiscount="${coupon.maxDiscountCost}"></span>
+
                         </label>
-                        <span class="max-discount-cost" th:text="'최대 할인 금액:'+${coupon.maxDiscountCost}"
-                              th:data-maxDiscount="${coupon.maxDiscountCost}"></span>
                     </th:block>
-                    <th:block th:if="${coupon.rate == false}">
+                    <th:block th:if="${coupon.rate != true}">
                         <label>
                             <span class="price" th:data-check="${coupon.rate}"
                                   th:text="${coupon.discountRateOrCost}"></span>
                             <span>원</span>
+
+                            <span class="max-discount-cost"
+                                  data-maxDiscount="0"></span>
                         </label>
                     </th:block>
                 </label>
@@ -66,17 +71,13 @@
         if (!beforecouponCost) { // 행의 처음 선택 했을 때
             opener.document.getElementsByClassName('select-coupon-cost')[index].value = couponCost;
         } else {
-            alert("쿠폰 적용한 총 값: " + parseInt(opener.document.getElementById("coupon-cost").value));
             opener.document.getElementById("coupon-cost").value = parseInt(opener.document.getElementById("coupon-cost").value)
                 - parseInt(beforecouponCost);
         }
 
         opener.document.querySelectorAll('p[class="select-coupon-name"]')[index].textContent = couponName
-        opener.document.querySelectorAll('.select-coupon-id')[index].value = selectId;
-        alert(couponCost)
-        alert(bookSale)
-        alert(typeof check)
-        alert(check)
+        opener.document.getElementsByClassName("select-coupon-id")[index].value = selectId;
+        alert(index)
         if (check === "true") {
             const maxDiscount = parseInt(document.getElementById('coupon-btn').getAttribute("coupon-max-discount-cost"));
 
@@ -106,11 +107,9 @@
             opener.document.getElementsByClassName('select-coupon-cost')[index].value = saleCost;
             alert(opener.document.getElementsByClassName('select-coupon-cost')[index].value)
         }
-        alert("book total cost의 값:" + parseInt(bookTotalCost))
-        alert("coupon cost의 값:" + parseInt(opener.document.getElementById("coupon-cost").value))
-        alert("coupon cost의 값:" + parseInt(opener.document.getElementById('user-point').value))
         opener.document.getElementById('totalCost').textContent = (parseInt(bookTotalCost) - parseInt(opener.document.getElementById("coupon-cost").value) -
             parseInt(opener.document.getElementById('user-point').value)).toString()
+        alert(opener.document.getElementsByClassName('select-coupon-id')[index].value)
 
         window.close()
     }
@@ -140,16 +139,19 @@
         const couponBtn = document.getElementById('coupon-btn');
         const coupon = radio.parentElement.querySelector('.price');
         const couponId = radio.parentElement.querySelector('input[class="coupon-id-form"]').id
+        alert("error")
         const couponOrderMin = radio.parentElement.querySelector(".coupon-order-min").getAttribute("data-min")
+        alert("error1")
+        alert("if")
+        alert("test: " + radio.parentElement.querySelector(".max-discount-cost").getAttribute("data-maxDiscount"))
         const maxDiscountCost = radio.parentElement.querySelector(".max-discount-cost").getAttribute("data-maxDiscount")
+        couponBtn.setAttribute('coupon-max-discount-cost', maxDiscountCost)
         alert(couponOrderMin)
-        alert(maxDiscountCost)
         couponBtn.setAttribute('coupon-name', radio.value);
         couponBtn.setAttribute('coupon-cost', coupon.innerText);
         couponBtn.setAttribute('radio-id', couponId)
         couponBtn.setAttribute('coupon-rate', coupon.getAttribute('data-check'))
         couponBtn.setAttribute('coupon-order-min', couponOrderMin)
-        couponBtn.setAttribute('coupon-max-discount-cost', maxDiscountCost)
     }
 </script>
 </body>
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index 8f6315fe..ce387609 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -123,7 +123,7 @@ <h5>받는 사람 정보</h5>
                                                         </label>
                                                         <div class="form-input form">
                                                             <input id="delivery-address-id"
-                                                                   name="orderInfo.addressId"
+                                                                   name="userInfo.addressId"
                                                                    type="hidden">
                                                             <input id="delivery-address"
                                                                    name="orderInfo.recipientAddress"
@@ -177,14 +177,20 @@ <h5>주문 내역
                                                                 </span>
                                                                 </label>
                                                             </td>
-                                                            <td></td>
-                                                            <!--                                                        <td th:text="${book.originalCost}"></td>-->
+                                                            <td th:text="${book.cost}"></td>
                                                             <td th:text="${book.saleCost}">
                                                             </td>
-                                                            <td th:text="${book.cartDetailAmount}">
-                                                                <input th:name="|bookInfoList${index.index}.amount|"
-                                                                       th:value="${book.cartDetailAmount}"
-                                                                       type="hidden">
+                                                            <td>
+
+                                                                <div>
+                                                                    <label>
+                                                                        <span th:text="${book.cartDetailAmount}">
+                                                                        </span>
+                                                                        <input th:name="|bookInfoList[${index.index}].amount|"
+                                                                               th:value="${book.cartDetailAmount}"
+                                                                               type="text"/>
+                                                                    </label>
+                                                                </div>
                                                             </td>
 
                                                             <td>
@@ -198,7 +204,7 @@ <h5>주문 내역
                                                                     </div>
                                                                 </div>
                                                             </td>
-                                                            <td class="form-input">
+                                                            <td class="form-text">
                                                                 <input class="select-wrap"
                                                                        th:name="|bookInfoList[${index.index}].selectWrapId|"
                                                                        type="hidden">
@@ -209,9 +215,9 @@ <h5>주문 내역
                                                                        type="hidden">
                                                             </td>
 
-                                                            <td class="form-input">
+                                                            <td class="form-text">
                                                                 <input class="select-coupon-id"
-                                                                       th:name="|bookInfoList[${index.index}].seletCouponId]|"
+                                                                       th:name="|bookInfoList[${index.index}].selectCouponId|"
                                                                        type="hidden">
                                                                 <p class="select-coupon-name"></p>
 
@@ -253,7 +259,7 @@ <h5>포인트 사용</h5>
                                                         <p th:if="${point==null}" th:text="'보유 포인트: 0'"></p>
                                                         <p th:if="${point!=null}" th:text="'보유 포인트: '+ ${point}"></p>
                                                         <input id="user-point" type="number" placeholder="포인트 사용"
-                                                               min="0" value="0"
+                                                               min="0" value="0" name="orderInfo.usingPoint"
                                                                th:max="${point}">
                                                     </label>
                                                 </div>
@@ -293,7 +299,7 @@ <h5>결제</h5>
                                                         <div class="form-text">
                                                             <span id="totalCost" th:text="${totalCost}"></span>
                                                             <input id="input-total-cost" th:value="${totalCost}"
-                                                                   type="hidden" name="orderInfo.usingPoint"/>
+                                                                   type="hidden"/>
                                                         </div>
                                                     </div>
                                                     <div class="single-form form-default">

From 3d03070cfe5ea1fc16e0d83c2c271543a522cc97 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 15:54:05 +0900
Subject: [PATCH 034/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EC=84=9C?=
 =?UTF-8?q?=20=EC=83=9D=EC=84=B1=ED=95=98=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adaptor/DeliveryRuleAdaptor.java            | 17 +++++++++++++++++
 .../service/DeliveryRuleService.java            |  5 +++++
 .../front/order/controller/OrderController.java |  5 +++++
 .../dto/request/BookOrderCreateRequest.java     |  2 +-
 .../order/dto/request/BookOrderRequest.java     |  2 +-
 .../order/dto/request/OrderInfoRequest.java     |  1 +
 .../mybooks/front/order/utils/OrderUtils.java   |  2 +-
 src/main/resources/templates/checkout.html      | 16 ++++++++++++++++
 8 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/admin/delivery_rule/adaptor/DeliveryRuleAdaptor.java b/src/main/java/store/mybooks/front/admin/delivery_rule/adaptor/DeliveryRuleAdaptor.java
index 4f1b18c2..0e59859d 100644
--- a/src/main/java/store/mybooks/front/admin/delivery_rule/adaptor/DeliveryRuleAdaptor.java
+++ b/src/main/java/store/mybooks/front/admin/delivery_rule/adaptor/DeliveryRuleAdaptor.java
@@ -121,4 +121,21 @@ public void deleteDeliveryRule(Integer id) {
 
         Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
+
+    /**
+     * 이름으로 배송 규정 조회.
+     *
+     * @param name the name
+     * @return the delivery rule by name
+     */
+    public DeliveryRuleResponse getDeliveryRuleByName(String name) {
+        ResponseEntity<DeliveryRuleResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/name/{name}",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<DeliveryRuleResponse>() {
+                }, name
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/admin/delivery_rule/service/DeliveryRuleService.java b/src/main/java/store/mybooks/front/admin/delivery_rule/service/DeliveryRuleService.java
index 20084845..577a9b2a 100644
--- a/src/main/java/store/mybooks/front/admin/delivery_rule/service/DeliveryRuleService.java
+++ b/src/main/java/store/mybooks/front/admin/delivery_rule/service/DeliveryRuleService.java
@@ -71,4 +71,9 @@ public void modifyDeliveryRule(DeliveryRuleModifyRequest deliveryRuleModifyReque
     public void deleteDeliveryRule(Integer id) {
         deliveryRuleAdaptor.deleteDeliveryRule(id);
     }
+
+    public DeliveryRuleResponse getDeliveryRuleResponseByName(String name) {
+        return deliveryRuleAdaptor.getDeliveryRuleByName(name);
+    }
+
 }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 6bc982ae..a540f0e9 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -10,6 +10,8 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import store.mybooks.front.admin.delivery_rule.dto.DeliveryRuleResponse;
+import store.mybooks.front.admin.delivery_rule.service.DeliveryRuleService;
 import store.mybooks.front.admin.wrap.dto.response.WrapResponse;
 import store.mybooks.front.admin.wrap.service.WrapService;
 import store.mybooks.front.cart.domain.CartDetail;
@@ -55,6 +57,7 @@ public class OrderController {
     private final CartNonUserService cartNonUserService;
     private final CartUserService cartUserService;
     private final OrderInfoCheckService orderInfoCheckService;
+    private final DeliveryRuleService deliveryRuleService;
 
     /**
      * methodName : viewOrderPage<br>
@@ -161,12 +164,14 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
         LocalDate localDate = LocalDate.now();
         UserGetResponse user = userAdaptor.findUser();
         List<CartDetail> bookFromCart = cartUserService.getBookFromCart();
+        DeliveryRuleResponse deliveryRule = deliveryRuleService.getDeliveryRuleResponseByName("배송 비");
         modelMap.put("bookLists", bookFromCart);
         modelMap.put("totalCost", orderService.calculateTotalCost(bookFromCart));
         modelMap.put("point", pointResponse.getRemainingPoint());
         modelMap.put("bookCostList", orderService.calculateBooksCost(bookFromCart));
         modelMap.put("localDate", localDate);
         modelMap.put("user", user);
+        modelMap.put("delivery", deliveryRule);
         modelMap.put("quantity", request.getQuantity());
         return "checkout";
     }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
index 6a7a621e..1b659f13 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
@@ -19,7 +19,7 @@
 @AllArgsConstructor
 public class BookOrderCreateRequest {
     private List<BookInfoRequest> bookInfoList;
-    private OrderInfoRequest orderInfoRequest;
+    private OrderInfoRequest orderInfo;
     private String orderNumber;
     private Integer pointCost;
     private Integer couponCost;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 9c1974a5..008edd3b 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -22,7 +22,7 @@
 @Setter
 @ToString
 public class BookOrderRequest {
-    private OrderInfoRequest orderInfo;
     private List<BookInfoRequest> bookInfoList;
+    private OrderInfoRequest orderInfo;
     private OrderUserInfoRequest userInfo;
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index d86f34a9..b3ec666a 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -25,6 +25,7 @@ public class OrderInfoRequest {
     private String recipientName;
     private String recipientPhoneNumber;
     private String recipientAddress;
+    private Integer deliveryId;
     private String deliveryDate;
     private String receiverMessage;
     private Integer usingPoint;
diff --git a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
index a877f29e..428f9970 100644
--- a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
+++ b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
@@ -29,7 +29,7 @@ public static String createOrderNumber() {
         String time = LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE);
         int leftLimit = 48;
         int rightLimit = 122;
-        int targetStringLength = 13;
+        int targetStringLength = 12;
         String randomStr = new Random()
                 .ints(leftLimit, rightLimit + 1)
                 .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97))
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index ce387609..cc231e8e 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -285,6 +285,22 @@ <h6>배송 시 요청 사항</h6>
                                                           name="orderInfo.receiverMessage"></textarea>
                                             </label>
                                         </div>
+                                        <div>
+                                            <h6>
+                                                배송 비
+                                            </h6>
+                                            <th:block th:if="${delivery.ruleCost} < ${totalCost}">
+                                                                <span th:text="${delivery.cost}">
+                                                                </span>
+                                            </th:block>
+                                            <th:block th:if="${delivery.ruleCost} > ${totalCost}">
+                                                <span>0원</span>
+                                            </th:block>
+                                            <label>
+                                                <input name="orderInfo.deliveryId"
+                                                       th:value="${delivery.id}">
+                                            </label>
+                                        </div>
                                     </section>
                                 </li>
                                 <li>

From f9f021ba4e3bc526269a64d30333d97e318f155d Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 16:10:20 +0900
Subject: [PATCH 035/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=9C=20=EB=B2=88=ED=98=B8=EC=9D=B8=EC=A7=80=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/adaptor/OrderAdaptor.java     | 10 +++++++
 .../front/order/service/OrderService.java     | 26 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index 04db8a3d..e8f1ba3e 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -63,4 +63,14 @@ public BookOrderCreateResponse createBookOrder(BookOrderCreateRequest request) {
                 });
         return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
     }
+
+    public Boolean checkBookOrderNumber(String orderNumber) {
+        ResponseEntity<Boolean> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/orderNumber/{orderNumber}",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<Boolean>() {
+                }, orderNumber);
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index c20b1790..4773002b 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -128,10 +128,27 @@ public Integer calculateBookWrapCost(List<BookInfoRequest> bookInfoRequests) {
         return result;
     }
 
+    /**
+     * 회원의 포인트 조회.
+     *
+     * @param orderInfoRequest the order info request
+     * @return the point
+     */
     public Integer getPoint(OrderInfoRequest orderInfoRequest) {
         return orderInfoRequest.getUsingPoint();
     }
 
+    /**
+     * 주문 등록.
+     *
+     * @param bookInfo   the book info
+     * @param orderInfo  the order info
+     * @param point      the point
+     * @param couponCost the coupon cost
+     * @param wrapCost   the wrap cost
+     * @param totalCost  the total cost
+     * @return the book order create response
+     */
     public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
                                                OrderInfoRequest orderInfo,
                                                Integer point,
@@ -139,11 +156,16 @@ public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
                                                Integer wrapCost,
                                                Integer totalCost) {
         totalCost += wrapCost - point - couponCost;
-        //todo 해당 주문 번호가 있는지 확인하는 메서드 필요
-        String orderNumber = OrderUtils.createOrderNumber();
+        String orderNumber = "";
+
+        do {
+            orderNumber = OrderUtils.createOrderNumber();
+        } while (!orderAdapter.checkBookOrderNumber(orderNumber));
 
         BookOrderCreateRequest request = new BookOrderCreateRequest(bookInfo, orderInfo,
                 orderNumber, point, couponCost, wrapCost, totalCost);
         return orderAdapter.createBookOrder(request);
     }
+
+  
 }

From 2a97c118c552380984db6bf474bc94e7cd626690 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 16:50:05 +0900
Subject: [PATCH 036/147] =?UTF-8?q?feat:=20=EA=B2=B0=EC=A0=9C=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=ED=95=B4=EB=8B=B9?=
 =?UTF-8?q?=20=EC=A3=BC=EB=AC=B8=EC=84=9C=EC=97=90=EC=84=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EB=B3=84=20=EC=BF=A0=ED=8F=B0=EC=9D=84=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=96=88=EB=8A=94=EC=A7=80=EC=9D=98=20=EA=B0=92=EC=9D=84=20?=
 =?UTF-8?q?=EB=B0=98=ED=99=98=ED=95=98=EA=B2=8C=20=EB=A7=8C=EB=93=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/adaptor/OrderAdaptor.java       |  8 ++++----
 .../front/order/controller/OrderController.java |  4 ++--
 .../response/BookOrderResultCreateResponse.java | 17 +++++++++++++++++
 .../front/order/service/OrderService.java       | 16 ++++++++--------
 4 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index e8f1ba3e..acf5eee5 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -11,7 +11,7 @@
 import store.mybooks.front.auth.Annotation.RequiredAuthorization;
 import store.mybooks.front.config.GatewayAdaptorProperties;
 import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
-import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -53,13 +53,13 @@ public void checkOrderUserAddressInfo(Long id) {
 
 
     @RequiredAuthorization
-    public BookOrderCreateResponse createBookOrder(BookOrderCreateRequest request) {
+    public BookOrderResultCreateResponse createBookOrder(BookOrderCreateRequest request) {
         HttpEntity<BookOrderCreateRequest> httpEntity = new HttpEntity<>(request, Utils.getAuthHeader());
-        ResponseEntity<BookOrderCreateResponse> exchange = restTemplate.exchange(
+        ResponseEntity<BookOrderResultCreateResponse> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + MEMBER_URL,
                 HttpMethod.POST,
                 httpEntity,
-                new ParameterizedTypeReference<BookOrderCreateResponse>() {
+                new ParameterizedTypeReference<BookOrderResultCreateResponse>() {
                 });
         return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
     }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index a540f0e9..78ee619f 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -19,7 +19,7 @@
 import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
-import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
 import store.mybooks.front.order.service.OrderInfoCheckService;
 import store.mybooks.front.order.service.OrderService;
 import store.mybooks.front.user.adaptor.UserAdaptor;
@@ -185,7 +185,7 @@ public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
         int couponCost = orderService.calculateBookCouponCost(orderRequest.getBookInfoList());
         int wrapCost = orderService.calculateBookWrapCost(orderRequest.getBookInfoList());
         int totalCost = orderService.calculateTotalCost(cart);
-        BookOrderCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
+        BookOrderResultCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
                 orderRequest.getOrderInfo(), point, couponCost, wrapCost, totalCost);
 
         return "test";
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java
new file mode 100644
index 00000000..18bd6fc8
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java
@@ -0,0 +1,17 @@
+package store.mybooks.front.order.dto.response;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.response<br>
+ * fileName       : BookOrderResultCreateResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/17/24        minsu11       최초 생성<br>
+ */
+public class BookOrderResultCreateResponse {
+    private BookOrderCreateResponse bookOrderInfo;
+    private Boolean isCouponUsed;
+}
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 4773002b..c0fd55e4 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -15,7 +15,7 @@
 import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
-import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
 import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -149,12 +149,12 @@ public Integer getPoint(OrderInfoRequest orderInfoRequest) {
      * @param totalCost  the total cost
      * @return the book order create response
      */
-    public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
-                                               OrderInfoRequest orderInfo,
-                                               Integer point,
-                                               Integer couponCost,
-                                               Integer wrapCost,
-                                               Integer totalCost) {
+    public BookOrderResultCreateResponse createOrder(List<BookInfoRequest> bookInfo,
+                                                     OrderInfoRequest orderInfo,
+                                                     Integer point,
+                                                     Integer couponCost,
+                                                     Integer wrapCost,
+                                                     Integer totalCost) {
         totalCost += wrapCost - point - couponCost;
         String orderNumber = "";
 
@@ -167,5 +167,5 @@ public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
         return orderAdapter.createBookOrder(request);
     }
 
-  
+
 }

From e26f593424261417ff5d871e4a6346d1fc9a55d7 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 17:20:26 +0900
Subject: [PATCH 037/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=EB=A7=88=EB=AC=B4=EB=A6=AC=20=EB=B0=8F=20=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=9C=20html=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     |  7 +-
 .../dto/response/BookOrderCreateResponse.java |  2 +
 .../BookOrderResultCreateResponse.java        |  7 ++
 .../payment/controller/PayController.java     |  1 +
 .../common/layout/my-books-layout.html        |  2 +-
 src/main/resources/templates/payment.html     | 84 +++++++++++--------
 6 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 78ee619f..63de3127 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import store.mybooks.front.admin.delivery_rule.dto.DeliveryRuleResponse;
 import store.mybooks.front.admin.delivery_rule.service.DeliveryRuleService;
 import store.mybooks.front.admin.wrap.dto.response.WrapResponse;
@@ -177,7 +178,8 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
     }
 
     @PostMapping("/order")
-    public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
+    public String doOrder(@ModelAttribute BookOrderRequest orderRequest,
+                          RedirectAttributes redirectAttributes) {
         log.info("값 : {}", orderRequest.toString());
         List<CartDetail> cart = cartUserService.getBookFromCart();
         orderInfoCheckService.checkModulation(orderRequest, cart);
@@ -187,7 +189,6 @@ public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
         int totalCost = orderService.calculateTotalCost(cart);
         BookOrderResultCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
                 orderRequest.getOrderInfo(), point, couponCost, wrapCost, totalCost);
-
-        return "test";
+        return "redirect:/pay";
     }
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
index 2d24ef76..429c1861 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
@@ -2,6 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
@@ -15,6 +16,7 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
+@NoArgsConstructor
 @AllArgsConstructor
 public class BookOrderCreateResponse {
     private String orderStatus;
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java
index 18bd6fc8..9e70072a 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderResultCreateResponse.java
@@ -1,5 +1,9 @@
 package store.mybooks.front.order.dto.response;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
  * fileName       : BookOrderResultCreateResponse<br>
@@ -11,6 +15,9 @@
  * -----------------------------------------------------------<br>
  * 3/17/24        minsu11       최초 생성<br>
  */
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class BookOrderResultCreateResponse {
     private BookOrderCreateResponse bookOrderInfo;
     private Boolean isCouponUsed;
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayController.java b/src/main/java/store/mybooks/front/payment/controller/PayController.java
index c401f786..4ed009a4 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayController.java
@@ -119,6 +119,7 @@ public String paymentRequest(HttpServletRequest request, Model model) throws Exc
     @GetMapping
     public String index(HttpServletRequest request, ModelMap model) throws Exception {
         model.put("tossValue", tossAppKey.getClientKey());
+
         return "payment";
     }
 
diff --git a/src/main/resources/templates/common/layout/my-books-layout.html b/src/main/resources/templates/common/layout/my-books-layout.html
index 7336e173..66d7c1e0 100644
--- a/src/main/resources/templates/common/layout/my-books-layout.html
+++ b/src/main/resources/templates/common/layout/my-books-layout.html
@@ -5,7 +5,7 @@
 <head>
     <meta charset="utf-8"/>
     <title>MyBooks</title>
-
+    <th:block layout:fragment="customSetting"></th:block>
     <th:block th:replace="common/fragment/my-book/config/my-books-config::configFragment1"/>
 </head>
 
diff --git a/src/main/resources/templates/payment.html b/src/main/resources/templates/payment.html
index 0cca9e34..0a58a588 100644
--- a/src/main/resources/templates/payment.html
+++ b/src/main/resources/templates/payment.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
-<html lang="ko">
-<head>
-    <meta charset="utf-8"/>
+<html lang="ko"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<div layout:fragment="customSetting">
     <link
             rel="icon"
             href="https://static.toss.im/icons/png/4x/icon-toss-logo.png"
@@ -12,49 +13,58 @@
     <title>토스페이먼츠 샘플 프로젝트</title>
     <!-- 결제위젯 SDK 추가 -->
     <script src="https://js.tosspayments.com/v1/payment-widget"></script>
+</div>
+
+<div layout:fragment="content">
+    <div class="container">
+        <div class="row justify-content-center">
+            <div>
+                <h3>결제 정보</h3>
+                
+
+            </div>
 
-</head>
 
-<body>
-<!-- 주문서 영역 -->
-<div class="wrapper">
-    <div
-            class="box_section"
-            style="
+            <div class="wrapper">
+                <div
+                        class="box_section"
+                        style="
           padding: 40px 30px 50px 30px;
           margin-top: 30px;
           margin-bottom: 50px;
         "
-    >
-        <input class="toss" th:value="${tossValue}" type="hidden">
-        <!-- 결제 UI -->
-        <div id="payment-method"></div>
-        <!-- 이용약관 UI -->
-        <div id="agreement"></div>
-        <!-- 쿠폰 체크박스 -->
-        <div style="padding-left: 25px">
-            <div class="checkable typography--p">
-                <label for="coupon-box" class="checkable__label typography--regular"
-                ><input
-                        id="coupon-box"
-                        class="checkable__input"
-                        type="checkbox"
-                        aria-checked="true"
-                /><span class="checkable__label-text"
-                >5,000원 쿠폰 적용</span
-                ></label
                 >
+                    <input class="toss" th:value="${tossValue}" type="hidden">
+                    <!-- 결제 UI -->
+                    <div id="payment-method"></div>
+                    <!-- 이용약관 UI -->
+                    <div id="agreement"></div>
+                    <!-- 쿠폰 체크박스 -->
+                    <div style="padding-left: 25px">
+                        <div class="checkable typography--p">
+                            <label for="coupon-box" class="checkable__label typography--regular"
+                            ><input
+                                    id="coupon-box"
+                                    class="checkable__input"
+                                    type="checkbox"
+                                    aria-checked="true"
+                            /><span class="checkable__label-text"
+                            >5,000원 쿠폰 적용</span
+                            ></label
+                            >
+                        </div>
+                    </div>
+                    <!-- 결제하기 버튼 -->
+                    <div class="result wrapper">
+                        <button class="button" id="payment-button" style="margin-top: 30px">
+                            결제하기
+                        </button>
+                    </div>
+                </div>
             </div>
+            <script src="/assets/js/payment/payment.js"></script>
         </div>
-        <!-- 결제하기 버튼 -->
-        <div class="result wrapper">
-            <button class="button" id="payment-button" style="margin-top: 30px">
-                결제하기
-            </button>
-        </div>
+
     </div>
 </div>
-<script src="/assets/js/payment/payment.js"></script>
-
-</body>
 </html>
\ No newline at end of file

From 2af45b180b2830e6ff24f05041b6c2ffc05b2463 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Sun, 17 Mar 2024 20:20:50 +0900
Subject: [PATCH 038/147] =?UTF-8?q?feat:=20=EA=B2=B0=EC=A0=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=84=98=EA=B8=B8=20=EC=A3=BC=EB=AC=B8=20=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/response/BookOrderInfoResponse.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java

diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
new file mode 100644
index 00000000..8515b33c
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
@@ -0,0 +1,24 @@
+package store.mybooks.front.order.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.response<br>
+ * fileName       : BookOrderInfoResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/17/24        minsu11       최초 생성<br>
+ */
+@Getter
+@AllArgsConstructor
+public class BookOrderInfoResponse {
+    private String orderStatus;
+    private String number;
+    private Integer totalCost;
+    private Boolean isCouponUsed;
+}

From 041c75408ad41d70755d2c8b1ab516bf7882324e Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Mon, 18 Mar 2024 01:54:49 +0900
Subject: [PATCH 039/147] =?UTF-8?q?refactor:=20dto=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=9E=AC=EA=B3=A0,=20=EC=83=81=ED=83=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/admin/book/model/response/BookCartResponse.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/store/mybooks/front/admin/book/model/response/BookCartResponse.java b/src/main/java/store/mybooks/front/admin/book/model/response/BookCartResponse.java
index beddc8a5..3cfa4398 100644
--- a/src/main/java/store/mybooks/front/admin/book/model/response/BookCartResponse.java
+++ b/src/main/java/store/mybooks/front/admin/book/model/response/BookCartResponse.java
@@ -22,4 +22,6 @@ public class BookCartResponse {
     private String bookImage;
     private Integer cost;
     private Integer saleCost;
+    private Integer stock;
+    private String sellingStatus;
 }
\ No newline at end of file

From 7df0877eabfd948f49a66e0e58df264895f90c0c Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Mon, 18 Mar 2024 01:55:15 +0900
Subject: [PATCH 040/147] =?UTF-8?q?refactor:=20=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/cart/controller/CartController.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/controller/CartController.java b/src/main/java/store/mybooks/front/cart/controller/CartController.java
index 57b3e15f..04340dc6 100644
--- a/src/main/java/store/mybooks/front/cart/controller/CartController.java
+++ b/src/main/java/store/mybooks/front/cart/controller/CartController.java
@@ -112,15 +112,14 @@ private boolean isUser(HttpServletRequest request) {
     }
 
     @PostMapping("/cart/update")
-    public ResponseEntity<Void> cartOrder(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
-                                    HttpServletResponse response, HttpServletRequest request,
-                                    @RequestBody List<OrderItemRequest> orderItemRequest) {
+    public ResponseEntity<Void> updateBookAmount(@CookieValue(name = CartUtil.CART_COOKIE, required = false) Cookie cartCookie,
+                                                 HttpServletResponse response, HttpServletRequest request,
+                                                 @RequestBody List<OrderItemRequest> orderItemRequest) {
         if (isUser(request)) {
-            cartUserService.orderBookInCart(orderItemRequest);
+            cartUserService.updateAmountBookInCart(orderItemRequest);
         } else {
             cartNonUserService.orderBookInCart(cartCookie, response, orderItemRequest);
         }
-
         return ResponseEntity.ok().build();
     }
 }
\ No newline at end of file

From ca343d112c8a2feb510bb5303219da1cf237a009 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Mon, 18 Mar 2024 01:55:32 +0900
Subject: [PATCH 041/147] =?UTF-8?q?refactor:=20dto=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=9E=AC=EA=B3=A0,=20=EC=83=81=ED=83=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/store/mybooks/front/cart/domain/CartDetail.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
index a2fe4ec8..172f1da9 100644
--- a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
+++ b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
@@ -27,6 +27,8 @@ public class CartDetail {
     private String bookImage;
     private Integer cost;
     private Integer saleCost;
+    private Integer stock;
+    private String sellingStatus;
 
     public void addAmount(int amount) {
         this.cartDetailAmount = this.cartDetailAmount + amount;

From 29a33f4acd0cded4a7e114c606de94ef1ebad7ab Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Mon, 18 Mar 2024 01:55:49 +0900
Subject: [PATCH 042/147] =?UTF-8?q?refactor:=20dto=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=9E=AC=EA=B3=A0,=20=EC=83=81=ED=83=9C=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20service=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/cart/service/CartNonUserService.java  | 4 +++-
 .../store/mybooks/front/cart/service/CartUserService.java     | 4 ++--
 src/main/java/store/mybooks/front/cart/service/CartUtil.java  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
index c439c6ec..52164733 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartNonUserService.java
@@ -81,7 +81,9 @@ public void registerBookToCart(Cookie cookie, HttpServletResponse response,
                         cartBook.getName(),
                         cartBook.getBookImage(),
                         cartBook.getCost(),
-                        cartBook.getSaleCost()));
+                        cartBook.getSaleCost(),
+                        cartBook.getStock(),
+                        cartBook.getSellingStatus()));
             }
             String cartJson = objectMapper.writeValueAsString(cartDetailList);
             String encode = URLEncoder.encode(cartJson, StandardCharsets.UTF_8);
diff --git a/src/main/java/store/mybooks/front/cart/service/CartUserService.java b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
index f5928abe..e82e18c3 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
@@ -79,7 +79,7 @@ public void addBookToCart(CartRegisterRequest cartRegisterRequest) {
             CartDetail cartDetail =
                     new CartDetail(cartBook.getId(), cartRegisterRequest.getQuantity(), cartBook.getName(),
                             cartBook.getBookImage(), cartBook.getCost(),
-                            cartBook.getSaleCost());
+                            cartBook.getSaleCost(), cartBook.getStock(), cartBook.getSellingStatus());
             cartDetailList.add(cartDetail);
             redisTemplate.opsForList().rightPush(cartKey, cartDetail);
         }
@@ -109,7 +109,7 @@ public void deleteBookFromCart(Long bookId) {
      *
      * @param orderItemRequestList the order item request list
      */
-    public void orderBookInCart(List<OrderItemRequest> orderItemRequestList) {
+    public void updateAmountBookInCart(List<OrderItemRequest> orderItemRequestList) {
         List<CartDetail> bookFromCart = getBookFromCart();
         if (Objects.isNull(bookFromCart) || bookFromCart.isEmpty()) {
             return;
diff --git a/src/main/java/store/mybooks/front/cart/service/CartUtil.java b/src/main/java/store/mybooks/front/cart/service/CartUtil.java
index 8130633a..9e73de72 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartUtil.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartUtil.java
@@ -61,7 +61,7 @@ public void registerBookToCart(Cookie cookie, HttpServletResponse response, Long
             if (!isAlreadyCart) {
                 cartDetailList.add(new CartDetail(cartBook.getId(), amount, cartBook.getName(), cartBook.getBookImage(),
                         cartBook.getCost(),
-                        cartBook.getSaleCost()));
+                        cartBook.getSaleCost(), cartBook.getStock(), cartBook.getSellingStatus()));
             }
             String cartJson = objectMapper.writeValueAsString(cartDetailList);
             String encode = URLEncoder.encode(cartJson, StandardCharsets.UTF_8);

From f9098bb3826bd189b1865c9d799ccaf98190719d Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Mon, 18 Mar 2024 01:56:03 +0900
Subject: [PATCH 043/147] =?UTF-8?q?feat:=20=EA=B0=92=EB=93=A4=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/cart.html | 60 +++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index 0daebacf..94cf16a1 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -89,14 +89,15 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                                         th:text="${cartDetail.name}">
                             </a></h5>
                             <p class="product-des">
-                                <span><em>Type:</em> Mirrorless</span>
-                                <span><em>Color:</em> Black</span>
+                                <span class="stock" th:text="'잔여수량: ' + ${cartDetail.stock}"></span>
+                                <span class="book-status" th:text="'도서상태: ' + ${cartDetail.sellingStatus}"></span>
                             </p></div>
                         <div class="quantity-input col-lg-2 col-md-2 col-12">
                             <button onclick="decreaseCounter(this)" class="minus-btn">-</button>
                             <p class="counter form-control quantity"
                                th:text="${cartDetail.cartDetailAmount}">0</p>
-                            <button onclick="increaseCounter(this)" class="plus-btn">+</button>
+                            <button th:onclick="'increaseCounter(this,'+ ${cartDetail.stock} +')'" class="plus-btn">+
+                            </button>
                         </div>
                         <div class="col-lg-2 col-md-2 col-12 ">
                             <p th:text="${#numbers.formatInteger(cartDetail.cost, 3, 'COMMA')}"></p>
@@ -117,11 +118,15 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         updateTotalAmount();
                     }
 
-                    function increaseCounter(button) {
+                    function increaseCounter(button, stock) {
                         let counterElement = button.parentElement.querySelector('.counter');
                         let counterValue = parseInt(counterElement.innerText);
-                        counterValue++;
-                        updateCounterDisplay(counterElement, counterValue);
+                        if (counterValue < stock) {
+                            counterValue++;
+                            updateCounterDisplay(counterElement, counterValue);
+                        } else {
+                            alert("재고가 부족합니다");
+                        }
                     }
 
                     function decreaseCounter(button) {
@@ -140,9 +145,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                         for (let i = 0; i < counters.length; i++) {
                             let counterValue = parseInt(counters[i].innerText);
-                            if (counterValue <= 0) {
 
-                            }
                             let costValue = parseInt(costs[i].innerText.replace(/[^0-9.]/g, ''));
 
                             total += counterValue * costValue;
@@ -155,19 +158,28 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                     async function orderAndRedirect() {
                         try {
+                            document.getElementById('orderButton').disabled = true;
+                            if (!await validateStatus()) {
+                                alert("판매중이지 않은 도서가 있습니다.")
+                                throw new Error("도서상태가 판매중이 아닙니다.");
+
+                            }
 
                             if (await validateQuantity()) {
                                 await orderItem();
 
                                 window.location.href = "/cart/checkout";
                             } else {
+                                alert("수량을 다시 설정 하세요");
                                 throw new Error("주문 수량이 0 이하입니다");
+
                             }
 
                         } catch (error) {
                             console.error("주문 처리중에 에러가 벌생했다 : ", error.name);
-                            alert("수량을 다시 설정 하세요");
                             window.location.href = "/cart";
+                        }finally {
+                            document.getElementById('orderButton').disabled = false;
                         }
                     }
 
@@ -206,6 +218,31 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                         });
                     }
 
+                    async function validateStatus() {
+                        return new Promise((resolve, reject) => {
+                            let isValid = true;
+                            let cartItems = document.querySelectorAll('.cart-single-list');
+
+                            cartItems.forEach(async function (cartItem) {
+                                let status = cartItem.querySelector('.book-status').innerText;
+
+                                if (status !== "도서상태: 판매중") {
+                                    isValid = false;
+                                    let bookId = cartItem.getAttribute('data-book-id');
+
+                                    try {
+                                        await fetch('/cart/delete?bookId=' + bookId);
+                                        cartItem.remove();
+                                    } catch (error) {
+                                        console.error("카트에서 도서 삭제하는 중에 오류가 발생 했다: ", error);
+                                    }
+
+                                }
+                            });
+                            resolve(isValid);
+                        });
+                    }
+
                     async function validateQuantity() {
                         return new Promise((resolve, reject) => {
                             let isValid = true;
@@ -213,7 +250,8 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
 
                             cartItems.forEach(function (cartItem) {
                                 let quantity = parseInt(cartItem.querySelector('.counter').innerText);
-                                if (quantity <= 0) {
+                                let stock = parseInt(cartItem.querySelector('.stock').innerText);
+                                if (quantity <= 0 || quantity > stock) {
                                     isValid = false;
                                     return;
                                 }
@@ -250,7 +288,7 @@ <h5 class="product-name"><a th:href="@{'/book/' + ${cartDetail.bookId}}"
                                             </li>
                                         </ul>
                                         <div class="button">
-                                            <a href="javascript:void(0);" class="btn"
+                                            <a id="orderButton" href="javascript:void(0);" class="btn"
                                                onclick="orderAndRedirect()">주문</a>
                                             <a href="/" class="btn btn-alt">계속 쇼핑하기</a>
                                         </div>

From c3211a9bf08530a4f3eab081334d03472b180dfa Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:26:56 +0900
Subject: [PATCH 044/147] =?UTF-8?q?feat:=20Review=20=EA=B4=80=EB=A0=A8=20V?=
 =?UTF-8?q?iew=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header/my-books-header-bottom.html        |   2 +-
 src/main/resources/templates/contact.html     | 127 -----------
 .../resources/templates/review-modify.html    | 204 ++++++++++++++++++
 .../resources/templates/review-register.html  | 199 +++++++++++++++++
 src/main/resources/templates/review.html      | 128 +++++++++++
 5 files changed, 532 insertions(+), 128 deletions(-)
 delete mode 100644 src/main/resources/templates/contact.html
 create mode 100644 src/main/resources/templates/review-modify.html
 create mode 100644 src/main/resources/templates/review-register.html
 create mode 100644 src/main/resources/templates/review.html

diff --git a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
index 673e9a7d..8e2ab32a 100644
--- a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
+++ b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
@@ -93,7 +93,7 @@
                                         <li class="nav-item"><a href="login">쿠폰</a></li>
                                         <li class="nav-item"><a href="register">주문목록</a></li>
                                         <li class="nav-item"><a href="mail-success.html">결제내역</a></li>
-                                        <li class="nav-item"><a href="404.html">404 Error</a></li>
+                                        <li class="nav-item"><a href="/review">리뷰내역</a></li>
                                     </ul>
                                 </li>
                                 <li class="nav-item">
diff --git a/src/main/resources/templates/contact.html b/src/main/resources/templates/contact.html
deleted file mode 100644
index 55479b91..00000000
--- a/src/main/resources/templates/contact.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{common/layout/my-books-layout}">
-
-<div layout:fragment="content">
-
-    <!-- Start Breadcrumbs -->
-    <div class="breadcrumbs">
-        <div class="container">
-            <div class="row align-items-center">
-                <div class="col-lg-6 col-md-6 col-12">
-                    <div class="breadcrumbs-content">
-                        <h1 class="page-title">Contact Us</h1>
-                    </div>
-                </div>
-                <div class="col-lg-6 col-md-6 col-12">
-                    <ul class="breadcrumb-nav">
-                        <li><a href="index.html"><i class="lni lni-home"></i> Home</a></li>
-                        <li>Contact</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- End Breadcrumbs -->
-
-    <!-- Start Contact Area -->
-    <section id="contact-us" class="contact-us section">
-        <div class="container">
-            <div class="contact-head">
-                <div class="row">
-                    <div class="col-12">
-                        <div class="section-title">
-                            <h2>Contact Us</h2>
-                            <p>There are many variations of passages of Lorem
-                                Ipsum available, but the majority have suffered alteration in some form.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="contact-info">
-                    <div class="row">
-                        <div class="col-lg-4 col-md-12 col-12">
-                            <div class="single-info-head">
-                                <!-- Start Single Info -->
-                                <div class="single-info">
-                                    <i class="lni lni-map"></i>
-                                    <h3>Address</h3>
-                                    <ul>
-                                        <li>44 Shirley Ave. West Chicago,<br> IL 60185, USA.</li>
-                                    </ul>
-                                </div>
-                                <!-- End Single Info -->
-                                <!-- Start Single Info -->
-                                <div class="single-info">
-                                    <i class="lni lni-phone"></i>
-                                    <h3>Call us on</h3>
-                                    <ul>
-                                        <li><a href="tel:+18005554400">+1 800 555 44 00 (Toll free)</a></li>
-                                        <li><a href="tel:+321556667890">+321 55 666 7890</a></li>
-                                    </ul>
-                                </div>
-                                <!-- End Single Info -->
-                                <!-- Start Single Info -->
-                                <div class="single-info">
-                                    <i class="lni lni-envelope"></i>
-                                    <h3>Mail at</h3>
-                                    <ul>
-                                        <li><a href="mailto:support@shopgrids.com">support@shopgrids.com</a>
-                                        </li>
-                                        <li><a href="mailto:career@shopgrids.com">career@shopgrids.com</a></li>
-                                    </ul>
-                                </div>
-                                <!-- End Single Info -->
-                            </div>
-                        </div>
-                        <div class="col-lg-8 col-md-12 col-12">
-                            <div class="contact-form-head">
-                                <div class="form-main">
-                                    <form class="form" method="post" action="assets/mail/mail.php">
-                                        <div class="row">
-                                            <div class="col-lg-6 col-md-6 col-12">
-                                                <div class="form-group">
-                                                    <input name="name" type="text" placeholder="Your Name"
-                                                           required="required">
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-6 col-md-6 col-12">
-                                                <div class="form-group">
-                                                    <input name="subject" type="text" placeholder="Your Subject"
-                                                           required="required">
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-6 col-md-6 col-12">
-                                                <div class="form-group">
-                                                    <input name="email" type="email" placeholder="Your Email"
-                                                           required="required">
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-6 col-md-6 col-12">
-                                                <div class="form-group">
-                                                    <input name="phone" type="text" placeholder="Your Phone"
-                                                           required="required">
-                                                </div>
-                                            </div>
-                                            <div class="col-12">
-                                                <div class="form-group message">
-                                                    <textarea name="message" placeholder="Your Message"></textarea>
-                                                </div>
-                                            </div>
-                                            <div class="col-12">
-                                                <div class="form-group button">
-                                                    <button type="submit" class="btn ">Submit Message</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!--/ End Contact Area -->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/review-modify.html b/src/main/resources/templates/review-modify.html
new file mode 100644
index 00000000..11a68203
--- /dev/null
+++ b/src/main/resources/templates/review-modify.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Review Form</title>
+
+    <style>
+        body {
+            height: 100vh;
+            display: grid;
+            place-items: center;
+            overflow: hidden;
+        }
+
+        .rating {
+            position: relative;
+            width: 180px;
+            background: transparent;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: .3em;
+            padding: 5px;
+            overflow: hidden;
+            border-radius: 20px;
+            box-shadow: 0 0 2px #b3acac;
+        }
+
+        .rating__result {
+            position: absolute;
+            top: 0;
+            left: 0;
+            transform: translateY(-10px) translateX(-5px);
+            z-index: -9;
+            font: 3em Arial, Helvetica, sans-serif;
+            color: #ebebeb8e;
+            pointer-events: none;
+        }
+
+        .rating__star {
+            font-size: 1.3em;
+            cursor: pointer;
+            color: #dabd18b2;
+            transition: filter linear .3s;
+        }
+
+        .rating__star:hover {
+            filter: drop-shadow(1px 1px 4px gold);
+        }
+    </style>
+</head>
+<body>
+<div layout:fragment="content">
+    <!-- Start Breadcrumbs -->
+    <div class="breadcrumbs">
+        <div class="container">
+            <div class="row align-items-center">
+                <div class="col-lg-6 col-md-6 col-12">
+                </div>
+                <div class="col-lg-6 col-md-6 col-12">
+                    <ul class="breadcrumb-nav">
+                        <li><a href="index.html"><i class="lni lni-home"></i> Home</a></li>
+                        <li>리뷰</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Start Contact Area -->
+    <section id="contact-us" class="contact-us section">
+        <div class="container">
+            <div class="contact-head">
+                <div class="row">
+                    <div class="col-12">
+                        <div class="section-title">
+                            <h2>리뷰 수정</h2>
+                            <p>리뷰 정책을 꼭 확인해 주세요</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="contact-info">
+                    <div class="row">
+                        <div class="col-lg-4 col-md-12 col-12">
+                            <div class="single-info-head">
+                                <!-- Start Single Info -->
+                                <div class="single-info">
+                                    <i class="lni lni-star"></i>
+                                    <h3>리뷰 정책</h3>
+                                    <ul>
+                                        <li>리뷰 작성시 자동으로 구매가 확정되며 환불이 불가능합니다.<br><br> 리뷰 : 200포인트 적립<br>리뷰 + 사진 첨부 :
+                                            500포인트 적립
+                                            <br>사진은 최초 리뷰 작성 시 등록 가능하며 수정이 불가능합니다
+                                            <br>별점 미선택시 5점으로 측정됩니다
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- End Single Info -->
+                            </div>
+                        </div>
+                        <div class="col-lg-8 col-md-12 col-12">
+                            <div class="contact-form-head">
+                                <div class="form-main">
+                                    <form class="form" method="post" action="/review/modify" enctype="multipart/form-data">
+                                        <div class="row">
+                                            <div class="col-lg-6 col-md-6 col-12">
+                                                <div class="form-group">
+                                                    <input name="title" type="text" placeholder="수정할 제목"
+                                                           required="required" th:value="${review.title}">
+                                                </div>
+                                            </div>
+
+                                            <input type="hidden" name="reviewId" th:value="${review.reviewId}">
+
+
+                                            <div class="col-lg-6 col-md-6 col-12">
+                                                별점
+                                                <link rel="stylesheet"
+                                                      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css">
+                                                <div class="rating">
+                                                    <span class="rating__result"></span>
+                                                    <input type="hidden" name="rate" id="rate" value="5">
+                                                    <!-- Hidden input field for rate -->
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-12">
+                                                <div class="form-group message">
+                                                    <textarea name="content" placeholder="수정할 내용"
+                                                              th:text="${review.content}"></textarea>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-12">
+                                                <div class="form-group button">
+                                                    <button type="submit" class="btn ">리뷰 수정</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    <!-- End Breadcrumbs -->
+    <script>
+        const ratingStars = [...document.getElementsByClassName("rating__star")];
+        const ratingResult = document.querySelector(".rating__result");
+
+        printRatingResult(ratingResult);
+
+        function executeRating(stars, result) {
+            const starClassActive = "rating__star fas fa-star";
+            const starClassUnactive = "rating__star far fa-star";
+            const starsLength = stars.length;
+            let i = 1; // i를 1로 초기화
+
+            stars.map((star) => {
+                star.onclick = () => {
+                    i = stars.indexOf(star) + 1;
+
+                    // Set the rate value to the selected number of stars
+                    document.getElementById('rate').value = i;
+
+                    if (star.className.indexOf(starClassUnactive) !== -1) {
+                        printRatingResult(result, i);
+                        for (let j = 0; j < i; ++j) stars[j].className = starClassActive;
+                    } else {
+                        printRatingResult(result, i - 1);
+                        for (let j = i; j < starsLength; ++j) stars[j].className = starClassUnactive;
+                    }
+                };
+            });
+        }
+
+        function printRatingResult(result, num = 1) {
+            result.textContent = `${num}/5`;
+        }
+
+        executeRating(ratingStars, ratingResult);
+
+        // Disable form submission if rating is 0
+        document.getElementById('reviewForm').addEventListener('submit', function(event) {
+            const ratingValue = document.getElementById('rate').value;
+            if (ratingValue === '0') {
+                event.preventDefault(); // Prevent form submission
+                alert('별점을 선택하세요.');
+            }
+        });
+    </script>
+</body>
+</html>
diff --git a/src/main/resources/templates/review-register.html b/src/main/resources/templates/review-register.html
new file mode 100644
index 00000000..76516679
--- /dev/null
+++ b/src/main/resources/templates/review-register.html
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Review Form</title>
+
+    <style>
+        body {
+            height: 100vh;
+            display: grid;
+            place-items: center;
+            overflow: hidden;
+        }
+
+        .rating {
+            position: relative;
+            width: 180px;
+            background: transparent;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: .3em;
+            padding: 5px;
+            overflow: hidden;
+            border-radius: 20px;
+            box-shadow: 0 0 2px #b3acac;
+        }
+
+        .rating__result {
+            position: absolute;
+            top: 0;
+            left: 0;
+            transform: translateY(-10px) translateX(-5px);
+            z-index: -9;
+            font: 3em Arial, Helvetica, sans-serif;
+            color: #ebebeb8e;
+            pointer-events: none;
+        }
+
+        .rating__star {
+            font-size: 1.3em;
+            cursor: pointer;
+            color: #dabd18b2;
+            transition: filter linear .3s;
+        }
+
+        .rating__star:hover {
+            filter: drop-shadow(1px 1px 4px gold);
+        }
+    </style>
+</head>
+<body>
+<div layout:fragment="content">
+    <!-- Start Breadcrumbs -->
+    <div class="breadcrumbs">
+        <div class="container">
+            <div class="row align-items-center">
+                <div class="col-lg-6 col-md-6 col-12">
+                </div>
+                <div class="col-lg-6 col-md-6 col-12">
+                    <ul class="breadcrumb-nav">
+                        <li><a href="index.html"><i class="lni lni-home"></i> Home</a></li>
+                        <li>리뷰</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Start Contact Area -->
+    <section id="contact-us" class="contact-us section">
+        <div class="container">
+            <div class="contact-head">
+                <div class="row">
+                    <div class="col-12">
+                        <div class="section-title">
+                            <h2>리뷰 작성</h2>
+                            <p>리뷰 정책을 꼭 확인해 주세요</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="contact-info">
+                    <div class="row">
+                        <div class="col-lg-4 col-md-12 col-12">
+                            <div class="single-info-head">
+                                <!-- Start Single Info -->
+                                <div class="single-info">
+                                    <i class="lni lni-star"></i>
+                                    <h3>리뷰 정책</h3>
+                                    <ul>
+                                        <li>리뷰 작성시 자동으로 구매가 확정되며 환불이 불가능합니다.<br><br> 리뷰 : 200포인트 적립<br>리뷰 + 사진 첨부 :
+                                            500포인트 적립
+                                            <br>사진은 최초 리뷰 작성 시 등록 가능하며 수정이 불가능합니다
+                                            <br>별점 미선택시 5점으로 측정됩니다
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- End Single Info -->
+                            </div>
+                        </div>
+                        <div class="col-lg-8 col-md-12 col-12">
+                            <div class="contact-form-head">
+                                <div class="form-main">
+                                    <form class="form" method="post" action="/review/register" enctype="multipart/form-data">
+                                        <div class="row">
+                                            <div class="col-lg-6 col-md-6 col-12">
+                                                <div class="form-group">
+                                                    <input name="title" type="text" placeholder="제목" required="required">
+                                                </div>
+                                            </div>
+
+                                            <div class="col-lg-6 col-md-6 col-12">
+                                                별점<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css">
+                                                <div class="rating">
+                                                    <span class="rating__result"></span>
+                                                    <input type="hidden" name="rate" id="rate" value="5"> <!-- Hidden input field for rate -->
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                    <i class="rating__star far fa-star"></i>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-12">
+                                                <div class="form-group message">
+                                                    <textarea name="content" placeholder="내용"></textarea>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-12 file-container">
+                                                <input id="contentImage" name="contentImage" type="file" class="file" accept="image/*">
+                                            </div>
+                                            <div class="col-12">
+                                                <div class="form-group button">
+                                                    <button type="submit" class="btn ">리뷰 작성</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    <!-- End Breadcrumbs -->
+    <script>
+        const ratingStars = [...document.getElementsByClassName("rating__star")];
+        const ratingResult = document.querySelector(".rating__result");
+
+        printRatingResult(ratingResult);
+
+        function executeRating(stars, result) {
+            const starClassActive = "rating__star fas fa-star";
+            const starClassUnactive = "rating__star far fa-star";
+            const starsLength = stars.length;
+            let i = 1; // i를 1로 초기화
+
+            stars.map((star) => {
+                star.onclick = () => {
+                    i = stars.indexOf(star) + 1;
+
+                    // Set the rate value to the selected number of stars
+                    document.getElementById('rate').value = i;
+
+                    if (star.className.indexOf(starClassUnactive) !== -1) {
+                        printRatingResult(result, i);
+                        for (let j = 0; j < i; ++j) stars[j].className = starClassActive;
+                    } else {
+                        printRatingResult(result, i - 1);
+                        for (let j = i; j < starsLength; ++j) stars[j].className = starClassUnactive;
+                    }
+                };
+            });
+        }
+
+        function printRatingResult(result, num = 1) {
+            result.textContent = `${num}/5`;
+        }
+
+        executeRating(ratingStars, ratingResult);
+
+        // Disable form submission if rating is 0
+        document.getElementById('reviewForm').addEventListener('submit', function(event) {
+            const ratingValue = document.getElementById('rate').value;
+            if (ratingValue === '0') {
+                event.preventDefault(); // Prevent form submission
+                alert('별점을 선택하세요.');
+            }
+        });
+    </script>
+</body>
+</html>
diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
new file mode 100644
index 00000000..3bc09514
--- /dev/null
+++ b/src/main/resources/templates/review.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Review Form</title>
+    <style>
+        .pagination {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 20px;
+        }
+
+        .pagination a {
+            padding: 8px 16px;
+            margin: 4px;
+            background-color: #4285f4;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            text-align: center;
+            text-decoration: none;
+            font-size: 14px;
+            cursor: pointer;
+        }
+
+        .pagination a:hover {
+            background-color: #3367d6;
+        }
+
+        .pagination ul {
+            list-style: none;
+            padding: 0;
+            display: flex;
+        }
+
+        .pagination li {
+            margin-right: 5px;
+        }
+
+        /* 수정 버튼 스타일 */
+        .edit-button {
+            padding: 8px 16px;
+            background-color: #F5F5F5;
+            color: #34495e;
+            border: none;
+            border-radius: 4px;
+            text-align: center;
+            text-decoration: none;
+            font-size: 14px;
+            cursor: pointer;
+        }
+
+        .edit-button:hover {
+            background-color: #F5F5F5;
+        }
+    </style>
+</head>
+<body>
+<div layout:fragment="content">
+    <script>
+        let url = "/review/all"
+        let currentPage = [[${reviews.number}]]
+        let totalPages = [[${reviews.totalPages}]]
+    </script>
+    <!-- Start Breadcrumbs -->
+    <div class="breadcrumbs">
+        <div class="container">
+            <div class="row align-items-center">
+                <div class="col-lg-6 col-md-6 col-12">
+                </div>
+                <div class="col-lg-6 col-md-6 col-12">
+                    <ul class="breadcrumb-nav">
+                        <li><a href="index.html"><i class="lni lni-home"></i> Home</a></li>
+                        <li>리뷰</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- End Breadcrumbs -->
+    <div class="container ml-2">
+        <div>
+            <div class="row mt-3">
+                <div th:each="review : ${reviews.content}" class="col-md-3 mb-3">
+                    <div class="card h-100">
+                        <div class="card-body">
+                            <h5>리뷰 : <span th:text="${review.title}"></span></h5>
+                            <br>
+                            도서명 : <a th:href="@{'/book/' + ${review.bookId}}" th:text="${review.bookName}"></a><br>
+
+                            평점 : <span class="rating__result" th:text="${review.rate+'/5'}"></span>
+
+                            <br>
+                            등록일 : <span th:text="${review.date}"></span>
+                            <br>
+
+                            <br>
+                            리뷰내용 <span th:text="${review.content}"></span>
+
+                            <div class="float-right">
+                                <img th:if="${review.reviewImage != null}"
+                                     th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                     width="100" height="100" alt="리뷰 이미지"/>
+                            </div>
+                        </div>
+                        <!-- 수정 버튼 -->
+                        <a class="edit-button" th:href="@{/review/modify(reviewId=${review.reviewId})}">수정</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="pagination">
+            <ul>
+                <li th:each="i : ${#numbers.sequence(0, reviews.totalPages - 1)}">
+                    <a th:href="@{${#httpServletRequest.requestURI}(page=${i})}"
+                       th:text="${i + 1}" th:class="${reviews.number == i ? 'active' : ''}"></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+
+</div>
+</body>
+</html>

From cdfa7fda25eb25638e1253c231ac9e3e185e6e62 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:27:58 +0900
Subject: [PATCH 045/147] =?UTF-8?q?refactor:=20member-all.html=20=EA=B0=84?=
 =?UTF-8?q?=EA=B2=A9=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/view/member/member-all.html  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/admin/view/member/member-all.html b/src/main/resources/templates/admin/view/member/member-all.html
index 1db61d97..ae1f72d1 100644
--- a/src/main/resources/templates/admin/view/member/member-all.html
+++ b/src/main/resources/templates/admin/view/member/member-all.html
@@ -13,7 +13,7 @@
     </script>
     <div class="container mt-5"> <!-- text-center 클래스 추가 -->
         <h1>회원 정보</h1>
-        <table class="table table-bordered" style="width: 150%; height: 150%;">
+        <table class="table table-bordered" style="width: 120%; height: 100%;">
             <thead>
             <tr>
                 <th>회원 이름</th>
@@ -22,11 +22,14 @@ <h1>회원 정보</h1>
                 <th>생년</th>
                 <th>생월일</th>
                 <th>가입일</th>
+                <th>등급</th>
+                <th>상태</th>
                 <th>최근 로그인</th>
                 <th>등급 변경일</th>
             </tr>
             </thead>
             <tbody>
+
             <tr th:each="member:${members.content}">
                 <td th:text="${member.name}"></td>
                 <td th:text="${member.phoneNumber}"></td>
@@ -34,6 +37,8 @@ <h1>회원 정보</h1>
                 <td th:text="${member.birthYear}"></td>
                 <td th:text="${member.birthMonthDay}"></td>
                 <td th:text="${member.createdAt}"></td>
+                <td th:text="${member.userGradeUserGradeNameId}"></td>
+                <td th:text="${member.userStatusId}"></td>
                 <td th:text="${member.latestLogin}"></td>
                 <td th:text="${member.gradeChangedDate}"></td>
             </tr>

From cb994f04fd04f0529481109faf12c6ec7b788282 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:28:10 +0900
Subject: [PATCH 046/147] =?UTF-8?q?feat:=20ReviewResponse=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/response/ReviewCreateResponse.java    | 22 ++++++++++
 .../dto/response/ReviewDetailGetResponse.java | 39 ++++++++++++++++
 .../dto/response/ReviewGetResponse.java       | 44 +++++++++++++++++++
 .../dto/response/ReviewModifyResponse.java    | 23 ++++++++++
 4 files changed, 128 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java

diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java
new file mode 100644
index 00000000..137d71a2
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java
@@ -0,0 +1,22 @@
+package store.mybooks.front.review.controller.dto.response;
+
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.resource.review.dto.response<br>
+ * fileName       : ReviewCreateResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+
+@Getter
+public class ReviewCreateResponse {
+
+    private String title;
+
+}
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java
new file mode 100644
index 00000000..f47e08c7
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java
@@ -0,0 +1,39 @@
+package store.mybooks.front.review.controller.dto.response;
+
+import java.time.LocalDate;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import store.mybooks.front.image.dto.ImageResponse;
+
+/**
+ * packageName    : store.mybooks.resource.review.dto.response<br>
+ * fileName       : ReviewDetailGetResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReviewDetailGetResponse {
+
+    private Long reviewId;
+
+    private String userName;
+
+    private Integer rate;
+
+    private LocalDate date;
+
+    private String title;
+
+    private String content;
+
+    private ImageResponse reviewImage;
+
+}
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java
new file mode 100644
index 00000000..08863503
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java
@@ -0,0 +1,44 @@
+package store.mybooks.front.review.controller.dto.response;
+
+import java.time.LocalDate;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import store.mybooks.front.image.dto.ImageResponse;
+
+/**
+ * packageName    : store.mybooks.front.review.controller.dto.response<br>
+ * fileName       : ReviewGetResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReviewGetResponse {
+
+    private Long bookId;
+
+    private String bookName;
+
+    private Long reviewId;
+
+    private String userName;
+
+    private Integer rate;
+
+    private LocalDate date;
+
+    private String title;
+
+    private String content;
+
+    private ImageResponse reviewImage;
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java
new file mode 100644
index 00000000..a64cc760
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java
@@ -0,0 +1,23 @@
+package store.mybooks.front.review.controller.dto.response;
+
+/**
+ * packageName    : store.mybooks.resource.review.dto.response<br>
+ * fileName       : ReviewModifyResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+public class ReviewModifyResponse {
+
+    private Integer rate;
+
+    private String title;
+
+    private String content;
+
+
+}

From 8d7fea81743e9b2378a32dc53d5f4a96cf7cd2c0 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:28:25 +0900
Subject: [PATCH 047/147] =?UTF-8?q?feat:=20Review=20Request=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/ReviewCreateRequest.java      | 32 +++++++++++++++++++
 .../dto/request/ReviewModifyRequest.java      | 29 +++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java
 create mode 100644 src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java

diff --git a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java b/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java
new file mode 100644
index 00000000..56c259e6
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java
@@ -0,0 +1,32 @@
+package store.mybooks.front.review.controller.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * packageName    : store.mybooks.front.review.controller.dto.request<br>
+ * fileName       : ReviewCreateRequest<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ReviewCreateRequest {
+
+    private Long orderDetailId;
+
+    private Integer rate;
+
+    private String title;
+
+    private String content;
+
+}
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java b/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java
new file mode 100644
index 00000000..2fe0c2dd
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java
@@ -0,0 +1,29 @@
+package store.mybooks.front.review.controller.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * packageName    : store.mybooks.resource.review.dto.reqeust<br>
+ * fileName       : ReviewModifyRequest<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+public class ReviewModifyRequest {
+
+    private Integer rate;
+
+    private String title;
+
+    private String content;
+
+}

From 5f5e99cb703e8ae53e6a981adbae5740bf638425 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:28:45 +0900
Subject: [PATCH 048/147] =?UTF-8?q?feat:=20ReviewAdaptor=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/adaptor/ReviewAdaptor.java     | 150 ++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java

diff --git a/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java b/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
new file mode 100644
index 00000000..554ffe6d
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
@@ -0,0 +1,150 @@
+package store.mybooks.front.review.controller.adaptor;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.controller.dto.response.ReviewCreateResponse;
+import store.mybooks.front.review.controller.dto.response.ReviewDetailGetResponse;
+import store.mybooks.front.review.controller.dto.response.ReviewGetResponse;
+import store.mybooks.front.review.controller.dto.response.ReviewModifyResponse;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.review.controller.adaptor<br>
+ * fileName       : ReviewAdaptor<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+
+@Component
+@RequiredArgsConstructor
+public class ReviewAdaptor {
+
+    private final RestTemplate restTemplate;
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+    private static final String URL = "/api/reviews";
+
+    private static final String URL_MEMBER = "/api/member/reviews";
+
+    private static final String URL_MEMBER_ID = "/api/member/reviews/{id}";
+
+
+    @RequiredAuthorization
+    public ReviewCreateResponse createReview(ReviewCreateRequest request, MultipartFile file) throws IOException {
+
+
+        HttpHeaders headers = Utils.getAuthHeader();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
+        parts.add("request", request);
+
+        if (!file.getOriginalFilename().isEmpty()) {
+            parts.add("contentImage", new FileSystemResource(convert(file)));
+        }
+        HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
+
+        ResponseEntity<ReviewCreateResponse> responseEntity =
+                restTemplate.postForEntity(gatewayAdaptorProperties.getAddress() + URL_MEMBER,
+                        requestHttpEntity,
+                        ReviewCreateResponse.class);
+
+        Utils.getResponseEntity(responseEntity, HttpStatus.CREATED);
+
+        return responseEntity.getBody();
+    }
+
+    @RequiredAuthorization
+    public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable) {
+
+        ResponseEntity<PageResponse<ReviewGetResponse>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL_MEMBER + "?page=" + pageable.getPageNumber()
+                        + "&size=" + 8,
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                });
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    // 책에서 보여줄 리뷰
+    @RequiredAuthorization
+    public PageResponse<ReviewDetailGetResponse> getBookReview(Pageable pageable, Long bookId) {
+
+        ResponseEntity<PageResponse<ReviewDetailGetResponse>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/book/{bookId}" + "?page=" + pageable.getPageNumber()
+                        + "&size=" + pageable.getPageSize(),
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                }, bookId);
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    @RequiredAuthorization
+    public ReviewGetResponse getUserReview(Long reviewId) {
+
+        ResponseEntity<ReviewGetResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL_MEMBER_ID,
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                }, reviewId);
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    @RequiredAuthorization
+    public ReviewModifyResponse modifyUserReview(Long reviewId, ReviewModifyRequest request) {
+
+        ResponseEntity<ReviewModifyResponse> responseEntity =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_MEMBER_ID,
+                        HttpMethod.PUT,
+                        new HttpEntity<>(request, Utils.getAuthHeader()),
+                        new ParameterizedTypeReference<>() {
+                        }, reviewId);
+
+        Utils.getResponseEntity(responseEntity, HttpStatus.OK);
+
+        return responseEntity.getBody();
+    }
+
+    private File convert(MultipartFile file) throws IOException {
+        File convFile = new File(Objects.requireNonNull(file.getOriginalFilename()));
+        try (FileOutputStream fileOutputStream = new FileOutputStream(convFile)) {
+            fileOutputStream.write(file.getBytes());
+        }
+        return convFile;
+    }
+
+
+}

From e530c877dbd49911e4a2e0d5b62559e39380f4a8 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:30:08 +0900
Subject: [PATCH 049/147] =?UTF-8?q?feat:=20ReviewService=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/service/ReviewService.java     | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/review/controller/service/ReviewService.java

diff --git a/src/main/java/store/mybooks/front/review/controller/service/ReviewService.java b/src/main/java/store/mybooks/front/review/controller/service/ReviewService.java
new file mode 100644
index 00000000..5a20798f
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/service/ReviewService.java
@@ -0,0 +1,52 @@
+package store.mybooks.front.review.controller.service;
+
+import java.io.IOException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.review.controller.adaptor.ReviewAdaptor;
+import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.controller.dto.response.ReviewDetailGetResponse;
+import store.mybooks.front.review.controller.dto.response.ReviewGetResponse;
+
+/**
+ * packageName    : store.mybooks.front.review.controller.service<br>
+ * fileName       : ReviewService<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+
+@Service
+@RequiredArgsConstructor
+public class ReviewService {
+
+    private final ReviewAdaptor reviewAdaptor;
+
+    public void createReview(ReviewCreateRequest request, MultipartFile file) throws IOException {
+        reviewAdaptor.createReview(request,file);
+    }
+
+    public void modifyReview(Long reviewId,ReviewModifyRequest request){
+        reviewAdaptor.modifyUserReview(reviewId,request);
+    }
+    public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable){
+        return reviewAdaptor.getAllUserReview(pageable);
+    }
+
+    public ReviewGetResponse getUserReview(Long reviewId){
+        return reviewAdaptor.getUserReview(reviewId);
+    }
+
+    public PageResponse<ReviewDetailGetResponse> getBookReview(Pageable pageable, Long bookId){
+        return reviewAdaptor.getBookReview(pageable,bookId);
+    }
+
+}

From d0d0c7aebd5ac8e7ded4de9b432f03e707f2fe6f Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:30:17 +0900
Subject: [PATCH 050/147] =?UTF-8?q?feat:=20ReviewController=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../review/controller/ReviewController.java   | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/review/controller/ReviewController.java

diff --git a/src/main/java/store/mybooks/front/review/controller/ReviewController.java b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
new file mode 100644
index 00000000..7e7747bb
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
@@ -0,0 +1,72 @@
+package store.mybooks.front.review.controller;
+
+import java.io.IOException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+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 org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.controller.service.ReviewService;
+
+/**
+ * packageName    : store.mybooks.front.review.controller<br>
+ * fileName       : ReviewController<br>
+ * author         : masiljangajji<br>
+ * date           : 3/17/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/17/24        masiljangajji       최초 생성
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/review")
+public class ReviewController {
+
+    private final ReviewService reviewService;
+
+    @GetMapping("/register")
+    public String reviewRegisterForm() {
+        return "review-register";
+    }
+
+    @PostMapping("/register")
+    public String reviewRegister(@ModelAttribute ReviewCreateRequest createRequest,
+                                 @RequestParam(value = "contentImage", required = false) MultipartFile contentImages)
+            throws IOException {
+
+        // todo 이거 진짜로 바꾸기
+        createRequest.setOrderDetailId(1L);
+        reviewService.createReview(createRequest, contentImages);
+        return "redirect:/review";
+    }
+
+    @GetMapping
+    public String getReviewByUserId(@PageableDefault Pageable pageable, Model model) {
+        model.addAttribute("reviews", reviewService.getAllUserReview(pageable));
+        return "review";
+    }
+
+    @GetMapping("/modify")
+    public String modifyForm(@RequestParam(name = "reviewId") Long reviewId, Model model) {
+        model.addAttribute("review", reviewService.getUserReview(reviewId));
+        return "review-modify";
+    }
+
+    @PostMapping("/modify")
+    public String modifyReview(@RequestParam(name = "reviewId") Long reviewId,
+                               @ModelAttribute ReviewModifyRequest request) {
+        reviewService.modifyReview(reviewId, request);
+        return "redirect:/review";
+    }
+
+}

From 9d2267579f0fc99a9e264429ecd67eabed3dd008 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Mon, 18 Mar 2024 02:30:54 +0900
Subject: [PATCH 051/147] =?UTF-8?q?fix:=20AuthorizationAspect=20=EB=A6=AC?=
 =?UTF-8?q?=ED=94=84=EB=9E=98=EC=8B=9C=ED=86=A0=ED=81=B0=20=EB=A7=8C?=
 =?UTF-8?q?=EB=A3=8C=EC=8B=9C=20=EC=83=9D=EA=B8=B0=EB=8D=98=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/auth/aop/AuthorizationAspect.java     | 2 +-
 .../mybooks/front/auth/interceptor/LogoutInterceptor.java     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java b/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
index 3ff0c6eb..a3d2a77e 100644
--- a/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
+++ b/src/main/java/store/mybooks/front/auth/aop/AuthorizationAspect.java
@@ -80,7 +80,7 @@ public Object aroundMethod(ProceedingJoinPoint joinPoint) throws Throwable {
                                         Utils.getUserIp(request), Utils.getUserAgent(request)));
 
                 // 리프래시 토큰 만료 됐거나 유효하지않음
-                if (refreshTokenResponse.getAccessToken().isEmpty()) {
+                if (Objects.isNull(refreshTokenResponse.getAccessToken())) {
                     throw new TokenExpiredException();
                 }
 
diff --git a/src/main/java/store/mybooks/front/auth/interceptor/LogoutInterceptor.java b/src/main/java/store/mybooks/front/auth/interceptor/LogoutInterceptor.java
index 430d3364..8b545bf7 100644
--- a/src/main/java/store/mybooks/front/auth/interceptor/LogoutInterceptor.java
+++ b/src/main/java/store/mybooks/front/auth/interceptor/LogoutInterceptor.java
@@ -36,15 +36,11 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
         ApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(request.getServletContext());
         TokenAdaptor tokenAdaptor = Objects.requireNonNull(context).getBean(TokenAdaptor.class);
 
-        log.warn("리프래시토큰 삭제");
-
         //리프래시토큰 삭제
         tokenAdaptor.deleteRefreshToken(
                 new LogoutRequest((String) request.getAttribute("identity_cookie_value"), Utils.getUserIp(request),
                         Utils.getUserAgent(request)));
         // 엑세스 토큰 담은 쿠키 삭제
-
-        log.warn("엑세스토큰 담은 쿠키 삭제");
         CookieUtils.deleteJwtCookie(response);
 
 

From cbd9384bf552c0fe80870431007b0a16614e4030 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Mon, 18 Mar 2024 08:37:55 +0900
Subject: [PATCH 052/147] =?UTF-8?q?feat:=20=EC=A3=BC=EB=AC=B8=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20=EA=B2=B0=EC=A0=9C=20=EC=B0=BD=EC=97=90=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=A0=84=EC=86=A1'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/order/adaptor/OrderAdaptor.java     | 22 +++++-
 .../order/controller/OrderController.java     |  6 +-
 .../dto/response/BookOrderCreateResponse.java |  2 -
 .../front/order/service/OrderService.java     | 20 +++--
 .../payment/controller/PayController.java     | 17 ++--
 src/main/resources/application.properties     | 28 +++----
 .../templates/assets/js/payment/payment.js    | 78 +++++++++----------
 src/main/resources/templates/payment.html     | 18 +++--
 src/main/resources/templates/test.html        | 16 ----
 9 files changed, 109 insertions(+), 98 deletions(-)
 delete mode 100644 src/main/resources/templates/test.html

diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index acf5eee5..ee438c34 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -11,7 +11,8 @@
 import store.mybooks.front.auth.Annotation.RequiredAuthorization;
 import store.mybooks.front.config.GatewayAdaptorProperties;
 import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
-import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -53,13 +54,13 @@ public void checkOrderUserAddressInfo(Long id) {
 
 
     @RequiredAuthorization
-    public BookOrderResultCreateResponse createBookOrder(BookOrderCreateRequest request) {
+    public BookOrderCreateResponse createBookOrder(BookOrderCreateRequest request) {
         HttpEntity<BookOrderCreateRequest> httpEntity = new HttpEntity<>(request, Utils.getAuthHeader());
-        ResponseEntity<BookOrderResultCreateResponse> exchange = restTemplate.exchange(
+        ResponseEntity<BookOrderCreateResponse> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + MEMBER_URL,
                 HttpMethod.POST,
                 httpEntity,
-                new ParameterizedTypeReference<BookOrderResultCreateResponse>() {
+                new ParameterizedTypeReference<BookOrderCreateResponse>() {
                 });
         return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
     }
@@ -73,4 +74,17 @@ public Boolean checkBookOrderNumber(String orderNumber) {
                 }, orderNumber);
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
+
+    public BookOrderInfoResponse getPayBookOrderInfo(String orderNumber) {
+        ResponseEntity<BookOrderInfoResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/info/pay/{orderNumber}",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<BookOrderInfoResponse>() {
+                }, orderNumber
+        );
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
 }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 63de3127..b97b5fb6 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -20,7 +20,7 @@
 import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
-import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.order.service.OrderInfoCheckService;
 import store.mybooks.front.order.service.OrderService;
 import store.mybooks.front.user.adaptor.UserAdaptor;
@@ -187,8 +187,8 @@ public String doOrder(@ModelAttribute BookOrderRequest orderRequest,
         int couponCost = orderService.calculateBookCouponCost(orderRequest.getBookInfoList());
         int wrapCost = orderService.calculateBookWrapCost(orderRequest.getBookInfoList());
         int totalCost = orderService.calculateTotalCost(cart);
-        BookOrderResultCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
+        BookOrderCreateResponse response = orderService.createOrder(orderRequest.getBookInfoList(),
                 orderRequest.getOrderInfo(), point, couponCost, wrapCost, totalCost);
-        return "redirect:/pay";
+        return "redirect:/pay/" + response.getNumber();
     }
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
index 429c1861..2d24ef76 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderCreateResponse.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
@@ -16,7 +15,6 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@NoArgsConstructor
 @AllArgsConstructor
 public class BookOrderCreateResponse {
     private String orderStatus;
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index c0fd55e4..86fc7c18 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -15,7 +15,8 @@
 import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
 import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
-import store.mybooks.front.order.dto.response.BookOrderResultCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
+import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
 import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -149,12 +150,12 @@ public Integer getPoint(OrderInfoRequest orderInfoRequest) {
      * @param totalCost  the total cost
      * @return the book order create response
      */
-    public BookOrderResultCreateResponse createOrder(List<BookInfoRequest> bookInfo,
-                                                     OrderInfoRequest orderInfo,
-                                                     Integer point,
-                                                     Integer couponCost,
-                                                     Integer wrapCost,
-                                                     Integer totalCost) {
+    public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
+                                               OrderInfoRequest orderInfo,
+                                               Integer point,
+                                               Integer couponCost,
+                                               Integer wrapCost,
+                                               Integer totalCost) {
         totalCost += wrapCost - point - couponCost;
         String orderNumber = "";
 
@@ -167,5 +168,10 @@ public BookOrderResultCreateResponse createOrder(List<BookInfoRequest> bookInfo,
         return orderAdapter.createBookOrder(request);
     }
 
+    public BookOrderInfoResponse getPayBookOrderInfo(String orderNumber) {
+        return orderAdapter.getPayBookOrderInfo(orderNumber);
+
+    }
+
 
 }
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayController.java b/src/main/java/store/mybooks/front/payment/controller/PayController.java
index 4ed009a4..7c462b99 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayController.java
@@ -18,11 +18,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import store.mybooks.front.config.TossAppKey;
+import store.mybooks.front.order.service.OrderService;
 
 
 /**
@@ -42,6 +40,8 @@
 @RequestMapping("/pay")
 public class PayController {
     private final TossAppKey tossAppKey;
+    private final OrderService orderService;
+
 
     @PostMapping("/confirm")
     public ResponseEntity<JSONObject> confirmPayment(@RequestBody String jsonBody) throws Exception {
@@ -65,8 +65,6 @@ public ResponseEntity<JSONObject> confirmPayment(@RequestBody String jsonBody) t
         obj.put("amount", amount);
         obj.put("paymentKey", paymentKey);
 
-        // TODO: 개발자센터에 로그인해서 내 결제위젯 연동 키 > 시크릿 키를 입력하세요. 시크릿 키는 외부에 공개되면 안돼요.
-        // @docs https://docs.tosspayments.com/reference/using-api/api-keys
         String apiKey = tossAppKey.getKey();
 
         // 토스페이먼츠 API는 시크릿 키를 사용자 ID로 사용하고, 비밀번호는 사용하지 않습니다.
@@ -116,9 +114,12 @@ public String paymentRequest(HttpServletRequest request, Model model) throws Exc
         return "success";
     }
 
-    @GetMapping
-    public String index(HttpServletRequest request, ModelMap model) throws Exception {
+    @GetMapping("/{orderNumber}")
+    public String index(HttpServletRequest request, ModelMap model,
+                        @PathVariable(name = "orderNumber") String orderNumber) throws Exception {
+        log.info("orderNumber: {}", orderNumber);
         model.put("tossValue", tossAppKey.getClientKey());
+        model.put("orderInfo", orderService.getPayBookOrderInfo(orderNumber));
 
         return "payment";
     }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 262cda8f..b78e8cd4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,20 +24,20 @@ my-books.redis.password=*N2vya7H@muDTwdNMR!
 my-books.redis.database=21
 my-books.redis.admin-expiration=3600000
 ## ?????
-#spring.profiles.active=dev
+spring.profiles.active=dev
 toss.api.key=081bdd46905c4d92aff5a8d51c0e2501
 toss.api.client-key=1c7a8079bed84ba881abb9dd32cf048f
 #
-# ???
-store.mybooks.front.config.gateway.address=c0722344686f4afba3ebd708d26c1380
-# Log Levels
-logging.level.root=INFO
-# Logging file
-logging.file.name=/home/administrator/log/resource.log
-logging.file.path=/home/administrator/log
-# OAuth2 User Payco Configuration
-oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
-oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
-oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
-# cookie
-cookie.domain=my-books.store
+## ???
+#store.mybooks.front.config.gateway.address=c0722344686f4afba3ebd708d26c1380
+## Log Levels
+#logging.level.root=INFO
+## Logging file
+#logging.file.name=/home/administrator/log/resource.log
+#logging.file.path=/home/administrator/log
+## OAuth2 User Payco Configuration
+#oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
+#oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
+#oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
+## cookie
+#cookie.domain=my-books.store
diff --git a/src/main/resources/templates/assets/js/payment/payment.js b/src/main/resources/templates/assets/js/payment/payment.js
index 71f68f55..c7bfcb9b 100644
--- a/src/main/resources/templates/assets/js/payment/payment.js
+++ b/src/main/resources/templates/assets/js/payment/payment.js
@@ -1,53 +1,53 @@
-const button = document.getElementById("payment-button");
-const coupon = document.getElementById("coupon-box");
-const generateRandomString = () =>
-    window.btoa(Math.random()).slice(0, 20);
-var amount = 50000;
+document.addEventListener("DOMContentLoaded", function () {
+    const button = document.getElementById("payment-button");
+    const coupon = document.getElementById("coupon-box");
+    const generateRandomString = document.getElementById("order-number").value;
+    var amount = parseInt(document.getElementById("order-total-cost").value);
 // ------  결제위젯 초기화 ------
-// TODO: clientKey는 개발자센터의 결제위젯 연동 키 > 클라이언트 키로 바꾸세요.
-// TODO: 구매자의 고유 아이디를 불러와서 customerKey로 설정하세요. 이메일・전화번호와 같이 유추가 가능한 값은 안전하지 않습니다.
-// @docs https://docs.tosspayments.com/reference/widget-sdk#sdk-설치-및-초기화
-const clientKey = document.querySelector(".toss").value;
-const customerKey = generateRandomString();
-const paymentWidget = PaymentWidget(clientKey, customerKey); // 회원 결제
+
+    const clientKey = document.querySelector(".toss").value;
+    const customerKey = generateRandomString;
+    const paymentWidget = PaymentWidget(clientKey, customerKey); // 회원 결제
 // const paymentWidget = PaymentWidget(clientKey, PaymentWidget.ANONYMOUS); // 비회원 결제
 
 // ------  결제 UI 렌더링 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#renderpaymentmethods선택자-결제-금액-옵션
-paymentMethodWidget = paymentWidget.renderPaymentMethods(
-    "#payment-method",
-    {value: amount},
-    // 렌더링하고 싶은 결제 UI의 variantKey
-    // 결제 수단 및 스타일이 다른 멀티 UI를 직접 만들고 싶다면 계약이 필요해요.
-    // @docs https://docs.tosspayments.com/guides/payment-widget/admin#멀티-결제-ui
-    {variantKey: "DEFAULT"}
-);
+    paymentMethodWidget = paymentWidget.renderPaymentMethods(
+        "#payment-method",
+        {value: amount},
+        // 렌더링하고 싶은 결제 UI의 variantKey
+        // 결제 수단 및 스타일이 다른 멀티 UI를 직접 만들고 싶다면 계약이 필요해요.
+        // @docs https://docs.tosspayments.com/guides/payment-widget/admin#멀티-결제-ui
+        {variantKey: "DEFAULT"}
+    );
 // ------  이용약관 UI 렌더링 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#renderagreement선택자-옵션
-paymentWidget.renderAgreement("#agreement", {variantKey: "AGREEMENT"});
+    paymentWidget.renderAgreement("#agreement", {variantKey: "AGREEMENT"});
 
 // ------  결제 금액 업데이트 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#updateamount결제-금액
-coupon.addEventListener("change", function () {
-    if (coupon.checked) {
-        paymentMethodWidget.updateAmount(amount - 5000);
-    } else {
-        paymentMethodWidget.updateAmount(amount);
-    }
-});
+    coupon.addEventListener("change", function () {
+        if (coupon.checked) {
+            paymentMethodWidget.updateAmount(amount - 5000);
+        } else {
+            paymentMethodWidget.updateAmount(amount);
+        }
+    });
 
 // ------ '결제하기' 버튼 누르면 결제창 띄우기 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#requestpayment결제-정보
-button.addEventListener("click", function () {
-    // 결제를 요청하기 전에 orderId, amount를 서버에 저장하세요.
-    // 결제 과정에서 악의적으로 결제 금액이 바뀌는 것을 확인하는 용도입니다.
-    paymentWidget.requestPayment({
-        orderId: generateRandomString(),
-        orderName: "토스 티셔츠 외 2건",
-        successUrl: window.location.origin + "/pay/success",
-        failUrl: window.location.origin + "/pay/fail",
-        customerEmail: "customer123@gmail.com",
-        customerName: "김토스",
-        customerMobilePhone: "01012341234",
+    button.addEventListener("click", function () {
+        // 결제를 요청하기 전에 orderId, amount를 서버에 저장하세요.
+        // 결제 과정에서 악의적으로 결제 금액이 바뀌는 것을 확인하는 용도입니다.
+        paymentWidget.requestPayment({
+            orderId: customerKey,
+            orderName: "토스 티셔츠 외 2건",
+            successUrl: window.location.origin + "/pay/success",
+            failUrl: window.location.origin + "/pay/fail",
+            customerEmail: "customer123@gmail.com",
+            customerName: "김토스",
+            customerMobilePhone: "01012341234",
+        });
     });
-});
+
+})
diff --git a/src/main/resources/templates/payment.html b/src/main/resources/templates/payment.html
index 0a58a588..96b7b5f4 100644
--- a/src/main/resources/templates/payment.html
+++ b/src/main/resources/templates/payment.html
@@ -18,11 +18,20 @@
 <div layout:fragment="content">
     <div class="container">
         <div class="row justify-content-center">
-            <div>
+
+            <section>
                 <h3>결제 정보</h3>
-                
+                <div>
+                    <span>주문 번호</span>
+                    <span th:text="${orderInfo.number}"></span>
+                    <input th:value="${orderInfo.number}" type="hidden"
+                           id="order-number">
+                    <input th:value="${orderInfo.totalCost}" type="hidden"
+                           id="order-total-cost">
+                </div>
 
-            </div>
+
+            </section>
 
 
             <div class="wrapper">
@@ -62,9 +71,8 @@ <h3>결제 정보</h3>
                     </div>
                 </div>
             </div>
-            <script src="/assets/js/payment/payment.js"></script>
         </div>
-
+        <script src="/assets/js/payment/payment.js"></script>
     </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/test.html b/src/main/resources/templates/test.html
deleted file mode 100644
index 2e27c327..00000000
--- a/src/main/resources/templates/test.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-<p>테스트</p>
-<!--<div th:each="o:${order}">-->
-<!--    <span th:text="${o}">-->
-
-<!--    </span>-->
-
-<!--</div>-->
-</body>
-</html>
\ No newline at end of file

From 90af1f12cc0e9c4e9e8eb815e125c1799807fd71 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Tue, 19 Mar 2024 00:14:24 +0900
Subject: [PATCH 053/147] =?UTF-8?q?fix:=20resource=20dto=20=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?=
 =?UTF-8?q?=ED=95=9C=20=EC=88=98=EC=A0=95=20=ED=95=84=EB=93=9C=20=EB=A7=9E?=
 =?UTF-8?q?=EC=B6=94=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/admin/book/model/response/BookBriefResponse.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java b/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
index b7269404..246dd085 100644
--- a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
+++ b/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
@@ -4,7 +4,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import store.mybooks.front.image.dto.ImageResponse;
 
 /**
  * packageName    : store.mybooks.front.admin.book.model.response <br/>
@@ -24,7 +23,7 @@
 public class BookBriefResponse {
     private Long id;
 
-    private ImageResponse imageResponse;
+    private String image;
 
     private String name;
 

From c15b4b2591054aa3365b9961ac8bc3f0d530870b Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Tue, 19 Mar 2024 00:14:39 +0900
Subject: [PATCH 054/147] =?UTF-8?q?fix:=20dto=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/view/book/book.html | 2 +-
 src/main/resources/templates/index.html                | 4 ++--
 src/main/resources/templates/user-book-like.html       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/admin/view/book/book.html b/src/main/resources/templates/admin/view/book/book.html
index 1a23688a..6e7e2261 100644
--- a/src/main/resources/templates/admin/view/book/book.html
+++ b/src/main/resources/templates/admin/view/book/book.html
@@ -29,7 +29,7 @@ <h2>도서</h2>
                 <div th:each="book : ${books.content}" class="col-md-3 mb-3">
                     <div class="card h-100">
                         <img class="card-img-top book-image"
-                             th:src="${book.imageResponse.path + book.imageResponse.fileName+ book.imageResponse.extension}"
+                             th:src="${book.image}"
                              alt="도서 썸네일 이미지">
                         <div class="card-body">
                             <a th:href="@{/admin/book/update(id=${book.id})}">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 178c1d5b..9b22f84e 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -228,7 +228,7 @@ <h2>Trending Product</h2>
                     <div class="single-product card h-100">
                         <div class="product-image">
                             <img class="product-image card-img-top "
-                                 th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}"
+                                 th:src="${book.image}"
                                  alt="#">
                             <div class="button">
                                 <form action="/cart/add" method="post">
@@ -280,7 +280,7 @@ <h2>Special Offer</h2>
                     <div class="single-product card h-100">
                         <div class="product-image">
                             <img class="product-image card-img-top "
-                                 th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}"
+                                 th:src="${book.image}"
                                  alt="#">
                             <div class="button">
                                 <form action="/cart/add" method="post">
diff --git a/src/main/resources/templates/user-book-like.html b/src/main/resources/templates/user-book-like.html
index 7884bdf2..ae75b6b5 100644
--- a/src/main/resources/templates/user-book-like.html
+++ b/src/main/resources/templates/user-book-like.html
@@ -49,7 +49,7 @@ <h2>나의 좋아요</h2>
                 <div class="row mt-3">
                     <div th:each="book : ${bookLikeList.content}" class="col-md-3 mb-3">
                         <div class="card h-100">
-                            <img th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}" alt="Book Image" class="card-img-top book-image" src="https://via.placeholder.com/150">
+                            <img th:src="${book.image}" alt="Book Image" class="card-img-top book-image" src="https://via.placeholder.com/150">
                             <div class="card-body">
                                 <a th:href="@{/book/{bookId}(bookId=${book.id})}">
                                     <h5 class="card-title" th:text="${book.name}">도서명</h5>

From 90470ebb3b86302a6ae599d19760ad165f58f3f0 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Tue, 19 Mar 2024 01:36:01 +0900
Subject: [PATCH 055/147] =?UTF-8?q?feat:=20toss=20=EC=97=B0=EB=8F=99=20res?=
 =?UTF-8?q?tTemplate=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/response/BookOrderDetailResponse.java | 26 ++++++
 .../dto/response/BookOrderInfoResponse.java   |  5 +-
 .../front/order/service/OrderService.java     |  1 -
 .../front/payment/adaptor/PayAdaptor.java     | 60 ++++++++++++++
 .../payment/controller/PayController.java     | 82 +++----------------
 .../payment/controller/PayRestController.java | 42 ++++++++++
 .../dto/request/TossPaymentRequest.java       | 25 ++++++
 .../dto/response/TossPaymentResponse.java     | 34 ++++++++
 .../payment/exception/PayFailedException.java | 18 ++++
 .../front/payment/service/PayService.java     | 47 +++++++++++
 .../templates/assets/js/payment/payment.js    |  6 +-
 src/main/resources/templates/payment.html     | 24 +++---
 src/main/resources/templates/success.html     |  2 +
 13 files changed, 281 insertions(+), 91 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
 create mode 100644 src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/payment/controller/PayRestController.java
 create mode 100644 src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
 create mode 100644 src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
 create mode 100644 src/main/java/store/mybooks/front/payment/exception/PayFailedException.java
 create mode 100644 src/main/java/store/mybooks/front/payment/service/PayService.java

diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
new file mode 100644
index 00000000..a78cd3c7
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
@@ -0,0 +1,26 @@
+package store.mybooks.front.order.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.response<br>
+ * fileName       : BookOrderDetailResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Getter
+@AllArgsConstructor
+@ToString
+public class BookOrderDetailResponse {
+    private String bookName;
+    private Integer cost;
+    private Boolean isCouponUsed;
+
+}
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
index 8515b33c..99cb603c 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
@@ -1,7 +1,9 @@
 package store.mybooks.front.order.dto.response;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
@@ -16,9 +18,10 @@
  */
 @Getter
 @AllArgsConstructor
+@ToString
 public class BookOrderInfoResponse {
     private String orderStatus;
     private String number;
     private Integer totalCost;
-    private Boolean isCouponUsed;
+    private List<BookOrderDetailResponse> orderDetails;
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 86fc7c18..113398a8 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -173,5 +173,4 @@ public BookOrderInfoResponse getPayBookOrderInfo(String orderNumber) {
 
     }
 
-
 }
diff --git a/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java b/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
new file mode 100644
index 00000000..5c7823d2
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
@@ -0,0 +1,60 @@
+package store.mybooks.front.payment.adaptor;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Collections;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.config.TossAppKey;
+import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.TossPaymentResponse;
+import store.mybooks.front.payment.exception.PayFailedException;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.payment.adaptor<br>
+ * fileName       : PayAdaptor<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Component
+@RequiredArgsConstructor
+public class PayAdaptor {
+    private final TossAppKey tossAppKey;
+    private final RestTemplate restTemplate;
+    private final static String TOSS_URL = "https://api.tosspayments.com/v1/payments/confirm";
+
+    public TossPaymentResponse confirmPayment(TossPaymentRequest request) {
+        HttpHeaders headers = new HttpHeaders();
+        String apiKey = tossAppKey.getKey();
+
+        Base64.Encoder encoder = Base64.getEncoder();
+        byte[] encodedBytes = encoder.encode((apiKey + ":").getBytes(StandardCharsets.UTF_8));
+        String authorizations = new String(encodedBytes, 0, encodedBytes.length);
+
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setBasicAuth(authorizations);
+        try {
+            ResponseEntity<TossPaymentResponse> exchange = restTemplate.exchange(
+                    TOSS_URL,
+                    HttpMethod.POST,
+                    new HttpEntity<>(request, headers),
+                    new ParameterizedTypeReference<TossPaymentResponse>() {
+                    }
+            );
+            return Utils.getResponseEntity(exchange, HttpStatus.OK);
+        } catch (Exception e) {
+            throw new PayFailedException();
+        }
+    }
+
+}
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayController.java b/src/main/java/store/mybooks/front/payment/controller/PayController.java
index 7c462b99..58f8d662 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayController.java
@@ -1,26 +1,18 @@
 package store.mybooks.front.payment;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import javax.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import store.mybooks.front.config.TossAppKey;
+import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
 import store.mybooks.front.order.service.OrderService;
+import store.mybooks.front.payment.service.PayService;
 
 
 /**
@@ -41,66 +33,9 @@
 public class PayController {
     private final TossAppKey tossAppKey;
     private final OrderService orderService;
+    private final PayService payService;
 
 
-    @PostMapping("/confirm")
-    public ResponseEntity<JSONObject> confirmPayment(@RequestBody String jsonBody) throws Exception {
-
-        JSONParser parser = new JSONParser();
-        String orderId;
-        String amount;
-        String paymentKey;
-        try {
-            // 클라이언트에서 받은 JSON 요청 바디입니다.
-            JSONObject requestData = (JSONObject) parser.parse(jsonBody);
-            paymentKey = (String) requestData.get("paymentKey");
-            orderId = (String) requestData.get("orderId");
-            amount = (String) requestData.get("amount");
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-
-        JSONObject obj = new JSONObject();
-        obj.put("orderId", orderId);
-        obj.put("amount", amount);
-        obj.put("paymentKey", paymentKey);
-
-        String apiKey = tossAppKey.getKey();
-
-        // 토스페이먼츠 API는 시크릿 키를 사용자 ID로 사용하고, 비밀번호는 사용하지 않습니다.
-        // 비밀번호가 없다는 것을 알리기 위해 시크릿 키 뒤에 콜론을 추가합니다.
-        // @docs https://docs.tosspayments.com/reference/using-api/authorization#%EC%9D%B8%EC%A6%9D
-        Base64.Encoder encoder = Base64.getEncoder();
-        byte[] encodedBytes = encoder.encode((apiKey + ":").getBytes("UTF-8"));
-        String authorizations = "Basic " + new String(encodedBytes, 0, encodedBytes.length);
-
-        // 결제 승인 API를 호출하세요.
-        // 결제를 승인하면 결제수단에서 금액이 차감돼요.
-        // @docs https://docs.tosspayments.com/guides/payment-widget/integration#3-결제-승인하기
-        URL url = new URL("https://api.tosspayments.com/v1/payments/confirm");
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setRequestProperty("Authorization", authorizations);
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setRequestMethod("POST");
-        connection.setDoOutput(true);
-
-
-        OutputStream outputStream = connection.getOutputStream();
-        outputStream.write(obj.toString().getBytes("UTF-8"));
-
-        int code = connection.getResponseCode();
-        boolean isSuccess = code == 200 ? true : false;
-
-        InputStream responseStream = isSuccess ? connection.getInputStream() : connection.getErrorStream();
-
-        // TODO: 결제 성공 및 실패 비즈니스 로직을 구현하세요.
-        Reader reader = new InputStreamReader(responseStream, StandardCharsets.UTF_8);
-        JSONObject jsonObject = (JSONObject) parser.parse(reader);
-        responseStream.close();
-
-        return ResponseEntity.status(code).body(jsonObject);
-    }
-
     /**
      * 인증성공처리
      *
@@ -118,8 +53,11 @@ public String paymentRequest(HttpServletRequest request, Model model) throws Exc
     public String index(HttpServletRequest request, ModelMap model,
                         @PathVariable(name = "orderNumber") String orderNumber) throws Exception {
         log.info("orderNumber: {}", orderNumber);
+        BookOrderInfoResponse bookOrderInfoResponse = orderService.getPayBookOrderInfo(orderNumber);
+        log.info("주문 정보: {}", bookOrderInfoResponse);
         model.put("tossValue", tossAppKey.getClientKey());
-        model.put("orderInfo", orderService.getPayBookOrderInfo(orderNumber));
+        model.put("orderInfo", bookOrderInfoResponse);
+        model.put("isCouponUsed", payService.checkCouponUsed(bookOrderInfoResponse.getOrderDetails()));
 
         return "payment";
     }
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayRestController.java b/src/main/java/store/mybooks/front/payment/controller/PayRestController.java
new file mode 100644
index 00000000..17a617b1
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/controller/PayRestController.java
@@ -0,0 +1,42 @@
+package store.mybooks.front.payment.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.TossPaymentResponse;
+import store.mybooks.front.payment.service.PayService;
+
+/**
+ * packageName    : store.mybooks.front.payment.controller<br>
+ * fileName       : PayRestController<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/pay")
+public class PayRestController {
+    private final PayService payService;
+
+    @PostMapping("/confirm")
+    public ResponseEntity<TossPaymentResponse> confirmPayment(@RequestBody TossPaymentRequest request) throws Exception {
+        TossPaymentResponse tossPaymentResponse = payService.getTossPayment(request);
+        log.info("toss value: {}", tossPaymentResponse);
+
+        return ResponseEntity.status(HttpStatus.OK).body(tossPaymentResponse);
+    }
+
+
+}
diff --git a/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java b/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
new file mode 100644
index 00000000..6ee24d71
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
@@ -0,0 +1,25 @@
+package store.mybooks.front.payment.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.front.payment.dto.request<br>
+ * fileName       : TossPaymentRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Getter
+@NoArgsConstructor
+public class TossPaymentRequest {
+    private String paymentKey;
+    private String orderId;
+    private String amount;
+
+
+}
diff --git a/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java b/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
new file mode 100644
index 00000000..3a94d766
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
@@ -0,0 +1,34 @@
+package store.mybooks.front.payment.dto.response;
+
+import lombok.Data;
+
+/**
+ * packageName    : store.mybooks.front.payment.dto.response<br>
+ * fileName       : TossPaymentResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Data
+public class TossPaymentResponse {
+
+    String mid; // 가맹점 Id -> tosspayments
+    String version; // Payment 객체 응답 버전
+    String paymentKey;
+    String orderId;
+    String orderName;
+    String method; // 결제 수단
+    String totalAmount;
+    String balanceAmount;
+    String suppliedAmount;
+    String vat; // 부가가치세
+    String status; // 결제 처리 상태
+    String requestedAt;
+    String approvedAt;
+    String type; // 결제 타입 정보 (NOMAL / BILLING / CONNECTPAY)
+
+}
diff --git a/src/main/java/store/mybooks/front/payment/exception/PayFailedException.java b/src/main/java/store/mybooks/front/payment/exception/PayFailedException.java
new file mode 100644
index 00000000..51f6298e
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/exception/PayFailedException.java
@@ -0,0 +1,18 @@
+package store.mybooks.front.payment.exception;
+
+/**
+ * packageName    : store.mybooks.front.payment.exception<br>
+ * fileName       : PayFailedException<br>
+ * author         : minsu11<br>
+ * date           : 3/19/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/19/24        minsu11       최초 생성<br>
+ */
+public class PayFailedException extends RuntimeException {
+    public PayFailedException() {
+        super("결제 실패");
+    }
+}
diff --git a/src/main/java/store/mybooks/front/payment/service/PayService.java b/src/main/java/store/mybooks/front/payment/service/PayService.java
new file mode 100644
index 00000000..aac38a3f
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/service/PayService.java
@@ -0,0 +1,47 @@
+package store.mybooks.front.payment.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import store.mybooks.front.order.dto.response.BookOrderDetailResponse;
+import store.mybooks.front.payment.adaptor.PayAdaptor;
+import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.TossPaymentResponse;
+
+/**
+ * packageName    : store.mybooks.front.payment.service<br>
+ * fileName       : PayService<br>
+ * author         : minsu11<br>
+ * date           : 3/18/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/18/24        minsu11       최초 생성<br>
+ */
+@Service
+@RequiredArgsConstructor
+public class PayService {
+    private final PayAdaptor payAdaptor;
+
+    /**
+     * 주문 상세에서 쿠폰을 사용했는 지 판별.
+     *
+     * @param orderInfoResponseList the order info response list
+     * @return the boolean
+     */
+    public boolean checkCouponUsed(List<BookOrderDetailResponse> orderInfoResponseList) {
+        for (BookOrderDetailResponse orderInfo : orderInfoResponseList) {
+            boolean isCheck = orderInfo.getIsCouponUsed();
+            if (isCheck) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public TossPaymentResponse getTossPayment(TossPaymentRequest request) {
+        return payAdaptor.confirmPayment(request);
+    }
+
+}
diff --git a/src/main/resources/templates/assets/js/payment/payment.js b/src/main/resources/templates/assets/js/payment/payment.js
index c7bfcb9b..4ae8816f 100644
--- a/src/main/resources/templates/assets/js/payment/payment.js
+++ b/src/main/resources/templates/assets/js/payment/payment.js
@@ -1,6 +1,6 @@
 document.addEventListener("DOMContentLoaded", function () {
     const button = document.getElementById("payment-button");
-    const coupon = document.getElementById("coupon-box");
+    const coupon = document.getElementById("all-book-coupon-button");
     const generateRandomString = document.getElementById("order-number").value;
     var amount = parseInt(document.getElementById("order-total-cost").value);
 // ------  결제위젯 초기화 ------
@@ -41,10 +41,10 @@ document.addEventListener("DOMContentLoaded", function () {
         // 결제 과정에서 악의적으로 결제 금액이 바뀌는 것을 확인하는 용도입니다.
         paymentWidget.requestPayment({
             orderId: customerKey,
-            orderName: "토스 티셔츠 외 2건",
+            orderName: "123",
             successUrl: window.location.origin + "/pay/success",
             failUrl: window.location.origin + "/pay/fail",
-            customerEmail: "customer123@gmail.com",
+            customerEmail: "123@gmail.com",
             customerName: "김토스",
             customerMobilePhone: "01012341234",
         });
diff --git a/src/main/resources/templates/payment.html b/src/main/resources/templates/payment.html
index 96b7b5f4..b81f9dc1 100644
--- a/src/main/resources/templates/payment.html
+++ b/src/main/resources/templates/payment.html
@@ -24,6 +24,7 @@ <h3>결제 정보</h3>
                 <div>
                     <span>주문 번호</span>
                     <span th:text="${orderInfo.number}"></span>
+                    <span th:text="${orderInfo.totalCost}"></span>
                     <input th:value="${orderInfo.number}" type="hidden"
                            id="order-number">
                     <input th:value="${orderInfo.totalCost}" type="hidden"
@@ -41,26 +42,21 @@ <h3>결제 정보</h3>
           padding: 40px 30px 50px 30px;
           margin-top: 30px;
           margin-bottom: 50px;
-        "
-                >
+        ">
                     <input class="toss" th:value="${tossValue}" type="hidden">
                     <!-- 결제 UI -->
                     <div id="payment-method"></div>
                     <!-- 이용약관 UI -->
                     <div id="agreement"></div>
                     <!-- 쿠폰 체크박스 -->
-                    <div style="padding-left: 25px">
-                        <div class="checkable typography--p">
-                            <label for="coupon-box" class="checkable__label typography--regular"
-                            ><input
-                                    id="coupon-box"
-                                    class="checkable__input"
-                                    type="checkbox"
-                                    aria-checked="true"
-                            /><span class="checkable__label-text"
-                            >5,000원 쿠폰 적용</span
-                            ></label
-                            >
+                    <div th:if="${isCouponUsed == false}">
+                        <div style="padding-left: 25px">
+                            <div class="checkable typography--p">
+                                <button type="button" id="all-book-coupon-button">
+                                    전체 쿠폰 적용
+                                </button>
+
+                            </div>
                         </div>
                     </div>
                     <!-- 결제하기 버튼 -->
diff --git a/src/main/resources/templates/success.html b/src/main/resources/templates/success.html
index c53fe6e7..93afcbed 100644
--- a/src/main/resources/templates/success.html
+++ b/src/main/resources/templates/success.html
@@ -25,6 +25,7 @@ <h2 style="padding: 20px 0px 10px 0px">
         <p id="paymentKey"></p>
         <p id="orderId"></p>
         <p id="amount"></p>
+        <p id="status"></p>
     </div>
 </div>
 <script>
@@ -70,6 +71,7 @@ <h2 style="padding: 20px 0px 10px 0px">
     amountElement.textContent = "결제 금액: " + urlParams.get("amount");
     paymentKeyElement.textContent =
         "paymentKey: " + urlParams.get("paymentKey");
+
 </script>
 </body>
 </html>
\ No newline at end of file

From b86931b1484fec99583842da7a27ea95b346e96c Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Tue, 19 Mar 2024 03:35:21 +0900
Subject: [PATCH 056/147] =?UTF-8?q?feat:=20=EA=B2=B0=EC=A0=9C=20=EC=8B=9C?=
 =?UTF-8?q?=20=ED=95=84=EC=9A=94=ED=95=9C=20=EC=A0=95=EB=B3=B4=20=EB=8B=B4?=
 =?UTF-8?q?=EA=B8=B4=20dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/dto/response/BookOrderPayInfoResponse.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java

diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java
new file mode 100644
index 00000000..032b91a4
--- /dev/null
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java
@@ -0,0 +1,12 @@
+package store.mybooks.front.order.dto.response;/**
+ *packageName    : store.mybooks.front.order.dto.response<br>
+ * fileName       : BookOrderPayInfoResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/19/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/19/24        minsu11       최초 생성<br>
+ */public class BookOrderPayInfoResponse {
+}

From 17636f27b00cf62ea2c95daed3a3daaaf3888eb2 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Tue, 19 Mar 2024 03:35:53 +0900
Subject: [PATCH 057/147] =?UTF-8?q?feat:=20=EC=96=B4=EB=85=B8=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/BookOrderPayInfoResponse.java    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java
index 032b91a4..df2f3fb1 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderPayInfoResponse.java
@@ -1,5 +1,10 @@
-package store.mybooks.front.order.dto.response;/**
- *packageName    : store.mybooks.front.order.dto.response<br>
+package store.mybooks.front.order.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.front.order.dto.response<br>
  * fileName       : BookOrderPayInfoResponse<br>
  * author         : minsu11<br>
  * date           : 3/19/24<br>
@@ -8,5 +13,14 @@
  * DATE              AUTHOR             NOTE<br>
  * -----------------------------------------------------------<br>
  * 3/19/24        minsu11       최초 생성<br>
- */public class BookOrderPayInfoResponse {
+ */
+@Getter
+@AllArgsConstructor
+public class BookOrderPayInfoResponse {
+    private String name;
+    private String email;
+    private String phoneNumber;
+    private String orderNumber;
+    private String orderName;
+    private String orderStatus;
 }

From 4a394c2a5ad3e4811d7de4af0d5d8c15765bfbe8 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Tue, 19 Mar 2024 14:32:16 +0900
Subject: [PATCH 058/147] =?UTF-8?q?fix:=20prod=20->=2022=20,=20dev=20->=20?=
 =?UTF-8?q?21=20redis=20index=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.properties  | 4 +++-
 src/main/resources/application-prod.properties | 4 +++-
 src/main/resources/application.properties      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index d98759cf..5043bc41 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -19,4 +19,6 @@ oauth2.user.payco.redirectUri=93d29b6eed9842a38f2e05a0fef269e6
 
 # cookie
 
-cookie.domain=localhost
\ No newline at end of file
+cookie.domain=localhost
+
+my-books.redis.database=21
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 7efd0ad0..82d64da6 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -20,4 +20,6 @@ oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
 
 # cookie
 
-cookie.domain=my-books.store
\ No newline at end of file
+cookie.domain=my-books.store
+
+my-books.redis.database=22
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 262cda8f..fc54ce33 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -21,7 +21,7 @@ oauth2.provider.payco.userInfoUri=https://apis-payco.krp.toastoven.net/payco/fri
 my-books.redis.host=133.186.241.167
 my-books.redis.port=6379
 my-books.redis.password=*N2vya7H@muDTwdNMR!
-my-books.redis.database=21
+
 my-books.redis.admin-expiration=3600000
 ## ?????
 #spring.profiles.active=dev

From 2a9f6b3453107be30ecbf7f1a0b2971b51238c15 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:13:16 +0900
Subject: [PATCH 059/147] =?UTF-8?q?refactor:=20ReviewAdaptor=20=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EA=B3=A0=EC=A0=95=EA=B0=92=20->=20pageabl?=
 =?UTF-8?q?e.getPageSize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/review/controller/adaptor/ReviewAdaptor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java b/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
index 554ffe6d..a5f28495 100644
--- a/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
+++ b/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
@@ -86,7 +86,7 @@ public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable) {
 
         ResponseEntity<PageResponse<ReviewGetResponse>> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + URL_MEMBER + "?page=" + pageable.getPageNumber()
-                        + "&size=" + 8,
+                        + "&size=" + pageable.getPageSize(),
                 HttpMethod.GET,
                 new HttpEntity<>(Utils.getAuthHeader()),
                 new ParameterizedTypeReference<>() {

From b2dab12c3bdcee28c5b33f18dcfae9876527b58d Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:13:34 +0900
Subject: [PATCH 060/147] =?UTF-8?q?feat:=20ReviewController=20=EC=B1=85?=
 =?UTF-8?q?=EC=9D=98=20=EB=A6=AC=EB=B7=B0=EB=A5=BC=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/review/controller/ReviewController.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/review/controller/ReviewController.java b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
index 7e7747bb..cd708409 100644
--- a/src/main/java/store/mybooks/front/review/controller/ReviewController.java
+++ b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
@@ -8,6 +8,7 @@
 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.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -51,11 +52,17 @@ public String reviewRegister(@ModelAttribute ReviewCreateRequest createRequest,
     }
 
     @GetMapping
-    public String getReviewByUserId(@PageableDefault Pageable pageable, Model model) {
+    public String getReviewByUserId(@PageableDefault (size = 8)Pageable pageable, Model model) {
         model.addAttribute("reviews", reviewService.getAllUserReview(pageable));
         return "review";
     }
 
+    @GetMapping("/book/{bookId}")
+    public String getReviewByBookId(@PathVariable(name = "bookId")Long bookId, @PageableDefault(size=5)Pageable pageable, Model model){
+        model.addAttribute("reviews",reviewService.getBookReview(pageable,bookId));
+        return "review-book";
+    }
+
     @GetMapping("/modify")
     public String modifyForm(@RequestParam(name = "reviewId") Long reviewId, Model model) {
         model.addAttribute("review", reviewService.getUserReview(reviewId));
@@ -69,4 +76,5 @@ public String modifyReview(@RequestParam(name = "reviewId") Long reviewId,
         return "redirect:/review";
     }
 
+
 }

From 3b47a388e89d0c120b1deed9899c31622f043303 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:13:55 +0900
Subject: [PATCH 061/147] =?UTF-8?q?refactor:=20BookController=20=EC=B1=85?=
 =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=B3=B4=EC=97=AC=EC=A4=84?=
 =?UTF-8?q?=EB=95=8C=20=EB=A6=AC=EB=B7=B0=EB=8F=84=20=EB=B3=B4=EC=97=AC?=
 =?UTF-8?q?=EC=A3=BC=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/book/controller/BookController.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/book/controller/BookController.java b/src/main/java/store/mybooks/front/book/controller/BookController.java
index 14aa6fed..daa9e255 100755
--- a/src/main/java/store/mybooks/front/book/controller/BookController.java
+++ b/src/main/java/store/mybooks/front/book/controller/BookController.java
@@ -3,7 +3,9 @@
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +17,7 @@
 import store.mybooks.front.admin.tag.model.response.TagGetResponseForBookDetail;
 import store.mybooks.front.book.service.BookService;
 import store.mybooks.front.booklike.service.BookLikeService;
+import store.mybooks.front.review.controller.service.ReviewService;
 import store.mybooks.front.utils.CookieUtils;
 
 /**
@@ -34,6 +37,7 @@
 public class BookController {
     private final BookService bookService;
     private final BookLikeService bookLikeService;
+    private final ReviewService reviewService;
     private final RedisTemplate<String, Integer> redisTemplate;
 
     /**
@@ -46,7 +50,8 @@ public class BookController {
      * @return string
      */
     @GetMapping("/{id}")
-    public String getBookDetailPage(HttpServletRequest request, @PathVariable("id") Long bookId, Model model) {
+    public String getBookDetailPage(HttpServletRequest request, @PathVariable("id") Long bookId, Model model, @PageableDefault(size = 5)
+    Pageable pageable) {
         BookDetailResponse book = bookService.getBook(bookId);
         model.addAttribute("book", book);
         model.addAttribute("authorNameList", book.getAuthorList().stream()
@@ -71,6 +76,9 @@ public String getBookDetailPage(HttpServletRequest request, @PathVariable("id")
         String key = "viewCount:" + bookId;
         redisTemplate.opsForValue().increment(key, 1);
 
+        model.addAttribute("reviews", reviewService.getBookReview(pageable,bookId));
+
+
         return "book-details";
     }
 

From 867e8f89e19e69e65330b3a8994eb1443b5f5ef5 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:14:13 +0900
Subject: [PATCH 062/147] =?UTF-8?q?feat:=20review-book.html=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review-book.html | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 src/main/resources/templates/review-book.html

diff --git a/src/main/resources/templates/review-book.html b/src/main/resources/templates/review-book.html
new file mode 100644
index 00000000..da4835a7
--- /dev/null
+++ b/src/main/resources/templates/review-book.html
@@ -0,0 +1,136 @@
+
+<head>
+    <style>
+        .pagination {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 20px;
+        }
+
+        .pagination a {
+            padding: 8px 16px;
+            margin: 4px;
+            background-color: #4285f4;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            text-align: center;
+            text-decoration: none;
+            font-size: 14px;
+            cursor: pointer;
+        }
+
+        .pagination a:hover {
+            background-color: #3367d6;
+        }
+
+        .pagination ul {
+            list-style: none;
+            padding: 0;
+            display: flex;
+        }
+
+        .pagination li {
+            margin-right: 5px;
+        }
+
+        .quantity-input {
+            display: flex;
+            align-items: center;
+        }
+
+        .quantity-input .form-control.quantity {
+            width: 60px; /* 입력 칸 크기 조정 */
+            text-align: center;
+            margin: 0 5px; /* 버튼과의 간격 */
+        }
+
+        .quantity-input button {
+            border: 1px solid #ddd;
+            background-color: #f5f5f5;
+            padding: 5px 10px;
+            cursor: pointer;
+        }
+
+        .quantity-input button:focus,
+        .quantity-input .form-control.quantity:focus {
+            outline: none;
+        }
+    </style>
+
+</head>
+
+<div class="myrevies">
+    <h2>리뷰</h2>
+    <div class="row mt-3">
+        <div class="row">
+            <div class="col-md-12">
+                <ul class="list-group">
+                    <li th:each="review : ${reviews.content}" class="list-group-item">
+                        <div class="row">
+                            <div class="col-md-10">
+                                <h5 class="mb-1"><span th:text="${review.title}"></span>
+                                </h5>
+                                <p class="mb-1">평점 : <span class="rating__result"
+                                                           th:text="${review.rate+'/5'}"></span>
+                                </p>
+                                <p class="mb-1">등록일 : <span th:text="${review.date}"></span>
+                                </p>
+                                <p class="mb-1">작성자 : <span
+                                        th:text="${review.userName}"></span></p>
+
+                                <div class="col-md-2">
+                                    <div class="float-left">
+                                        <img th:if="${review.reviewImage != null}"
+                                             th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                             width="100" height="100" alt="리뷰 이미지"/>
+                                    </div>
+                                </div>
+                                <p class="mb-1"><span th:text="${review.content}"></span>
+                                </p>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+
+    <script type="text/javascript">
+
+        // 페이지 번호를 클릭할 때 AJAX로 페이지를 로드하는 함수
+        function loadReviewsPage(pageNumber) {
+            // AJAX 요청 생성
+            var xhr = new XMLHttpRequest();
+
+            xhr.open("GET", "/review/book?page=" + pageNumber, true);
+
+            // 요청이 완료되었을 때의 콜백 함수 등록
+            xhr.onload = function () {
+                if (xhr.status >= 200 && xhr.status < 300) {
+                    // 요청이 성공한 경우 페이지 내용을 업데이트
+                    var response = xhr.responseText;
+
+                    document.querySelector(".myrevies").innerHTML = response;
+                } else {
+                    // 요청이 실패한 경우 오류 처리
+                    console.error(xhr.statusText);
+                }
+            };
+
+            // 요청 보내기
+            xhr.send();
+        }
+
+        document.querySelectorAll(".pagination li a").forEach(function (pageLink) {
+            pageLink.addEventListener("click", function (event) {
+                event.preventDefault(); // 링크 기본 동작 방지
+                var pageNumber = parseInt(this.textContent.trim()); // 클릭한 페이지 번호 가져오기
+                loadReviewsPage(pageNumber-1); // 해당 페이지 로드
+            });
+        });
+    </script>
+
+</div>
+

From d6eed647cd306784bb52193fdc9fe371d8d3bef8 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:15:17 +0900
Subject: [PATCH 063/147] =?UTF-8?q?refactor:=20review=20=20=20=EB=B0=94?=
 =?UTF-8?q?=EB=94=94=20css=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review-modify.html   | 7 -------
 src/main/resources/templates/review-register.html | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/src/main/resources/templates/review-modify.html b/src/main/resources/templates/review-modify.html
index 11a68203..03a1f80a 100644
--- a/src/main/resources/templates/review-modify.html
+++ b/src/main/resources/templates/review-modify.html
@@ -8,13 +8,6 @@
     <title>Review Form</title>
 
     <style>
-        body {
-            height: 100vh;
-            display: grid;
-            place-items: center;
-            overflow: hidden;
-        }
-
         .rating {
             position: relative;
             width: 180px;
diff --git a/src/main/resources/templates/review-register.html b/src/main/resources/templates/review-register.html
index 76516679..cde79e8e 100644
--- a/src/main/resources/templates/review-register.html
+++ b/src/main/resources/templates/review-register.html
@@ -8,13 +8,6 @@
     <title>Review Form</title>
 
     <style>
-        body {
-            height: 100vh;
-            display: grid;
-            place-items: center;
-            overflow: hidden;
-        }
-
         .rating {
             position: relative;
             width: 180px;

From 02532696eac7c4b580cc2eb1cfcbe19e56d3ebd9 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:15:50 +0900
Subject: [PATCH 064/147] =?UTF-8?q?feat:=20book-details.html=20=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=20view=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/book-details.html     | 306 ++++++++----------
 1 file changed, 132 insertions(+), 174 deletions(-)

diff --git a/src/main/resources/templates/book-details.html b/src/main/resources/templates/book-details.html
index 02df5011..e41489f5 100644
--- a/src/main/resources/templates/book-details.html
+++ b/src/main/resources/templates/book-details.html
@@ -4,6 +4,39 @@
       layout:decorate="~{common/layout/my-books-layout}">
 <head>
     <style>
+        .pagination {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 20px;
+        }
+
+        .pagination a {
+            padding: 8px 16px;
+            margin: 4px;
+            background-color: #4285f4;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            text-align: center;
+            text-decoration: none;
+            font-size: 14px;
+            cursor: pointer;
+        }
+
+        .pagination a:hover {
+            background-color: #3367d6;
+        }
+
+        .pagination ul {
+            list-style: none;
+            padding: 0;
+            display: flex;
+        }
+
+        .pagination li {
+            margin-right: 5px;
+        }
+
         .quantity-input {
             display: flex;
             align-items: center;
@@ -31,7 +64,6 @@
 </head>
 <div layout:fragment="content">
 
-
     <!-- Start Breadcrumbs -->
     <div class="breadcrumbs">
         <div class="container">
@@ -178,7 +210,8 @@ <h2 style="font-size: 24px; margin-top: 20px;">설명</h2>
 
                                 <h2 style="font-size: 24px; margin-top: 20px;">책소개</h2>
                                 <div th:each="contentImage : ${contentImage}">
-                                    <img th:src="${contentImage.path + contentImage.fileName + contentImage.extension}" alt="책 소개 이미지">
+                                    <img th:src="${contentImage.path + contentImage.fileName + contentImage.extension}"
+                                         alt="책 소개 이미지">
                                 </div>
 
 
@@ -193,193 +226,118 @@ <h2 style="font-size: 24px; margin-top: 20px;">저자 소개</h2>
                     <!-- 도서상세정보 끝 -->
 
 
-                    <div class="row">
-                        <div class="col-lg-4 col-12">
-                            <div class="single-block give-review">
-                                <h4>4.5 (Overall)</h4>
-                                <ul>
-                                    <li>
-                                        <span>5 stars - 38</span>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                    </li>
-                                    <li>
-                                        <span>4 stars - 10</span>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star"></i>
-                                    </li>
-                                    <li>
-                                        <span>3 stars - 3</span>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                    </li>
-                                    <li>
-                                        <span>2 stars - 1</span>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                    </li>
-                                    <li>
-                                        <span>1 star - 0</span>
-                                        <i class="lni lni-star-filled"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                        <i class="lni lni-star"></i>
-                                    </li>
-                                </ul>
-                                <!-- Button trigger modal -->
-                                <button type="button" class="btn review-btn" data-bs-toggle="modal"
-                                        data-bs-target="#exampleModal">
-                                    Leave a Review
-                                </button>
-                            </div>
-                        </div>
-                        <div class="col-lg-8 col-12">
-                            <div class="single-block">
-                                <div class="reviews">
-                                    <h4 class="title">Latest Reviews</h4>
-                                    <!-- Start Single Review -->
-                                    <div class="single-review">
-                                        <img src="https://via.placeholder.com/150x150" alt="#">
-                                        <div class="review-info">
-                                            <h4>Awesome quality for the price
-                                                <span>Jacob Hammond
-                                            </span>
-                                            </h4>
-                                            <ul class="stars">
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                            </ul>
-                                            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
-                                                tempor...</p>
-                                        </div>
-                                    </div>
-                                    <!-- End Single Review -->
-                                    <!-- Start Single Review -->
-                                    <div class="single-review">
-                                        <img src="https://via.placeholder.com/150x150" alt="#">
-                                        <div class="review-info">
-                                            <h4>My husband love his new...
-                                                <span>Alex Jaza
-                                            </span>
-                                            </h4>
-                                            <ul class="stars">
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star"></i></li>
-                                            </ul>
-                                            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
-                                                tempor...</p>
-                                        </div>
-                                    </div>
-                                    <!-- End Single Review -->
-                                    <!-- Start Single Review -->
-                                    <div class="single-review">
-                                        <img src="https://via.placeholder.com/150x150" alt="#">
-                                        <div class="review-info">
-                                            <h4>I love the built quality...
-                                                <span>Jacob Hammond
-                                            </span>
-                                            </h4>
-                                            <ul class="stars">
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
-                                                <li><i class="lni lni-star-filled"></i></li>
+                    <div class="col-lg-8 col-12">
+                        <div class="single-block">
+                            <div class="myrevies">
+                                <h2>리뷰</h2>
+                                <div class="row mt-3">
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <ul class="list-group">
+                                                <li th:each="review : ${reviews.content}" class="list-group-item">
+                                                    <div class="row">
+                                                        <div class="col-md-10">
+                                                            <h5 class="mb-1"><span th:text="${review.title}"></span>
+                                                            </h5>
+                                                            <p class="mb-1">평점 : <span class="rating__result"
+                                                                                       th:text="${review.rate+'/5'}"></span>
+                                                            </p>
+                                                            <p class="mb-1">등록일 : <span th:text="${review.date}"></span>
+                                                            </p>
+                                                            <p class="mb-1">작성자 : <span
+                                                                    th:text="${review.userName}"></span></p>
+
+                                                            <div class="col-md-2">
+                                                                <div class="float-left">
+                                                                    <img th:if="${review.reviewImage != null}"
+                                                                         th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                                                         width="100" height="100" alt="리뷰 이미지"/>
+                                                                </div>
+                                                            </div>
+                                                            <p class="mb-1"><span th:text="${review.content}"></span>
+                                                            </p>
+                                                        </div>
+                                                    </div>
+                                                </li>
                                             </ul>
-                                            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
-                                                tempor...</p>
                                         </div>
                                     </div>
-                                    <!-- End Single Review -->
                                 </div>
                             </div>
+                            <div class="pagination">
+                                <ul>
+                                    <li th:each="i : ${#numbers.sequence(0, reviews.totalPages - 1)}">
+                                        <a th:href="@{${#httpServletRequest.requestURI}(page=${i})}"
+                                           th:text="${i + 1}" th:class="${reviews.number == i ? 'active' : ''}"></a>
+                                    </li>
+                                </ul>
+                            </div>
+
                         </div>
                     </div>
+
                 </div>
             </div>
+
         </div>
     </section>
     <!-- End Item Details -->
 
-    <!-- Review Modal -->
-    <div class="modal fade review-modal" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel"
-         aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">Leave a Review</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label for="review-name">Your Name</label>
-                                <input class="form-control" type="text" id="review-name" required>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label for="review-email">Your Email</label>
-                                <input class="form-control" type="email" id="review-email" required>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label for="review-subject">Subject</label>
-                                <input class="form-control" type="text" id="review-subject" required>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label for="review-rating">Rating</label>
-                                <select class="form-control" id="review-rating">
-                                    <option>5 Stars</option>
-                                    <option>4 Stars</option>
-                                    s
-                                    <option>3 Stars</option>
-                                    <option>2 Stars</option>
-                                    <option>1 Star</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="review-message">Review</label>
-                        <textarea class="form-control" id="review-message" rows="8" required></textarea>
-                    </div>
-                </div>
-                <div class="modal-footer button">
-                    <button type="button" class="btn">Submit Review</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- End Review Modal -->
-
 
     <script type="text/javascript">
+
+
+        document.addEventListener("DOMContentLoaded", function() {
+            // 리뷰 목록이 비어 있는지 확인
+            var reviewsList = document.querySelectorAll(".list-group-item");
+            if (reviewsList.length === 0) {
+                // 리뷰가 없는 경우 메시지를 보여줌
+                var noReviewsMessage = document.createElement("p");
+                noReviewsMessage.textContent = "리뷰가 존재하지 않습니다.";
+                document.querySelector(".myrevies").appendChild(noReviewsMessage);
+                // 페이지네이션 숨김
+                document.querySelector(".pagination").style.display = "none";
+            }
+        });
+
+
+        // 페이지 번호를 클릭할 때 AJAX로 페이지를 로드하는 함수
+        function loadReviewsPage(pageNumber) {
+            // AJAX 요청 생성
+            var xhr = new XMLHttpRequest();
+            var bookId = [[${book.id}]];
+            var url = "/review/book/" + bookId + "?page=" + pageNumber;
+            xhr.open("GET", url, true);
+
+            // 요청이 완료되었을 때의 콜백 함수 등록
+            xhr.onload = function () {
+                if (xhr.status >= 200 && xhr.status < 300) {
+                    // 요청이 성공한 경우 페이지 내용을 업데이트
+                    var response = xhr.responseText;
+
+                    document.querySelector(".myrevies").innerHTML = response;
+                } else {
+                    // 요청이 실패한 경우 오류 처리
+                    console.error(xhr.statusText);
+                }
+            };
+
+            // 요청 보내기
+            xhr.send();
+        }
+
+        document.querySelectorAll(".pagination li a").forEach(function (pageLink) {
+            pageLink.addEventListener("click", function (event) {
+                event.preventDefault(); // 링크 기본 동작 방지
+                var pageNumber = parseInt(this.textContent.trim()); // 클릭한 페이지 번호 가져오기
+                loadReviewsPage(pageNumber-1); // 해당 페이지 로드
+            });
+        });
+
+
+
+
+
         const current = document.getElementById("current");
         const opacity = 0.6;
         const imgs = document.querySelectorAll(".img");

From b77842eeb552a1f0d50822708daaa0a6ad19f841 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:16:06 +0900
Subject: [PATCH 065/147] =?UTF-8?q?feat:=20review.html=20css=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
index 3bc09514..7975c006 100644
--- a/src/main/resources/templates/review.html
+++ b/src/main/resources/templates/review.html
@@ -56,6 +56,16 @@
         .edit-button:hover {
             background-color: #F5F5F5;
         }
+
+        .rating-container {
+            display: inline-block;
+        }
+
+        .rating-star {
+            font-size: 20px;
+            color: #dabd18b2;
+        }
+
     </style>
 </head>
 <body>

From 1e9cf504f4ad8f6d31862ac12c27320256be2998 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 15:59:29 +0900
Subject: [PATCH 066/147] =?UTF-8?q?refactor:=20review.html=20=EB=B3=B4?=
 =?UTF-8?q?=EC=97=AC=EC=A4=84=20=EC=96=91=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
index 7975c006..05f4f2be 100644
--- a/src/main/resources/templates/review.html
+++ b/src/main/resources/templates/review.html
@@ -97,7 +97,7 @@
                 <div th:each="review : ${reviews.content}" class="col-md-3 mb-3">
                     <div class="card h-100">
                         <div class="card-body">
-                            <h5>리뷰 : <span th:text="${review.title}"></span></h5>
+                            <h5><span th:text="${review.title}"></span></h5>
                             <br>
                             도서명 : <a th:href="@{'/book/' + ${review.bookId}}" th:text="${review.bookName}"></a><br>
 
@@ -108,7 +108,7 @@ <h5>리뷰 : <span th:text="${review.title}"></span></h5>
                             <br>
 
                             <br>
-                            리뷰내용 <span th:text="${review.content}"></span>
+                             <span th:text="${review.content}"></span>
 
                             <div class="float-right">
                                 <img th:if="${review.reviewImage != null}"

From 919bd824b99c468feec97b0eebc2372b203efce8 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Tue, 19 Mar 2024 16:29:13 +0900
Subject: [PATCH 067/147] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=B1=85?=
 =?UTF-8?q?=20=EB=A6=AC=EB=B7=B0=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EA=B6=8C?=
 =?UTF-8?q?=ED=95=9C=EC=B2=B4=ED=81=AC=20=EC=95=88=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/book/controller/BookController.java    |  2 +-
 .../{controller => }/adaptor/ReviewAdaptor.java  | 16 +++++++---------
 .../review/controller/ReviewController.java      |  6 +++---
 .../dto/request/ReviewCreateRequest.java         |  2 +-
 .../dto/request/ReviewModifyRequest.java         |  2 +-
 .../dto/response/ReviewCreateResponse.java       |  2 +-
 .../dto/response/ReviewDetailGetResponse.java    |  2 +-
 .../dto/response/ReviewGetResponse.java          |  2 +-
 .../dto/response/ReviewModifyResponse.java       |  2 +-
 .../{controller => }/service/ReviewService.java  | 12 ++++++------
 10 files changed, 23 insertions(+), 25 deletions(-)
 rename src/main/java/store/mybooks/front/review/{controller => }/adaptor/ReviewAdaptor.java (90%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/request/ReviewCreateRequest.java (92%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/request/ReviewModifyRequest.java (91%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/response/ReviewCreateResponse.java (89%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/response/ReviewDetailGetResponse.java (93%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/response/ReviewGetResponse.java (94%)
 rename src/main/java/store/mybooks/front/review/{controller => }/dto/response/ReviewModifyResponse.java (90%)
 rename src/main/java/store/mybooks/front/review/{controller => }/service/ReviewService.java (77%)

diff --git a/src/main/java/store/mybooks/front/book/controller/BookController.java b/src/main/java/store/mybooks/front/book/controller/BookController.java
index daa9e255..ee6944e4 100755
--- a/src/main/java/store/mybooks/front/book/controller/BookController.java
+++ b/src/main/java/store/mybooks/front/book/controller/BookController.java
@@ -17,7 +17,7 @@
 import store.mybooks.front.admin.tag.model.response.TagGetResponseForBookDetail;
 import store.mybooks.front.book.service.BookService;
 import store.mybooks.front.booklike.service.BookLikeService;
-import store.mybooks.front.review.controller.service.ReviewService;
+import store.mybooks.front.review.service.ReviewService;
 import store.mybooks.front.utils.CookieUtils;
 
 /**
diff --git a/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
similarity index 90%
rename from src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
rename to src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
index a5f28495..46297915 100644
--- a/src/main/java/store/mybooks/front/review/controller/adaptor/ReviewAdaptor.java
+++ b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.adaptor;
+package store.mybooks.front.review.adaptor;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -22,12 +22,12 @@
 import store.mybooks.front.auth.Annotation.RequiredAuthorization;
 import store.mybooks.front.config.GatewayAdaptorProperties;
 import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
-import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
-import store.mybooks.front.review.controller.dto.response.ReviewCreateResponse;
-import store.mybooks.front.review.controller.dto.response.ReviewDetailGetResponse;
-import store.mybooks.front.review.controller.dto.response.ReviewGetResponse;
-import store.mybooks.front.review.controller.dto.response.ReviewModifyResponse;
+import store.mybooks.front.review.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.dto.response.ReviewCreateResponse;
+import store.mybooks.front.review.dto.response.ReviewDetailGetResponse;
+import store.mybooks.front.review.dto.response.ReviewGetResponse;
+import store.mybooks.front.review.dto.response.ReviewModifyResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -95,8 +95,6 @@ public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable) {
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
 
-    // 책에서 보여줄 리뷰
-    @RequiredAuthorization
     public PageResponse<ReviewDetailGetResponse> getBookReview(Pageable pageable, Long bookId) {
 
         ResponseEntity<PageResponse<ReviewDetailGetResponse>> exchange = restTemplate.exchange(
diff --git a/src/main/java/store/mybooks/front/review/controller/ReviewController.java b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
index cd708409..8a5f7ecf 100644
--- a/src/main/java/store/mybooks/front/review/controller/ReviewController.java
+++ b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
@@ -13,9 +13,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
-import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
-import store.mybooks.front.review.controller.service.ReviewService;
+import store.mybooks.front.review.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.service.ReviewService;
 
 /**
  * packageName    : store.mybooks.front.review.controller<br>
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java b/src/main/java/store/mybooks/front/review/dto/request/ReviewCreateRequest.java
similarity index 92%
rename from src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java
rename to src/main/java/store/mybooks/front/review/dto/request/ReviewCreateRequest.java
index 56c259e6..12752456 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewCreateRequest.java
+++ b/src/main/java/store/mybooks/front/review/dto/request/ReviewCreateRequest.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.request;
+package store.mybooks.front.review.dto.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java b/src/main/java/store/mybooks/front/review/dto/request/ReviewModifyRequest.java
similarity index 91%
rename from src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java
rename to src/main/java/store/mybooks/front/review/dto/request/ReviewModifyRequest.java
index 2fe0c2dd..deb7ac3b 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/request/ReviewModifyRequest.java
+++ b/src/main/java/store/mybooks/front/review/dto/request/ReviewModifyRequest.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.request;
+package store.mybooks.front.review.dto.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewCreateResponse.java
similarity index 89%
rename from src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java
rename to src/main/java/store/mybooks/front/review/dto/response/ReviewCreateResponse.java
index 137d71a2..6f999a45 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewCreateResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewCreateResponse.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.response;
+package store.mybooks.front.review.dto.response;
 
 import lombok.Getter;
 
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
similarity index 93%
rename from src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java
rename to src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
index f47e08c7..10b6d910 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewDetailGetResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.response;
+package store.mybooks.front.review.dto.response;
 
 import java.time.LocalDate;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
similarity index 94%
rename from src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java
rename to src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
index 08863503..1182eb8d 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewGetResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.response;
+package store.mybooks.front.review.dto.response;
 
 import java.time.LocalDate;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewModifyResponse.java
similarity index 90%
rename from src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java
rename to src/main/java/store/mybooks/front/review/dto/response/ReviewModifyResponse.java
index a64cc760..3794a4b4 100644
--- a/src/main/java/store/mybooks/front/review/controller/dto/response/ReviewModifyResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewModifyResponse.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.dto.response;
+package store.mybooks.front.review.dto.response;
 
 /**
  * packageName    : store.mybooks.resource.review.dto.response<br>
diff --git a/src/main/java/store/mybooks/front/review/controller/service/ReviewService.java b/src/main/java/store/mybooks/front/review/service/ReviewService.java
similarity index 77%
rename from src/main/java/store/mybooks/front/review/controller/service/ReviewService.java
rename to src/main/java/store/mybooks/front/review/service/ReviewService.java
index 5a20798f..bf9c0051 100644
--- a/src/main/java/store/mybooks/front/review/controller/service/ReviewService.java
+++ b/src/main/java/store/mybooks/front/review/service/ReviewService.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.review.controller.service;
+package store.mybooks.front.review.service;
 
 import java.io.IOException;
 import lombok.RequiredArgsConstructor;
@@ -6,11 +6,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.review.controller.adaptor.ReviewAdaptor;
-import store.mybooks.front.review.controller.dto.request.ReviewCreateRequest;
-import store.mybooks.front.review.controller.dto.request.ReviewModifyRequest;
-import store.mybooks.front.review.controller.dto.response.ReviewDetailGetResponse;
-import store.mybooks.front.review.controller.dto.response.ReviewGetResponse;
+import store.mybooks.front.review.adaptor.ReviewAdaptor;
+import store.mybooks.front.review.dto.request.ReviewCreateRequest;
+import store.mybooks.front.review.dto.request.ReviewModifyRequest;
+import store.mybooks.front.review.dto.response.ReviewDetailGetResponse;
+import store.mybooks.front.review.dto.response.ReviewGetResponse;
 
 /**
  * packageName    : store.mybooks.front.review.controller.service<br>

From 136c6ff0c06b6aa98f0ea30aa5a8d4f84d4ab1cc Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Tue, 19 Mar 2024 22:08:48 +0900
Subject: [PATCH 068/147] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adaptor/PointHistoryAdaptor.java          | 65 +++++++++++++++++++
 .../controller/PointHistoryController.java    | 37 +++++++++++
 .../model/PointHistoryGetResponse.java        | 24 +++++++
 .../service/PointHistoryService.java          | 29 +++++++++
 .../resources/templates/point-history.html    | 44 +++++++++++++
 5 files changed, 199 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
 create mode 100644 src/main/java/store/mybooks/front/pointhistory/model/PointHistoryGetResponse.java
 create mode 100644 src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
 create mode 100644 src/main/resources/templates/point-history.html

diff --git a/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
new file mode 100644
index 00000000..2aafc1bc
--- /dev/null
+++ b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
@@ -0,0 +1,65 @@
+package store.mybooks.front.pointhistory.adaptor;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.pointhistory.model.PointHistoryGetResponse;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.pointhistory.adaptor
+ * fileName       : PointHistoryAdaptor
+ * author         : damho-lee
+ * date           : 3/19/24
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/19/24          damho-lee          최초 생성
+ */
+@Component
+@RequiredArgsConstructor
+public class PointHistoryAdaptor {
+    private final RestTemplate restTemplate;
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+    private static final String URL = "/api/point-histories";
+    private static final String URL_MEMBER = "/api/member/point-histories";
+
+
+    /**
+     * methodName : getPointHistories <br>
+     * author : damho-lee <br>
+     * description : 포인트 사용 내역 패이지 조회.<br>
+     *
+     * @param pageable Pageable
+     * @return page
+     */
+    @RequiredAuthorization
+    public PageResponse<PointHistoryGetResponse> getPointHistories(Pageable pageable) {
+        HttpHeaders headers = Utils.getAuthHeader();
+        HttpEntity<Void> requestEntity = new HttpEntity<>(headers);
+
+        ResponseEntity<PageResponse<PointHistoryGetResponse>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL_MEMBER
+                        + "/history?page=" + pageable.getPageNumber() + "&size=" + pageable.getPageSize(),
+                HttpMethod.GET,
+                requestEntity,
+                new ParameterizedTypeReference<>() {
+                }
+        );
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+}
diff --git a/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java b/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
new file mode 100644
index 00000000..d9a666c2
--- /dev/null
+++ b/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
@@ -0,0 +1,37 @@
+package store.mybooks.front.pointhistory.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.pointhistory.model.PointHistoryGetResponse;
+import store.mybooks.front.pointhistory.service.PointHistoryService;
+
+/**
+ * packageName    : store.mybooks.front.pointhistory.controller
+ * fileName       : PointHistoryController
+ * author         : damho-lee
+ * date           : 3/19/24
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/19/24          damho-lee          최초 생성
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/user/point-history")
+public class PointHistoryController {
+    private final PointHistoryService pointHistoryService;
+
+    @GetMapping
+    public String getPointHistoryPage(@PageableDefault Pageable pageable, Model model) {
+        PageResponse<PointHistoryGetResponse> page = pointHistoryService.getPointHistories(pageable);
+        model.addAttribute("points", page);
+        return "point-history";
+    }
+}
diff --git a/src/main/java/store/mybooks/front/pointhistory/model/PointHistoryGetResponse.java b/src/main/java/store/mybooks/front/pointhistory/model/PointHistoryGetResponse.java
new file mode 100644
index 00000000..06cfd273
--- /dev/null
+++ b/src/main/java/store/mybooks/front/pointhistory/model/PointHistoryGetResponse.java
@@ -0,0 +1,24 @@
+package store.mybooks.front.pointhistory.model;
+
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.front.pointhistory.model
+ * fileName       : PointHistoryGetResponse
+ * author         : damho-lee
+ * date           : 3/19/24
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/19/24          damho-lee          최초 생성
+ */
+@Getter
+@NoArgsConstructor
+public class PointHistoryGetResponse {
+    private String pointRuleName;
+    private Integer statusCost;
+    private LocalDate createdDate;
+}
diff --git a/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java b/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
new file mode 100644
index 00000000..52b9fab5
--- /dev/null
+++ b/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
@@ -0,0 +1,29 @@
+package store.mybooks.front.pointhistory.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.pointhistory.adaptor.PointHistoryAdaptor;
+import store.mybooks.front.pointhistory.model.PointHistoryGetResponse;
+
+/**
+ * packageName    : store.mybooks.front.pointhistory.service
+ * fileName       : PointHistoryService
+ * author         : damho-lee
+ * date           : 3/19/24
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/19/24          damho-lee          최초 생성
+ */
+@Service
+@RequiredArgsConstructor
+public class PointHistoryService {
+    private final PointHistoryAdaptor pointHistoryAdaptor;
+
+    public PageResponse<PointHistoryGetResponse> getPointHistories(Pageable pageable) {
+        return pointHistoryAdaptor.getPointHistories(pageable);
+    }
+}
diff --git a/src/main/resources/templates/point-history.html b/src/main/resources/templates/point-history.html
new file mode 100644
index 00000000..c9ba1543
--- /dev/null
+++ b/src/main/resources/templates/point-history.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+
+<div layout:fragment="content">
+    <script>
+        let url = "/user/point-history"
+        let currentPage = [[${points.number}]]
+        let totalPages = [[${points.totalPages}]]
+    </script>
+    <div class="container">
+        <table class="table table-hover text-center">
+            <thead>
+            <tr>
+                <th th:text="포인트"></th>
+                <th th:text="'적립 구분'"></th>
+                <th th:text="'적립 날짜'"></th>
+            </tr>
+            </thead>
+            <tbody>
+                    <tr th:each="point: ${points.content}">
+                        <td th:text="${point.statusCost}"></td>
+                        <td th:text="${point.pointRuleName}"></td>
+                        <td th:text="${point.createdDate}"></td>
+                    </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="mt-3" th:block th:if="${points.totalPages > 1}">
+        <div class="pagination">
+            <div class="page-item">
+                <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+            </div>
+            <div class="pagination" id="pageNumContainer"></div>
+            <div class="page-item">
+                <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+            </div>
+        </div>
+        <script src="/admin/js/page/setPrevious.js"></script>
+        <script src="/admin/js/page/setNext.js"></script>
+        <script src="/admin/js/page/setLastPage.js"></script>
+    </div>
+</div>
\ No newline at end of file

From 84470e5e4e39f81fd7cc392a22cd4b24e484866c Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Tue, 19 Mar 2024 22:08:55 +0900
Subject: [PATCH 069/147] =?UTF-8?q?feat:=20=EC=A0=88=EB=8C=80=20=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/fragment/my-book/footer/my-books-footer-bottom.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/common/fragment/my-book/footer/my-books-footer-bottom.html b/src/main/resources/templates/common/fragment/my-book/footer/my-books-footer-bottom.html
index 4249f201..af55f686 100644
--- a/src/main/resources/templates/common/fragment/my-book/footer/my-books-footer-bottom.html
+++ b/src/main/resources/templates/common/fragment/my-book/footer/my-books-footer-bottom.html
@@ -8,7 +8,7 @@
                     <div class="col-lg-6 col-18">
                         <div class="payment-gateway">
                             <span>We Accept:</span>
-                            <img src="assets/images/footer/credit-cards-footer.png" alt="#">
+                            <img src="/assets/images/footer/credit-cards-footer.png" alt="#">
                         </div>
                     </div>
                     <div class="col-lg-6 col-18">

From 023f2135a3e3196d6c713f37687cc9a31e8c7280 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Tue, 19 Mar 2024 22:17:47 +0900
Subject: [PATCH 070/147] =?UTF-8?q?docs:=20Javadoc=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pointhistory/adaptor/PointHistoryAdaptor.java  |  2 +-
 .../controller/PointHistoryController.java         | 14 ++++++++++----
 .../pointhistory/service/PointHistoryService.java  |  8 ++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
index 2aafc1bc..469a357b 100644
--- a/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
+++ b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
@@ -44,7 +44,7 @@ public class PointHistoryAdaptor {
      * description : 포인트 사용 내역 패이지 조회.<br>
      *
      * @param pageable Pageable
-     * @return page
+     * @return PageResponse
      */
     @RequiredAuthorization
     public PageResponse<PointHistoryGetResponse> getPointHistories(Pageable pageable) {
diff --git a/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java b/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
index d9a666c2..c4dd4bd7 100644
--- a/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
+++ b/src/main/java/store/mybooks/front/pointhistory/controller/PointHistoryController.java
@@ -7,8 +7,6 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.pointhistory.model.PointHistoryGetResponse;
 import store.mybooks.front.pointhistory.service.PointHistoryService;
 
 /**
@@ -28,10 +26,18 @@
 public class PointHistoryController {
     private final PointHistoryService pointHistoryService;
 
+    /**
+     * methodName : getPointHistoryPage <br>
+     * author : damho-lee <br>
+     * description : 포인트 내역 페이지 조회.<br>
+     *
+     * @param pageable Pageable
+     * @param model Model
+     * @return string
+     */
     @GetMapping
     public String getPointHistoryPage(@PageableDefault Pageable pageable, Model model) {
-        PageResponse<PointHistoryGetResponse> page = pointHistoryService.getPointHistories(pageable);
-        model.addAttribute("points", page);
+        model.addAttribute("points", pointHistoryService.getPointHistories(pageable));
         return "point-history";
     }
 }
diff --git a/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java b/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
index 52b9fab5..d557c485 100644
--- a/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
+++ b/src/main/java/store/mybooks/front/pointhistory/service/PointHistoryService.java
@@ -23,6 +23,14 @@
 public class PointHistoryService {
     private final PointHistoryAdaptor pointHistoryAdaptor;
 
+    /**
+     * methodName : getPointHistories <br>
+     * author : damho-lee <br>
+     * description : 포인트 내역 페이지 조회.<br>
+     *
+     * @param pageable Pageable
+     * @return PageResponse
+     */
     public PageResponse<PointHistoryGetResponse> getPointHistories(Pageable pageable) {
         return pointHistoryAdaptor.getPointHistories(pageable);
     }

From faff8d72cd1fad3a857c4c939e95881a2f116362 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Tue, 19 Mar 2024 22:18:13 +0900
Subject: [PATCH 071/147] =?UTF-8?q?refactor:=20=20=EC=95=88=20=EC=93=B0?=
 =?UTF-8?q?=EB=8A=94=20=EC=83=81=EC=88=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
index 469a357b..66348877 100644
--- a/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
+++ b/src/main/java/store/mybooks/front/pointhistory/adaptor/PointHistoryAdaptor.java
@@ -33,8 +33,6 @@ public class PointHistoryAdaptor {
     private final RestTemplate restTemplate;
 
     private final GatewayAdaptorProperties gatewayAdaptorProperties;
-
-    private static final String URL = "/api/point-histories";
     private static final String URL_MEMBER = "/api/member/point-histories";
 
 

From e5cf6aebfaece2342ee5d8d6228e5272aaeaa167 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:29:41 +0900
Subject: [PATCH 072/147] =?UTF-8?q?feat:=20book-details.html=20=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=ED=8F=89=EC=A0=90=20=EB=B0=8F=20=EC=A0=84=EC=B2=B4?=
 =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EA=B0=9C=EC=88=98=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book-details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/book-details.html b/src/main/resources/templates/book-details.html
index f808a651..0552c403 100644
--- a/src/main/resources/templates/book-details.html
+++ b/src/main/resources/templates/book-details.html
@@ -122,7 +122,7 @@ <h1 class="title">도서명: <span th:text="${book.name}"></span></h1>
                             <p>출판사: <span th:text="${book.publisher.name}"></span></p>
                             <p>카테고리: <span th:text="${categoryNameList}"></span></p>
                             <p>태그: <span th:text="${tagNameList}"></span></p>
-                            <p>리뷰: <span></span></p>
+                            <p>리뷰: <span th:text="${reviewRateInfo.averageRate}">/5</span>(<span th:text="(${reviewRateInfo.totalCount})"></span>)</p>
                             <div class="price-info">
                                 <div class="original-price">정가: <span th:text="${book.originalCost}">원</span></div>
                                 <div class="sale-price">판매가:

From bb27ce299be24eec17c014d20e227de39eec6ec1 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:32:15 +0900
Subject: [PATCH 073/147] =?UTF-8?q?refactor:=20ReviewGetResponse=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20ImageResponse=20->=20String?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/review/dto/response/ReviewGetResponse.java    | 2 +-
 src/main/resources/templates/review.html                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
index 1182eb8d..4506a378 100644
--- a/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewGetResponse.java
@@ -38,7 +38,7 @@ public class ReviewGetResponse {
 
     private String content;
 
-    private ImageResponse reviewImage;
+    private String reviewImage;
 
 
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
index 05f4f2be..0b6f9c97 100644
--- a/src/main/resources/templates/review.html
+++ b/src/main/resources/templates/review.html
@@ -112,7 +112,7 @@ <h5><span th:text="${review.title}"></span></h5>
 
                             <div class="float-right">
                                 <img th:if="${review.reviewImage != null}"
-                                     th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                     th:src="${review.reviewImage}"
                                      width="100" height="100" alt="리뷰 이미지"/>
                             </div>
                         </div>

From ace90a2a1817b7f3d741e603c6aeadb8e22b33b9 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:33:07 +0900
Subject: [PATCH 074/147] =?UTF-8?q?feat:=20getTotalReviewRate=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/review/adaptor/ReviewAdaptor.java   | 25 ++++++++++++-----
 .../dto/response/ReviewRateResponse.java      | 27 +++++++++++++++++++
 .../front/review/service/ReviewService.java   |  5 ++++
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/review/dto/response/ReviewRateResponse.java

diff --git a/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
index 46297915..9ea79ba9 100644
--- a/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
+++ b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
@@ -28,6 +28,7 @@
 import store.mybooks.front.review.dto.response.ReviewDetailGetResponse;
 import store.mybooks.front.review.dto.response.ReviewGetResponse;
 import store.mybooks.front.review.dto.response.ReviewModifyResponse;
+import store.mybooks.front.review.dto.response.ReviewRateResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -57,8 +58,22 @@ public class ReviewAdaptor {
     private static final String URL_MEMBER_ID = "/api/member/reviews/{id}";
 
 
+    public ReviewRateResponse getTotalReviewRate(Long bookId){
+
+        ResponseEntity<ReviewRateResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/book/{bookId}/rate",
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                },bookId);
+
+        Utils.getResponseEntity(exchange, HttpStatus.OK);
+
+        return exchange.getBody();
+    }
+
     @RequiredAuthorization
-    public ReviewCreateResponse createReview(ReviewCreateRequest request, MultipartFile file) throws IOException {
+    public void createReview(ReviewCreateRequest request, MultipartFile file) throws IOException {
 
 
         HttpHeaders headers = Utils.getAuthHeader();
@@ -66,7 +81,7 @@ public ReviewCreateResponse createReview(ReviewCreateRequest request, MultipartF
         MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
         parts.add("request", request);
 
-        if (!file.getOriginalFilename().isEmpty()) {
+        if (!Objects.requireNonNull(file.getOriginalFilename()).isEmpty()) {
             parts.add("contentImage", new FileSystemResource(convert(file)));
         }
         HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
@@ -77,8 +92,6 @@ public ReviewCreateResponse createReview(ReviewCreateRequest request, MultipartF
                         ReviewCreateResponse.class);
 
         Utils.getResponseEntity(responseEntity, HttpStatus.CREATED);
-
-        return responseEntity.getBody();
     }
 
     @RequiredAuthorization
@@ -122,7 +135,7 @@ public ReviewGetResponse getUserReview(Long reviewId) {
     }
 
     @RequiredAuthorization
-    public ReviewModifyResponse modifyUserReview(Long reviewId, ReviewModifyRequest request) {
+    public void modifyUserReview(Long reviewId, ReviewModifyRequest request) {
 
         ResponseEntity<ReviewModifyResponse> responseEntity =
                 restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_MEMBER_ID,
@@ -132,8 +145,6 @@ public ReviewModifyResponse modifyUserReview(Long reviewId, ReviewModifyRequest
                         }, reviewId);
 
         Utils.getResponseEntity(responseEntity, HttpStatus.OK);
-
-        return responseEntity.getBody();
     }
 
     private File convert(MultipartFile file) throws IOException {
diff --git a/src/main/java/store/mybooks/front/review/dto/response/ReviewRateResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewRateResponse.java
new file mode 100644
index 00000000..eba216c1
--- /dev/null
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewRateResponse.java
@@ -0,0 +1,27 @@
+package store.mybooks.front.review.dto.response;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.resource.review.dto.response<br>
+ * fileName       : ReviewRateResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 3/19/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/19/24        masiljangajji       최초 생성
+ */
+
+@Getter
+@NoArgsConstructor
+public class ReviewRateResponse {
+
+    private Long totalCount;
+
+    private Double averageRate;
+
+
+}
diff --git a/src/main/java/store/mybooks/front/review/service/ReviewService.java b/src/main/java/store/mybooks/front/review/service/ReviewService.java
index bf9c0051..2d18c6bc 100644
--- a/src/main/java/store/mybooks/front/review/service/ReviewService.java
+++ b/src/main/java/store/mybooks/front/review/service/ReviewService.java
@@ -11,6 +11,7 @@
 import store.mybooks.front.review.dto.request.ReviewModifyRequest;
 import store.mybooks.front.review.dto.response.ReviewDetailGetResponse;
 import store.mybooks.front.review.dto.response.ReviewGetResponse;
+import store.mybooks.front.review.dto.response.ReviewRateResponse;
 
 /**
  * packageName    : store.mybooks.front.review.controller.service<br>
@@ -49,4 +50,8 @@ public PageResponse<ReviewDetailGetResponse> getBookReview(Pageable pageable, Lo
         return reviewAdaptor.getBookReview(pageable,bookId);
     }
 
+    public ReviewRateResponse getTotalReviewRate(Long bookId){
+        return  reviewAdaptor.getTotalReviewRate(bookId);
+    }
+
 }

From 20427683b9345ccd1630180064110ad86d02f323 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:33:42 +0900
Subject: [PATCH 075/147] =?UTF-8?q?feat:=20BookBriefResponse=20reviewCount?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/admin/book/model/response/BookBriefResponse.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java b/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
index 246dd085..f219bdff 100644
--- a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
+++ b/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponse.java
@@ -27,7 +27,9 @@ public class BookBriefResponse {
 
     private String name;
 
-//    private Double rate;
+    private Double rate;
+
+    private Long reviewCount;
 
     private Integer cost;
 

From 2fd5a0d770a1c3a9df21f69583c56ff8ed75d9ef Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:37:48 +0900
Subject: [PATCH 076/147] =?UTF-8?q?feat:=20BookController=20getBookDetailP?=
 =?UTF-8?q?age=20=EB=A6=AC=EB=B7=B0=20=EA=B0=9C=EC=88=98=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=8F=89=EC=A0=90=20=ED=8F=89=EA=B7=A0=20=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/book/controller/BookController.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/store/mybooks/front/book/controller/BookController.java b/src/main/java/store/mybooks/front/book/controller/BookController.java
index ee6944e4..18ce5f86 100755
--- a/src/main/java/store/mybooks/front/book/controller/BookController.java
+++ b/src/main/java/store/mybooks/front/book/controller/BookController.java
@@ -76,7 +76,9 @@ public String getBookDetailPage(HttpServletRequest request, @PathVariable("id")
         String key = "viewCount:" + bookId;
         redisTemplate.opsForValue().increment(key, 1);
 
+
         model.addAttribute("reviews", reviewService.getBookReview(pageable,bookId));
+        model.addAttribute("reviewRateInfo",reviewService.getTotalReviewRate(bookId));
 
 
         return "book-details";

From 69d3e758982751e7a96dfb094816f702268ee03e Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:38:06 +0900
Subject: [PATCH 077/147] =?UTF-8?q?refactor:=20ReviewDetailResponse=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=EB=B3=80=EA=B2=BD=20ImageResponse=20->=20Str?=
 =?UTF-8?q?ing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/review/dto/response/ReviewDetailGetResponse.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java b/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
index 10b6d910..58eb5f65 100644
--- a/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
+++ b/src/main/java/store/mybooks/front/review/dto/response/ReviewDetailGetResponse.java
@@ -4,7 +4,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import store.mybooks.front.image.dto.ImageResponse;
 
 /**
  * packageName    : store.mybooks.resource.review.dto.response<br>
@@ -34,6 +33,6 @@ public class ReviewDetailGetResponse {
 
     private String content;
 
-    private ImageResponse reviewImage;
+    private String reviewImage;
 
 }

From 116fb31af9d16957f141574433e1274c2789fa6c Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:38:43 +0900
Subject: [PATCH 078/147] =?UTF-8?q?refactor:=20review=20response=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=EC=9D=B8=ED=95=9C=20html=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book-details.html | 2 +-
 src/main/resources/templates/review-book.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/book-details.html b/src/main/resources/templates/book-details.html
index 0552c403..9dbdb4be 100644
--- a/src/main/resources/templates/book-details.html
+++ b/src/main/resources/templates/book-details.html
@@ -265,7 +265,7 @@ <h5 class="mb-1"><span th:text="${review.title}"></span>
                                                             <div class="col-md-2">
                                                                 <div class="float-left">
                                                                     <img th:if="${review.reviewImage != null}"
-                                                                         th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                                                         th:src="${review.reviewImage}"
                                                                          width="100" height="100" alt="리뷰 이미지"/>
                                                                 </div>
                                                             </div>
diff --git a/src/main/resources/templates/review-book.html b/src/main/resources/templates/review-book.html
index da4835a7..361ac6e0 100644
--- a/src/main/resources/templates/review-book.html
+++ b/src/main/resources/templates/review-book.html
@@ -82,7 +82,7 @@ <h5 class="mb-1"><span th:text="${review.title}"></span>
                                 <div class="col-md-2">
                                     <div class="float-left">
                                         <img th:if="${review.reviewImage != null}"
-                                             th:src="${review.reviewImage.path+review.reviewImage.getFileName()+review.reviewImage.getExtension()}"
+                                             th:src="${review.reviewImage}"
                                              width="100" height="100" alt="리뷰 이미지"/>
                                     </div>
                                 </div>

From f814837fd5f755c342f41572e1f97c9a699500fc Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 14:41:13 +0900
Subject: [PATCH 079/147] =?UTF-8?q?feat:=20index.html=20=ED=8F=89=EC=A0=90?=
 =?UTF-8?q?=ED=8F=89=EA=B7=A0=20=EB=B0=8F=20=EB=A6=AC=EB=B7=B0=EA=B0=9C?=
 =?UTF-8?q?=EC=88=98=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/index.html | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 9b22f84e..e30fb82d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -241,17 +241,11 @@ <h2>Trending Product</h2>
                             </div>
                         </div>
                         <div class="product-info">
-                            <span class="category">TT</span>
                             <h4 class="title">
                                 <a th:href="@{'/book/' + ${book.id}}" th:text="${book.name}"></a>
                             </h4>
                             <ul class="review">
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star"></i></li>
-                                <li><span>4.0 Review(s)</span></li>
+                                <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span th:text="(${book.reviewCount})"></span>)</p></li>
                             </ul>
                             <div class="price">
                                 <span th:text="${book.saleCost}"></span>
@@ -293,17 +287,12 @@ <h2>Special Offer</h2>
                             </div>
                         </div>
                         <div class="product-info">
-                            <span class="category">TT</span>
                             <h4 class="title">
                                 <a th:href="@{'/book/' + ${book.id}}" th:text="${book.name}"></a>
                             </h4>
                             <ul class="review">
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star-filled"></i></li>
-                                <li><i class="lni lni-star"></i></li>
-                                <li><span>4.0 Review(s)</span></li>
+                                <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span th:text="(${book.reviewCount})"></span>)</p></li>
+
                             </ul>
                             <div class="price">
                                 <span th:text="${book.saleCost}"></span>

From c059d4d544d0faf91769558eafd69def29e15f5f Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 15:00:38 +0900
Subject: [PATCH 080/147] =?UTF-8?q?feat:=20=EA=B2=80=EC=83=89=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/elastic/adaptor/ElasticAdaptor.java |  60 ++++++++++
 .../elastic/controller/ElasticController.java |  39 +++++++
 .../front/elastic/service/ElasticService.java |  33 ++++++
 .../resources/templates/search-display.html   | 103 ++++++++++++++++++
 4 files changed, 235 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
 create mode 100644 src/main/java/store/mybooks/front/elastic/service/ElasticService.java
 create mode 100644 src/main/resources/templates/search-display.html

diff --git a/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
new file mode 100644
index 00000000..395d6a7e
--- /dev/null
+++ b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
@@ -0,0 +1,60 @@
+package store.mybooks.front.elastic.adaptor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.elastic.adaptor <br/>
+ * fileName       : ElasticAdaptor<br/>
+ * author         : newjaehun <br/>
+ * date           : 3/20/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 3/20/24        newjaehun       최초 생성<br/>
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ElasticAdaptor {
+    private final RestTemplate restTemplate;
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+
+    public PageResponse<BookBriefResponse> searchPaged(String query, Pageable pageable) {
+        String url = UriComponentsBuilder
+                .fromHttpUrl(gatewayAdaptorProperties.getAddress() + "/api/searches")
+                .queryParam("query", query)
+                .queryParam("page", pageable.getPageNumber())
+                .queryParam("size", pageable.getPageSize())
+                .queryParam("sort", pageable.getSort())
+                .encode()
+                .toUriString();
+
+        ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
+                url,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<PageResponse<BookBriefResponse>>() {
+                }
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+}
diff --git a/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
new file mode 100644
index 00000000..fb193631
--- /dev/null
+++ b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
@@ -0,0 +1,39 @@
+package store.mybooks.front.elastic.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
+import store.mybooks.front.elastic.service.ElasticService;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+
+/**
+ * packageName    : store.mybooks.front.elastic.controller <br/>
+ * fileName       : ElasticController<br/>
+ * author         : newjaehun <br/>
+ * date           : 3/20/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 3/20/24        newjaehun       최초 생성<br/>
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/search")
+public class ElasticController {
+    private final ElasticService elasticService;
+
+    @GetMapping
+    public String getSearchResultPage(@PathVariable("query") String query, @PageableDefault(size = 8, sort = "viewCount", direction = Sort.Direction.DESC) Pageable pageable, Model model) {
+//        PageResponse<BookBriefResponse> result = elasticService.getSearchResultPage(query, type);
+//        model.addAttribute("books", result);
+        return "search-display";
+    }
+}
diff --git a/src/main/java/store/mybooks/front/elastic/service/ElasticService.java b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
new file mode 100644
index 00000000..a6c17878
--- /dev/null
+++ b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
@@ -0,0 +1,33 @@
+package store.mybooks.front.elastic.service;
+
+import static io.lettuce.core.GeoArgs.Sort.desc;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
+import store.mybooks.front.elastic.adaptor.ElasticAdaptor;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.pageable.dto.response.Pageable;
+
+/**
+ * packageName    : store.mybooks.front.elastic.service <br/>
+ * fileName       : ElasticService<br/>
+ * author         : newjaehun <br/>
+ * date           : 3/20/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 3/20/24        newjaehun       최초 생성<br/>
+ */
+@Service
+@RequiredArgsConstructor
+public class ElasticService {
+    private final ElasticAdaptor elasticAdaptor;
+
+//    public PageResponse<BookBriefResponse> getSearchResultPage(String query, String type) {
+//        return elasticAdaptor.searchPaged(query, pageable);
+//    }
+}
diff --git a/src/main/resources/templates/search-display.html b/src/main/resources/templates/search-display.html
new file mode 100644
index 00000000..8de81d98
--- /dev/null
+++ b/src/main/resources/templates/search-display.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+
+<style>
+  .product-image img {
+    width: 100%;
+    height: auto;
+  }
+</style>
+<div layout:fragment="content" class="border border-dark">
+  <script>
+    let url = "/category/category-display"
+    let currentPage = [[${books.number}]]
+    let totalPages = [[${books.totalPages}]]
+  </script>
+  <section class="product-grids section">
+    <div class="container">
+      <div class="row">
+        <div class="col-lg-3 col-12">
+          <div class="product-sidebar">
+            <div class="single-widget">
+              <h3>
+                <span th:text="${highestCategoryName}"></span>
+              </h3>
+              <ul th:each="levelTwoCategory : ${levelTwoCategories}">
+                <li>
+                  <a th:href="@{/category/category-display/{categoryId}(categoryId=${levelTwoCategory.id})}"
+                     th:text="${levelTwoCategory.name}"></a>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="col-lg-9 col-12">
+          <h3>
+            <span th:text="${name}"></span>
+          </h3>
+          <div class="product-grids-head">
+            <div class="product-grid-topbar" th:block th:if="${targetCategories.size() != 0}">
+              <div class="row align-items-center">
+                <div th:each="category, iterStat : ${targetCategories}" class="col-2 text-center">
+                  <a th:href="@{/category/category-display/{categoryId}(categoryId=${category.id})}"
+                     th:text="${category.name}">
+                  </a>
+                </div>
+              </div>
+            </div>
+            <div class="tab-content" id="nav-tabContent">
+              <div class="tab-pane fade show active" id="nav-grid" role="tabpanel"
+                   aria-labelledby="nav-grid-tab">
+                <div class="row">
+                  <div class="col-lg-4 col-md-6 col-12" th:each="book : ${books.content}">
+                    <div class="single-product">
+                      <div class="product-image">
+                        <img class="product-image card-img-top "
+                             th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}"
+                             alt="#">
+                      </div>
+                      <div class="product-info">
+                        <span class="category">Watches</span>
+                        <h4 class="title">
+                          <a th:href="@{/book/{id}(id=${book.id})}"
+                             th:text="${book.name}"></a>
+                        </h4>
+                        <ul class="review">
+                          <li><i class="lni lni-star-filled"></i></li>
+                          <li><i class="lni lni-star-filled"></i></li>
+                          <li><i class="lni lni-star-filled"></i></li>
+                          <li><i class="lni lni-star-filled"></i></li>
+                          <li><i class="lni lni-star"></i></li>
+                          <li><span>4.0 Review(s)</span></li>
+                        </ul>
+                        <div class="price">
+                          <span th:text="${book.saleCost}"></span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+  <div class="mt-3" th:block th:if="${books.totalPages > 1}">
+    <div class="pagination">
+      <div class="page-item">
+        <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+      </div>
+      <div class="pagination" id="pageNumContainer"></div>
+      <div class="page-item">
+        <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+      </div>
+    </div>
+  </div>
+  <script src="/admin/js/page/setPrevious.js"></script>
+  <script src="/admin/js/page/setNext.js"></script>
+  <script src="/admin/js/page/setLastPage.js"></script>
+</div>
\ No newline at end of file

From 82ae97e4afb9937bb17f1b0b443c4ee0c535e0f0 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Wed, 20 Mar 2024 17:02:33 +0900
Subject: [PATCH 081/147] =?UTF-8?q?style:=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=20=EB=AC=B8=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/user/controller/UserController.java     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/store/mybooks/front/user/controller/UserController.java b/src/main/java/store/mybooks/front/user/controller/UserController.java
index 321b6995..b218d8d6 100644
--- a/src/main/java/store/mybooks/front/user/controller/UserController.java
+++ b/src/main/java/store/mybooks/front/user/controller/UserController.java
@@ -6,7 +6,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -21,8 +20,6 @@
 import store.mybooks.front.auth.dto.response.TokenCreateResponse;
 import store.mybooks.front.auth.redis.RedisAuthService;
 import store.mybooks.front.config.RedisProperties;
-import store.mybooks.front.cart.LoginCartDataMoveEvent;
-import store.mybooks.front.cart.LogoutCartDataMoveEvent;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.request.UserCreateRequest;
 import store.mybooks.front.user.dto.request.UserEmailRequest;
@@ -64,8 +61,6 @@ public class UserController {
     private final RedisProperties redisProperties;
 
 
-    private final ApplicationEventPublisher applicationEventPublisher;
-
     /**
      * methodName : loginUserForm
      * author : masiljangajji
@@ -91,7 +86,6 @@ public RedirectView paycoLoginForm() {
 
     @GetMapping("/logout")
     public String logout() {
-//        applicationEventPublisher.publishEvent(new LogoutCartDataMoveEvent(this));
         return "redirect:/";
     }
 
@@ -192,7 +186,7 @@ public String loginUser(@ModelAttribute UserLoginRequest userLoginRequest, HttpS
 
             // 쿠키추가
             CookieUtils.addJwtCookie(response, tokenCreateResponse.getAccessToken());
-//            applicationEventPublisher.publishEvent(new LoginCartDataMoveEvent(this));
+
             return "redirect:/";
         }
 

From c4aa645cf8cdcef8855afc42178990f58c074c94 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Wed, 20 Mar 2024 17:03:44 +0900
Subject: [PATCH 082/147] =?UTF-8?q?feat:=20=EC=A1=B0=ED=9A=8C=ED=95=A0?=
 =?UTF-8?q?=EB=95=8C=20Redis=EC=97=90=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=EA=B0=80=20=EC=97=86=EC=9D=84=EB=95=8C=20mysql=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=A1=B0=ED=9A=8C,=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=20=EC=9C=A0=ED=9A=A8=EC=8B=9C=EA=B0=84=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/cart/service/CartUserService.java       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/service/CartUserService.java b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
index e82e18c3..32915983 100644
--- a/src/main/java/store/mybooks/front/cart/service/CartUserService.java
+++ b/src/main/java/store/mybooks/front/cart/service/CartUserService.java
@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.book.adaptor.BookAdminAdaptor;
 import store.mybooks.front.admin.book.model.response.BookCartResponse;
+import store.mybooks.front.cart.adaptor.CartAdaptor;
 import store.mybooks.front.cart.controller.CartController;
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.domain.CartRegisterRequest;
@@ -32,7 +34,10 @@ public class CartUserService {
 
     private final BookAdminAdaptor bookAdminAdaptor;
     private final RedisTemplate<String, CartDetail> redisTemplate;
+    private final RedisTemplate<String, String> stringRedisTemplate;
     private final UserAdaptor userAdaptor;
+    private final CartAdaptor cartAdaptor;
+    private static final String EXPIRED_KEY = "EXPIRED_CART";
 
     /**
      * Gets book from cart.
@@ -42,9 +47,8 @@ public class CartUserService {
     public List<CartDetail> getBookFromCart() {
         String cartKey = cartKey();
         List<CartDetail> cartDetailList = redisTemplate.opsForList().range(cartKey, 0, -1);
-
         if (Objects.isNull(cartDetailList) || cartDetailList.isEmpty()) {
-            return new ArrayList<>();
+            return cartAdaptor.moveDataMysqlToRedis(cartKey);
         } else {
             return cartDetailList;
         }
@@ -82,6 +86,9 @@ public void addBookToCart(CartRegisterRequest cartRegisterRequest) {
                             cartBook.getSaleCost(), cartBook.getStock(), cartBook.getSellingStatus());
             cartDetailList.add(cartDetail);
             redisTemplate.opsForList().rightPush(cartKey, cartDetail);
+            stringRedisTemplate.opsForValue().set(getExpiredKey(cartKey), cartKey);
+            stringRedisTemplate.expire(getExpiredKey(cartKey), 179, TimeUnit.MINUTES);
+            redisTemplate.expire(cartKey, 180, TimeUnit.MINUTES);
         }
     }
 
@@ -145,4 +152,8 @@ public String cartKey() {
         UserGetResponse user = userAdaptor.findUser();
         return CartController.CART_COOKIE_VALUE + ":" + user.getEmail();
     }
+
+    public String getExpiredKey(String cartKey) {
+        return EXPIRED_KEY + " " + cartKey;
+    }
 }

From b0d3a0a1bc494f027d803f5e2dc379d082faeb28 Mon Sep 17 00:00:00 2001
From: hyeonjaez <jhjh0022@naver.com>
Date: Wed, 20 Mar 2024 17:04:44 +0900
Subject: [PATCH 083/147] =?UTF-8?q?feat:=20=EC=9E=A5=EB=B0=94=EA=B5=AC?=
 =?UTF-8?q?=EB=8B=88=20=EC=A1=B0=ED=9A=8C=ED=95=A0=EB=95=8C=20redis?=
 =?UTF-8?q?=EC=97=90=20=EC=97=86=EC=9D=84=EC=8B=9C=20mysql=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/cart/adaptor/CartAdaptor.java       | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/main/java/store/mybooks/front/cart/adaptor/CartAdaptor.java b/src/main/java/store/mybooks/front/cart/adaptor/CartAdaptor.java
index 456f78e3..0c8262b4 100644
--- a/src/main/java/store/mybooks/front/cart/adaptor/CartAdaptor.java
+++ b/src/main/java/store/mybooks/front/cart/adaptor/CartAdaptor.java
@@ -1,8 +1,8 @@
 package store.mybooks.front.cart.adaptor;
 
+import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.event.EventListener;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -11,10 +11,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
-import store.mybooks.front.cart.LoginCartDataMoveEvent;
-import store.mybooks.front.cart.LogoutCartDataMoveEvent;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.domain.CartUserRedisKeyNameRequest;
-import store.mybooks.front.cart.service.CartUserService;
 import store.mybooks.front.config.GatewayAdaptorProperties;
 import store.mybooks.front.utils.Utils;
 
@@ -33,43 +32,25 @@
 @RequiredArgsConstructor
 public class CartAdaptor {
     private final RestTemplate restTemplate;
-    private final CartUserService cartUserService;
     private final GatewayAdaptorProperties gatewayAdaptorProperties;
-    private static final String URL_CART = "/api/carts";
 
+    private static final String URL_USER_CART = "/api/member/carts";
 
-    @EventListener
-    public void moveDataRedisToMysql(LoginCartDataMoveEvent loginCartDataMoveEvent) {
-        CartUserRedisKeyNameRequest cartUserRedisKeyNameRequest =
-                new CartUserRedisKeyNameRequest(cartUserService.cartKey());
 
-        HttpHeaders headers = Utils.getHttpHeader();
+    @RequiredAuthorization
+    public List<CartDetail> moveDataMysqlToRedis(String cartKey) {
+        CartUserRedisKeyNameRequest cartUserRedisKeyNameRequest = new CartUserRedisKeyNameRequest(cartKey);
+        HttpHeaders headers = Utils.getAuthHeader();
         HttpEntity<CartUserRedisKeyNameRequest> requestEntity = new HttpEntity<>(cartUserRedisKeyNameRequest, headers);
-        ResponseEntity<Void> exchange =
-                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_CART + "/user-login",
-                        HttpMethod.POST, requestEntity, new ParameterizedTypeReference<Void>() {
-                        });
-
-        if (!Objects.equals(exchange.getStatusCode(), HttpStatus.CREATED)) {
-            throw new RuntimeException();
-        }
-    }
-
-    @EventListener
-    public void moveDataMysqlToRedis(LogoutCartDataMoveEvent logoutCartDataMoveEvent) {
-        CartUserRedisKeyNameRequest cartUserRedisKeyNameRequest =
-                new CartUserRedisKeyNameRequest(cartUserService.cartKey());
-
-        HttpHeaders headers = Utils.getHttpHeader();
-        HttpEntity<CartUserRedisKeyNameRequest> requestEntity = new HttpEntity<>(cartUserRedisKeyNameRequest, headers);
-        ResponseEntity<Void> exchange =
-                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_CART + "/user-logout",
-                        HttpMethod.POST, requestEntity, new ParameterizedTypeReference<Void>() {
+        ResponseEntity<List<CartDetail>> exchange =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_USER_CART + "/get/items",
+                        HttpMethod.POST, requestEntity, new ParameterizedTypeReference<List<CartDetail>>() {
                         });
 
         if (!Objects.equals(exchange.getStatusCode(), HttpStatus.CREATED)) {
             throw new RuntimeException();
         }
+        return exchange.getBody();
     }
 
 

From 835dc1bc449bdf0f821f5e67b56a310934ae0e4b Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:08:12 +0900
Subject: [PATCH 084/147] =?UTF-8?q?feat:=20book-details.html=20=EB=B3=84?=
 =?UTF-8?q?=EC=A0=90=ED=8F=89=EA=B7=A0=20=EC=86=8C=EC=88=98=ED=95=9C?=
 =?UTF-8?q?=EC=9E=90=EB=A6=AC=EC=97=90=EC=84=9C=20=EB=B0=98=EC=98=AC?=
 =?UTF-8?q?=EB=A6=BC=ED=95=98=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book-details.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/book-details.html b/src/main/resources/templates/book-details.html
index 9dbdb4be..ec610666 100644
--- a/src/main/resources/templates/book-details.html
+++ b/src/main/resources/templates/book-details.html
@@ -122,7 +122,7 @@ <h1 class="title">도서명: <span th:text="${book.name}"></span></h1>
                             <p>출판사: <span th:text="${book.publisher.name}"></span></p>
                             <p>카테고리: <span th:text="${categoryNameList}"></span></p>
                             <p>태그: <span th:text="${tagNameList}"></span></p>
-                            <p>리뷰: <span th:text="${reviewRateInfo.averageRate}">/5</span>(<span th:text="(${reviewRateInfo.totalCount})"></span>)</p>
+                            <p>리뷰: <span id="roundedRate"></span>/5(<span th:text="(${book.reviewCount})"></span>)</p>
                             <div class="price-info">
                                 <div class="original-price">정가: <span th:text="${book.originalCost}">원</span></div>
                                 <div class="sale-price">판매가:
@@ -390,5 +390,15 @@ <h5 class="mb-1"><span th:text="${review.title}"></span>
         }
 
         setting()
+
+
+        // Thymeleaf를 통해 전달된 book.rate 값을 가져옴
+        var originalRate = parseFloat([[${book.rate}]]);
+        // 소수점 한 자리로 반올림
+        var roundedRate = Math.round(originalRate * 10) / 10;
+
+        // 소수점 한 자리에서 반올림한 값을 HTML에 설정
+        document.getElementById('roundedRate').innerText = roundedRate;
+
     </script>
 </div>
\ No newline at end of file

From f3b0dedc96f0baec705646e69593195b93d5a458 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:08:25 +0900
Subject: [PATCH 085/147] =?UTF-8?q?feat:=20review.html=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=ED=95=9C=20=EB=A6=AC=EB=B7=B0=20=EC=97=86=EC=9D=84?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review.html | 36 ++++++++++++++----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
index 0b6f9c97..435a13a0 100644
--- a/src/main/resources/templates/review.html
+++ b/src/main/resources/templates/review.html
@@ -70,11 +70,6 @@
 </head>
 <body>
 <div layout:fragment="content">
-    <script>
-        let url = "/review/all"
-        let currentPage = [[${reviews.number}]]
-        let totalPages = [[${reviews.totalPages}]]
-    </script>
     <!-- Start Breadcrumbs -->
     <div class="breadcrumbs">
         <div class="container">
@@ -93,7 +88,7 @@
     <!-- End Breadcrumbs -->
     <div class="container ml-2">
         <div>
-            <div class="row mt-3">
+            <div class="row mt-3" th:if="${reviews != null and not #lists.isEmpty(reviews.content)}">
                 <div th:each="review : ${reviews.content}" class="col-md-3 mb-3">
                     <div class="card h-100">
                         <div class="card-body">
@@ -108,7 +103,7 @@ <h5><span th:text="${review.title}"></span></h5>
                             <br>
 
                             <br>
-                             <span th:text="${review.content}"></span>
+                            <span th:text="${review.content}"></span>
 
                             <div class="float-right">
                                 <img th:if="${review.reviewImage != null}"
@@ -120,17 +115,28 @@ <h5><span th:text="${review.title}"></span></h5>
                         <a class="edit-button" th:href="@{/review/modify(reviewId=${review.reviewId})}">수정</a>
                     </div>
                 </div>
+
+                <div class="pagination">
+                    <ul>
+                        <li th:each="i : ${#numbers.sequence(0, reviews.totalPages - 1)}">
+                            <a th:href="@{${#httpServletRequest.requestURI}(page=${i})}"
+                               th:text="${i + 1}" th:class="${reviews.number == i ? 'active' : ''}"></a>
+                        </li>
+                    </ul>
+                </div>
+
+
             </div>
-        </div>
+            <div th:if="${reviews == null or #lists.isEmpty(reviews.content)}" style="text-align: center; margin-top: 20px;">
+                <div style="background-color: #f8f9fa; padding: 20px; border-radius: 10px;">
+                    <h2>리뷰가 존재하지 않습니다.</h2>
+                </div>
+            </div>
+
 
-        <div class="pagination">
-            <ul>
-                <li th:each="i : ${#numbers.sequence(0, reviews.totalPages - 1)}">
-                    <a th:href="@{${#httpServletRequest.requestURI}(page=${i})}"
-                       th:text="${i + 1}" th:class="${reviews.number == i ? 'active' : ''}"></a>
-                </li>
-            </ul>
         </div>
+
+
     </div>
 
 </div>

From f7e077d641fa85b705b468b941e3c0c1dcf5b1ba Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:09:07 +0900
Subject: [PATCH 086/147] =?UTF-8?q?feat:=20BookDetailResponse=20=EB=B3=84?=
 =?UTF-8?q?=EC=A0=90=ED=8F=89=EA=B7=A0=EA=B3=BC=20=EB=A6=AC=EB=B7=B0=20?=
 =?UTF-8?q?=EC=B4=9D=ED=95=A9=EC=A0=95=EB=B3=B4=20=EA=B0=96=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/admin/book/model/response/BookDetailResponse.java | 6 ++----
 .../store/mybooks/front/book/controller/BookController.java | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/store/mybooks/front/admin/book/model/response/BookDetailResponse.java b/src/main/java/store/mybooks/front/admin/book/model/response/BookDetailResponse.java
index bbaf1665..a148fe31 100755
--- a/src/main/java/store/mybooks/front/admin/book/model/response/BookDetailResponse.java
+++ b/src/main/java/store/mybooks/front/admin/book/model/response/BookDetailResponse.java
@@ -44,9 +44,9 @@ public class BookDetailResponse {
 
     private Integer disCountRate;
 
-//    private Double totalRate;
+    private Double rate;
 
-//    private Integer reviewCount;
+    private Long reviewCount;
 
     private Integer likeCount;
 
@@ -68,7 +68,5 @@ public class BookDetailResponse {
 
     private List<ImageResponse> contentImageList;
 
-//    private List<ReviewDetailResponse> review;
-
 
 }
\ No newline at end of file
diff --git a/src/main/java/store/mybooks/front/book/controller/BookController.java b/src/main/java/store/mybooks/front/book/controller/BookController.java
index 18ce5f86..1c62cdf4 100755
--- a/src/main/java/store/mybooks/front/book/controller/BookController.java
+++ b/src/main/java/store/mybooks/front/book/controller/BookController.java
@@ -69,7 +69,6 @@ public String getBookDetailPage(HttpServletRequest request, @PathVariable("id")
         model.addAttribute("contentImage", book.getContentImageList());
 
         if (CookieUtils.getIdentityCookieValue(request) != null) {
-
             model.addAttribute("userBookLikeCheck", bookLikeService.isUserLikeCheck(bookId));
         }
 
@@ -78,7 +77,6 @@ public String getBookDetailPage(HttpServletRequest request, @PathVariable("id")
 
 
         model.addAttribute("reviews", reviewService.getBookReview(pageable,bookId));
-        model.addAttribute("reviewRateInfo",reviewService.getTotalReviewRate(bookId));
 
 
         return "book-details";

From 48ede3883907456e43badd9e18ad3e020496f249 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 17:10:28 +0900
Subject: [PATCH 087/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=EC=A2=8B?=
 =?UTF-8?q?=EC=95=84=EC=9A=94=EC=A1=B0=ED=9A=8C=ED=99=94=EB=A9=B4=20DTO?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=20=EA=B3=B5=EA=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/user-book-like.html   | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/templates/user-book-like.html b/src/main/resources/templates/user-book-like.html
index ae75b6b5..4482382a 100644
--- a/src/main/resources/templates/user-book-like.html
+++ b/src/main/resources/templates/user-book-like.html
@@ -2,15 +2,6 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{common/layout/my-books-layout}">
-<style>
-    .book-image {
-        width: 100px;
-        height: 150px;
-        object-fit: cover;
-        display: block;
-        margin: 0 auto;
-    }
-</style>
 
 <div layout:fragment="content">
     <script>
@@ -48,14 +39,22 @@ <h2>나의 좋아요</h2>
             <div>
                 <div class="row mt-3">
                     <div th:each="book : ${bookLikeList.content}" class="col-md-3 mb-3">
-                        <div class="card h-100">
-                            <img th:src="${book.image}" alt="Book Image" class="card-img-top book-image" src="https://via.placeholder.com/150">
-                            <div class="card-body">
-                                <a th:href="@{/book/{bookId}(bookId=${book.id})}">
-                                    <h5 class="card-title" th:text="${book.name}">도서명</h5>
-                                </a>
-                                <p class="card-text">평점: 5점</p>
-                                <p class="card-text" th:text="${book.saleCost} + '원'">가격</p>
+                        <div class="single-product card h-100">
+                            <div class="product-image">
+                                <img class="product-image card-img-top" th:src="${book.image}" alt="#">
+                            </div>
+                            <div class="product-info">
+                                <h4 class="book-title-large-text">
+                                    <a th:href="@{'/book/' + ${book.id}}" th:text="${book.name}"></a>
+                                </h4>
+                                <ul class="review">
+                                    <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span
+                                            th:text="(${book.reviewCount})"></span>)</p></li>
+                                </ul>
+                                <div class="price">
+                                    <span th:text="'₩'+ ${book.saleCost}"></span>
+                                    <span th:if="${book.saleCost != book.cost}" class="discount-price" th:text="${book.cost}"></span>
+                                </div>
                             </div>
                         </div>
                     </div>

From e411c1eeff2dc7e9f4c232f099581acbd0f6bc9d Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 17:13:02 +0900
Subject: [PATCH 088/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/view/book/book.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/admin/view/book/book.html b/src/main/resources/templates/admin/view/book/book.html
index 6e7e2261..04f22778 100644
--- a/src/main/resources/templates/admin/view/book/book.html
+++ b/src/main/resources/templates/admin/view/book/book.html
@@ -28,15 +28,14 @@ <h2>도서</h2>
             <div class="row mt-3">
                 <div th:each="book : ${books.content}" class="col-md-3 mb-3">
                     <div class="card h-100">
-                        <img class="card-img-top book-image"
-                             th:src="${book.image}"
-                             alt="도서 썸네일 이미지">
+                        <img class="card-img-top book-image" th:src="${book.image}" alt="도서 썸네일 이미지">
                         <div class="card-body">
                             <a th:href="@{/admin/book/update(id=${book.id})}">
                                 <h5 class="card-title" th:text="${book.name}">도서명</h5>
                             </a>
-                            <p class="card-text">평점: 5점</p>
-                            <p class="card-text" th:text="${book.saleCost} + '원'">가격</p>
+                            <p>리뷰: <span th:text="${book.rate}">/5</span>(<span
+                                    th:text="(${book.reviewCount})"></span>)</p>
+                            <p class="card-text" th:text="${book.saleCost == book.cost} ? '₩' + ${book.saleCost} : ('₩' + ${book.saleCost} + ' (' + ${book.cost} + ')')"></p>
                         </div>
                     </div>
                 </div>

From 62cbe5f0ba33ba808ce16935cc64ba85b1a91176 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 17:13:32 +0900
Subject: [PATCH 089/147] =?UTF-8?q?refactor:=20=EB=A9=94=EC=9D=B8=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9B=90=EA=B0=80=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index e30fb82d..c7698388 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -248,7 +248,8 @@ <h4 class="title">
                                 <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span th:text="(${book.reviewCount})"></span>)</p></li>
                             </ul>
                             <div class="price">
-                                <span th:text="${book.saleCost}"></span>
+                                <span th:text="'₩'+ ${book.saleCost}"></span>
+                                <span th:if="${book.saleCost != book.cost}" class="discount-price" th:text="${book.cost} + '₩'"></span>
                             </div>
                         </div>
                     </div>
@@ -295,7 +296,8 @@ <h4 class="title">
 
                             </ul>
                             <div class="price">
-                                <span th:text="${book.saleCost}"></span>
+                                <span th:text="'₩'+ ${book.saleCost}"></span>
+                                <span th:if="${book.saleCost != book.cost}" class="discount-price" th:text="${book.cost} + '₩'"></span>
                             </div>
                         </div>
                     </div>

From c9df2c9f1b229250fdf5f4839d6aabb8959e8c4b Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 17:18:11 +0900
Subject: [PATCH 090/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=ED=8F=B0=ED=8A=B8=ED=81=AC=EA=B8=B0=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/book-details.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/book-details.html b/src/main/resources/templates/book-details.html
index 9dbdb4be..6e52c795 100644
--- a/src/main/resources/templates/book-details.html
+++ b/src/main/resources/templates/book-details.html
@@ -196,7 +196,7 @@ <h1 class="title">도서명: <span th:text="${book.name}"></span></h1>
                     <div class="single-block">
                         <div class="row">
                             <div class="col-4">
-                                <h2 style="font-size: 24px; margin-top: 20px;">도서정보</h2>
+                                <h2 style="font-size: 35px; margin-top: 20px;">도서정보</h2>
                                 <table class="table">
                                     <tr>
                                         <th>출판일</th>
@@ -217,20 +217,20 @@ <h2 style="font-size: 24px; margin-top: 20px;">도서정보</h2>
                                 </table>
                             </div>
                             <div class="col-12">
-                                <h2 style="font-size: 24px; margin-top: 20px;">목차</h2>
+                                <h2 style="font-size: 35px; margin-top: 20px;">목차</h2>
                                 <div th:utext="${book.index}"></div>
 
-                                <h2 style="font-size: 24px; margin-top: 20px;">설명</h2>
+                                <h2 style="font-size: 35px; margin-top: 20px;">설명</h2>
                                 <div th:utext="${book.explanation}"></div>
 
-                                <h2 style="font-size: 24px; margin-top: 20px;">책소개</h2>
+                                <h2 style="font-size: 35px; margin-top: 20px;">책소개</h2>
                                 <div th:each="contentImage : ${contentImage}">
                                     <img th:src="${contentImage.path + contentImage.fileName + contentImage.extension}"
                                          alt="책 소개 이미지">
                                 </div>
 
 
-                                <h2 style="font-size: 24px; margin-top: 20px;">저자 소개</h2>
+                                <h2 style="font-size: 35px; margin-top: 20px;">저자 소개</h2>
                                 <div th:each="author : ${book.authorList}">
                                     <p>저자명: <span th:text="${author.name}"></span></p>
                                     <p>저자소개: <span th:text="${author.content}"></span></p>

From 8b77a7f8718b7aa16d363d82e95604251a7276ae Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Wed, 20 Mar 2024 17:28:46 +0900
Subject: [PATCH 091/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=EC=A2=8B?=
 =?UTF-8?q?=EC=95=84=EC=9A=94=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/user-book-like.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/user-book-like.html b/src/main/resources/templates/user-book-like.html
index 4482382a..0c9762c9 100644
--- a/src/main/resources/templates/user-book-like.html
+++ b/src/main/resources/templates/user-book-like.html
@@ -60,7 +60,7 @@ <h4 class="book-title-large-text">
                     </div>
                 </div>
             </div>
-            <div class="mt-3">
+            <div class="mt-3" th:block th:if="${bookLikeList.totalPages > 1}">
                 <div class="pagination">
                     <div class="page-item">
                         <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
@@ -70,10 +70,10 @@ <h4 class="book-title-large-text">
                         <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
                     </div>
                 </div>
-                <script src="/admin/js/page/setPrevious.js"></script>
-                <script src="/admin/js/page/setNext.js"></script>
-                <script src="/admin/js/page/setLastPage.js"></script>
             </div>
+            <script src="/admin/js/page/setPrevious.js"></script>
+            <script src="/admin/js/page/setNext.js"></script>
+            <script src="/admin/js/page/setLastPage.js"></script>
         </div>
     </section>
     <!-- End About Area -->

From 98f80a774f574119a84fd411002877888e9b4c21 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:42:55 +0900
Subject: [PATCH 092/147] =?UTF-8?q?feat:=20=EC=B0=B8=EA=B3=A0=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20readonly=20->=20required=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index bae95cff..4e6c37d4 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -96,7 +96,6 @@ <h2 class="accordion-header" id="headingOne">
                                             <td>
                                                 <button type="button" class="delete-btn" th:id="${address.id}" onclick="openWindow(this.getAttribute('id'))">수정</button>
                                             </td>
-
                                             <td>
                                                 <form  method="post" action="/user/address/delete">
                                                     <input type="hidden" name="addressId"
@@ -153,7 +152,7 @@ <h2 class="accordion-header" id="headingTwo">
                                         <div class="form-group">
                                             <label for="sample6_extraAddress">참고항목</label>
                                             <input type="text" id="sample6_extraAddress" name="reference"
-                                                   class="form-control" placeholder="참고항목" readonly>
+                                                   class="form-control" placeholder="참고항목" required>
                                         </div>
                                         <button type="submit" class="btn btn-primary">추가</button>
                                     </form>

From 1b82f12d5d4d877f9811b792d6699ba57a60fd4b Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:46:32 +0900
Subject: [PATCH 093/147] =?UTF-8?q?refactor:=20address.html=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20https=20=EB=A1=9C=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=EB=B3=B4=EB=82=B4=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index 4e6c37d4..8c6da7c9 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -243,7 +243,7 @@ <h3>나중에 추가</h3>
             <title>주소 수정</title>
         </head>
         <body>
-        <form id="modifyForm" method="post" action="/user/address/modify">
+        <form id="modifyForm" method="post" action="https:/https://www.my-books.store/user/address/modify">
             <!-- 주소 id를 hidden으로 전달 -->
             <input type="hidden" name="addressId" value="${addressId}"/>
 

From 1f6e0960ee1eaab697f3ddf3d0582a1a665868b1 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:51:26 +0900
Subject: [PATCH 094/147] =?UTF-8?q?refactor:=20address.html=20post=20url?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index 8c6da7c9..aa591d82 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -243,7 +243,7 @@ <h3>나중에 추가</h3>
             <title>주소 수정</title>
         </head>
         <body>
-        <form id="modifyForm" method="post" action="https:/https://www.my-books.store/user/address/modify">
+        <form id="modifyForm" method="post" action="https://www.my-books.store/user/address/modify">
             <!-- 주소 id를 hidden으로 전달 -->
             <input type="hidden" name="addressId" value="${addressId}"/>
 

From 85ca91ae000bece9b8bc6b19744256c5b6a1325d Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 17:59:47 +0900
Subject: [PATCH 095/147] =?UTF-8?q?refactor:=20address.html=20xhr=20?=
 =?UTF-8?q?=ED=8F=BC=EC=9A=94=EC=B2=AD=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index aa591d82..0df3f00f 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -271,7 +271,7 @@ <h3>나중에 추가</h3>
                 var form = event.target; // 폼 요소 가져오기
                 var formData = new FormData(form); // 폼 데이터 생성
                 var xhr = new XMLHttpRequest(); // XMLHttpRequest 객체 생성
-                xhr.open('POST', form.action); // 요청 설정
+                xhr.open('POST', 'https://www.my-books.store/user/address/modify'); // 요청 설정
                 xhr.onload = function () {
                     // 요청 완료 시
                     if (xhr.status === 200) {

From 032a98ade1eb3ec06cef33805734a9bc8f1742df Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 18:32:34 +0900
Subject: [PATCH 096/147] =?UTF-8?q?feat:=20address.html=20openWindow=20->.?=
 =?UTF-8?q?modal=20=20=EC=A3=BC=EC=86=8C=EC=88=98=EC=A0=95=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html | 153 ++++++++++++----------
 1 file changed, 85 insertions(+), 68 deletions(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index 0df3f00f..9e2f123c 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -47,6 +47,45 @@ <h2 class="accordion-header" id="headingOne">
                                  data-bs-parent="#accordionExample">
                                 <div class="accordion-body">
                                     <style>
+
+                                        /* 모달 스타일 */
+                                        .modal {
+                                            display: none; /* 모달을 기본적으로 숨김 */
+                                            position: fixed; /* 고정 위치 */
+                                            z-index: 1; /* 다른 요소들 위에 표시 */
+                                            left: 0;
+                                            top: 0;
+                                            width: 100%; /* 화면 전체 너비 */
+                                            height: 100%; /* 화면 전체 높이 */
+                                            overflow: auto; /* 스크롤 가능하도록 설정 */
+                                            background-color: rgb(0,0,0); /* 배경색 */
+                                            background-color: rgba(0,0,0,0.4); /* 배경 투명도 */
+                                        }
+
+                                        /* 모달 콘텐츠 스타일 */
+                                        .modal-content {
+                                            background-color: #fefefe; /* 배경색 */
+                                            margin: 15% auto; /* 화면 중앙에서 수직 및 수평 가운데로 정렬 */
+                                            padding: 20px;
+                                            border: 1px solid #888;
+                                            width: 80%; /* 모달의 너비 */
+                                        }
+
+                                        /* 닫기 버튼 스타일 */
+                                        .close {
+                                            color: #aaa;
+                                            float: right;
+                                            font-size: 28px;
+                                            font-weight: bold;
+                                        }
+
+                                        .close:hover,
+                                        .close:focus {
+                                            color: black;
+                                            text-decoration: none;
+                                            cursor: pointer;
+                                        }
+
                                         table {
                                             width: 100%;
                                             border-collapse: collapse;
@@ -93,8 +132,9 @@ <h2 class="accordion-header" id="headingOne">
                                             <td th:text="${address.detail}"></td>
                                             <td th:text="${address.number}"></td>
                                             <td th:text="${address.reference}"></td>
+                                            <!-- 버튼을 클릭하면 모달 열기 -->
                                             <td>
-                                                <button type="button" class="delete-btn" th:id="${address.id}" onclick="openWindow(this.getAttribute('id'))">수정</button>
+                                                <button type="button" class="delete-btn" th:id="${address.id}" onclick="openModal(this.getAttribute('id'))">수정</button>
                                             </td>
                                             <td>
                                                 <form  method="post" action="/user/address/delete">
@@ -107,6 +147,10 @@ <h2 class="accordion-header" id="headingOne">
                                         </tbody>
                                     </table>
 
+
+
+
+
                                 </div>
                             </div>
 
@@ -218,78 +262,35 @@ <h3>나중에 추가</h3>
             </div>
         </div>
     </section>
+
+    <!-- 모달 -->
+    <div id="myModal" class="modal">
+        <div class="modal-content">
+            <span class="close" onclick="closeModal()">&times;</span>
+            <!-- 모달 내용 -->
+            <h2>주소 수정</h2>
+            <form id="modifyForm" method="post" action="/user/address/modify">
+                <!-- 주소 id를 hidden으로 전달 -->
+                <input type="hidden" name="addressId" value="" id="addressId"/>
+
+                <!-- 수정 양식 내용 -->
+                <div class="form-group">
+                    <label for="modify_alias">별명</label>
+                    <input type="text" id="modify_alias" class="form-control" name="alias" placeholder="별명" required>
+                </div>
+                <div class="form-group">
+                    <label for="modify_sample6_detailAddress">상세주소</label>
+                    <input type="text" id="modify_sample6_detailAddress" class="form-control" name="detail" placeholder="상세주소" required>
+                </div>
+                <button type="submit" class="delete-btn">변경</button>
+            </form>
+        </div>
+    </div>
     <!-- End Team Area -->
 
     <script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
     <script>
 
-        var newWindow;
-
-        function openWindow(addressId) {
-            // 기존에 열려있는 창이 있다면 닫기
-            if (newWindow && !newWindow.closed) {
-                newWindow.close();
-            }
-
-            // 새 창 열기
-            newWindow = window.open("", "NewWindow", "width=400,height=100");
-
-            console.log(addressId)
-
-            // 새 창에 폼 내용 작성
-            var content = `
-        <html>
-        <head>
-            <title>주소 수정</title>
-        </head>
-        <body>
-        <form id="modifyForm" method="post" action="https://www.my-books.store/user/address/modify">
-            <!-- 주소 id를 hidden으로 전달 -->
-            <input type="hidden" name="addressId" value="${addressId}"/>
-
-            <!-- 수정 양식 내용 -->
-            <div class="form-group">
-                <label for="modify_alias">별명</label>
-                <input type="text" id="modify_alias" class="form-control" name="alias" placeholder="별명" required>
-            </div>
-            <div class="form-group">
-                <label for="modify_sample6_detailAddress">상세주소</label>
-                <input type="text" id="modify_sample6_detailAddress" class="form-control" name="detail" placeholder="상세주소" required>
-            </div>
-            <button type="submit">변경</button>
-        </form>
-        </body>
-        </html>
-    `;
-
-            // 새 창에 내용 쓰기
-            newWindow.document.write(content);
-
-            // 폼 제출 시 새 창 닫기
-            newWindow.document.getElementById('modifyForm').addEventListener('submit', function (event) {
-                event.preventDefault(); // 폼 제출 방지
-                var form = event.target; // 폼 요소 가져오기
-                var formData = new FormData(form); // 폼 데이터 생성
-                var xhr = new XMLHttpRequest(); // XMLHttpRequest 객체 생성
-                xhr.open('POST', 'https://www.my-books.store/user/address/modify'); // 요청 설정
-                xhr.onload = function () {
-                    // 요청 완료 시
-                    if (xhr.status === 200) {
-                        // 요청 성공 시
-                        newWindow.close(); // 새 창 닫기
-                        location.reload(); // 기존 페이지 새로고침
-                    }
-                };
-                xhr.send(formData); // 요청 전송
-            });
-        }
-
-        // 기존 창 닫기
-        function closeWindow() {
-            // 창 닫기
-            newWindow.close();
-        }
-
 
         function sample6_execDaumPostcode() {
             new daum.Postcode({
@@ -334,5 +335,21 @@ <h3>나중에 추가</h3>
             }
             return true;
         }
+
+        // 모달 열기 함수
+        function openModal(addressId) {
+            var modal = document.getElementById("myModal");
+            var addressIdField = document.getElementById("addressId");
+            addressIdField.value = addressId;
+            console.log(addressId)
+            modal.style.display = "block";
+        }
+
+        // 모달 닫기 함수
+        function closeModal() {
+            var modal = document.getElementById("myModal");
+            modal.style.display = "none";
+        }
+
     </script>
 </div>
\ No newline at end of file

From 92a454055b0da3e48159ff4018cd7fc5825017b5 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 18:46:48 +0900
Subject: [PATCH 097/147] =?UTF-8?q?feat:=20UserAddress=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EC=B6=94=EA=B0=80=ED=95=AD=EB=AA=A9?=
 =?UTF-8?q?=EB=8F=84=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user_address/request/UserAddressModifyRequest.java     | 4 +++-
 src/main/resources/templates/address.html                  | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/user_address/request/UserAddressModifyRequest.java b/src/main/java/store/mybooks/front/user_address/request/UserAddressModifyRequest.java
index b05ce9a3..82e36340 100644
--- a/src/main/java/store/mybooks/front/user_address/request/UserAddressModifyRequest.java
+++ b/src/main/java/store/mybooks/front/user_address/request/UserAddressModifyRequest.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * packageName    : store.mybooks.resource.user_address.dto.request<br>
@@ -24,4 +23,7 @@ public class UserAddressModifyRequest {
 
     private String detail;
 
+    private String reference;
+
+
 }
diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index 9e2f123c..99f6e2b5 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -282,6 +282,13 @@ <h2>주소 수정</h2>
                     <label for="modify_sample6_detailAddress">상세주소</label>
                     <input type="text" id="modify_sample6_detailAddress" class="form-control" name="detail" placeholder="상세주소" required>
                 </div>
+
+                <div class="form-group">
+                    <label for="modify_alias_extra">참고항목</label>
+                    <input type="text" id="modify_alias_extra" name="reference"
+                           class="form-control" placeholder="참고항목" required>
+                </div>
+
                 <button type="submit" class="delete-btn">변경</button>
             </form>
         </div>

From 9544cad5ee61a316fe11397e78c5966733cde6de Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 19:28:47 +0900
Subject: [PATCH 098/147] =?UTF-8?q?feat:=20Review=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=EC=82=AC=EC=A7=84=EB=8F=84=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

기존사진삭제 -> 새로운 사진 추가 의 형식으로 수정
---
 .../front/review/adaptor/ReviewAdaptor.java   | 37 ++++++++++++-------
 .../review/controller/ReviewController.java   |  8 +++-
 .../front/review/service/ReviewService.java   |  4 +-
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
index 9ea79ba9..98abc1ba 100644
--- a/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
+++ b/src/main/java/store/mybooks/front/review/adaptor/ReviewAdaptor.java
@@ -94,6 +94,30 @@ public void createReview(ReviewCreateRequest request, MultipartFile file) throws
         Utils.getResponseEntity(responseEntity, HttpStatus.CREATED);
     }
 
+    @RequiredAuthorization
+    public void modifyUserReview(Long reviewId, ReviewModifyRequest request, MultipartFile file) throws IOException {
+
+
+        HttpHeaders headers = Utils.getAuthHeader();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
+        parts.add("request", request);
+
+        if (!Objects.requireNonNull(file.getOriginalFilename()).isEmpty()) {
+            parts.add("contentImage", new FileSystemResource(convert(file)));
+        }
+        HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
+
+        ResponseEntity<ReviewModifyResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL_MEMBER_ID,
+                HttpMethod.PUT,
+                requestHttpEntity,
+                new ParameterizedTypeReference<>() {
+                },reviewId);
+
+        Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
     @RequiredAuthorization
     public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable) {
 
@@ -134,19 +158,6 @@ public ReviewGetResponse getUserReview(Long reviewId) {
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
 
-    @RequiredAuthorization
-    public void modifyUserReview(Long reviewId, ReviewModifyRequest request) {
-
-        ResponseEntity<ReviewModifyResponse> responseEntity =
-                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_MEMBER_ID,
-                        HttpMethod.PUT,
-                        new HttpEntity<>(request, Utils.getAuthHeader()),
-                        new ParameterizedTypeReference<>() {
-                        }, reviewId);
-
-        Utils.getResponseEntity(responseEntity, HttpStatus.OK);
-    }
-
     private File convert(MultipartFile file) throws IOException {
         File convFile = new File(Objects.requireNonNull(file.getOriginalFilename()));
         try (FileOutputStream fileOutputStream = new FileOutputStream(convFile)) {
diff --git a/src/main/java/store/mybooks/front/review/controller/ReviewController.java b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
index 8a5f7ecf..f6f403fe 100644
--- a/src/main/java/store/mybooks/front/review/controller/ReviewController.java
+++ b/src/main/java/store/mybooks/front/review/controller/ReviewController.java
@@ -46,6 +46,8 @@ public String reviewRegister(@ModelAttribute ReviewCreateRequest createRequest,
             throws IOException {
 
         // todo 이거 진짜로 바꾸기
+
+
         createRequest.setOrderDetailId(1L);
         reviewService.createReview(createRequest, contentImages);
         return "redirect:/review";
@@ -71,8 +73,10 @@ public String modifyForm(@RequestParam(name = "reviewId") Long reviewId, Model m
 
     @PostMapping("/modify")
     public String modifyReview(@RequestParam(name = "reviewId") Long reviewId,
-                               @ModelAttribute ReviewModifyRequest request) {
-        reviewService.modifyReview(reviewId, request);
+                               @ModelAttribute ReviewModifyRequest request,
+                               @RequestParam(value = "contentImage", required = false) MultipartFile contentImages)
+            throws IOException {
+        reviewService.modifyReview(reviewId, request,contentImages);
         return "redirect:/review";
     }
 
diff --git a/src/main/java/store/mybooks/front/review/service/ReviewService.java b/src/main/java/store/mybooks/front/review/service/ReviewService.java
index 2d18c6bc..6324cb22 100644
--- a/src/main/java/store/mybooks/front/review/service/ReviewService.java
+++ b/src/main/java/store/mybooks/front/review/service/ReviewService.java
@@ -35,8 +35,8 @@ public void createReview(ReviewCreateRequest request, MultipartFile file) throws
         reviewAdaptor.createReview(request,file);
     }
 
-    public void modifyReview(Long reviewId,ReviewModifyRequest request){
-        reviewAdaptor.modifyUserReview(reviewId,request);
+    public void modifyReview(Long reviewId,ReviewModifyRequest request,MultipartFile file) throws IOException {
+        reviewAdaptor.modifyUserReview(reviewId,request,file);
     }
     public PageResponse<ReviewGetResponse> getAllUserReview(Pageable pageable){
         return reviewAdaptor.getAllUserReview(pageable);

From a03d41ab5a1919daccb483d638823436b16d691d Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 19:29:07 +0900
Subject: [PATCH 099/147] =?UTF-8?q?feat:=20review-modify.html=20=EC=82=AC?=
 =?UTF-8?q?=EC=A7=84=EC=88=98=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review-modify.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/templates/review-modify.html b/src/main/resources/templates/review-modify.html
index 03a1f80a..c3cdc409 100644
--- a/src/main/resources/templates/review-modify.html
+++ b/src/main/resources/templates/review-modify.html
@@ -132,6 +132,10 @@ <h3>리뷰 정책</h3>
                                                 </div>
                                             </div>
 
+                                            <div class="col-12 file-container">
+                                                <input id="contentImage" name="contentImage" type="file" class="file" accept="image/*">
+                                            </div>
+
                                             <div class="col-12">
                                                 <div class="form-group button">
                                                     <button type="submit" class="btn ">리뷰 수정</button>

From 2ebc5bb83b3524d120659cd797f68e258981400a Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 21:06:42 +0900
Subject: [PATCH 100/147] =?UTF-8?q?refactor:=20review-modify.html=20?=
 =?UTF-8?q?=EB=A6=AC=EB=B7=B0=EC=A0=95=EC=B1=85=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review-modify.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/templates/review-modify.html b/src/main/resources/templates/review-modify.html
index c3cdc409..9987bafa 100644
--- a/src/main/resources/templates/review-modify.html
+++ b/src/main/resources/templates/review-modify.html
@@ -86,7 +86,6 @@ <h3>리뷰 정책</h3>
                                     <ul>
                                         <li>리뷰 작성시 자동으로 구매가 확정되며 환불이 불가능합니다.<br><br> 리뷰 : 200포인트 적립<br>리뷰 + 사진 첨부 :
                                             500포인트 적립
-                                            <br>사진은 최초 리뷰 작성 시 등록 가능하며 수정이 불가능합니다
                                             <br>별점 미선택시 5점으로 측정됩니다
                                         </li>
                                     </ul>

From 9eccd268bbd9a4bcfff0871dfbfbff647263e180 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Wed, 20 Mar 2024 21:07:57 +0900
Subject: [PATCH 101/147] =?UTF-8?q?refactor:=20review-register.html=20?=
 =?UTF-8?q?=EC=A0=95=EC=B1=85=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/review-register.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/templates/review-register.html b/src/main/resources/templates/review-register.html
index cde79e8e..2cdf047d 100644
--- a/src/main/resources/templates/review-register.html
+++ b/src/main/resources/templates/review-register.html
@@ -86,7 +86,6 @@ <h3>리뷰 정책</h3>
                                     <ul>
                                         <li>리뷰 작성시 자동으로 구매가 확정되며 환불이 불가능합니다.<br><br> 리뷰 : 200포인트 적립<br>리뷰 + 사진 첨부 :
                                             500포인트 적립
-                                            <br>사진은 최초 리뷰 작성 시 등록 가능하며 수정이 불가능합니다
                                             <br>별점 미선택시 5점으로 측정됩니다
                                         </li>
                                     </ul>

From 3c167e2f6ba442728470c3c55e1d9d8499cd0c0a Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Thu, 21 Mar 2024 00:32:55 +0900
Subject: [PATCH 102/147] =?UTF-8?q?refactor:=20=EC=83=81=EB=8B=A8=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=EC=B0=BD=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=8A=B9=EC=88=98=EB=AC=B8=EC=9E=90=20=EC=9E=85=EB=A0=A5=20?=
 =?UTF-8?q?=EB=B0=A9=EC=A7=80=20=EA=B2=80=EC=A6=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header/my-books-header-middle.html        | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
index 276038e9..8e16b753 100644
--- a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
+++ b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
@@ -21,26 +21,16 @@
                     <!-- Start Main Menu Search -->
                     <div class="main-menu-search">
                         <!-- navbar search start -->
-                        <div class="navbar-search search-style-5">
-                            <div class="search-select">
-                                <div class="select-position">
-                                    <select id="select1">
-                                        <option selected>All</option>
-                                        <option value="1">option 01</option>
-                                        <option value="2">option 02</option>
-                                        <option value="3">option 03</option>
-                                        <option value="4">option 04</option>
-                                        <option value="5">option 05</option>
-                                    </select>
+<!--                        <div class="navbar-search search-style-5">-->
+                            <form class="navbar-search search-style-5" id="searchForm" action="/search" method="get">
+                                <div class="search-input">
+                                    <input id="query" name="query" type="text" placeholder="검색어를 입력하세요">
                                 </div>
-                            </div>
-                            <div class="search-input">
-                                <input type="text" placeholder="Search">
-                            </div>
-                            <div class="search-btn">
-                                <button><i class="lni lni-search-alt"></i></button>
-                            </div>
-                        </div>
+                                <div class="search-btn">
+                                    <button type="submit"><i class="lni lni-search-alt"></i></button>
+                                </div>
+                            </form>
+<!--                        </div>-->
                         <!-- navbar search Ends -->
                     </div>
                     <!-- End Main Menu Search -->
@@ -122,6 +112,22 @@
         </div>
     </div>
     <!-- End Header Middle -->
+    <script>
+        document.getElementById('searchForm').addEventListener('submit', function(event) {
+            var input = document.getElementById('query').value.trim();
+
+            if (input === '') {
+                alert('검색어를 입력하세요');
+                event.preventDefault();
+            }
+            if (/[^a-zA-Z0-9ㄱ-ㅎㅏ-ㅣ가-힣]/.test(input)) {
+                alert('한글, 영문, 숫자만 입력할 수 있습니다');
+                event.preventDefault();
+            }
+        });
+
+    </script>
+
 </div>
 </body>
 

From 64d5f60480318452dcec88d3610dd5b5309aab06 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Thu, 21 Mar 2024 09:51:46 +0900
Subject: [PATCH 103/147] =?UTF-8?q?refactor:=20String=20url=20=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20Uri=20uri=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/elastic/adaptor/ElasticAdaptor.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
index 395d6a7e..78fdb640 100644
--- a/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
+++ b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
@@ -1,5 +1,7 @@
 package store.mybooks.front.elastic.adaptor;
 
+import java.net.URI;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
@@ -39,14 +41,16 @@ public class ElasticAdaptor {
 
 
     public PageResponse<BookBriefResponse> searchPaged(String query, Pageable pageable) {
-        String url = UriComponentsBuilder
+        URI url = UriComponentsBuilder
                 .fromHttpUrl(gatewayAdaptorProperties.getAddress() + "/api/searches")
                 .queryParam("query", query)
                 .queryParam("page", pageable.getPageNumber())
                 .queryParam("size", pageable.getPageSize())
-                .queryParam("sort", pageable.getSort())
+                .queryParam("sort",pageable.getSort().stream()
+                        .map(order -> order.getProperty() + "," + order.getDirection().toString().toLowerCase())
+                        .collect(Collectors.joining(",")))
                 .encode()
-                .toUriString();
+                .build().toUri();
 
         ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
                 url,

From 628aff556f373d082a93edde77e12d6b1d74be02 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Thu, 21 Mar 2024 09:52:18 +0900
Subject: [PATCH 104/147] =?UTF-8?q?refactor:=20PageableDefault=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/elastic/controller/ElasticController.java       | 7 ++++---
 .../mybooks/front/elastic/service/ElasticService.java     | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
index fb193631..2f172b89 100644
--- a/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
+++ b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import store.mybooks.front.admin.book.model.response.BookBriefResponse;
 import store.mybooks.front.elastic.service.ElasticService;
 import store.mybooks.front.pageable.dto.response.PageResponse;
@@ -31,9 +32,9 @@ public class ElasticController {
     private final ElasticService elasticService;
 
     @GetMapping
-    public String getSearchResultPage(@PathVariable("query") String query, @PageableDefault(size = 8, sort = "viewCount", direction = Sort.Direction.DESC) Pageable pageable, Model model) {
-//        PageResponse<BookBriefResponse> result = elasticService.getSearchResultPage(query, type);
-//        model.addAttribute("books", result);
+    public String getSearchResultPage(@RequestParam("query") String query, @PageableDefault(size = 8, sort = "book_view_count", direction = Sort.Direction.DESC) Pageable pageable, Model model) {
+        PageResponse<BookBriefResponse> result = elasticService.getSearchResultPage(query, pageable);
+        model.addAttribute("books", result);
         return "search-display";
     }
 }
diff --git a/src/main/java/store/mybooks/front/elastic/service/ElasticService.java b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
index a6c17878..52553b62 100644
--- a/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
+++ b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
@@ -4,12 +4,12 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.book.model.response.BookBriefResponse;
 import store.mybooks.front.elastic.adaptor.ElasticAdaptor;
 import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.pageable.dto.response.Pageable;
 
 /**
  * packageName    : store.mybooks.front.elastic.service <br/>
@@ -27,7 +27,7 @@
 public class ElasticService {
     private final ElasticAdaptor elasticAdaptor;
 
-//    public PageResponse<BookBriefResponse> getSearchResultPage(String query, String type) {
-//        return elasticAdaptor.searchPaged(query, pageable);
-//    }
+    public PageResponse<BookBriefResponse> getSearchResultPage(String query, Pageable pageable) {
+        return elasticAdaptor.searchPaged(query, pageable);
+    }
 }

From 6d1af6599887069fd097840684b1aaea38be0474 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Thu, 21 Mar 2024 10:21:46 +0900
Subject: [PATCH 105/147] =?UTF-8?q?refactor:=20=EA=B2=80=EC=83=89=EC=96=B4?=
 =?UTF-8?q?=20=EA=B3=84=EC=86=8D=20=EC=9C=A0=EC=A7=80=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/global/GlobalControllerAdvice.java | 7 ++++++-
 .../fragment/my-book/header/my-books-header-middle.html    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index 31b94ffc..6e3cd874 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -5,6 +5,8 @@
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.HttpClientErrorException;
 import store.mybooks.front.auth.exception.AccessIdForbiddenException;
 import store.mybooks.front.auth.exception.AuthenticationIsNotValidException;
@@ -67,5 +69,8 @@ public String handleAuthException(RuntimeException ex, HttpServletResponse respo
         return "redirect:/";
     }
 
-
+    @ModelAttribute("query")
+    public String lastSearchMemory(@RequestParam(value = "query", required = false) String query) {
+        return query;
+    }
 }
diff --git a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
index 8e16b753..dd6b318a 100644
--- a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
+++ b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-middle.html
@@ -24,7 +24,7 @@
 <!--                        <div class="navbar-search search-style-5">-->
                             <form class="navbar-search search-style-5" id="searchForm" action="/search" method="get">
                                 <div class="search-input">
-                                    <input id="query" name="query" type="text" placeholder="검색어를 입력하세요">
+                                    <input id="query" name="query" type="text" th:value="${query}" placeholder="검색어를 입력하세요">
                                 </div>
                                 <div class="search-btn">
                                     <button type="submit"><i class="lni lni-search-alt"></i></button>

From 3a02378313afc976f3d6fcdea34b8d0692291ab5 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Thu, 21 Mar 2024 10:22:13 +0900
Subject: [PATCH 106/147] =?UTF-8?q?refactor:=20sort=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/elastic/adaptor/ElasticAdaptor.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
index 78fdb640..578d0b2f 100644
--- a/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
+++ b/src/main/java/store/mybooks/front/elastic/adaptor/ElasticAdaptor.java
@@ -41,16 +41,14 @@ public class ElasticAdaptor {
 
 
     public PageResponse<BookBriefResponse> searchPaged(String query, Pageable pageable) {
+        Sort.Order order = pageable.getSort().iterator().next();
         URI url = UriComponentsBuilder
                 .fromHttpUrl(gatewayAdaptorProperties.getAddress() + "/api/searches")
                 .queryParam("query", query)
                 .queryParam("page", pageable.getPageNumber())
                 .queryParam("size", pageable.getPageSize())
-                .queryParam("sort",pageable.getSort().stream()
-                        .map(order -> order.getProperty() + "," + order.getDirection().toString().toLowerCase())
-                        .collect(Collectors.joining(",")))
-                .encode()
-                .build().toUri();
+                .queryParam("sort", order.getProperty() + "," + order.getDirection().toString().toLowerCase())
+                .encode().build().toUri();
 
         ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
                 url,

From 46cd150ed8f458af5d385ba96ac70661676d4873 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Thu, 21 Mar 2024 13:50:13 +0900
Subject: [PATCH 107/147] =?UTF-8?q?feat:=20=EA=B2=B0=EC=A0=9C=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mvnw                                          |  2 +-
 .../front/admin/wrap/adaptor/WrapAdaptor.java | 10 +-
 .../mybooks/front/cart/domain/CartDetail.java |  8 +-
 .../front/order/adaptor/OrderAdaptor.java     | 21 ++++-
 .../order/controller/OrderController.java     | 12 +--
 .../order/dto/request/BookInfoRequest.java    |  2 -
 .../dto/request/BookOrderCreateRequest.java   |  3 +
 .../dto/request/BookOrderDirectRequest.java   |  2 +
 .../order/dto/request/BookOrderRequest.java   |  2 -
 .../dto/response/BookOrderDetailResponse.java |  4 +-
 .../dto/response/BookOrderInfoResponse.java   |  3 +-
 .../front/order/service/OrderService.java     |  8 ++
 .../mybooks/front/order/utils/OrderUtils.java |  2 +-
 .../front/payment/adaptor/PayAdaptor.java     | 72 ++++++++++++--
 .../payment/controller/PayController.java     | 12 ++-
 .../payment/controller/PayRestController.java | 44 +++++++--
 .../payment/dto/request/PayCreateRequest.java | 27 ++++++
 .../dto/request/TossPaymentRequest.java       |  7 +-
 .../dto/response/PayCreateResponse.java       | 23 +++++
 .../dto/response/TossPaymentResponse.java     | 25 ++---
 .../front/payment/service/PayService.java     | 15 ++-
 .../adaptor/UserCouponAdaptor.java            |  2 +-
 .../templates/assets/js/order/order.js        | 19 ++--
 .../templates/assets/js/payment/payment.js    | 63 +++++++++----
 .../templates/assets/js/payment/success.js    | 86 +++++++++++++++++
 .../resources/templates/checkout-coupon.html  | 19 +++-
 src/main/resources/templates/checkout.html    | 46 ++++++---
 .../fragment/my-book/my-books-footer.html     | 10 +-
 src/main/resources/templates/payment.html     |  3 +-
 src/main/resources/templates/success.html     | 93 ++++++-------------
 30 files changed, 468 insertions(+), 177 deletions(-)
 create mode 100644 src/main/java/store/mybooks/front/payment/dto/request/PayCreateRequest.java
 create mode 100644 src/main/java/store/mybooks/front/payment/dto/response/PayCreateResponse.java
 create mode 100644 src/main/resources/templates/assets/js/payment/success.js

diff --git a/mvnw b/mvnw
index 8a8fb228..994b6bb9 100755
--- a/mvnw
+++ b/mvnw
@@ -220,7 +220,7 @@ else
     else
       jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     fi
-    while IFS="=" read key value; do
+    while IFS="=" read key ; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
       esac
     done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
diff --git a/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java b/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
index a9bec665..9f02a31a 100644
--- a/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
+++ b/src/main/java/store/mybooks/front/admin/wrap/adaptor/WrapAdaptor.java
@@ -7,6 +7,7 @@
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
 import store.mybooks.front.admin.wrap.dto.request.WrapCreateRequest;
 import store.mybooks.front.admin.wrap.dto.request.WrapModifyRequest;
 import store.mybooks.front.admin.wrap.dto.response.WrapCreateResponse;
@@ -35,8 +36,13 @@ public class WrapAdaptor {
     private static final String URL = "/api/wraps";
 
     public WrapResponse getWrap(Integer id) {
-        String url = gatewayAdaptorProperties.getAddress() + URL + "/{id}";
-        ResponseEntity<WrapResponse> exchange = restTemplate.exchange(url,
+        String uri = UriComponentsBuilder
+                .fromUriString(gatewayAdaptorProperties.getAddress())
+                .path(URL + "/{id}")
+                .build().expand(id).toString();
+
+
+        ResponseEntity<WrapResponse> exchange = restTemplate.exchange(uri,
                 HttpMethod.GET,
                 null,
                 new ParameterizedTypeReference<WrapResponse>() {
diff --git a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
index 172f1da9..13862717 100644
--- a/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
+++ b/src/main/java/store/mybooks/front/cart/domain/CartDetail.java
@@ -1,9 +1,6 @@
 package store.mybooks.front.cart.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 /**
  * packageName    : store.mybooks.front.cart <br/>
@@ -20,9 +17,10 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode
+@ToString
 public class CartDetail {
     private Long bookId;
-    private int cartDetailAmount;
+    private Integer cartDetailAmount;
     private String name;
     private String bookImage;
     private Integer cost;
diff --git a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
index ee438c34..7bd66df7 100644
--- a/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
+++ b/src/main/java/store/mybooks/front/order/adaptor/OrderAdaptor.java
@@ -13,6 +13,7 @@
 import store.mybooks.front.order.dto.request.BookOrderCreateRequest;
 import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
+import store.mybooks.front.order.dto.response.BookOrderPayInfoResponse;
 import store.mybooks.front.utils.Utils;
 
 /**
@@ -42,14 +43,14 @@ public class OrderAdaptor {
      *
      * @param id 주소 아이디
      */
-    public void checkOrderUserAddressInfo(Long id) {
-        ResponseEntity<Object> exchange = restTemplate.exchange(
+    public Boolean checkOrderUserAddressInfo(Long id) {
+        ResponseEntity<Boolean> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + URL + "/check/address/{id}",
                 HttpMethod.GET,
                 null,
-                new ParameterizedTypeReference<Object>() {
+                new ParameterizedTypeReference<Boolean>() {
                 }, id);
-        Utils.getResponseEntity(exchange, HttpStatus.NO_CONTENT);
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
 
 
@@ -87,4 +88,16 @@ public BookOrderInfoResponse getPayBookOrderInfo(String orderNumber) {
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
 
+    public BookOrderPayInfoResponse getBookOrderPayInfo(String orderNumber) {
+        ResponseEntity<BookOrderPayInfoResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/info/{orderNumber}/pay",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<BookOrderPayInfoResponse>() {
+                }, orderNumber
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index b97b5fb6..1598f322 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -10,7 +10,6 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import store.mybooks.front.admin.delivery_rule.dto.DeliveryRuleResponse;
 import store.mybooks.front.admin.delivery_rule.service.DeliveryRuleService;
 import store.mybooks.front.admin.wrap.dto.response.WrapResponse;
@@ -18,7 +17,6 @@
 import store.mybooks.front.cart.domain.CartDetail;
 import store.mybooks.front.cart.service.CartNonUserService;
 import store.mybooks.front.cart.service.CartUserService;
-import store.mybooks.front.order.dto.request.BookOrderDirectRequest;
 import store.mybooks.front.order.dto.request.BookOrderRequest;
 import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.order.service.OrderInfoCheckService;
@@ -154,13 +152,12 @@ public String viewCoupon(ModelMap modelMap,
      * author : minsu11<br>
      * description : 장바구니를 통한 주문.
      *
-     * @param request  the requestx
      * @param modelMap the model map
      * @return the string
      */
     @GetMapping("/cart/checkout")
-    public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
-                                ModelMap modelMap) {
+    public String viewOrderPage(
+            ModelMap modelMap) {
         PointResponse pointResponse = userPointService.getPointsHeld();
         LocalDate localDate = LocalDate.now();
         UserGetResponse user = userAdaptor.findUser();
@@ -169,17 +166,14 @@ public String viewOrderPage(@ModelAttribute BookOrderDirectRequest request,
         modelMap.put("bookLists", bookFromCart);
         modelMap.put("totalCost", orderService.calculateTotalCost(bookFromCart));
         modelMap.put("point", pointResponse.getRemainingPoint());
-        modelMap.put("bookCostList", orderService.calculateBooksCost(bookFromCart));
         modelMap.put("localDate", localDate);
         modelMap.put("user", user);
         modelMap.put("delivery", deliveryRule);
-        modelMap.put("quantity", request.getQuantity());
         return "checkout";
     }
 
     @PostMapping("/order")
-    public String doOrder(@ModelAttribute BookOrderRequest orderRequest,
-                          RedirectAttributes redirectAttributes) {
+    public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
         log.info("값 : {}", orderRequest.toString());
         List<CartDetail> cart = cartUserService.getBookFromCart();
         orderInfoCheckService.checkModulation(orderRequest, cart);
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
index 4da7f350..d3ad9a15 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
@@ -3,7 +3,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -19,7 +18,6 @@
 @Getter
 @NoArgsConstructor
 @Setter
-@ToString
 public class BookInfoRequest {
     private Long bookId;
     private Integer saleCost;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
index 1b659f13..e31579d6 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -17,6 +18,7 @@
  */
 @Getter
 @AllArgsConstructor
+@ToString
 public class BookOrderCreateRequest {
     private List<BookInfoRequest> bookInfoList;
     private OrderInfoRequest orderInfo;
@@ -26,4 +28,5 @@ public class BookOrderCreateRequest {
     private Integer wrapCost;
     private Integer totalCost;
 
+
 }
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
index dfbace75..42168119 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.dto.request<br>
@@ -16,6 +17,7 @@
  */
 @Getter
 @Setter
+@ToString
 public class BookOrderDirectRequest {
     private Long id;
     private Integer saleCost;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 008edd3b..68cd5064 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -4,7 +4,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -20,7 +19,6 @@
 @Getter
 @NoArgsConstructor
 @Setter
-@ToString
 public class BookOrderRequest {
     private List<BookInfoRequest> bookInfoList;
     private OrderInfoRequest orderInfo;
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
index a78cd3c7..1b8dd258 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderDetailResponse.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
@@ -17,8 +16,9 @@
  */
 @Getter
 @AllArgsConstructor
-@ToString
 public class BookOrderDetailResponse {
+    private Long id;
+    private Long couponId;
     private String bookName;
     private Integer cost;
     private Boolean isCouponUsed;
diff --git a/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
index 99cb603c..3bcc9d27 100644
--- a/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
+++ b/src/main/java/store/mybooks/front/order/dto/response/BookOrderInfoResponse.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.response<br>
@@ -18,10 +17,10 @@
  */
 @Getter
 @AllArgsConstructor
-@ToString
 public class BookOrderInfoResponse {
     private String orderStatus;
     private String number;
     private Integer totalCost;
+    private Boolean isCouponUsed;
     private List<BookOrderDetailResponse> orderDetails;
 }
diff --git a/src/main/java/store/mybooks/front/order/service/OrderService.java b/src/main/java/store/mybooks/front/order/service/OrderService.java
index 113398a8..4b33c090 100644
--- a/src/main/java/store/mybooks/front/order/service/OrderService.java
+++ b/src/main/java/store/mybooks/front/order/service/OrderService.java
@@ -4,6 +4,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.admin.book.model.response.BookDetailResponse;
 import store.mybooks.front.admin.wrap.adaptor.WrapAdaptor;
@@ -17,6 +18,7 @@
 import store.mybooks.front.order.dto.request.OrderInfoRequest;
 import store.mybooks.front.order.dto.response.BookOrderCreateResponse;
 import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
+import store.mybooks.front.order.dto.response.BookOrderPayInfoResponse;
 import store.mybooks.front.order.utils.OrderUtils;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user_address.adaptor.UserAddressAdaptor;
@@ -34,6 +36,7 @@
  * -----------------------------------------------------------<br>
  * 3/5/24        minsu11       최초 생성<br>
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class OrderService {
@@ -165,6 +168,8 @@ public BookOrderCreateResponse createOrder(List<BookInfoRequest> bookInfo,
 
         BookOrderCreateRequest request = new BookOrderCreateRequest(bookInfo, orderInfo,
                 orderNumber, point, couponCost, wrapCost, totalCost);
+        log.debug("주문 저장할 데이터: {}", request);
+        
         return orderAdapter.createBookOrder(request);
     }
 
@@ -173,4 +178,7 @@ public BookOrderInfoResponse getPayBookOrderInfo(String orderNumber) {
 
     }
 
+    public BookOrderPayInfoResponse getBookOrderPayInfo(String orderNumber) {
+        return orderAdapter.getBookOrderPayInfo(orderNumber);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
index 428f9970..58b499b5 100644
--- a/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
+++ b/src/main/java/store/mybooks/front/order/utils/OrderUtils.java
@@ -34,7 +34,7 @@ public static String createOrderNumber() {
                 .ints(leftLimit, rightLimit + 1)
                 .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97))
                 .limit(targetStringLength)
-                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .collect(StringBuffer::new, StringBuffer::appendCodePoint, StringBuffer::append)
                 .toString();
         return orderNumber.append(time)
                 .append(randomStr).toString();
diff --git a/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java b/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
index 5c7823d2..3b478028 100644
--- a/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
+++ b/src/main/java/store/mybooks/front/payment/adaptor/PayAdaptor.java
@@ -2,14 +2,17 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.Collections;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
 import store.mybooks.front.config.TossAppKey;
+import store.mybooks.front.payment.dto.request.PayCreateRequest;
 import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.PayCreateResponse;
 import store.mybooks.front.payment.dto.response.TossPaymentResponse;
 import store.mybooks.front.payment.exception.PayFailedException;
 import store.mybooks.front.utils.Utils;
@@ -30,22 +33,23 @@
 public class PayAdaptor {
     private final TossAppKey tossAppKey;
     private final RestTemplate restTemplate;
-    private final static String TOSS_URL = "https://api.tosspayments.com/v1/payments/confirm";
+    private static final String TOSS_URL = "https://api.tosspayments.com/v1/payments";
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+    private static final String URL = "/api/pays";
+    private static final String MEMBER_URL = "/api/member/pays";
 
     public TossPaymentResponse confirmPayment(TossPaymentRequest request) {
-        HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = Utils.getHttpHeader();
         String apiKey = tossAppKey.getKey();
 
         Base64.Encoder encoder = Base64.getEncoder();
         byte[] encodedBytes = encoder.encode((apiKey + ":").getBytes(StandardCharsets.UTF_8));
         String authorizations = new String(encodedBytes, 0, encodedBytes.length);
 
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
         headers.setBasicAuth(authorizations);
         try {
             ResponseEntity<TossPaymentResponse> exchange = restTemplate.exchange(
-                    TOSS_URL,
+                    TOSS_URL + "/confirm",
                     HttpMethod.POST,
                     new HttpEntity<>(request, headers),
                     new ParameterizedTypeReference<TossPaymentResponse>() {
@@ -57,4 +61,60 @@ public TossPaymentResponse confirmPayment(TossPaymentRequest request) {
         }
     }
 
+
+    public TossPaymentResponse getTossPaymentResponse(TossPaymentRequest request) {
+        HttpHeaders headers = new HttpHeaders();
+
+        Base64.Encoder encoder = Base64.getEncoder();
+        byte[] encodedBytes = encoder.encode((tossAppKey.getKey() + ":").getBytes(StandardCharsets.UTF_8));
+        String authorizations = new String(encodedBytes, 0, encodedBytes.length);
+
+        headers.setBasicAuth(authorizations);
+        try {
+            ResponseEntity<TossPaymentResponse> exchange = restTemplate.exchange(
+                    TOSS_URL + "/" + request.getPaymentKey(),
+                    HttpMethod.GET,
+                    new HttpEntity<>(request, headers),
+                    new ParameterizedTypeReference<TossPaymentResponse>() {
+                    }
+            );
+            return Utils.getResponseEntity(exchange, HttpStatus.OK);
+        } catch (Exception e) {
+            throw new PayFailedException();
+        }
+    }
+
+    /**
+     * methodName : createPayment<br>
+     * author : minsu11<br>
+     * description : 결제 정보 저장.
+     * <br>.
+     *
+     * @param request the request
+     * @return the pay create response
+     */
+//    public PayCreateResponse createPayment(PayCreateRequest request) {
+//        HttpHeaders headers = Utils.getHttpHeader();
+//        HttpEntity<PayCreateRequest> httpEntity = new HttpEntity<>(request, headers);
+//        ResponseEntity<PayCreateResponse> exchange = restTemplate.exchange(
+//                gatewayAdaptorProperties.getAddress() + URL,
+//                HttpMethod.POST,
+//                httpEntity,
+//                new ParameterizedTypeReference<PayCreateResponse>() {
+//                }
+//        );
+//        return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
+//    }
+    @RequiredAuthorization
+    public PayCreateResponse createResponse(PayCreateRequest request) {
+        HttpEntity<PayCreateRequest> httpEntity = new HttpEntity<>(request, Utils.getAuthHeader());
+        ResponseEntity<PayCreateResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + MEMBER_URL,
+                HttpMethod.POST,
+                httpEntity,
+                new ParameterizedTypeReference<PayCreateResponse>() {
+                }
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.CREATED);
+    }
 }
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayController.java b/src/main/java/store/mybooks/front/payment/controller/PayController.java
index 58f8d662..04a69172 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayController.java
@@ -7,11 +7,13 @@
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import store.mybooks.front.config.TossAppKey;
 import store.mybooks.front.order.dto.response.BookOrderInfoResponse;
 import store.mybooks.front.order.service.OrderService;
+import store.mybooks.front.payment.dto.request.TossPaymentRequest;
 import store.mybooks.front.payment.service.PayService;
 
 
@@ -45,20 +47,20 @@ public class PayController {
      * @throws Exception
      */
     @GetMapping("/success")
-    public String paymentRequest(HttpServletRequest request, Model model) throws Exception {
+    public String paymentRequest(ModelMap model,
+                                 @ModelAttribute TossPaymentRequest request
+    ) {
         return "success";
     }
 
     @GetMapping("/{orderNumber}")
     public String index(HttpServletRequest request, ModelMap model,
                         @PathVariable(name = "orderNumber") String orderNumber) throws Exception {
-        log.info("orderNumber: {}", orderNumber);
         BookOrderInfoResponse bookOrderInfoResponse = orderService.getPayBookOrderInfo(orderNumber);
-        log.info("주문 정보: {}", bookOrderInfoResponse);
         model.put("tossValue", tossAppKey.getClientKey());
         model.put("orderInfo", bookOrderInfoResponse);
         model.put("isCouponUsed", payService.checkCouponUsed(bookOrderInfoResponse.getOrderDetails()));
-
+        model.put("orderNumber", orderNumber);
         return "payment";
     }
 
@@ -81,4 +83,6 @@ public String failPayment(HttpServletRequest request, Model model) throws Except
 
         return "fail";
     }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/payment/controller/PayRestController.java b/src/main/java/store/mybooks/front/payment/controller/PayRestController.java
index 17a617b1..5ccd8907 100644
--- a/src/main/java/store/mybooks/front/payment/controller/PayRestController.java
+++ b/src/main/java/store/mybooks/front/payment/controller/PayRestController.java
@@ -4,11 +4,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import store.mybooks.front.cart.service.CartUserService;
+import store.mybooks.front.order.dto.response.BookOrderPayInfoResponse;
+import store.mybooks.front.order.service.OrderService;
+import store.mybooks.front.payment.adaptor.PayAdaptor;
+import store.mybooks.front.payment.dto.request.PayCreateRequest;
 import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.PayCreateResponse;
 import store.mybooks.front.payment.dto.response.TossPaymentResponse;
 import store.mybooks.front.payment.service.PayService;
 
@@ -29,14 +32,39 @@
 @RequestMapping("/pay")
 public class PayRestController {
     private final PayService payService;
+    private final OrderService orderService;
+    private final PayAdaptor payAdaptor;
+    private final CartUserService cartUserService;
 
     @PostMapping("/confirm")
-    public ResponseEntity<TossPaymentResponse> confirmPayment(@RequestBody TossPaymentRequest request) throws Exception {
-        TossPaymentResponse tossPaymentResponse = payService.getTossPayment(request);
-        log.info("toss value: {}", tossPaymentResponse);
+    public ResponseEntity<TossPaymentResponse> confirmPayment(@RequestBody TossPaymentRequest request) {
 
-        return ResponseEntity.status(HttpStatus.OK).body(tossPaymentResponse);
+        return ResponseEntity.status(HttpStatus.OK).body(payService.createTossPayment(request));
     }
 
+    @GetMapping("/info/{orderNumber}")
+    public ResponseEntity<BookOrderPayInfoResponse> getBookOrderPayInfo(@PathVariable(name = "orderNumber") String orderNumber) {
+        BookOrderPayInfoResponse orderPayInfoResponse = orderService.getBookOrderPayInfo(orderNumber);
+        log.info("결제 정보 value: {}", orderPayInfoResponse);
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(orderPayInfoResponse);
+    }
+
+    @PostMapping("/info/success")
+    public ResponseEntity<PayCreateResponse> payProcessing(@RequestBody PayCreateRequest payCreateRequest) {
+        log.debug("장바구니 전");
+        PayCreateResponse response = payAdaptor.createResponse(payCreateRequest);
+        log.debug("장바구니가 찍히나?");
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(response);
+    }
 
+    @GetMapping("/info/cart")
+    public ResponseEntity<Void> removeUserCart() {
+        log.debug("장바구니 삭제 호출 전");
+        cartUserService.deleteAllBookFromCart();
+        log.debug("장바구니 삭제 호출 후");
+        return ResponseEntity.status(HttpStatus.OK)
+                .build();
+    }
 }
diff --git a/src/main/java/store/mybooks/front/payment/dto/request/PayCreateRequest.java b/src/main/java/store/mybooks/front/payment/dto/request/PayCreateRequest.java
new file mode 100644
index 00000000..6e40bf95
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/dto/request/PayCreateRequest.java
@@ -0,0 +1,27 @@
+package store.mybooks.front.payment.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.front.payment.dto.request<br>
+ * fileName       : PatCreateRequest<br>
+ * author         : minsu11<br>
+ * date           : 3/19/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/19/24        minsu11       최초 생성<br>
+ */
+
+@Getter
+@NoArgsConstructor
+public class PayCreateRequest {
+    private String orderNumber;
+    private String paymentKey;
+    private String status;
+    private String requestedAt;
+    private Integer totalAmount;
+    private String method;
+}
diff --git a/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java b/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
index 6ee24d71..3b0276f3 100644
--- a/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
+++ b/src/main/java/store/mybooks/front/payment/dto/request/TossPaymentRequest.java
@@ -1,7 +1,7 @@
 package store.mybooks.front.payment.dto.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * packageName    : store.mybooks.front.payment.dto.request<br>
@@ -15,11 +15,12 @@
  * 3/18/24        minsu11       최초 생성<br>
  */
 @Getter
-@NoArgsConstructor
+@AllArgsConstructor
 public class TossPaymentRequest {
     private String paymentKey;
     private String orderId;
-    private String amount;
+    private Integer amount;
+    private String paymentType;
 
 
 }
diff --git a/src/main/java/store/mybooks/front/payment/dto/response/PayCreateResponse.java b/src/main/java/store/mybooks/front/payment/dto/response/PayCreateResponse.java
new file mode 100644
index 00000000..8d3b881a
--- /dev/null
+++ b/src/main/java/store/mybooks/front/payment/dto/response/PayCreateResponse.java
@@ -0,0 +1,23 @@
+package store.mybooks.front.payment.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.front.payment.dto.response<br>
+ * fileName       : PayCreateResponse<br>
+ * author         : minsu11<br>
+ * date           : 3/19/24<br>
+ * description    :
+ * ===========================================================<br>
+ * DATE              AUTHOR             NOTE<br>
+ * -----------------------------------------------------------<br>
+ * 3/19/24        minsu11       최초 생성<br>
+ */
+@Getter
+@AllArgsConstructor
+public class PayCreateResponse {
+    private Long payId;
+    private String paymentKey;
+    private Integer totalAmount;
+}
diff --git a/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java b/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
index 3a94d766..d5d0d53a 100644
--- a/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
+++ b/src/main/java/store/mybooks/front/payment/dto/response/TossPaymentResponse.java
@@ -1,34 +1,35 @@
 package store.mybooks.front.payment.dto.response;
 
-import lombok.Data;
+import lombok.*;
 
 /**
  * packageName    : store.mybooks.front.payment.dto.response<br>
  * fileName       : TossPaymentResponse<br>
  * author         : minsu11<br>
  * date           : 3/18/24<br>
- * description    :
+ * description    : 결제 후 toss에서 제공하는 타입
  * ===========================================================<br>
  * DATE              AUTHOR             NOTE<br>
  * -----------------------------------------------------------<br>
  * 3/18/24        minsu11       최초 생성<br>
  */
-@Data
+@Getter
+@NoArgsConstructor
+@Setter
+@AllArgsConstructor
+@ToString
 public class TossPaymentResponse {
-
-    String mid; // 가맹점 Id -> tosspayments
-    String version; // Payment 객체 응답 버전
+    String mid;
+    String version;
     String paymentKey;
     String orderId;
     String orderName;
-    String method; // 결제 수단
-    String totalAmount;
+    String method;
+    Integer totalAmount;
     String balanceAmount;
     String suppliedAmount;
-    String vat; // 부가가치세
-    String status; // 결제 처리 상태
+    String status;
     String requestedAt;
     String approvedAt;
-    String type; // 결제 타입 정보 (NOMAL / BILLING / CONNECTPAY)
-
+    String type;
 }
diff --git a/src/main/java/store/mybooks/front/payment/service/PayService.java b/src/main/java/store/mybooks/front/payment/service/PayService.java
index aac38a3f..f0608625 100644
--- a/src/main/java/store/mybooks/front/payment/service/PayService.java
+++ b/src/main/java/store/mybooks/front/payment/service/PayService.java
@@ -2,10 +2,13 @@
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import store.mybooks.front.order.dto.response.BookOrderDetailResponse;
 import store.mybooks.front.payment.adaptor.PayAdaptor;
+import store.mybooks.front.payment.dto.request.PayCreateRequest;
 import store.mybooks.front.payment.dto.request.TossPaymentRequest;
+import store.mybooks.front.payment.dto.response.PayCreateResponse;
 import store.mybooks.front.payment.dto.response.TossPaymentResponse;
 
 /**
@@ -19,6 +22,7 @@
  * -----------------------------------------------------------<br>
  * 3/18/24        minsu11       최초 생성<br>
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class PayService {
@@ -40,8 +44,17 @@ public boolean checkCouponUsed(List<BookOrderDetailResponse> orderInfoResponseLi
         return false;
     }
 
-    public TossPaymentResponse getTossPayment(TossPaymentRequest request) {
+    public TossPaymentResponse createTossPayment(TossPaymentRequest request) {
         return payAdaptor.confirmPayment(request);
     }
 
+    public PayCreateResponse createPayment(PayCreateRequest request) {
+        return payAdaptor.createResponse(request);
+    }
+
+    public TossPaymentResponse getTossPayment(TossPaymentRequest request) {
+        return payAdaptor.getTossPaymentResponse(request);
+    }
+
+
 }
diff --git a/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java b/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
index bb9bc2a6..c931fe97 100644
--- a/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
+++ b/src/main/java/store/mybooks/front/user_coupon/adaptor/UserCouponAdaptor.java
@@ -121,7 +121,7 @@ public UserCouponResponse getUserCouponResponse(Long id) {
         HttpEntity<Object> requestEntity = new HttpEntity<>(Utils.getAuthHeader());
 
         ResponseEntity<UserCouponResponse> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + URL_USER + "/" + id,
+                gatewayAdaptorProperties.getAddress() + URL_USER + "/{id}",
                 HttpMethod.GET,
                 requestEntity,
                 new ParameterizedTypeReference<UserCouponResponse>() {
diff --git a/src/main/resources/templates/assets/js/order/order.js b/src/main/resources/templates/assets/js/order/order.js
index c45a27b8..65d0f2b0 100644
--- a/src/main/resources/templates/assets/js/order/order.js
+++ b/src/main/resources/templates/assets/js/order/order.js
@@ -11,6 +11,18 @@ document.addEventListener('DOMContentLoaded', function (event
     const date = document.getElementById('delivery-date-id');
     const submitForm = document.getElementById('order-pay-form')
     let data = 0;
+    const payBtn = document.getElementById('pay-btn');
+    payBtn.addEventListener('submit', function () {
+        const couponCost = document.getElementById('coupon-cost')
+        console.log(wrapCost.value);
+        alert(wrapCost.value);
+        if (couponCost.value < 0 || wrapCost.value < 0) {
+            alert("음수를 입력했습니다.")
+            event.preventDefault()
+            return false;
+        }
+    })
+
 
     submitForm.addEventListener("keydown", function (event) {
         if (event.keyCode === 13) {
@@ -100,10 +112,3 @@ function updateTotalCost(total, num) {
 }
 
 
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/assets/js/payment/payment.js b/src/main/resources/templates/assets/js/payment/payment.js
index 4ae8816f..90317512 100644
--- a/src/main/resources/templates/assets/js/payment/payment.js
+++ b/src/main/resources/templates/assets/js/payment/payment.js
@@ -1,14 +1,19 @@
 document.addEventListener("DOMContentLoaded", function () {
+    const orderNumber = document.getElementById("order-number").value;
     const button = document.getElementById("payment-button");
     const coupon = document.getElementById("all-book-coupon-button");
-    const generateRandomString = document.getElementById("order-number").value;
+    const generateRandomString = orderNumber.toString()
     var amount = parseInt(document.getElementById("order-total-cost").value);
+
 // ------  결제위젯 초기화 ------
 
     const clientKey = document.querySelector(".toss").value;
     const customerKey = generateRandomString;
     const paymentWidget = PaymentWidget(clientKey, customerKey); // 회원 결제
+
+    const payValue = payInfo(customerKey);
 // const paymentWidget = PaymentWidget(clientKey, PaymentWidget.ANONYMOUS); // 비회원 결제
+    console.log(coupon)
 
 // ------  결제 UI 렌더링 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#renderpaymentmethods선택자-결제-금액-옵션
@@ -26,28 +31,52 @@ document.addEventListener("DOMContentLoaded", function () {
 
 // ------  결제 금액 업데이트 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#updateamount결제-금액
-    coupon.addEventListener("change", function () {
-        if (coupon.checked) {
-            paymentMethodWidget.updateAmount(amount - 5000);
-        } else {
-            paymentMethodWidget.updateAmount(amount);
-        }
-    });
+    if (coupon) {
+        coupon.addEventListener("click", function () {
+            if (coupon.checked) {
+                paymentMethodWidget.updateAmount(amount - 5000);
+            } else {
+                paymentMethodWidget.updateAmount(amount);
+            }
+        });
+    }
 
 // ------ '결제하기' 버튼 누르면 결제창 띄우기 ------
 // @docs https://docs.tosspayments.com/reference/widget-sdk#requestpayment결제-정보
     button.addEventListener("click", function () {
         // 결제를 요청하기 전에 orderId, amount를 서버에 저장하세요.
         // 결제 과정에서 악의적으로 결제 금액이 바뀌는 것을 확인하는 용도입니다.
-        paymentWidget.requestPayment({
-            orderId: customerKey,
-            orderName: "123",
-            successUrl: window.location.origin + "/pay/success",
-            failUrl: window.location.origin + "/pay/fail",
-            customerEmail: "123@gmail.com",
-            customerName: "김토스",
-            customerMobilePhone: "01012341234",
-        });
+        payValue.then(value => {
+            paymentWidget.requestPayment({
+                orderId: customerKey,
+                orderName: value.orderName,
+                successUrl: window.location.origin + "/pay/success",
+                failUrl: window.location.origin + "/pay/fail",
+                customerEmail: value.email,
+                customerName: value.name,
+                customerMobilePhone: value.phoneNumber,
+            });
+        })
+
+
     });
 
+
 })
+
+async function payInfo(customerKey) {
+
+    const response = await fetch("/pay/info/" + customerKey, {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json"
+        }
+    });
+    const json = await response.json()
+    if (!response.ok) {
+
+        console.log(json)
+    }
+    return json;
+}
+
diff --git a/src/main/resources/templates/assets/js/payment/success.js b/src/main/resources/templates/assets/js/payment/success.js
new file mode 100644
index 00000000..50a98efe
--- /dev/null
+++ b/src/main/resources/templates/assets/js/payment/success.js
@@ -0,0 +1,86 @@
+// 쿼리 파라미터 값이 결제 요청할 때 보낸 데이터와 동일한지 반드시 확인하세요.
+// 클라이언트에서 결제 금액을 조작하는 행위를 방지할 수 있습니다.
+var status;
+document.addEventListener('DOMContentLoaded', async function () {
+    const urlParams = new URLSearchParams(window.location.search);
+    console.log(new Date())
+    // 서버로 결제 승인에 필요한 결제 정보를 보내세요.
+    const pay = await confirm(urlParams)
+    const orderIdElement = document.getElementById("orderId");
+    const amountElement = document.getElementById("amount");
+
+
+    console.log(pay)
+    const payInfo = {
+        "paymentKey": pay.paymentKey,
+        "orderNumber": pay.orderId,
+        "status": pay.status,
+        "totalAmount": pay.totalAmount,
+        "method": pay.method,
+        "requestedAt": pay.requestedAt
+    }
+
+    const test = await payTest(payInfo);
+    if (pay.status === "DONE") {
+        console.log("삭제 호출 ")
+        removeCart();
+    }
+    console.log(payInfo)
+    console.log(test);
+    orderIdElement.textContent = "주문번호: " + payInfo.paymentKey;
+    amountElement.textContent = "결제 금액: " + payInfo.totalAmount;
+})
+
+async function confirm(urlParams) {
+    const requestData = {
+        paymentKey: urlParams.get("paymentKey"),
+        orderId: urlParams.get("orderId"),
+        amount: urlParams.get("amount"),
+    };
+
+    const response = await fetch("/pay/confirm", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(requestData),
+    });
+
+    const json = await response.json();
+    console.log(json)
+    if (!response.ok) {
+        console.log(json);
+        window.location.href = `/pay/fail?message=${json.message}&code=${json.code}`;
+    }
+    return json;
+}
+
+
+async function payTest(payInfo) {
+    console.log("함수 안: " + payInfo)
+
+    const response = await fetch("/pay/info/success", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(payInfo),
+    });
+
+    const json = await response.json();
+    console.log(json)
+    if (!response.ok) {
+        console.log(json);
+    }
+    return json;
+}
+
+
+function removeCart() {
+    const response = fetch("/pay/info/cart", {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+    });
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/checkout-coupon.html b/src/main/resources/templates/checkout-coupon.html
index 517c80c7..a9f82364 100644
--- a/src/main/resources/templates/checkout-coupon.html
+++ b/src/main/resources/templates/checkout-coupon.html
@@ -47,20 +47,32 @@
                 th:value="${id}"
                 onclick="sendCoupon(this)">선택
         </button>
-        <input type="text" id="before-data">
     </div>
 </div>
 <script>
     function sendCoupon(button) {
+        alert(2)
+
         const index = button.value
+        alert(1)
         const beforecouponCost = opener.document.getElementsByClassName('select-coupon-cost')[index].value;
+        alert(beforecouponCost)
         const couponName = document.getElementById('coupon-btn').getAttribute('coupon-name');
+        alert(couponName)
         const couponCost = document.getElementById('coupon-btn').getAttribute('coupon-cost');
+        alert(couponCost)
         const selectId = document.getElementById('coupon-btn').getAttribute('radio-id');
+        alert(selectId)
+        alert(1)
+
         const bookTotalCost = opener.document.getElementById('input-total-cost').value;
+        alert(bookTotalCost)
         const check = document.getElementById('coupon-btn').getAttribute('coupon-rate');
-        const bookSale = opener.document.getElementsByClassName('book-sale-cost')[index].textContent;
+        alert(check)
+        const bookSale = opener.document.getElementsByClassName('book-sale-cost')[index].value;
+        alert("할인가: " + bookSale)
         const orderMin = document.getElementById('coupon-btn').getAttribute('coupon-order-min');
+        alert("최소 주문 금액: " + orderMin)
         let saleCost;
         alert(orderMin)
         if (parseInt(orderMin) > bookTotalCost) {
@@ -113,10 +125,7 @@
 
         window.close()
     }
-</script>
 
-
-<script>
     document.addEventListener('DOMContentLoaded', function () {
         const selectedCouponId = opener.document.querySelectorAll(".select-coupon-id");
         const coupon = document.querySelectorAll(".coupon-id-form");
diff --git a/src/main/resources/templates/checkout.html b/src/main/resources/templates/checkout.html
index cc231e8e..b98ecc29 100644
--- a/src/main/resources/templates/checkout.html
+++ b/src/main/resources/templates/checkout.html
@@ -194,15 +194,13 @@ <h5>주문 내역
                                                             </td>
 
                                                             <td>
-                                                                <div th:each="bookCost:${bookCostList}">
-                                                                    <div th:if="${bookCost == book.saleCost}">
-                                                                        <p class="book-sale-cost"
-                                                                           th:text="${bookCost}"></p>
-                                                                        <input th:name="|bookInfoList[${index.index}].bookCost|"
-                                                                               th:value="${bookCost}"
-                                                                               type="hidden">
-                                                                    </div>
-                                                                </div>
+                                                                <label>
+                                                                    <span th:text="${book.saleCost} * ${book.cartDetailAmount}"></span>
+                                                                    <input class="book-sale-cost"
+                                                                           th:name="|bookInfoList[${index.index}].bookCost|"
+                                                                           th:value="${book.saleCost.intValue()} * ${book.cartDetailAmount.intValue()}"
+                                                                           type="hidden">
+                                                                </label>
                                                             </td>
                                                             <td class="form-text">
                                                                 <input class="select-wrap"
@@ -274,7 +272,9 @@ <h5>배송</h5>
                                             <h6> 배송 날짜</h6>
                                             <label>
                                                 <input type="date" id="delivery-date-id" th:min="${localDate}"
-                                                       name="orderInfo.deliveryDate">
+                                                       name="orderInfo.deliveryDate"
+
+                                                       required>
                                                 <label for="delivery-date-id" id="delivery-date-label"></label>
                                             </label>
                                         </div>
@@ -282,7 +282,7 @@ <h6> 배송 날짜</h6>
                                             <h6>배송 시 요청 사항</h6>
                                             <label class="form-label">
                                                 <textarea id="receiver-message" class="form-control" rows="3"
-                                                          name="orderInfo.receiverMessage"></textarea>
+                                                          name="orderInfo.receiverMessage" required></textarea>
                                             </label>
                                         </div>
                                         <div>
@@ -297,7 +297,7 @@ <h6>
                                                 <span>0원</span>
                                             </th:block>
                                             <label>
-                                                <input name="orderInfo.deliveryId"
+                                                <input name="orderInfo.deliveryId" type="hidden"
                                                        th:value="${delivery.id}">
                                             </label>
                                         </div>
@@ -341,7 +341,8 @@ <h5>결제</h5>
                                                     <div class="single-form form-default button">
 
 
-                                                        <button type="submit" id="pay-btn">pay now
+                                                        <button type="submit" id="pay-btn">pay
+                                                            now
                                                         </button>
 
                                                     </div>
@@ -358,5 +359,24 @@ <h5>결제</h5>
         </div>
     </section>
     <script src="/assets/js/order/order.js"></script>
+    <script>
+        // 현재 날짜 가져오기
+        var today = new Date();
+
+        // 2주 뒤의 날짜 계산
+        var twoWeeksLater = new Date();
+        twoWeeksLater.setDate(today.getDate() + 14);
+        console.log(twoWeeksLater)
+
+        // yyyy-MM-dd 형식으로 변환 (input의 value 속성 값에 들어갈 형식)
+        var formattedToday = today.toISOString().slice(0, 10);
+        console.log(formattedToday)
+        var formattedTwoWeeksLater = twoWeeksLater.toISOString().slice(0, 10);
+
+        // input 태그에 min과 max 속성 설정
+        var inputDate = document.getElementById("delivery-date-id");
+        inputDate.setAttribute("min", formattedToday);
+        inputDate.setAttribute("max", formattedTwoWeeksLater);
+    </script>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/common/fragment/my-book/my-books-footer.html b/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
index b46f8a29..06ab59b5 100644
--- a/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
+++ b/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
@@ -2,11 +2,13 @@
 <html lang="en" xmlns:th="http://www.thympleaf.org">
 <div th:fragment="myBooksFooterFragment">
     <!-- Start Footer Area -->
-    <footer class="footer">
-<!--        <div th:replace="common/fragment/my-book/footer/my-books-footer-top :: myBooksFooterFragment"></div>-->
-        <div th:replace="common/fragment/my-book/footer/my-books-footer-middle::myBooksFooterMiddleFragment"></div>
-        <div th:replace="common/fragment/my-book/footer/my-books-footer-bottom::myBooksFooterBottomFragment"></div>
+    <footer class="footer sticky-footer bg-white mt-auto">
+        <div class="container my-auto">
 
+            <!--        <div th:replace="common/fragment/my-book/footer/my-books-footer-top :: myBooksFooterFragment"></div>-->
+            <div th:replace="common/fragment/my-book/footer/my-books-footer-middle::myBooksFooterMiddleFragment"></div>
+            <div th:replace="common/fragment/my-book/footer/my-books-footer-bottom::myBooksFooterBottomFragment"></div>
+        </div>
     </footer>
     <!--/ End Footer Area -->
 </div>
diff --git a/src/main/resources/templates/payment.html b/src/main/resources/templates/payment.html
index b81f9dc1..b7f3c5d9 100644
--- a/src/main/resources/templates/payment.html
+++ b/src/main/resources/templates/payment.html
@@ -22,8 +22,9 @@
             <section>
                 <h3>결제 정보</h3>
                 <div>
-                    <span>주문 번호</span>
+                    <h5>주문 번호</h5>
                     <span th:text="${orderInfo.number}"></span>
+                    <h5>결제 금액</h5>
                     <span th:text="${orderInfo.totalCost}"></span>
                     <input th:value="${orderInfo.number}" type="hidden"
                            id="order-number">
diff --git a/src/main/resources/templates/success.html b/src/main/resources/templates/success.html
index 93afcbed..8ec36220 100644
--- a/src/main/resources/templates/success.html
+++ b/src/main/resources/templates/success.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
-<html lang="ko">
-<head>
-    <meta charset="utf-8"/>
+<html lang="ko"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<div layout:fragment="customSetting">
+
     <link
             rel="icon"
             href="https://static.toss.im/icons/png/4x/icon-toss-logo.png"
@@ -9,69 +11,30 @@
     <link rel="stylesheet" type="text/css" href="style.css"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>토스페이먼츠 샘플 프로젝트</title>
-</head>
-<body>
-<div class="result wrapper">
-    <div class="box_section">
-        <h2 style="padding: 20px 0px 10px 0px">
-            <img
-                    width="35px"
-                    src="https://static.toss.im/3d-emojis/u1F389_apng.png"
-            />
-            결제 성공
-        </h2>
 
-        <p id="paymentKey"></p>
-        <p id="orderId"></p>
-        <p id="amount"></p>
-        <p id="status"></p>
-    </div>
 </div>
-<script>
-    // 쿼리 파라미터 값이 결제 요청할 때 보낸 데이터와 동일한지 반드시 확인하세요.
-    // 클라이언트에서 결제 금액을 조작하는 행위를 방지할 수 있습니다.
-    const urlParams = new URLSearchParams(window.location.search);
-
-    // 서버로 결제 승인에 필요한 결제 정보를 보내세요.
-    async function confirm() {
-        var requestData = {
-            paymentKey: urlParams.get("paymentKey"),
-            orderId: urlParams.get("orderId"),
-            amount: urlParams.get("amount"),
-        };
-
-        const response = await fetch("/pay/confirm", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(requestData),
-        });
-
-        const json = await response.json();
-
-        if (!response.ok) {
-            // TODO: 결제 실패 비즈니스 로직을 구현하세요.
-            console.log(json);
-            window.location.href = `/pay/fail?message=${json.message}&code=${json.code}`;
-        }
-
-        // TODO: 결제 성공 비즈니스 로직을 구현하세요.
-        console.log(json);
-    }
-
-    confirm();
-
-    const paymentKeyElement = document.getElementById("paymentKey");
-    const orderIdElement = document.getElementById("orderId");
-    const amountElement = document.getElementById("amount");
-
-    orderIdElement.textContent = "주문번호: " + urlParams.get("orderId");
-    amountElement.textContent = "결제 금액: " + urlParams.get("amount");
-    paymentKeyElement.textContent =
-        "paymentKey: " + urlParams.get("paymentKey");
+<div layout:fragment="content">
+    <div class="container">
+        <div class="row justify-content-center">
+            <div class="result wrapper">
+                <div class="box_section">
+                    <h2 style="padding: 20px 0px 10px 0px">
+                        <img
+                                width="35px"
+                                src="https://static.toss.im/3d-emojis/u1F389_apng.png"
+                        />
+                        결제 성공
+                    </h2>
+
+                    <p id="paymentKey"></p>
+                    <p id="orderId"></p>
+                    <p id="amount"></p>
+                    <p id="status"></p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="/assets/js/payment/success.js"></script>
 
-</script>
-</body>
+</div>
 </html>
\ No newline at end of file

From 17764ea1d55db30b7fa959565bbaad1831361dd1 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Thu, 21 Mar 2024 14:08:37 +0900
Subject: [PATCH 108/147] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=A0=9C=EA=B1=B0=20?=
 =?UTF-8?q?=EB=B0=8F=20properties=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/payment/service/PayService.java     | 10 -------
 src/main/resources/application.properties     | 27 +++++++++----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/java/store/mybooks/front/payment/service/PayService.java b/src/main/java/store/mybooks/front/payment/service/PayService.java
index f0608625..1ba08c6f 100644
--- a/src/main/java/store/mybooks/front/payment/service/PayService.java
+++ b/src/main/java/store/mybooks/front/payment/service/PayService.java
@@ -6,9 +6,7 @@
 import org.springframework.stereotype.Service;
 import store.mybooks.front.order.dto.response.BookOrderDetailResponse;
 import store.mybooks.front.payment.adaptor.PayAdaptor;
-import store.mybooks.front.payment.dto.request.PayCreateRequest;
 import store.mybooks.front.payment.dto.request.TossPaymentRequest;
-import store.mybooks.front.payment.dto.response.PayCreateResponse;
 import store.mybooks.front.payment.dto.response.TossPaymentResponse;
 
 /**
@@ -48,13 +46,5 @@ public TossPaymentResponse createTossPayment(TossPaymentRequest request) {
         return payAdaptor.confirmPayment(request);
     }
 
-    public PayCreateResponse createPayment(PayCreateRequest request) {
-        return payAdaptor.createResponse(request);
-    }
-
-    public TossPaymentResponse getTossPayment(TossPaymentRequest request) {
-        return payAdaptor.getTossPaymentResponse(request);
-    }
-
 
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4eb34d5c..c0c5a864 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -21,23 +21,22 @@ oauth2.provider.payco.userInfoUri=https://apis-payco.krp.toastoven.net/payco/fri
 my-books.redis.host=133.186.241.167
 my-books.redis.port=6379
 my-books.redis.password=*N2vya7H@muDTwdNMR!
-
 my-books.redis.admin-expiration=3600000
 ## ?????
-spring.profiles.active=dev
+#spring.profiles.active=dev
 toss.api.key=081bdd46905c4d92aff5a8d51c0e2501
 toss.api.client-key=1c7a8079bed84ba881abb9dd32cf048f
 #
 ## ???
-#store.mybooks.front.config.gateway.address=c0722344686f4afba3ebd708d26c1380
-## Log Levels
-#logging.level.root=INFO
-## Logging file
-#logging.file.name=/home/administrator/log/resource.log
-#logging.file.path=/home/administrator/log
-## OAuth2 User Payco Configuration
-#oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
-#oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
-#oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
-## cookie
-#cookie.domain=my-books.store
+store.mybooks.front.config.gateway.address=c0722344686f4afba3ebd708d26c1380
+# Log Levels
+logging.level.root=INFO
+# Logging file
+logging.file.name=/home/administrator/log/resource.log
+logging.file.path=/home/administrator/log
+# OAuth2 User Payco Configuration
+oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
+oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
+oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
+# cookie
+cookie.domain=my-books.store

From 6b8426104e3122b07750b034de514d75215f5ea2 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Thu, 21 Mar 2024 14:23:01 +0900
Subject: [PATCH 109/147] =?UTF-8?q?refactor:=20code=20=ED=94=BC=EB=93=9C?=
 =?UTF-8?q?=EB=B0=B1=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/global/GlobalControllerAdvice.java      | 2 +-
 .../front/order/dto/request/BookOrderCreateRequest.java   | 2 --
 .../front/order/dto/request/BookOrderDirectRequest.java   | 6 ++----
 .../mybooks/front/order/dto/request/BookOrderRequest.java | 6 ++----
 .../mybooks/front/order/dto/request/OrderInfoRequest.java | 8 ++------
 .../front/order/dto/request/OrderUserInfoRequest.java     | 8 ++------
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
index 9647b9ce..a764ebea 100644
--- a/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
+++ b/src/main/java/store/mybooks/front/global/GlobalControllerAdvice.java
@@ -69,7 +69,7 @@ public String handleAuthException(RuntimeException ex, HttpServletResponse respo
     public String handleOrderModulationException(Exception exception, HttpServletRequest request) {
 
         String previousUrl = request.getHeader(REFERER);
-        request.getSession().setAttribute("errosr", exception.getMessage());
+        request.getSession().setAttribute("error", exception.getMessage());
         return previousUrl.replace(domain, "redirect:");
     }
 
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
index e31579d6..c6e39138 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderCreateRequest.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -18,7 +17,6 @@
  */
 @Getter
 @AllArgsConstructor
-@ToString
 public class BookOrderCreateRequest {
     private List<BookInfoRequest> bookInfoList;
     private OrderInfoRequest orderInfo;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
index 42168119..481a4840 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderDirectRequest.java
@@ -1,8 +1,7 @@
 package store.mybooks.front.order.dto.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.dto.request<br>
@@ -16,8 +15,7 @@
  * 3/6/24        minsu11       최초 생성<br>
  */
 @Getter
-@Setter
-@ToString
+@AllArgsConstructor
 public class BookOrderDirectRequest {
     private Long id;
     private Integer saleCost;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 68cd5064..8bee876c 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -1,9 +1,8 @@
 package store.mybooks.front.order.dto.request;
 
 import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -17,8 +16,7 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@NoArgsConstructor
-@Setter
+@AllArgsConstructor
 public class BookOrderRequest {
     private List<BookInfoRequest> bookInfoList;
     private OrderInfoRequest orderInfo;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index b3ec666a..b3a5fa42 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -1,9 +1,7 @@
 package store.mybooks.front.order.dto.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -17,9 +15,7 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@Setter
-@NoArgsConstructor
-@ToString
+@AllArgsConstructor
 public class OrderInfoRequest {
 
     private String recipientName;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
index 0d7b9bb3..3044e9c5 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
@@ -1,9 +1,7 @@
 package store.mybooks.front.order.dto.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -17,9 +15,7 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@Setter
-@NoArgsConstructor
-@ToString
+@AllArgsConstructor
 public class OrderUserInfoRequest {
     private String userName;
     private String email;

From fca13f02b528fe4e1d75bc8c92d622fb0de0ef11 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Thu, 21 Mar 2024 15:16:41 +0900
Subject: [PATCH 110/147] =?UTF-8?q?feat:=20mypage.html=20=EC=96=91?=
 =?UTF-8?q?=EC=8B=9D=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/address.html |  9 ++--
 src/main/resources/templates/my-page.html |  8 ++--
 src/main/resources/templates/review.html  | 54 +++++++++++++++++++++++
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/address.html b/src/main/resources/templates/address.html
index 99f6e2b5..b6290a9f 100644
--- a/src/main/resources/templates/address.html
+++ b/src/main/resources/templates/address.html
@@ -209,6 +209,7 @@ <h2 class="accordion-header" id="headingTwo">
         </div>
     </section>
 
+
     <!-- Start Team Area -->
     <section class="team section">
         <div class="container">
@@ -242,7 +243,7 @@ <h3>주소관리</h3>
                     <div class="single-team">
                         <div class="content">
                             <div class="info">
-                                <h3>구매 목록</h3>
+                                <h3>주문 내역</h3>
                             </div>
                         </div>
                     </div>
@@ -252,9 +253,9 @@ <h3>구매 목록</h3>
                     <!-- Start Single Team -->
                     <div class="single-team">
                         <div class="content">
-                            <div class="info">
-                                <h3>나중에 추가</h3>
-                            </div>
+                            <a href="/review">
+                                <h3>리뷰 내역</h3>
+                            </a>
                         </div>
                     </div>
                     <!-- End Single Team -->
diff --git a/src/main/resources/templates/my-page.html b/src/main/resources/templates/my-page.html
index a1b16d19..bbfd12e9 100644
--- a/src/main/resources/templates/my-page.html
+++ b/src/main/resources/templates/my-page.html
@@ -193,7 +193,7 @@ <h3>주소관리</h3>
                     <div class="single-team">
                         <div class="content">
                             <div class="info">
-                                <h3>구매 목록</h3>
+                                <h3>주문 내역</h3>
                             </div>
                         </div>
                     </div>
@@ -203,9 +203,9 @@ <h3>구매 목록</h3>
                     <!-- Start Single Team -->
                     <div class="single-team">
                         <div class="content">
-                            <div class="info">
-                                <h3>나중에 추가</h3>
-                            </div>
+                            <a href="/review">
+                                <h3>리뷰 내역</h3>
+                            </a>
                         </div>
                     </div>
                     <!-- End Single Team -->
diff --git a/src/main/resources/templates/review.html b/src/main/resources/templates/review.html
index 435a13a0..99abb952 100644
--- a/src/main/resources/templates/review.html
+++ b/src/main/resources/templates/review.html
@@ -136,9 +136,63 @@ <h2>리뷰가 존재하지 않습니다.</h2>
 
         </div>
 
+        <!-- Start Team Area -->
+        <section class="team section">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-3 col-md-6 col-12">
+                        <!-- Start Single Team -->
+                        <div class="single-team">
+                            <div class="content">
+                                <div class="info">
+                                    <a href="/user">
+                                        <h3>마이페이지</h3>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                        <!-- End Single Team -->
+                    </div>
+                    <div class="col-lg-3 col-md-6 col-12">
+                        <!-- Start Single Team -->
+                        <div class="single-team">
+                            <div class="content">
+                                <a href="/user/address">
+                                    <h3>주소관리</h3>
+                                </a>
+                            </div>
+                        </div>
+                        <!-- End Single Team -->
+                    </div>
+                    <div class="col-lg-3 col-md-6 col-12">
+                        <!-- Start Single Team -->
+                        <div class="single-team">
+                            <div class="content">
+                                <div class="info">
+                                    <h3>주문 내역</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <!-- End Single Team -->
+                    </div>
+                    <div class="col-lg-3 col-md-6 col-12">
+                        <!-- Start Single Team -->
+                        <div class="single-team">
+                            <div class="content">
+                                <a href="/review">
+                                    <h3>리뷰 내역</h3>
+                                </a>
+                            </div>
+                        </div>
+                        <!-- End Single Team -->
+                    </div>
+                </div>
+            </div>
+        </section>
 
     </div>
 
 </div>
+
 </body>
 </html>

From 8dec974353f8cede96d3d849137b3aa726468cd2 Mon Sep 17 00:00:00 2001
From: minsu <zmfjtnl1@naver.com>
Date: Thu, 21 Mar 2024 15:38:14 +0900
Subject: [PATCH 111/147] =?UTF-8?q?refactor:=20code=20=ED=94=BC=EB=93=9C?=
 =?UTF-8?q?=EB=B0=B1=20=ED=9B=84=20=EC=97=90=EB=9F=AC=EB=82=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     | 14 ++++-
 .../order/dto/request/BookInfoRequest.java    |  4 +-
 .../order/dto/request/BookOrderRequest.java   |  8 ++-
 .../order/dto/request/OrderInfoRequest.java   |  6 +-
 .../dto/request/OrderUserInfoRequest.java     |  6 +-
 src/main/resources/templates/fail.html        | 59 ++++++++++---------
 src/main/resources/templates/success.html     | 25 ++++++--
 7 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/src/main/java/store/mybooks/front/order/controller/OrderController.java b/src/main/java/store/mybooks/front/order/controller/OrderController.java
index 1598f322..1f60d743 100644
--- a/src/main/java/store/mybooks/front/order/controller/OrderController.java
+++ b/src/main/java/store/mybooks/front/order/controller/OrderController.java
@@ -159,23 +159,33 @@ public String viewCoupon(ModelMap modelMap,
     public String viewOrderPage(
             ModelMap modelMap) {
         PointResponse pointResponse = userPointService.getPointsHeld();
-        LocalDate localDate = LocalDate.now();
         UserGetResponse user = userAdaptor.findUser();
+
         List<CartDetail> bookFromCart = cartUserService.getBookFromCart();
+
         DeliveryRuleResponse deliveryRule = deliveryRuleService.getDeliveryRuleResponseByName("배송 비");
         modelMap.put("bookLists", bookFromCart);
         modelMap.put("totalCost", orderService.calculateTotalCost(bookFromCart));
         modelMap.put("point", pointResponse.getRemainingPoint());
-        modelMap.put("localDate", localDate);
+        modelMap.put("localDate", LocalDate.now());
         modelMap.put("user", user);
         modelMap.put("delivery", deliveryRule);
         return "checkout";
     }
 
+    /**
+     * methodName : doOrder<br>
+     * author : minsu11<br>
+     * description : 주문 처리.
+     *
+     * @param orderRequest the order request
+     * @return the string
+     */
     @PostMapping("/order")
     public String doOrder(@ModelAttribute BookOrderRequest orderRequest) {
         log.info("값 : {}", orderRequest.toString());
         List<CartDetail> cart = cartUserService.getBookFromCart();
+        log.debug(cart.get(0).toString());
         orderInfoCheckService.checkModulation(orderRequest, cart);
         int point = orderService.getPoint(orderRequest.getOrderInfo());
         int couponCost = orderService.calculateBookCouponCost(orderRequest.getBookInfoList());
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
index d3ad9a15..6c4ac4f7 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookInfoRequest.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -16,8 +17,9 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@NoArgsConstructor
 @Setter
+@NoArgsConstructor
+@ToString
 public class BookInfoRequest {
     private Long bookId;
     private Integer saleCost;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
index 8bee876c..008edd3b 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/BookOrderRequest.java
@@ -1,8 +1,10 @@
 package store.mybooks.front.order.dto.request;
 
 import java.util.List;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -16,7 +18,9 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@ToString
 public class BookOrderRequest {
     private List<BookInfoRequest> bookInfoList;
     private OrderInfoRequest orderInfo;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
index b3a5fa42..2265783f 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderInfoRequest.java
@@ -1,7 +1,8 @@
 package store.mybooks.front.order.dto.request;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -15,7 +16,8 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@AllArgsConstructor
+@Setter
+@NoArgsConstructor
 public class OrderInfoRequest {
 
     private String recipientName;
diff --git a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
index 3044e9c5..98093f0c 100644
--- a/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
+++ b/src/main/java/store/mybooks/front/order/dto/request/OrderUserInfoRequest.java
@@ -1,7 +1,8 @@
 package store.mybooks.front.order.dto.request;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * packageName    : store.mybooks.front.order.dto.request<br>
@@ -15,7 +16,8 @@
  * 3/16/24        minsu11       최초 생성<br>
  */
 @Getter
-@AllArgsConstructor
+@Setter
+@NoArgsConstructor
 public class OrderUserInfoRequest {
     private String userName;
     private String email;
diff --git a/src/main/resources/templates/fail.html b/src/main/resources/templates/fail.html
index f09c9a28..94a6d659 100644
--- a/src/main/resources/templates/fail.html
+++ b/src/main/resources/templates/fail.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
-<html lang="ko">
-<head>
-    <meta charset="utf-8"/>
+<html lang="ko"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+<div layout:fragment="customSetting">
+
     <link
             rel="icon"
             href="https://static.toss.im/icons/png/4x/icon-toss-logo.png"
@@ -9,32 +11,35 @@
     <link rel="stylesheet" type="text/css" href="style.css"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>토스페이먼츠 샘플 프로젝트</title>
-</head>
 
-<body>
-<div class="result wrapper">
-    <div class="box_section">
-        <h2 style="padding: 20px 0px 10px 0px">
-            <img
-                    width="25px"
-                    src="https://static.toss.im/3d-emojis/u1F6A8-apng.png"
-            />
-            결제 실패
-        </h2>
-        <p id="code"></p>
-        <p id="message"></p>
-    </div>
 </div>
-</body>
-</html>
+<div layout:fragment="content">
+    <div class="container">
+        <div class="row justify-content-center">
 
-<script>
-    const urlParams = new URLSearchParams(window.location.search);
 
-    const codeElement = document.getElementById("code");
-    const messageElement = document.getElementById("message");
+            <div class="result wrapper">
+                <div class="box_section">
+                    <h2 style="padding: 20px 0px 10px 0px">
+                        <img
+                                width="25px"
+                                src="https://static.toss.im/3d-emojis/u1F6A8-apng.png"
+                        />
+                        결제 실패
+                    </h2>
+                    <p id="code"></p>
+                    <p id="message"></p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        const urlParams = new URLSearchParams(window.location.search);
+
+        const codeElement = document.getElementById("code");
+        const messageElement = document.getElementById("message");
 
-    codeElement.textContent = "에러코드: " + urlParams.get("code");
-    messageElement.textContent = "실패 사유: " + urlParams.get("message");
-</script>
\ No newline at end of file
+        codeElement.textContent = "에러코드: " + urlParams.get("code");
+        messageElement.textContent = "실패 사유: " + urlParams.get("message");
+    </script>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/success.html b/src/main/resources/templates/success.html
index 8ec36220..365811a5 100644
--- a/src/main/resources/templates/success.html
+++ b/src/main/resources/templates/success.html
@@ -17,7 +17,7 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="result wrapper">
-                <div class="box_section">
+                <div class="box_section form-text">
                     <h2 style="padding: 20px 0px 10px 0px">
                         <img
                                 width="35px"
@@ -25,12 +25,27 @@ <h2 style="padding: 20px 0px 10px 0px">
                         />
                         결제 성공
                     </h2>
+                    <label>
+                        <h4>주문 번호</h4>
+                        <p id="orderId"></p>
+                    </label>
+                    <label>
+                        <h4>주문 이름</h4>
+                        <p id="order-name"></p>
+                    </label>
+                    <label>
+                        <h4>
+                            결제 금액
+                        </h4>
+                        <p id="amount"></p>
+                    </label>
+                    <label>
+                        <span>결제 상태</span>
+                        <p id="status"></p>
+                    </label>
 
-                    <p id="paymentKey"></p>
-                    <p id="orderId"></p>
-                    <p id="amount"></p>
-                    <p id="status"></p>
                 </div>
+
             </div>
         </div>
     </div>

From c903fcd0c5efaa5c8e0254e20073213fdc219b3a Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Thu, 21 Mar 2024 15:42:51 +0900
Subject: [PATCH 112/147] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=ED=8C=A8=ED=84=B4=EA=B2=80=EC=A6=9D=20=EB=B0=8F=20=EC=83=9D?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B2=A8=EB=A6=AC=EB=8D=B0=EC=9D=B4=EC=85=98=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/user/controller/UserController.java |  8 ++++---
 src/main/resources/templates/signup.html      | 21 +++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/store/mybooks/front/user/controller/UserController.java b/src/main/java/store/mybooks/front/user/controller/UserController.java
index 321b6995..cc62b7d3 100644
--- a/src/main/java/store/mybooks/front/user/controller/UserController.java
+++ b/src/main/java/store/mybooks/front/user/controller/UserController.java
@@ -1,6 +1,7 @@
 package store.mybooks.front.user.controller;
 
 import java.time.Duration;
+import java.time.LocalDate;
 import java.util.Objects;
 import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
@@ -21,8 +22,6 @@
 import store.mybooks.front.auth.dto.response.TokenCreateResponse;
 import store.mybooks.front.auth.redis.RedisAuthService;
 import store.mybooks.front.config.RedisProperties;
-import store.mybooks.front.cart.LoginCartDataMoveEvent;
-import store.mybooks.front.cart.LogoutCartDataMoveEvent;
 import store.mybooks.front.user.adaptor.UserAdaptor;
 import store.mybooks.front.user.dto.request.UserCreateRequest;
 import store.mybooks.front.user.dto.request.UserEmailRequest;
@@ -106,6 +105,7 @@ public String logout() {
     @GetMapping("/signup")
     public String createUserForm(HttpServletRequest request) {
         if (Objects.isNull(request.getAttribute("identity_cookie_value"))) {
+            request.setAttribute("nowDate", LocalDate.now());
             return "signup";
         }
         return "redirect:/";
@@ -188,7 +188,8 @@ public String loginUser(@ModelAttribute UserLoginRequest userLoginRequest, HttpS
             TokenCreateResponse tokenCreateResponse =
                     tokenAdaptor.createToken(
                             new TokenCreateRequest(loginResponse.getIsAdmin(), loginResponse.getUserId(),
-                                    loginResponse.getStatus(), String.valueOf(UUID.randomUUID()),Utils.getUserIp(request),Utils.getUserAgent(request)));
+                                    loginResponse.getStatus(), String.valueOf(UUID.randomUUID()),
+                                    Utils.getUserIp(request), Utils.getUserAgent(request)));
 
             // 쿠키추가
             CookieUtils.addJwtCookie(response, tokenCreateResponse.getAccessToken());
@@ -196,6 +197,7 @@ public String loginUser(@ModelAttribute UserLoginRequest userLoginRequest, HttpS
             return "redirect:/";
         }
 
+
         return "redirect:/login";
     }
 
diff --git a/src/main/resources/templates/signup.html b/src/main/resources/templates/signup.html
index cf9bd51d..7ec4cfa9 100644
--- a/src/main/resources/templates/signup.html
+++ b/src/main/resources/templates/signup.html
@@ -89,12 +89,11 @@
                                 </div>
 
 
-
                                 <div class="col-sm-6">
                                     <div class="form-group">
                                         <label for="reg-birthdate">생일</label>
                                         <input class="form-control" type="date" id="reg-birthdate" name="birth"
-                                               required>
+                                               required th:max="${nowDate}">
                                     </div>
                                 </div>
                                 <input type="hidden" name="isAdmin" value="false">
@@ -117,10 +116,28 @@
     <script>
         var authNumber; // 전역 변수로 선언하여 다른 함수에서도 사용할 수 있도록 설정
 
+
+
+
+
+        // 강력한 비밀번호인지 확인하는 함수
+        function strongPassword(str) {
+            return /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/.test(str);
+        }
+
+
+
         function checkPassword() {
             var newPassword = document.getElementById('password').value;
             var confirmPassword = document.getElementById('confirmPassword').value;
 
+
+            // 강력한 비밀번호인지 확인
+            if (!strongPassword(newPassword)) {
+                alert("비밀번호는 최소 8자 이상의 길이, 하나의 영문자, 숫자, 특수 문자를 포함해야 합니다.");
+                return false;
+            }
+
             // 새 비밀번호와 비밀번호 확인이 일치하는지 확인합니다.
             if (newPassword !== confirmPassword) {
                 // 일치하지 않는 경우 경고 메시지를 표시하고 폼을 제출하지 않습니다.

From de699eb126c74b4d4fd4827947da08ee76aca0b7 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Thu, 21 Mar 2024 15:43:11 +0900
Subject: [PATCH 113/147] =?UTF-8?q?refactor:=20UserAdaptor=20=EB=AF=B8?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=83=81=EC=88=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java b/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
index 8eb7320a..08b8ab2c 100644
--- a/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
+++ b/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
@@ -53,8 +53,6 @@ public class UserAdaptor {
     private static final String URL = "/api/users";
     private static final String URL_MEMBER = "/api/member/users";
     private static final String URL_ADMIN_ID = "/api/admin/users/{userId}";
-    private static final String URL_ADMIN = "/api/admin/users/"; // todo 전체유저 조회
-
 
     public UserEncryptedPasswordResponse verifyUserStatus(UserEmailRequest request) {
 

From 267279e98d019e2c6b7780644d3c9b41962a882d Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Thu, 21 Mar 2024 17:16:21 +0900
Subject: [PATCH 114/147] =?UTF-8?q?refactor:=20=EB=82=B4=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20->=20=EC=BF=A0=ED=8F=B0=20url=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/fragment/my-book/header/my-books-header-bottom.html  | 2 +-
 src/main/resources/templates/user-coupon-page.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
index 1e049237..ade4e380 100644
--- a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
+++ b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
@@ -75,7 +75,7 @@
                                     <ul class="sub-menu collapse" id="submenu-1-2">
                                         <li class="nav-item"><a href="/user">마이페이지</a></li>
                                         <li class="nav-item"><a href="/user/address">내 주소</a></li>
-                                        <li class="nav-item"><a href="login">쿠폰</a></li>
+                                        <li class="nav-item"><a href="/user-coupon">쿠폰</a></li>
                                         <li class="nav-item"><a href="register">주문목록</a></li>
                                         <li class="nav-item"><a href="mail-success.html">결제내역</a></li>
                                         <li class="nav-item"><a href="/review">리뷰내역</a></li>
diff --git a/src/main/resources/templates/user-coupon-page.html b/src/main/resources/templates/user-coupon-page.html
index 77e11ec2..5ac166e7 100644
--- a/src/main/resources/templates/user-coupon-page.html
+++ b/src/main/resources/templates/user-coupon-page.html
@@ -8,7 +8,7 @@
         let currentPage = [[${userCoupons.number}]]
         let totalPages = [[${userCoupons.totalPages}]]
     </script>
-    <div>
+    <div class="container">
         <table class="table">
             <thead>
             <tr>

From e0c297919d0505b9e6761dbcd423a332594b11f5 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Thu, 21 Mar 2024 17:16:34 +0900
Subject: [PATCH 115/147] =?UTF-8?q?refactor:=20.pagination=20=EC=B6=A9?=
 =?UTF-8?q?=EB=8F=8C=EB=82=98=EC=84=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/assets/css/main.css   | 69 ++-----------------
 1 file changed, 5 insertions(+), 64 deletions(-)

diff --git a/src/main/resources/templates/assets/css/main.css b/src/main/resources/templates/assets/css/main.css
index 95700b8b..293739b8 100644
--- a/src/main/resources/templates/assets/css/main.css
+++ b/src/main/resources/templates/assets/css/main.css
@@ -1224,66 +1224,7 @@ ol {
   z-index: -1;
 }
 
-/* Pagination CSS */
-.pagination {
-  text-align: left;
-  margin: 40px 0 0 0;
-  display: block;
-}
-
-.pagination.center {
-  text-align: center;
-}
-
-.pagination.right {
-  text-align: right;
-}
-
-.pagination.left {
-  text-align: left;
-}
 
-.pagination .pagination-list {
-  display: inline-block;
-  overflow: hidden;
-}
-
-.pagination .pagination-list li {
-  margin-right: 5px;
-  display: inline-block;
-  margin-top: 10px;
-}
-
-.pagination .pagination-list li:last-child {
-  margin-right: 0px;
-}
-
-.pagination .pagination-list li a {
-  background: #fff;
-  color: #081828;
-  font-weight: 500;
-  font-size: 14px;
-  border-radius: 4px;
-  padding: 6px 18px;
-  text-align: center;
-  border: 1px solid #eee;
-}
-
-.pagination .pagination-list li.active a,
-.pagination .pagination-list li:hover a {
-  background: #0167F3;
-  color: #fff;
-  border-color: transparent;
-}
-
-.pagination .pagination-list li a i {
-  font-size: 14px;
-}
-
-.blog-grids.pagination {
-  margin-top: 50px;
-  text-align: center;
-}
 
 .button .btn {
   display: inline-block;
@@ -4230,11 +4171,11 @@ ol {
   background: #f9f9f9;
 }
 
-@media only screen and (min-width: 768px) and (max-width: 991px), (max-width: 767px) {
-  .blog-list .pagination {
-    margin-top: 20px;
-  }
-}
+/*@media only screen and (min-width: 768px) and (max-width: 991px), (max-width: 767px) {*/
+/*  .blog-list .pagination {*/
+/*    margin-top: 20px;*/
+/*  }*/
+/*}*/
 
 .blog-list .single-blog {
   margin: 0;

From aa1c09051e9e4a8a40e8a4ee70e4e4ae51968dbd Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Thu, 21 Mar 2024 17:24:59 +0900
Subject: [PATCH 116/147] =?UTF-8?q?refactor:=20pagination=20=EB=B7=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/category/category-admin-page.html    | 18 +++++++--------
 .../admin/view/tag/tag-admin-page.html        | 23 +++++++++++--------
 .../resources/templates/category-display.html | 20 ++++++++--------
 .../resources/templates/user-coupon-page.html |  2 +-
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/templates/admin/view/category/category-admin-page.html b/src/main/resources/templates/admin/view/category/category-admin-page.html
index 0774ed12..1c57eefc 100644
--- a/src/main/resources/templates/admin/view/category/category-admin-page.html
+++ b/src/main/resources/templates/admin/view/category/category-admin-page.html
@@ -46,15 +46,15 @@ <h1>카테고리 페이지</h1>
                 </tbody>
             </table>
         </div>
-    </div>
-    <div class="mt-3" th:block th:if="${categories.totalPages > 1}">
-        <div class="pagination">
-            <div class="page-item">
-                <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-            </div>
-            <div class="pagination" id="pageNumContainer"></div>
-            <div class="page-item">
-                <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+        <div class="mt-3" th:block th:if="${categories.totalPages > 1}">
+            <div class="pagination">
+                <div class="page-item">
+                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                </div>
+                <div class="pagination" id="pageNumContainer"></div>
+                <div class="page-item">
+                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/main/resources/templates/admin/view/tag/tag-admin-page.html b/src/main/resources/templates/admin/view/tag/tag-admin-page.html
index 68a5bc93..af6ddff9 100644
--- a/src/main/resources/templates/admin/view/tag/tag-admin-page.html
+++ b/src/main/resources/templates/admin/view/tag/tag-admin-page.html
@@ -9,7 +9,7 @@
         let totalPages = [[${tags.totalPages}]]
     </script>
     <h1>태그 페이지</h1>
-    <div>
+    <div class="container">
         <div>
             <a th:href="@{/admin/tag/register}" class="btn btn-primary" role="button">태그 추가하기</a>
         </div>
@@ -37,17 +37,20 @@ <h1>태그 페이지</h1>
                 </tbody>
             </table>
         </div>
-    </div>
-    <div class="mt-3" th:block th:if="${tags.totalPages > 1}">
-        <div class="pagination">
-            <div class="page-item">
-                <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-            </div>
-            <div class="pagination" id="pageNumContainer"></div>
-            <div class="page-item">
-                <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+        <div class="mt-3" th:block th:if="${tags.totalPages > 1}">
+            <div class="pagination">
+                <div class="page-item">
+                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                </div>
+                <div class="pagination" id="pageNumContainer"></div>
+                <div class="page-item">
+                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                </div>
             </div>
         </div>
     </div>
+    <script src="/admin/js/page/setPrevious.js"></script>
+    <script src="/admin/js/page/setNext.js"></script>
+    <script src="/admin/js/page/setLastPage.js"></script>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/category-display.html b/src/main/resources/templates/category-display.html
index 239e911d..f4d1469c 100644
--- a/src/main/resources/templates/category-display.html
+++ b/src/main/resources/templates/category-display.html
@@ -85,18 +85,18 @@ <h4 class="title">
                 </div>
             </div>
         </div>
-    </section>
-    <div class="mt-3" th:block th:if="${books.totalPages > 1}">
-        <div class="pagination">
-            <div class="page-item">
-                <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-            </div>
-            <div class="pagination" id="pageNumContainer"></div>
-            <div class="page-item">
-                <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+        <div class="mt-3" th:block th:if="${books.totalPages > 1}">
+            <div class="pagination">
+                <div class="page-item">
+                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                </div>
+                <div class="pagination" id="pageNumContainer"></div>
+                <div class="page-item">
+                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                </div>
             </div>
         </div>
-    </div>
+    </section>
     <script src="/admin/js/page/setPrevious.js"></script>
     <script src="/admin/js/page/setNext.js"></script>
     <script src="/admin/js/page/setLastPage.js"></script>
diff --git a/src/main/resources/templates/user-coupon-page.html b/src/main/resources/templates/user-coupon-page.html
index 5ac166e7..434262bf 100644
--- a/src/main/resources/templates/user-coupon-page.html
+++ b/src/main/resources/templates/user-coupon-page.html
@@ -37,7 +37,7 @@
             </tr>
             </tbody>
         </table>
-        <div class="mt-3">
+        <div class="mt-3" th:block th:if="${userCoupons.totalPages > 1}">
             <div class="pagination">
                 <div class="page-item">
                     <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>

From f7a5316a6372fc6d619a44f2cee3667abcce0c13 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Thu, 21 Mar 2024 17:25:10 +0900
Subject: [PATCH 117/147] =?UTF-8?q?refactor:=20=ED=95=84=EC=9A=94=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/view/tag/tag.html         | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 src/main/resources/templates/admin/view/tag/tag.html

diff --git a/src/main/resources/templates/admin/view/tag/tag.html b/src/main/resources/templates/admin/view/tag/tag.html
deleted file mode 100644
index 89f7ab86..00000000
--- a/src/main/resources/templates/admin/view/tag/tag.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{common/layout/admin-layout}">
-<div layout:fragment="content">
-    <h1>태그 페이지</h1>
-    <div>
-        <div>
-            <a th:href="@{/admin/tag/register}" class="btn btn-primary" role="button">태그 추가하기</a>
-        </div>
-        <div>
-            <table class="table">
-                <thead>
-                <tr>
-                    <th scope="col">태그 이름</th>
-                    <th scope="col">수정하기</th>
-                    <th scope="col">삭제하기</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr th:each="tag : ${tags.content}">
-                    <th th:text="${tag.name}"></th>
-                    <th>
-                        <form action="/admin/tag/update" method="get">
-                            <input hidden="hidden" name="id" th:value="${tag.id}">
-                            <button class="btn btn-primary" type="submit" th:text="수정하기"></button>
-                        </form>
-                    </th>
-                    <th><a th:href="@{/admin/tag/delete/{id}(id=${tag.id})}" class="btn btn-secondary" role="button">삭제하기</a></th>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <div class="mt-3">
-        <nav aria-label="admin-book-paging">
-            <ul class="pagination">
-                <li th:each="pageNum : ${#numbers.sequence(0, tags.totalPages - 1)}" class="page-item"
-                    th:classappend="${pageNum + 1 == tags.number ? 'active' : ''}">
-                    <a class="page-link" th:text="${pageNum + 1}" th:href="@{/admin/tag(page=${pageNum})}"></a>
-                </li>
-            </ul>
-        </nav>
-    </div>
-</div>
-</html>
\ No newline at end of file

From 3e0b16c93c8c13fe946d92cfa5bc248e25aab48b Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Thu, 21 Mar 2024 17:56:16 +0900
Subject: [PATCH 118/147] =?UTF-8?q?refactor:=20=EB=A9=94=EC=9D=B8=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=95=98=EB=8B=A8=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B3=B5=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/common/fragment/my-book/my-books-footer.html    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/resources/templates/common/fragment/my-book/my-books-footer.html b/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
index 06ab59b5..830d4e97 100644
--- a/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
+++ b/src/main/resources/templates/common/fragment/my-book/my-books-footer.html
@@ -2,10 +2,8 @@
 <html lang="en" xmlns:th="http://www.thympleaf.org">
 <div th:fragment="myBooksFooterFragment">
     <!-- Start Footer Area -->
-    <footer class="footer sticky-footer bg-white mt-auto">
+    <footer class="footer">
         <div class="container my-auto">
-
-            <!--        <div th:replace="common/fragment/my-book/footer/my-books-footer-top :: myBooksFooterFragment"></div>-->
             <div th:replace="common/fragment/my-book/footer/my-books-footer-middle::myBooksFooterMiddleFragment"></div>
             <div th:replace="common/fragment/my-book/footer/my-books-footer-bottom::myBooksFooterBottomFragment"></div>
         </div>

From 843a24c40a01c28185231ea647e31f086b0152b5 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:33:51 +0900
Subject: [PATCH 119/147] =?UTF-8?q?feat:=20=EA=B2=80=EC=83=89=EC=B0=BD=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/js/page-search/setLastPage.js       | 20 +++++++++++++++++++
 .../templates/admin/js/page-search/setNext.js |  8 ++++++++
 .../admin/js/page-search/setPrevious.js       |  8 ++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 src/main/resources/templates/admin/js/page-search/setLastPage.js
 create mode 100644 src/main/resources/templates/admin/js/page-search/setNext.js
 create mode 100644 src/main/resources/templates/admin/js/page-search/setPrevious.js

diff --git a/src/main/resources/templates/admin/js/page-search/setLastPage.js b/src/main/resources/templates/admin/js/page-search/setLastPage.js
new file mode 100644
index 00000000..d3eceda3
--- /dev/null
+++ b/src/main/resources/templates/admin/js/page-search/setLastPage.js
@@ -0,0 +1,20 @@
+document.addEventListener("DOMContentLoaded", function(){
+    var page = currentPage;
+    var query = document.querySelector("[name='query']").value;
+    var order = document.querySelector("[name='order']").value;
+
+    var pageNumContainer = document.getElementById("pageNumContainer");
+    for (let i = ((page / 10) >> 0) * 10; i <= Math.min((((page / 10) >> 0) + 1) * 10 - 1, totalPages - 1); i++) {
+        var pageNumElement = document.createElement("li");
+        pageNumElement.className = "page-item";
+        if (i === currentPage) {
+            pageNumElement.className += " active";
+        }
+        var pageNumLink = document.createElement("a");
+        pageNumLink.className = "page-link";
+        pageNumLink.textContent = i + 1;
+        pageNumLink.href = url + "?query=" + query + "&order=" + order + "&page=" + i;
+        pageNumElement.appendChild(pageNumLink);
+        pageNumContainer.appendChild(pageNumElement);
+    }
+});
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/js/page-search/setNext.js b/src/main/resources/templates/admin/js/page-search/setNext.js
new file mode 100644
index 00000000..f6878edc
--- /dev/null
+++ b/src/main/resources/templates/admin/js/page-search/setNext.js
@@ -0,0 +1,8 @@
+document.addEventListener("DOMContentLoaded", function(){
+    var page = Math.min(totalPages - 1, ((currentPage / 10) + 1) * 10);
+    var query = document.querySelector("[name='query']").value;
+    var order = document.querySelector("[name='order']").value;
+
+    let linkElement = document.getElementById("nextLink");
+    linkElement.href = url + "?query=" + query + "&order=" + order + "&page=" + page;
+});
diff --git a/src/main/resources/templates/admin/js/page-search/setPrevious.js b/src/main/resources/templates/admin/js/page-search/setPrevious.js
new file mode 100644
index 00000000..868d1d16
--- /dev/null
+++ b/src/main/resources/templates/admin/js/page-search/setPrevious.js
@@ -0,0 +1,8 @@
+document.addEventListener("DOMContentLoaded", function() {
+    var previous = Math.max(0, Math.floor((currentPage - 1) / 10) * 10);
+    var query = document.querySelector("[name='query']").value;
+    var order = document.querySelector("[name='order']").value;
+
+    let linkElement = document.getElementById("prevLink");
+    linkElement.href = url + "?query=" + query + "&order=" + order + "&page=" + previous;
+});

From 92198633c14a3154d4638258b6e3d8077e741106 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:34:19 +0900
Subject: [PATCH 120/147] =?UTF-8?q?refactor:=20PageResponse=20setter?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mybooks/front/pageable/dto/response/PageResponse.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/store/mybooks/front/pageable/dto/response/PageResponse.java b/src/main/java/store/mybooks/front/pageable/dto/response/PageResponse.java
index f31629e9..9224026f 100644
--- a/src/main/java/store/mybooks/front/pageable/dto/response/PageResponse.java
+++ b/src/main/java/store/mybooks/front/pageable/dto/response/PageResponse.java
@@ -6,6 +6,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * packageName    : store.mybooks.front.pageable.dto.response<br>
@@ -19,6 +20,7 @@
  * 2/24/24        minsu11       최초 생성<br>
  */
 @Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 public class PageResponse<T> {

From 39257f7cb6cdc220ea814034b2275a64eeaaf563 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:35:01 +0900
Subject: [PATCH 121/147] =?UTF-8?q?refactor:=20ElasticService=20=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC=EB=B0=A9=EB=B2=95order=EC=97=90=20=EB=94=B0=EB=A5=B8?=
 =?UTF-8?q?=20pageable=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/elastic/service/ElasticService.java | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/store/mybooks/front/elastic/service/ElasticService.java b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
index 52553b62..8d5a2edd 100644
--- a/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
+++ b/src/main/java/store/mybooks/front/elastic/service/ElasticService.java
@@ -27,7 +27,30 @@
 public class ElasticService {
     private final ElasticAdaptor elasticAdaptor;
 
-    public PageResponse<BookBriefResponse> getSearchResultPage(String query, Pageable pageable) {
+    public PageResponse<BookBriefResponse> getSearchResultPage(String query, Pageable pageable, String order) {
+        if (order != null) {
+            Sort sort;
+            switch (order) {
+                case "recent":
+                    sort = Sort.by(Sort.Direction.DESC, "book_publish_date");
+                    break;
+                case "low-price":
+                    sort = Sort.by(Sort.Direction.ASC, "book_sale_cost");
+                    break;
+                case "high-price":
+                    sort = Sort.by(Sort.Direction.DESC, "book_sale_cost");
+                    break;
+                case "rate":
+                    sort = Sort.by(Sort.Direction.DESC, "avg_rate");
+                    break;
+                case "review":
+                    sort = Sort.by(Sort.Direction.DESC, "book_review_count");
+                    break;
+                default:
+                    sort = Sort.by(Sort.Direction.DESC, "book_view_count");
+            }
+            pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
+        }
         return elasticAdaptor.searchPaged(query, pageable);
     }
 }

From b518ac5ad1812b2a708f14cc558627370a3d9a57 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:35:23 +0900
Subject: [PATCH 122/147] =?UTF-8?q?refactor:=20search-display.html=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/search-display.html   | 171 ++++++++----------
 1 file changed, 80 insertions(+), 91 deletions(-)

diff --git a/src/main/resources/templates/search-display.html b/src/main/resources/templates/search-display.html
index 8de81d98..1d471007 100644
--- a/src/main/resources/templates/search-display.html
+++ b/src/main/resources/templates/search-display.html
@@ -3,101 +3,90 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{common/layout/my-books-layout}">
 
-<style>
-  .product-image img {
-    width: 100%;
-    height: auto;
-  }
-</style>
-<div layout:fragment="content" class="border border-dark">
-  <script>
-    let url = "/category/category-display"
-    let currentPage = [[${books.number}]]
-    let totalPages = [[${books.totalPages}]]
-  </script>
-  <section class="product-grids section">
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-3 col-12">
-          <div class="product-sidebar">
-            <div class="single-widget">
-              <h3>
-                <span th:text="${highestCategoryName}"></span>
-              </h3>
-              <ul th:each="levelTwoCategory : ${levelTwoCategories}">
-                <li>
-                  <a th:href="@{/category/category-display/{categoryId}(categoryId=${levelTwoCategory.id})}"
-                     th:text="${levelTwoCategory.name}"></a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <div class="col-lg-9 col-12">
-          <h3>
-            <span th:text="${name}"></span>
-          </h3>
-          <div class="product-grids-head">
-            <div class="product-grid-topbar" th:block th:if="${targetCategories.size() != 0}">
-              <div class="row align-items-center">
-                <div th:each="category, iterStat : ${targetCategories}" class="col-2 text-center">
-                  <a th:href="@{/category/category-display/{categoryId}(categoryId=${category.id})}"
-                     th:text="${category.name}">
-                  </a>
+<div layout:fragment="content">
+    <script>
+        let url = "/search"
+        let currentPage = [[${books.number}]]
+        let totalPages = [[${books.totalPages}]]
+    </script>
+    <style>
+        .sort-options {
+            display: flex;
+            background-color: #e0e0e0;
+            padding: 10px;
+            margin-bottom: 20px;
+        }
+
+        .sort-options a {
+            margin-right: 15px;
+            color: #000;
+        }
+
+        .sort-options a.active {
+            color: #007bff;
+        }
+    </style>
+    <!-- Start Faq Area -->
+    <section class="faq section">
+        <div class="container">
+            <div>
+                <div class="sort-options">
+                    <a th:href="@{/search(query=${query}, order='popular')}" id="popular"
+                       th:class="${order == 'popular'} ? 'active' : ''">인기도순</a>
+                    <a th:href="@{/search(query=${query}, order='recent')}" id="recent"
+                       th:class="${order == 'recent'} ? 'active' : ''">신상품순</a>
+                    <a th:href="@{/search(query=${query}, order='low-price')}" id="low-price"
+                       th:class="${order == 'low-price'} ? 'active' : ''">최저가순</a>
+                    <a th:href="@{/search(query=${query}, order='high-price')}" id="high-price"
+                       th:class="${order == 'high-price'} ? 'active' : ''">최고가순</a>
+                    <a th:href="@{/search(query=${query}, order='rate')}" id="rate"
+                       th:class="${order == 'rate'} ? 'active' : ''">평점순</a>
+                    <a th:href="@{/search(query=${query}, order='review')}" id="review"
+                       th:class="${order == 'review'} ? 'active' : ''">리뷰순</a>
                 </div>
-              </div>
-            </div>
-            <div class="tab-content" id="nav-tabContent">
-              <div class="tab-pane fade show active" id="nav-grid" role="tabpanel"
-                   aria-labelledby="nav-grid-tab">
-                <div class="row">
-                  <div class="col-lg-4 col-md-6 col-12" th:each="book : ${books.content}">
-                    <div class="single-product">
-                      <div class="product-image">
-                        <img class="product-image card-img-top "
-                             th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}"
-                             alt="#">
-                      </div>
-                      <div class="product-info">
-                        <span class="category">Watches</span>
-                        <h4 class="title">
-                          <a th:href="@{/book/{id}(id=${book.id})}"
-                             th:text="${book.name}"></a>
-                        </h4>
-                        <ul class="review">
-                          <li><i class="lni lni-star-filled"></i></li>
-                          <li><i class="lni lni-star-filled"></i></li>
-                          <li><i class="lni lni-star-filled"></i></li>
-                          <li><i class="lni lni-star-filled"></i></li>
-                          <li><i class="lni lni-star"></i></li>
-                          <li><span>4.0 Review(s)</span></li>
-                        </ul>
-                        <div class="price">
-                          <span th:text="${book.saleCost}"></span>
+                <div th:if="${books.content.size() > 0}" class="row mt-3">
+                    <div th:each="book : ${books.content}" class="col-md-3 mb-3">
+                        <div class="single-product card h-100">
+                            <div class="product-image">
+                                <img class="product-image card-img-top" th:src="${book.image}" alt="#">
+                            </div>
+                            <div class="product-info">
+                                <h4 class="book-title-large-text">
+                                    <a th:href="@{'/book/' + ${book.id}}" th:text="${book.name}"></a>
+                                </h4>
+                                <ul class="review">
+                                    <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span
+                                            th:text="(${book.reviewCount})"></span>)</p></li>
+                                </ul>
+                                <div class="price">
+                                    <span th:text="'₩'+ ${book.saleCost}"></span>
+                                    <span th:if="${book.saleCost != book.cost}" class="discount-price"
+                                          th:text="${book.cost}"></span>
+                                </div>
+                            </div>
                         </div>
-                      </div>
                     </div>
-                  </div>
                 </div>
-              </div>
+                <div th:unless="${books.content.size() > 0}" class="text-center">
+                    <p th:if="${order == 'rate'}">정렬 조건에 맞는 도서가 없습니다.</p>
+                    <p th:unless="${order == 'rate'}">검색 결과가 없습니다.</p>
+                </div>
+            </div>
+            <div class="mt-3" th:block th:if="${books.totalPages > 1}">
+                <div class="pagination">
+                    <div class="page-item">
+                        <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                    </div>
+                    <div class="pagination" id="pageNumContainer"></div>
+                    <div class="page-item">
+                        <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                    </div>
+                </div>
             </div>
-          </div>
+            <script src="/admin/js/page-search/setPrevious.js"></script>
+            <script src="/admin/js/page-search/setNext.js"></script>
+            <script src="/admin/js/page-search/setLastPage.js"></script>
         </div>
-      </div>
-    </div>
-  </section>
-  <div class="mt-3" th:block th:if="${books.totalPages > 1}">
-    <div class="pagination">
-      <div class="page-item">
-        <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-      </div>
-      <div class="pagination" id="pageNumContainer"></div>
-      <div class="page-item">
-        <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
-      </div>
-    </div>
-  </div>
-  <script src="/admin/js/page/setPrevious.js"></script>
-  <script src="/admin/js/page/setNext.js"></script>
-  <script src="/admin/js/page/setLastPage.js"></script>
+    </section>
+    <!-- End About Area -->
 </div>
\ No newline at end of file

From 31625b8093bdf999751ed538ff1741fd2005e18a Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:35:53 +0900
Subject: [PATCH 123/147] =?UTF-8?q?refactor:=20ElasticController=20?=
 =?UTF-8?q?=ED=8F=89=EC=A0=90=EC=9D=B4=20100=EA=B0=9C=20=EC=9D=B4=EC=83=81?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=EB=A7=8C=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elastic/controller/ElasticController.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
index 2f172b89..e239ccfa 100644
--- a/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
+++ b/src/main/java/store/mybooks/front/elastic/controller/ElasticController.java
@@ -1,5 +1,7 @@
 package store.mybooks.front.elastic.controller;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -32,8 +34,19 @@ public class ElasticController {
     private final ElasticService elasticService;
 
     @GetMapping
-    public String getSearchResultPage(@RequestParam("query") String query, @PageableDefault(size = 8, sort = "book_view_count", direction = Sort.Direction.DESC) Pageable pageable, Model model) {
-        PageResponse<BookBriefResponse> result = elasticService.getSearchResultPage(query, pageable);
+    public String getSearchResultPage(@RequestParam("query") String query,
+                                      @RequestParam(value = "order", required = false) String order,
+                                      @PageableDefault(size = 8, sort = "book_view_count", direction = Sort.Direction.DESC)
+                                      Pageable pageable, Model model) {
+        PageResponse<BookBriefResponse> result = elasticService.getSearchResultPage(query, pageable, order);
+
+        model.addAttribute("order", (order != null) ? order : "popular");
+        if ("rate".equals(order)) {
+            List<BookBriefResponse> checkReviewCount = result.getContent().stream()
+                    .filter(book -> book.getReviewCount() != null && book.getReviewCount() >= 100)
+                    .collect(Collectors.toList());
+            result.setContent(checkReviewCount);
+        }
         model.addAttribute("books", result);
         return "search-display";
     }

From 9bc591334049fa87d30d6a9ee1e211bd5bf70148 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 10:36:17 +0900
Subject: [PATCH 124/147] =?UTF-8?q?refactor:=20=EA=B4=80=EB=A6=AC=EC=9E=90?=
 =?UTF-8?q?=20=EB=8F=84=EC=84=9C=EC=A1=B0=ED=9A=8C=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20style=ED=83=9C=EA=B7=B8=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/view/book/book.html       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/templates/admin/view/book/book.html b/src/main/resources/templates/admin/view/book/book.html
index 04f22778..1f5fe67d 100644
--- a/src/main/resources/templates/admin/view/book/book.html
+++ b/src/main/resources/templates/admin/view/book/book.html
@@ -3,17 +3,16 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{common/layout/admin-layout}">
 
-<style>
-    .book-image {
-        width: 100px;
-        height: 150px;
-        object-fit: cover;
-        display: block;
-        margin: 0 auto;
-    }
-</style>
-
 <div layout:fragment="content">
+    <style>
+        .book-image {
+            width: 100px;
+            height: 150px;
+            object-fit: cover;
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
     <script>
         let url = "/admin/book"
         let currentPage = [[${books.number}]]

From 4a74b4b42755e4424797312e73221d7ab7c06350 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Fri, 22 Mar 2024 15:12:11 +0900
Subject: [PATCH 125/147] =?UTF-8?q?refactor:=20BookBriefResponse=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookBriefResponseIncludePublishDate.java  | 32 -------------------
 .../category/adaptor/CategoryAdaptor.java     |  7 ++--
 .../category/service/CategoryService.java     |  6 ++--
 .../resources/templates/category-display.html | 28 ++++++++--------
 4 files changed, 21 insertions(+), 52 deletions(-)
 delete mode 100644 src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponseIncludePublishDate.java

diff --git a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponseIncludePublishDate.java b/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponseIncludePublishDate.java
deleted file mode 100644
index 3ca034d0..00000000
--- a/src/main/java/store/mybooks/front/admin/book/model/response/BookBriefResponseIncludePublishDate.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package store.mybooks.front.admin.book.model.response;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import store.mybooks.front.image.dto.ImageResponse;
-
-/**
- * packageName    : store.mybooks.front.admin.book.model.response
- * fileName       : BookBriefResponseIncludePublishDate
- * author         : damho-lee
- * date           : 3/14/24
- * description    :
- * ===========================================================
- * DATE              AUTHOR             NOTE
- * -----------------------------------------------------------
- * 3/14/24          damho-lee          최초 생성
- */
-@Getter
-@NoArgsConstructor
-public class BookBriefResponseIncludePublishDate {
-    private Long id;
-
-    private ImageResponse imageResponse;
-
-    private String name;
-
-//    private Double rate;
-
-    private Integer cost;
-
-    private Integer saleCost;
-}
diff --git a/src/main/java/store/mybooks/front/category/adaptor/CategoryAdaptor.java b/src/main/java/store/mybooks/front/category/adaptor/CategoryAdaptor.java
index e6c8160a..c612214b 100644
--- a/src/main/java/store/mybooks/front/category/adaptor/CategoryAdaptor.java
+++ b/src/main/java/store/mybooks/front/category/adaptor/CategoryAdaptor.java
@@ -11,7 +11,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
-import store.mybooks.front.admin.book.model.response.BookBriefResponseIncludePublishDate;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
 import store.mybooks.front.category.model.reesponse.CategoryGetResponseForCategoryView;
 import store.mybooks.front.category.model.reesponse.CategoryGetResponseForMainView;
 import store.mybooks.front.config.GatewayAdaptorProperties;
@@ -68,12 +68,11 @@ public CategoryGetResponseForCategoryView getCategoriesForCategoryView(Integer c
         return Utils.getResponseEntity(exchange, HttpStatus.OK);
     }
 
-    public PageResponse<BookBriefResponseIncludePublishDate> getBooksForCategoryView(Integer categoryId,
-                                                                                     Pageable pageable) {
+    public PageResponse<BookBriefResponse> getBooksForCategoryView(Integer categoryId, Pageable pageable) {
         HttpHeaders headers = Utils.getHttpHeader();
         HttpEntity<Void> requestEntity = new HttpEntity<>(headers);
 
-        ResponseEntity<PageResponse<BookBriefResponseIncludePublishDate>> exchange = restTemplate.exchange(
+        ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + URL + "/view/book/" + categoryId
                         + "?page=" + pageable.getPageNumber() + "&size=" + pageable.getPageSize(),
                 HttpMethod.GET,
diff --git a/src/main/java/store/mybooks/front/category/service/CategoryService.java b/src/main/java/store/mybooks/front/category/service/CategoryService.java
index 55850259..a5e8c6f0 100644
--- a/src/main/java/store/mybooks/front/category/service/CategoryService.java
+++ b/src/main/java/store/mybooks/front/category/service/CategoryService.java
@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import store.mybooks.front.admin.book.model.response.BookBriefResponseIncludePublishDate;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
 import store.mybooks.front.category.adaptor.CategoryAdaptor;
 import store.mybooks.front.category.model.reesponse.CategoryGetResponseForCategoryView;
 import store.mybooks.front.category.model.reesponse.CategoryGetResponseForMainView;
@@ -34,8 +34,8 @@ public CategoryGetResponseForCategoryView getCategoriesForCategoryView(Integer c
         return categoryAdaptor.getCategoriesForCategoryView(categoryId);
     }
 
-    public PageResponse<BookBriefResponseIncludePublishDate> getBooksForCategoryView(Integer categoryId,
-                                                                                     Pageable pageable) {
+    public PageResponse<BookBriefResponse> getBooksForCategoryView(Integer categoryId,
+                                                                   Pageable pageable) {
         return categoryAdaptor.getBooksForCategoryView(categoryId, pageable);
     }
 }
diff --git a/src/main/resources/templates/category-display.html b/src/main/resources/templates/category-display.html
index f4d1469c..550d9a4e 100644
--- a/src/main/resources/templates/category-display.html
+++ b/src/main/resources/templates/category-display.html
@@ -50,27 +50,29 @@ <h3>
                         <div class="tab-content" id="nav-tabContent">
                             <div class="tab-pane fade show active" id="nav-grid" role="tabpanel"
                                  aria-labelledby="nav-grid-tab">
-                                <div class="row">
-                                    <div class="col-lg-4 col-md-6 col-12" th:each="book : ${books.content}">
-                                        <div class="single-product">
+                                <div class="row mt-3">
+                                    <div th:each="book: ${books.content}" class="col-lg-3 col-md-6 col-12">
+                                        <div class="single-product card h-100">
                                             <div class="product-image">
                                                 <img class="product-image card-img-top "
-                                                     th:src="${book.imageResponse.path + book.imageResponse.fileName + book.imageResponse.extension}"
+                                                     th:src="${book.image}"
                                                      alt="#">
+                                                <div class="button">
+                                                    <form action="/cart/add" method="post">
+                                                        <input type="hidden" name="id" th:value="${book.id}">
+                                                        <input type="hidden" name="cost" th:value="${book.cost}">
+                                                        <input type="hidden" name="saleCost" th:value="${book.saleCost}">
+                                                        <input type="hidden" name="quantity" value=1>
+                                                        <button type="submit" class="lni lni-cart btn">Add to Cart</button>
+                                                    </form>
+                                                </div>
                                             </div>
                                             <div class="product-info">
-                                                <span class="category">Watches</span>
                                                 <h4 class="title">
-                                                    <a th:href="@{/book/{id}(id=${book.id})}"
-                                                       th:text="${book.name}"></a>
+                                                    <a th:href="@{'/book/' + ${book.id}}" th:text="${book.name}"></a>
                                                 </h4>
                                                 <ul class="review">
-                                                    <li><i class="lni lni-star-filled"></i></li>
-                                                    <li><i class="lni lni-star-filled"></i></li>
-                                                    <li><i class="lni lni-star-filled"></i></li>
-                                                    <li><i class="lni lni-star-filled"></i></li>
-                                                    <li><i class="lni lni-star"></i></li>
-                                                    <li><span>4.0 Review(s)</span></li>
+                                                    <li><p>리뷰: <span th:text="${book.rate}">/5</span>(<span th:text="(${book.reviewCount})"></span>)</p></li>
                                                 </ul>
                                                 <div class="price">
                                                     <span th:text="${book.saleCost}"></span>

From 0ddf39c0949bff06e9383fca7eaa4ff59eb533f4 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:19:58 +0900
Subject: [PATCH 126/147] =?UTF-8?q?refactor:=20=ED=8E=98=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/member/service/MemberService.java   | 34 ----------
 .../adaptor/AdminUserAdaptor.java}            |  4 +-
 .../controller/AdminUserController.java}      | 12 ++--
 .../adaptor/UserStatusAdaptor.java            | 55 ----------------
 .../controller/UserStatusController.java      | 43 ------------
 .../dto/response/UserStatusGetResponse.java   | 23 -------
 .../admin/view/member/member-all.html         | 66 -------------------
 7 files changed, 8 insertions(+), 229 deletions(-)
 delete mode 100644 src/main/java/store/mybooks/front/admin/member/service/MemberService.java
 rename src/main/java/store/mybooks/front/admin/{member/adaptor/MemberAdaptor.java => user/adaptor/AdminUserAdaptor.java} (96%)
 rename src/main/java/store/mybooks/front/admin/{member/controller/MemberController.java => user/controller/AdminUserController.java} (74%)
 delete mode 100644 src/main/java/store/mybooks/front/user_status/adaptor/UserStatusAdaptor.java
 delete mode 100644 src/main/java/store/mybooks/front/user_status/controller/UserStatusController.java
 delete mode 100644 src/main/java/store/mybooks/front/user_status/dto/response/UserStatusGetResponse.java
 delete mode 100644 src/main/resources/templates/admin/view/member/member-all.html

diff --git a/src/main/java/store/mybooks/front/admin/member/service/MemberService.java b/src/main/java/store/mybooks/front/admin/member/service/MemberService.java
deleted file mode 100644
index 12b2bcab..00000000
--- a/src/main/java/store/mybooks/front/admin/member/service/MemberService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package store.mybooks.front.admin.member.service;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import store.mybooks.front.admin.member.adaptor.MemberAdaptor;
-import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.user.dto.response.UserGetResponse;
-
-
-/**
- * packageName    : store.mybooks.front.admin.member.controller.service<br>
- * fileName       : MemberService<br>
- * author         : masiljangajji<br>
- * date           : 3/15/24<br>
- * description    :
- * ===========================================================
- * DATE              AUTHOR             NOTE
- * -----------------------------------------------------------
- * 3/15/24        masiljangajji       최초 생성
- */
-
-@Service
-@RequiredArgsConstructor
-public class MemberService {
-
-    private final MemberAdaptor adaptor;
-
-    public PageResponse<UserGetResponse> getAllMembers(Pageable pageable) {
-        return adaptor.getPagedMembers(pageable);
-    }
-
-
-}
diff --git a/src/main/java/store/mybooks/front/admin/member/adaptor/MemberAdaptor.java b/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
similarity index 96%
rename from src/main/java/store/mybooks/front/admin/member/adaptor/MemberAdaptor.java
rename to src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
index fa19bff1..7abef5aa 100644
--- a/src/main/java/store/mybooks/front/admin/member/adaptor/MemberAdaptor.java
+++ b/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.admin.member.adaptor;
+package store.mybooks.front.admin.user.adaptor;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
@@ -29,7 +29,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class MemberAdaptor {
+public class UserAdaptor {
 
     private final RestTemplate restTemplate;
 
diff --git a/src/main/java/store/mybooks/front/admin/member/controller/MemberController.java b/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
similarity index 74%
rename from src/main/java/store/mybooks/front/admin/member/controller/MemberController.java
rename to src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
index e5214fdb..72c87aee 100644
--- a/src/main/java/store/mybooks/front/admin/member/controller/MemberController.java
+++ b/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
@@ -1,4 +1,4 @@
-package store.mybooks.front.admin.member.controller;
+package store.mybooks.front.admin.user.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -7,7 +7,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import store.mybooks.front.admin.member.service.MemberService;
+import store.mybooks.front.admin.user.adaptor.AdminUserAdaptor;
 
 /**
  * packageName    : store.mybooks.front.admin.member<br>
@@ -24,16 +24,16 @@
 @Controller
 @RequiredArgsConstructor
 @RequestMapping("/admin/member")
-public class MemberController {
+public class UserController {
 
-    private final MemberService memberService;
+    private final AdminUserAdaptor adminUserAdaptor;
 
     @GetMapping
     public String viewMembers(@PageableDefault Pageable pageable, Model model) {
 
-        model.addAttribute("members", memberService.getAllMembers(pageable));
+        model.addAttribute("users", adminUserAdaptor.getPagedUsers(pageable));
 
-        return "admin/view/member/member-all";
+        return "admin/view/user/user-all";
     }
 
 
diff --git a/src/main/java/store/mybooks/front/user_status/adaptor/UserStatusAdaptor.java b/src/main/java/store/mybooks/front/user_status/adaptor/UserStatusAdaptor.java
deleted file mode 100644
index 8f89c16b..00000000
--- a/src/main/java/store/mybooks/front/user_status/adaptor/UserStatusAdaptor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package store.mybooks.front.user_status.adaptor;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import store.mybooks.front.config.GatewayAdaptorProperties;
-import store.mybooks.front.user_status.dto.response.UserStatusGetResponse;
-
-/**
- * packageName    : store.mybooks.front.user_status.adaptor<br>
- * fileName       : UserStatusAdaptor<br>
- * author         : masiljangajji<br>
- * date           : 2/22/24<br>
- * description    :
- * ===========================================================
- * DATE              AUTHOR             NOTE
- * -----------------------------------------------------------
- * 2/22/24        masiljangajji       최초 생성
- */
-@Component
-@RequiredArgsConstructor
-public class UserStatusAdaptor {
-
-    private final RestTemplate restTemplate;
-
-    private final GatewayAdaptorProperties gatewayAdaptorProperties;
-
-
-    /**
-     * methodName : findUserStatusById
-     * author : masiljangajji
-     * description : 유저가 가질 수 있는 상태를 찾음
-     *
-     * @param id id
-     * @return user status get response
-     */
-    public UserStatusGetResponse findUserStatusById(String id) {
-        ResponseEntity<UserStatusGetResponse> responseEntity =
-                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + "/api/users-statuses/{statusId}", HttpMethod.GET, null,
-                        new ParameterizedTypeReference<>() {
-                        },id);
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new RuntimeException();
-        }
-
-        return responseEntity.getBody();
-    }
-
-
-}
diff --git a/src/main/java/store/mybooks/front/user_status/controller/UserStatusController.java b/src/main/java/store/mybooks/front/user_status/controller/UserStatusController.java
deleted file mode 100644
index aa38f0e6..00000000
--- a/src/main/java/store/mybooks/front/user_status/controller/UserStatusController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package store.mybooks.front.user_status.controller;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import store.mybooks.front.user_status.adaptor.UserStatusAdaptor;
-
-/**
- * packageName    : store.mybooks.resource.user_status.controller<br>
- * fileName       : UserStatusRestController<br>
- * author         : masiljangajji<br>
- * date           : 2/18/24<br>
- * description    :
- * ===========================================================
- * DATE              AUTHOR             NOTE
- * -----------------------------------------------------------
- * 2/18/24        masiljangajji       최초 생성
- */
-@Controller
-@RequiredArgsConstructor
-@RequestMapping("/api/users-status")
-public class UserStatusController {
-
-    private final UserStatusAdaptor userStatusAdaptor;
-
-
-    @GetMapping("/{id}")
-    public String getAllAccounts(@PathVariable(name = "id") String id,
-                                 Model model) {
-        model.addAttribute("userStatus", userStatusAdaptor.findUserStatusById(id));
-
-
-        return "good";
-    }
-
-
-
-
-
-}
diff --git a/src/main/java/store/mybooks/front/user_status/dto/response/UserStatusGetResponse.java b/src/main/java/store/mybooks/front/user_status/dto/response/UserStatusGetResponse.java
deleted file mode 100644
index aa7e22ec..00000000
--- a/src/main/java/store/mybooks/front/user_status/dto/response/UserStatusGetResponse.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package store.mybooks.front.user_status.dto.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * packageName    : store.mybooks.resource.user_status.dto.response<br>
- * fileName       : UserStatusGetResponse<br>
- * author         : masiljangajji<br>
- * date           : 2/19/24<br>
- * description    :
- * ===========================================================
- * DATE              AUTHOR             NOTE
- * -----------------------------------------------------------
- * 2/19/24        masiljangajji       최초 생성
- */
-@Getter
-@AllArgsConstructor
-public class UserStatusGetResponse {
-
-    private String id;
-
-}
diff --git a/src/main/resources/templates/admin/view/member/member-all.html b/src/main/resources/templates/admin/view/member/member-all.html
deleted file mode 100644
index ae1f72d1..00000000
--- a/src/main/resources/templates/admin/view/member/member-all.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/html"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{common/layout/admin-layout}">
-
-<div layout:fragment="content">
-    <script>
-        let url = "/admin/member"
-        let currentPage = [[${members.number}]]
-        let totalPages = [[${members.totalPages}]]
-        console.log(currentPage)
-        console.log(totalPages)
-    </script>
-    <div class="container mt-5"> <!-- text-center 클래스 추가 -->
-        <h1>회원 정보</h1>
-        <table class="table table-bordered" style="width: 120%; height: 100%;">
-            <thead>
-            <tr>
-                <th>회원 이름</th>
-                <th>전화번호</th>
-                <th>이메일</th>
-                <th>생년</th>
-                <th>생월일</th>
-                <th>가입일</th>
-                <th>등급</th>
-                <th>상태</th>
-                <th>최근 로그인</th>
-                <th>등급 변경일</th>
-            </tr>
-            </thead>
-            <tbody>
-
-            <tr th:each="member:${members.content}">
-                <td th:text="${member.name}"></td>
-                <td th:text="${member.phoneNumber}"></td>
-                <td th:text="${member.email}"></td>
-                <td th:text="${member.birthYear}"></td>
-                <td th:text="${member.birthMonthDay}"></td>
-                <td th:text="${member.createdAt}"></td>
-                <td th:text="${member.userGradeUserGradeNameId}"></td>
-                <td th:text="${member.userStatusId}"></td>
-                <td th:text="${member.latestLogin}"></td>
-                <td th:text="${member.gradeChangedDate}"></td>
-            </tr>
-            </tbody>
-        </table>
-        <div class="mt-3">
-            <div class="pagination">
-                <div class="page-item">
-                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-                </div>
-                <div class="pagination" id="pageNumContainer"></div>
-                <div class="page-item">
-                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <script src="/admin/js/page/setPrevious.js"></script>
-    <script src="/admin/js/page/setNext.js"></script>
-    <script src="/admin/js/page/setLastPage.js"></script>
-</div>
-
-</html>

From 738a5b451674bcfc94df301e6b5cf4b9635621b7 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:20:21 +0900
Subject: [PATCH 127/147] =?UTF-8?q?feat:=20admin-sidebar=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EB=93=B1=EA=B8=89=20,=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/common/fragment/admin/admin-sidebar.html          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/templates/common/fragment/admin/admin-sidebar.html b/src/main/resources/templates/common/fragment/admin/admin-sidebar.html
index 9826077f..1a004803 100644
--- a/src/main/resources/templates/common/fragment/admin/admin-sidebar.html
+++ b/src/main/resources/templates/common/fragment/admin/admin-sidebar.html
@@ -42,6 +42,8 @@
                 <div class="bg-white py-2 collapse-inner rounded">
                     <h6 class="collapse-header">회원:</h6>
                     <a class="collapse-item" href="/admin/member">회원 목록</a>
+                    <a class="collapse-item" href="/admin/member/grade">회원 등급</a>
+                    <a class="collapse-item" href="/admin/member/status">회원 상태</a>
                 </div>
             </div>
         </li>

From 3b906e5934dda1793a8031945d27020892e57202 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:20:36 +0900
Subject: [PATCH 128/147] =?UTF-8?q?feat:=20status.html=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EC=83=81=ED=83=9C=20=EB=B7=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/view/user/status.html     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/main/resources/templates/admin/view/user/status.html

diff --git a/src/main/resources/templates/admin/view/user/status.html b/src/main/resources/templates/admin/view/user/status.html
new file mode 100644
index 00000000..3481422c
--- /dev/null
+++ b/src/main/resources/templates/admin/view/user/status.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/admin-layout}">
+
+<div layout:fragment="content">
+    <div class="container mt-5"> <!-- text-center 클래스 추가 -->
+        <table class="table table-bordered" style="width: 120%; height: 100%;">
+            <thead>
+            <tr>
+                <th>회원 상태표</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="status : ${userStatus}">
+                <td th:text="${status.id}"></td>
+            </tr>
+            </tbody>
+        </table>
+
+
+
+    </div>
+
+
+</div>
+
+</html>

From 295da74922d919f370caa8309dd46bde8aa9ee1b Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:21:01 +0900
Subject: [PATCH 129/147] =?UTF-8?q?feat:=20grade.html=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EB=A5=BC=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=B7=B0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/user/grade-active.html         | 146 ++++++++++++++++++
 .../templates/admin/view/user/grade-all.html  |  41 +++++
 2 files changed, 187 insertions(+)
 create mode 100644 src/main/resources/templates/admin/view/user/grade-active.html
 create mode 100644 src/main/resources/templates/admin/view/user/grade-all.html

diff --git a/src/main/resources/templates/admin/view/user/grade-active.html b/src/main/resources/templates/admin/view/user/grade-active.html
new file mode 100644
index 00000000..5db53996
--- /dev/null
+++ b/src/main/resources/templates/admin/view/user/grade-active.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/admin-layout}">
+
+<head>
+    <!-- 여기에 CSS 및 JavaScript 라이브러리 추가 -->
+    <style>
+        /* 변경 버튼 스타일 */
+        .delete-btn {
+            background-color: #007bff; /* 배경색 */
+            color: white; /* 글자색 */
+            border: none; /* 테두리 없음 */
+            padding: 5px 10px; /* 내부 여백 */
+            text-align: center; /* 텍스트 가운데 정렬 */
+            text-decoration: none; /* 밑줄 없앰 */
+            display: inline-block; /* 인라인 요소로 표시 */
+            font-size: 14px; /* 글자 크기 */
+            cursor: pointer; /* 포인터 모양으로 변경 */
+            border-radius: 4px; /* 모서리 둥글게 */
+        }
+
+        /* 변경 버튼 호버 효과 */
+        .delete-btn:hover {
+            background-color: #007bff; /* 호버시 배경색 변경 */
+        }
+
+        /* 모달 */
+        .modal {
+            display: none; /* 기본적으로 모달 숨김 */
+            position: fixed; /* 고정 위치 */
+            z-index: 1; /* 모달 위에 다른 요소들이 보이지 않도록 설정 */
+            left: 0;
+            top: 0;
+            width: 100%; /* 전체 화면 너비 */
+            height: 100%; /* 전체 화면 높이 */
+            overflow: auto; /* 스크롤 가능하도록 설정 */
+            background-color: rgba(0, 0, 0, 0.4); /* 배경 어둡게 설정 */
+        }
+
+        /* 모달 컨텐츠 */
+        .modal-content {
+            background-color: #fefefe; /* 모달 배경색 */
+            margin: 15% auto; /* 상단과 하단 간격 15% */
+            padding: 20px;
+            border: 1px solid #888;
+            width: 80%; /* 모달 너비 */
+        }
+
+        /* 닫기 버튼 */
+        .close {
+            color: #aaa;
+            float: right; /* 오른쪽 정렬 */
+            font-size: 28px;
+            font-weight: bold;
+        }
+
+        /* 닫기 버튼 호버 효과 */
+        .close:hover,
+        .close:focus {
+            color: black;
+            text-decoration: none;
+            cursor: pointer;
+        }
+    </style>
+</head>
+
+<body>
+
+<div layout:fragment="content">
+    <div class="container mt-5"> <!-- text-center 클래스 추가 -->
+        <h3>활성 회원등급표</h3>
+        <table class="table table-bordered" style="width: 120%; height: 100%;">
+            <thead>
+            <tr>
+                <th>이름</th>
+                <th>최소 가격</th>
+                <th>최대 가격</th>
+                <th>포인트 적립률 (%)</th>
+                <th>생성일</th>
+                <th>관리</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="grade : ${userGrades}">
+                <td th:text="${grade.userGradeNameId}"></td>
+                <td th:text="${grade.minCost}"></td>
+                <td th:text="${grade.maxCost}"></td>
+                <td th:text="${grade.rate}"></td>
+                <td th:text="${grade.createdDate}"></td>
+                <td>
+                    <button class="btn btn-primary btn-sm" th:id="${grade.userGradeNameId}"
+                            onclick="openModal(this.getAttribute('id'))">관리
+                    </button>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+        <button class="btn btn-primary btn-sm" onclick="location.href='/admin/member/grade/all'">모든 회원등급표</button>
+    </div>
+
+
+    <!-- 모달 -->
+    <div id="myModal" class="modal">
+        <div class="modal-content">
+            <span class="close" onclick="closeModal()">&times;</span>
+            <!-- 모달 내용 -->
+            <h2>등급 포인트 변경시 기존의 등급은 자동으로 비활성화 처리됩니다.</h2>
+            <form id="modifyForm" method="post" action="/admin/member/grade">
+
+                <input type="hidden" name="userGradeNameId" value="" id="userGradeNameId"/>
+
+                <div class="form-group">
+                    <label for="modify_alias">포인트 적립률</label>
+                    <input type="text" id="modify_alias" class="form-control" name="rate" required>
+                </div>
+
+                <button type="submit" class="delete-btn">변경</button>
+            </form>
+        </div>
+    </div>
+
+    <!-- JavaScript -->
+    <script>
+        // 모달 열기 함수
+        function openModal(userGradeNameId) {
+
+            var modal = document.getElementById("myModal");
+            var userGradeNameIdField = document.getElementById("userGradeNameId");
+            userGradeNameIdField.value = userGradeNameId;
+            console.log(userGradeNameId)
+            modal.style.display = "block";
+        }
+
+        // 모달 닫기 함수
+        function closeModal() {
+            var modal = document.getElementById("myModal");
+            modal.style.display = "none";
+        }
+    </script>
+</div>
+
+
+</body>
+
+</html>
diff --git a/src/main/resources/templates/admin/view/user/grade-all.html b/src/main/resources/templates/admin/view/user/grade-all.html
new file mode 100644
index 00000000..8375f2e8
--- /dev/null
+++ b/src/main/resources/templates/admin/view/user/grade-all.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/admin-layout}">
+
+
+<body>
+
+<div layout:fragment="content">
+    <div class="container mt-5"> <!-- text-center 클래스 추가 -->
+        <h3>모든 회원등급표(비활성 등급 포함)</h3>
+        <table class="table table-bordered" style="width: 120%; height: 100%;">
+            <thead>
+            <tr>
+                <th>이름</th>
+                <th>최소 가격</th>
+                <th>최대 가격</th>
+                <th>포인트 적립률 (%)</th>
+                <th>생성일</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="grade : ${userGrades}">
+                <td th:text="${grade.userGradeNameId}"></td>
+                <td th:text="${grade.minCost}"></td>
+                <td th:text="${grade.maxCost}"></td>
+                <td th:text="${grade.rate}"></td>
+                <td th:text="${grade.createdDate}"></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+
+
+
+</div>
+
+
+</body>
+
+</html>

From 8aca626a4cc83afb81dff173fa0a9db5a362263f Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:21:13 +0900
Subject: [PATCH 130/147] =?UTF-8?q?refactor:=20=ED=8E=98=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/view/user/user-all.html   | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/main/resources/templates/admin/view/user/user-all.html

diff --git a/src/main/resources/templates/admin/view/user/user-all.html b/src/main/resources/templates/admin/view/user/user-all.html
new file mode 100644
index 00000000..d345cf67
--- /dev/null
+++ b/src/main/resources/templates/admin/view/user/user-all.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/admin-layout}">
+
+<div layout:fragment="content">
+    <script>
+        let url = "/admin/member"
+        let currentPage = [[${users.number}]]
+        let totalPages = [[${users.totalPages}]]
+        console.log(currentPage)
+        console.log(totalPages)
+    </script>
+    <div class="container mt-5"> <!-- text-center 클래스 추가 -->
+        <h1>회원 정보</h1>
+        <table class="table table-bordered" style="width: 120%; height: 100%;">
+            <thead>
+            <tr>
+                <th>회원 이름</th>
+                <th>전화번호</th>
+                <th>이메일</th>
+                <th>생년</th>
+                <th>생월일</th>
+                <th>가입일</th>
+                <th>등급</th>
+                <th>상태</th>
+                <th>최근 로그인</th>
+                <th>등급 변경일</th>
+            </tr>
+            </thead>
+            <tbody>
+
+            <tr th:each="user:${users.content}">
+                <td th:text="${user.name}"></td>
+                <td th:text="${user.phoneNumber}"></td>
+                <td th:text="${user.email}"></td>
+                <td th:text="${user.birthYear}"></td>
+                <td th:text="${user.birthMonthDay}"></td>
+                <td th:text="${user.createdAt}"></td>
+                <td th:text="${user.userGradeUserGradeNameId}"></td>
+                <td th:text="${user.userStatusId}"></td>
+                <td th:text="${user.latestLogin}"></td>
+                <td th:text="${user.gradeChangedDate}"></td>
+            </tr>
+            </tbody>
+        </table>
+        <div class="mt-3">
+            <div class="pagination">
+                <div class="page-item">
+                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                </div>
+                <div class="pagination" id="pageNumContainer"></div>
+                <div class="page-item">
+                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script src="/admin/js/page/setPrevious.js"></script>
+    <script src="/admin/js/page/setNext.js"></script>
+    <script src="/admin/js/page/setLastPage.js"></script>
+</div>
+
+</html>

From 10610928e0b49900ad6431845d0d7eb33058813b Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:21:53 +0900
Subject: [PATCH 131/147] =?UTF-8?q?feat:=20social.html=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=94=20=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EB=AF=B8=EB=8F=99=EC=9D=98=EC=8B=9C=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=95=EB=B3=B4=EB=B0=9B=EB=8A=94=20=EB=B7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/social.html | 163 +++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 src/main/resources/templates/social.html

diff --git a/src/main/resources/templates/social.html b/src/main/resources/templates/social.html
new file mode 100644
index 00000000..5a091941
--- /dev/null
+++ b/src/main/resources/templates/social.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{common/layout/my-books-layout}">
+
+<div layout:fragment="content">
+
+    <!-- Start Breadcrumbs -->
+    <div class="breadcrumbs">
+        <div class="container">
+            <div class="row align-items-center">
+                <div class="col-lg-6 col-md-6 col-12">
+                </div>
+                <div class="col-lg-6 col-md-6 col-12">
+                    <ul class="breadcrumb-nav">
+                        <li><a href="/"><i class="lni lni-home"></i>Home</a></li>
+                        <li>추가정보 기입</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- End Breadcrumbs -->
+
+    <!-- Start Account Register Area -->
+    <section>
+        <div class="account-login section">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-6 offset-lg-3 col-md-10 offset-md-1 col-12">
+                        <div class="register-form">
+
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label for="reg-fn">소셜 회원으로 추가적인 정보가 필요합니다</label>
+                                </div>
+                            </div>
+
+                            <form id="registerForm" class="row" method="post" action="/social"
+                                  onsubmit="return checkPasswordAndAuth()">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label for="reg-fn">이름</label>
+                                        <input class="form-control" type="text" id="reg-fn" name="name" required>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label for="reg-email">이메일</label>
+                                        <input class="form-control" type="email" id="reg-email" name="email" required>
+                                    </div>
+                                </div>
+
+                                <!-- 전화번호 입력 폼 -->
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label for="reg-phone">핸드폰 번호 (숫자만 입력하세요)</label>
+                                        <input class="form-control" type="text" id="reg-phone" name="phoneNumber"
+                                               required pattern="[0-9]{10,11}">
+                                    </div>
+                                </div>
+                                <!-- 버튼 -->
+                                <div class="col-sm-6 mt-4">
+                                    <div class="form-group">
+                                        <button class="btn btn-primary btn-sm" type="button" onclick="validatePhoneNumberAndRequestAuthCode()">인증번호 받기</button>
+                                    </div>
+                                </div>
+
+
+                                <!-- 인증번호 입력 폼 -->
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label for="verificationCode">인증번호 입력</label>
+                                        <input class="form-control" type="text" id="verificationCode"
+                                               name="verificationCode" required>
+                                    </div>
+                                </div>
+
+
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label for="reg-birthdate">생일</label>
+                                        <input class="form-control" type="date" id="reg-birthdate" name="birth"
+                                               required th:max="${nowDate}">
+                                    </div>
+                                </div>
+                                <input type="hidden" name="isAdmin" value="false">
+
+                                <div class="button">
+                                    <button class="btn" type="submit">회원인증</button>
+                                </div>
+
+                            </form>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    <!-- End Account Register Area -->
+
+    <script>
+        var authNumber; // 전역 변수로 선언하여 다른 함수에서도 사용할 수 있도록 설정
+
+        function validatePhoneNumberAndRequestAuthCode() {
+            // 전화번호 양식을 가져옵니다.
+            var phoneNumberInput = document.getElementById('reg-phone');
+            // 전화번호의 값
+            var phoneNumberValue = phoneNumberInput.value;
+            // 전화번호의 유효성을 확인합니다.
+            var phoneNumberPattern = /^[0-9]{10,11}$/;
+            if (!phoneNumberPattern.test(phoneNumberValue)) {
+                // 전화번호가 유효하지 않은 경우 경고 메시지를 표시하고 함수를 종료합니다.
+                alert("올바른 전화번호를 입력해주세요.");
+                return;
+            }
+
+            // 전화번호가 유효한 경우에만 인증번호를 요청합니다.
+            requestAuthCode();
+        }
+
+
+        // '인증번호 받기' 버튼을 클릭하면 서버로부터 인증번호를 요청하고 저장
+        function requestAuthCode() {
+            var xhr = new XMLHttpRequest();
+            xhr.open("GET", "/dooray", true);
+            xhr.onreadystatechange = function () {
+                if (xhr.readyState === 4) {
+                    if (xhr.status === 200) {
+                        var responseJson = JSON.parse(xhr.responseText); // JSON 문자열을 JavaScript 객체로 변환
+                        authNumber = responseJson.randomNumber; // 서버로부터 받은 인증번호 중 randomNumber 값만 추출하여 저장
+                        alert("인증번호를 전송했습니다.");
+                    } else {
+                        alert("인증번호 요청에 실패했습니다.");
+                    }
+                }
+            };
+            xhr.send();
+        }
+
+
+
+        function checkPasswordAndAuth() {
+
+            // 인증번호 확인
+            var verificationCode = document.getElementById('verificationCode').value;
+
+
+            if (verificationCode !== authNumber) {
+                // 인증번호가 일치하지 않는 경우
+                alert("인증번호가 일치하지 않습니다.");
+                return false; // 회원가입 폼 제출 방지
+            }
+
+            // 인증번호가 일치하는 경우 회원가입 폼 제출
+            return true;
+        }
+    </script>
+
+</div>
+</html>

From 643a9ba1f2459915a83c9cf49268a75017343957 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:22:24 +0900
Subject: [PATCH 132/147] =?UTF-8?q?refactor:=20=ED=8E=98=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=EB=B3=80=EA=B2=BD=20member->user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/admin/user/adaptor/AdminUserAdaptor.java    | 4 ++--
 .../front/admin/user/controller/AdminUserController.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java b/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
index 7abef5aa..2bd1f651 100644
--- a/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
+++ b/src/main/java/store/mybooks/front/admin/user/adaptor/AdminUserAdaptor.java
@@ -29,7 +29,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class UserAdaptor {
+public class AdminUserAdaptor {
 
     private final RestTemplate restTemplate;
 
@@ -37,7 +37,7 @@ public class UserAdaptor {
     private static final String ADMIN_URL = "/api/admin/users";
 
     @RequiredAuthorization
-    public PageResponse<UserGetResponse> getPagedMembers(Pageable pageable) {
+    public PageResponse<UserGetResponse> getPagedUsers(Pageable pageable) {
 
         ResponseEntity<PageResponse<UserGetResponse>> exchange = restTemplate.exchange(
                 gatewayAdaptorProperties.getAddress() + ADMIN_URL + "/page?page=" + pageable.getPageNumber()
diff --git a/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java b/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
index 72c87aee..66bdc89a 100644
--- a/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
+++ b/src/main/java/store/mybooks/front/admin/user/controller/AdminUserController.java
@@ -24,7 +24,7 @@
 @Controller
 @RequiredArgsConstructor
 @RequestMapping("/admin/member")
-public class UserController {
+public class AdminUserController {
 
     private final AdminUserAdaptor adminUserAdaptor;
 

From cac9ab906b06f0be95de0da1479d12dd8da3a5a7 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:22:47 +0900
Subject: [PATCH 133/147] =?UTF-8?q?feat:=20UserGrade=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8A=94=20dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/UserGradeCreateRequest.java   | 26 ++++++++++++++
 .../dto/response/UserGradeGetResponse.java    | 36 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/admin/user_grade/dto/request/UserGradeCreateRequest.java
 create mode 100644 src/main/java/store/mybooks/front/admin/user_grade/dto/response/UserGradeGetResponse.java

diff --git a/src/main/java/store/mybooks/front/admin/user_grade/dto/request/UserGradeCreateRequest.java b/src/main/java/store/mybooks/front/admin/user_grade/dto/request/UserGradeCreateRequest.java
new file mode 100644
index 00000000..1f3cee3a
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_grade/dto/request/UserGradeCreateRequest.java
@@ -0,0 +1,26 @@
+package store.mybooks.front.admin.user_grade.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * packageName    : store.mybooks.front.admin.user_grade.dto.request<br>
+ * fileName       : UserGradeCreateRequest<br>
+ * author         : masiljangajji<br>
+ * date           : 3/22/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/22/24        masiljangajji       최초 생성
+ */
+
+@Getter
+@AllArgsConstructor
+public class UserGradeCreateRequest {
+
+    private Integer rate;
+
+    private String userGradeNameId;
+
+}
diff --git a/src/main/java/store/mybooks/front/admin/user_grade/dto/response/UserGradeGetResponse.java b/src/main/java/store/mybooks/front/admin/user_grade/dto/response/UserGradeGetResponse.java
new file mode 100644
index 00000000..02607046
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_grade/dto/response/UserGradeGetResponse.java
@@ -0,0 +1,36 @@
+package store.mybooks.front.admin.user_grade.dto.response;
+
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.resource.user_grade.dto.response<br>
+ * fileName       : UserGradeGetResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 2/19/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 2/19/24        masiljangajji       최초 생성
+ */
+
+
+@Getter
+@NoArgsConstructor
+public class UserGradeGetResponse {
+
+    Integer id;
+
+    String userGradeNameId;
+
+    Integer minCost;
+
+    Integer maxCost;
+
+    Integer rate;
+
+    LocalDate createdDate;
+
+}

From 67be9e3b619a281cf54011d6ecf35ec9fa3d8b42 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:23:11 +0900
Subject: [PATCH 134/147] =?UTF-8?q?feat:=20UserGrade=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user_grade/adaptor/UserGradeAdaptor.java  | 95 +++++++++++++++++++
 .../controller/UserGradeController.java       | 51 ++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/admin/user_grade/adaptor/UserGradeAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/admin/user_grade/controller/UserGradeController.java

diff --git a/src/main/java/store/mybooks/front/admin/user_grade/adaptor/UserGradeAdaptor.java b/src/main/java/store/mybooks/front/admin/user_grade/adaptor/UserGradeAdaptor.java
new file mode 100644
index 00000000..f765551c
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_grade/adaptor/UserGradeAdaptor.java
@@ -0,0 +1,95 @@
+package store.mybooks.front.admin.user_grade.adaptor;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.admin.user_grade.dto.request.UserGradeCreateRequest;
+import store.mybooks.front.admin.user_grade.dto.response.UserGradeGetResponse;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.admin.member_grade.adaptor<br>
+ * fileName       : MemberGradeAdaptor<br>
+ * author         : masiljangajji<br>
+ * date           : 3/22/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/22/24        masiljangajji       최초 생성
+ */
+@Component
+@RequiredArgsConstructor
+public class UserGradeAdaptor {
+
+    private final RestTemplate restTemplate;
+
+    private static final String URL_ADMIN = "/api/admin/users-grades";
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+
+    /**
+     * methodName : findUserStatusById
+     * author : masiljangajji
+     * description : 유저가 가질 수 있는 상태를 찾음
+     *
+     * @return user status get response
+     */
+
+    @RequiredAuthorization
+    public List<UserGradeGetResponse> findAllAvailableUserGrade() {
+        ResponseEntity<List<UserGradeGetResponse>> responseEntity =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_ADMIN, HttpMethod.GET,
+                        new HttpEntity<>(Utils.getAuthHeader()),
+                        new ParameterizedTypeReference<>() {
+                        });
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new RuntimeException();
+        }
+
+        return responseEntity.getBody();
+    }
+
+    @RequiredAuthorization
+    public List<UserGradeGetResponse> findAllUserGrade() {
+
+        ResponseEntity<List<UserGradeGetResponse>> responseEntity =
+                restTemplate.exchange(
+                        gatewayAdaptorProperties.getAddress() + URL_ADMIN + "/all", HttpMethod.GET,
+                        new HttpEntity<>(Utils.getAuthHeader()),
+                        new ParameterizedTypeReference<>() {
+                        });
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new RuntimeException();
+        }
+
+        return responseEntity.getBody();
+    }
+
+    @RequiredAuthorization
+    public void createUserGrade(UserGradeCreateRequest createRequest) {
+        ResponseEntity<Void> responseEntity =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL_ADMIN, HttpMethod.POST,
+                        new HttpEntity<>(createRequest, Utils.getAuthHeader()),
+                        new ParameterizedTypeReference<>() {
+                        });
+
+        if (responseEntity.getStatusCode() != HttpStatus.CREATED) {
+            throw new RuntimeException();
+        }
+
+    }
+
+
+}
diff --git a/src/main/java/store/mybooks/front/admin/user_grade/controller/UserGradeController.java b/src/main/java/store/mybooks/front/admin/user_grade/controller/UserGradeController.java
new file mode 100644
index 00000000..cf232d4f
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_grade/controller/UserGradeController.java
@@ -0,0 +1,51 @@
+package store.mybooks.front.admin.user_grade.controller;
+
+import lombok.RequiredArgsConstructor;
+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 store.mybooks.front.admin.user_grade.adaptor.UserGradeAdaptor;
+import store.mybooks.front.admin.user_grade.dto.request.UserGradeCreateRequest;
+
+/**
+ * packageName    : store.mybooks.front.admin.member_grade.controller<br>
+ * fileName       : MemberGradeController<br>
+ * author         : masiljangajji<br>
+ * date           : 3/22/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/22/24        masiljangajji       최초 생성
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/admin/member/grade")
+public class UserGradeController {
+
+    private final UserGradeAdaptor userGradeAdaptor;
+
+
+    @GetMapping
+    public String findAllAvailableUserGrade(Model model) {
+        model.addAttribute("userGrades", userGradeAdaptor.findAllAvailableUserGrade());
+        return "admin/view/user/grade-active";
+    }
+
+    @GetMapping("/all")
+    public String findAllUserGrade(Model model) {
+        model.addAttribute("userGrades", userGradeAdaptor.findAllUserGrade());
+        return "admin/view/user/grade-all";
+    }
+
+    @PostMapping
+    public String createUserGrade(@ModelAttribute UserGradeCreateRequest request) {
+        userGradeAdaptor.createUserGrade(request);
+        return "redirect:/admin/member/grade";
+    }
+
+
+}

From f6634384969788bb095fa81a70bbad03e88772a1 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:23:25 +0900
Subject: [PATCH 135/147] =?UTF-8?q?feat:=20UserStatusResponse=20dto=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/response/UserStatusGetResponse.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/admin/user_status/dto/response/UserStatusGetResponse.java

diff --git a/src/main/java/store/mybooks/front/admin/user_status/dto/response/UserStatusGetResponse.java b/src/main/java/store/mybooks/front/admin/user_status/dto/response/UserStatusGetResponse.java
new file mode 100644
index 00000000..7d9bf3a5
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_status/dto/response/UserStatusGetResponse.java
@@ -0,0 +1,23 @@
+package store.mybooks.front.admin.user_status.dto.response;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * packageName    : store.mybooks.resource.user_status.dto.response<br>
+ * fileName       : UserStatusGetResponse<br>
+ * author         : masiljangajji<br>
+ * date           : 2/19/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 2/19/24        masiljangajji       최초 생성
+ */
+@Getter
+@NoArgsConstructor
+public class UserStatusGetResponse {
+
+    private String id;
+
+}

From a5dccf5ea7f71fb8027aa45e72c9e36e79aa9323 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 15:23:39 +0900
Subject: [PATCH 136/147] =?UTF-8?q?feat:=20UserStatus=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adaptor/UserStatusAdaptor.java            | 65 +++++++++++++++++++
 .../controller/UserStatusController.java      | 37 +++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/admin/user_status/adaptor/UserStatusAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/admin/user_status/controller/UserStatusController.java

diff --git a/src/main/java/store/mybooks/front/admin/user_status/adaptor/UserStatusAdaptor.java b/src/main/java/store/mybooks/front/admin/user_status/adaptor/UserStatusAdaptor.java
new file mode 100644
index 00000000..12183c19
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_status/adaptor/UserStatusAdaptor.java
@@ -0,0 +1,65 @@
+package store.mybooks.front.admin.user_status.adaptor;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import store.mybooks.front.admin.user_status.dto.response.UserStatusGetResponse;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.user_status.adaptor<br>
+ * fileName       : UserStatusAdaptor<br>
+ * author         : masiljangajji<br>
+ * date           : 2/22/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 2/22/24        masiljangajji       최초 생성
+ */
+@Component
+@RequiredArgsConstructor
+public class UserStatusAdaptor {
+
+    private final RestTemplate restTemplate;
+
+
+    private static final String ADMIN_URL = "/api/admin/users-statuses";
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+
+    /**
+     * methodName : findUserStatusById
+     * author : masiljangajji
+     * description : 유저가 가질 수 있는 상태를 찾음
+     *
+     * @return user status get response
+     */
+
+    @RequiredAuthorization
+    public List<UserStatusGetResponse> findAllUserStatus() {
+
+        ResponseEntity<List<UserStatusGetResponse>> responseEntity =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + ADMIN_URL, HttpMethod.GET,
+                        new HttpEntity<>(Utils.getAuthHeader()),
+                        new ParameterizedTypeReference<>() {
+                        });
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new RuntimeException();
+        }
+
+        return responseEntity.getBody();
+    }
+
+
+}
diff --git a/src/main/java/store/mybooks/front/admin/user_status/controller/UserStatusController.java b/src/main/java/store/mybooks/front/admin/user_status/controller/UserStatusController.java
new file mode 100644
index 00000000..66bd6b26
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/user_status/controller/UserStatusController.java
@@ -0,0 +1,37 @@
+package store.mybooks.front.admin.user_status.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import store.mybooks.front.admin.user_status.adaptor.UserStatusAdaptor;
+
+/**
+ * packageName    : store.mybooks.resource.user_status.controller<br>
+ * fileName       : UserStatusRestController<br>
+ * author         : masiljangajji<br>
+ * date           : 2/18/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 2/18/24        masiljangajji       최초 생성
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/admin/member/status")
+public class UserStatusController {
+
+    private final UserStatusAdaptor userStatusAdaptor;
+
+
+    @GetMapping
+    public String findUserStatusById(Model model) {
+        model.addAttribute("userStatus", userStatusAdaptor.findAllUserStatus());
+
+        return "admin/view/user/status";
+    }
+
+
+}

From 068dd3c5d579ef701a0b9afe5696401c38582a36 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Fri, 22 Mar 2024 16:08:12 +0900
Subject: [PATCH 137/147] =?UTF-8?q?refactor:=20=EC=B5=9C=EB=8C=80=ED=95=A0?=
 =?UTF-8?q?=EC=9D=B8=EA=B8=88=EC=95=A1=20=EC=98=A4=ED=83=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/user-coupon-page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/user-coupon-page.html b/src/main/resources/templates/user-coupon-page.html
index 434262bf..c1767a7f 100644
--- a/src/main/resources/templates/user-coupon-page.html
+++ b/src/main/resources/templates/user-coupon-page.html
@@ -17,7 +17,7 @@
                 <th scope="col">할인 대상</th>
                 <th scope="col">최소 주문 금액</th>
                 <th scope="col">할인율 / 할인금액</th>
-                <th scope="col">최대 할인 금맥</th>
+                <th scope="col">최대 할인 금액</th>
                 <th scope="col">시작일</th>
                 <th scope="col">종료일</th>
             </tr>

From ab37bf32ac1322bb0ebf959dbfdeba5cd9f4ec43 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 16:59:25 +0900
Subject: [PATCH 138/147] =?UTF-8?q?feat:=20User=20OauthId=20=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=EC=B6=94=EA=B0=80=EB=A1=9C=EC=9D=B8=ED=95=9C=20dto=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/UserOauthCreateRequest.java   |  2 ++
 .../dto/request/UserOauthLoginRequest.java    |  2 +-
 .../user/dto/request/UserOauthRequest.java    | 34 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/store/mybooks/front/user/dto/request/UserOauthRequest.java

diff --git a/src/main/java/store/mybooks/front/user/dto/request/UserOauthCreateRequest.java b/src/main/java/store/mybooks/front/user/dto/request/UserOauthCreateRequest.java
index 7289c07f..110781e5 100644
--- a/src/main/java/store/mybooks/front/user/dto/request/UserOauthCreateRequest.java
+++ b/src/main/java/store/mybooks/front/user/dto/request/UserOauthCreateRequest.java
@@ -26,6 +26,8 @@ public class UserOauthCreateRequest {
 
     private String birthMonthDay;
 
+    private String oauthId;
+
 
 }
 
diff --git a/src/main/java/store/mybooks/front/user/dto/request/UserOauthLoginRequest.java b/src/main/java/store/mybooks/front/user/dto/request/UserOauthLoginRequest.java
index 6aa4de4f..96515562 100644
--- a/src/main/java/store/mybooks/front/user/dto/request/UserOauthLoginRequest.java
+++ b/src/main/java/store/mybooks/front/user/dto/request/UserOauthLoginRequest.java
@@ -19,6 +19,6 @@
 @AllArgsConstructor
 public class UserOauthLoginRequest {
 
-    private String email;
+    private String oauthId;
 
 }
diff --git a/src/main/java/store/mybooks/front/user/dto/request/UserOauthRequest.java b/src/main/java/store/mybooks/front/user/dto/request/UserOauthRequest.java
new file mode 100644
index 00000000..b4058a20
--- /dev/null
+++ b/src/main/java/store/mybooks/front/user/dto/request/UserOauthRequest.java
@@ -0,0 +1,34 @@
+package store.mybooks.front.user.dto.request;
+
+import java.time.LocalDate;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * packageName    : store.mybooks.front.user.dto.request<br>
+ * fileName       : UserSocialModifyRequest<br>
+ * author         : masiljangajji<br>
+ * date           : 3/22/24<br>
+ * description    :
+ * ===========================================================
+ * DATE              AUTHOR             NOTE
+ * -----------------------------------------------------------
+ * 3/22/24        masiljangajji       최초 생성
+ */
+@Getter
+@AllArgsConstructor
+public class UserOauthRequest {
+
+    private String name;
+
+    private String email;
+
+    private String phoneNumber;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate birth;
+
+    private String oauthId;
+
+}

From 61da6ee86e157077a2e8c182a3735ae2151aebdd Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 16:59:43 +0900
Subject: [PATCH 139/147] =?UTF-8?q?feat:=20social.html=20oauthId=20?=
 =?UTF-8?q?=EC=A0=84=EB=8B=AC=EB=B0=9B=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/social.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/templates/social.html b/src/main/resources/templates/social.html
index 5a091941..d992fd1b 100644
--- a/src/main/resources/templates/social.html
+++ b/src/main/resources/templates/social.html
@@ -38,6 +38,9 @@
 
                             <form id="registerForm" class="row" method="post" action="/social"
                                   onsubmit="return checkPasswordAndAuth()">
+
+                                <input type="hidden" id="oauthId" name="oauthId" th:value="${oauthId}" />
+
                                 <div class="col-sm-6">
                                     <div class="form-group">
                                         <label for="reg-fn">이름</label>

From 558928a386494c21a737c3d8223dab7381ea638e Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 17:01:01 +0900
Subject: [PATCH 140/147] =?UTF-8?q?feat:=20Oauth=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=8B=9C=EB=8F=84=EC=8B=9C=20=EC=A1=B4=EC=9E=AC?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=9A=8C=EC=9B=90=EC=9D=B8=EC=A7=80=20?=
 =?UTF-8?q?=ED=8C=90=EB=B3=84=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20,=20=EC=A0=95=EB=B3=B4=EC=A0=9C=EA=B3=B5?=
 =?UTF-8?q?=20=EB=8F=99=EC=9D=98,=EB=AF=B8=EB=8F=99=EC=9D=98=20=EB=B6=84?=
 =?UTF-8?q?=EA=B8=B0=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybooks/front/oauth/OauthController.java  |  9 +++++---
 .../mybooks/front/oauth/OauthService.java     | 22 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/store/mybooks/front/oauth/OauthController.java b/src/main/java/store/mybooks/front/oauth/OauthController.java
index e1ce9fb7..a2bbcfb1 100644
--- a/src/main/java/store/mybooks/front/oauth/OauthController.java
+++ b/src/main/java/store/mybooks/front/oauth/OauthController.java
@@ -40,16 +40,19 @@ public String oauthLogin(@PathVariable String provider, @RequestParam String cod
 
         UserLoginResponse loginResponse = oauthService.oauthLogin(provider, code);
 
+        if (loginResponse.getUserId().equals(0L)) {
+            return "redirect:/verification/social/"+loginResponse.getStatus();
+        }
+
         if (loginResponse.getIsValidUser()) { // 기존에 계정이 있거나 , 회원가입에 문제가 없는 경우 로그인
+
             TokenCreateResponse tokenCreateResponse =
                     tokenAdaptor.createToken(
                             new TokenCreateRequest(loginResponse.getIsAdmin(), loginResponse.getUserId(),
                                     loginResponse.getStatus(), String.valueOf(UUID.randomUUID()),
-                                    Utils.getUserIp(request),Utils.getUserAgent(request)));
-
+                                    Utils.getUserIp(request), Utils.getUserAgent(request)));
 
             CookieUtils.addJwtCookie(response, tokenCreateResponse.getAccessToken());
-
             return "redirect:/";
         }
 
diff --git a/src/main/java/store/mybooks/front/oauth/OauthService.java b/src/main/java/store/mybooks/front/oauth/OauthService.java
index 96a45890..4bd64280 100644
--- a/src/main/java/store/mybooks/front/oauth/OauthService.java
+++ b/src/main/java/store/mybooks/front/oauth/OauthService.java
@@ -1,6 +1,7 @@
 package store.mybooks.front.oauth;
 
 import java.util.Map;
+import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
@@ -49,8 +50,6 @@ private OauthTokenResponse getToken(String code, OauthProvider provider) {
     // 바디부에 필요한 정보들 추가 , 페이코 api 양식에 맞춰서
     private MultiValueMap<String, String> tokenRequest(String code, OauthProvider provider) {
 
-        System.out.println(code);
-
         MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
         formData.add("client_id", keyConfig.keyStore(provider.getClientId()));
         formData.add("client_secret", keyConfig.keyStore(provider.getClientSecret()));
@@ -79,22 +78,29 @@ public UserLoginResponse oauthLogin(String providerName, String code) {
         // 유저 정보 가져오기
         UserProfile userProfile = getUserProfile(providerName, tokenResponse, provider);
 
-        // 가져온걸로 db 긁어서 있는회원인지 확인
+
+        // 가져온 OauthId 가지고 db 긁어서 있는회원인지 확인
         UserLoginResponse userLoginResponse =
-                userAdaptor.loginOauthUser(new UserOauthLoginRequest(userProfile.getEmail()));
+                userAdaptor.loginOauthUser(new UserOauthLoginRequest(userProfile.getOauthId()));
 
         if (userLoginResponse.getIsValidUser()) { // 이미 존재하는 회원이면 그대로 로그인
             return userLoginResponse;
         }
 
-        // 존재하는 회원 아니면 회원가입 시키기
+        // 만약 null 이라면 = 정보제공 동의 안해주면 , 추가정보 받기
+        if (Objects.isNull(userProfile.getEmail()) || Objects.isNull(userProfile.getBirthday()) ||
+                Objects.isNull(userProfile.getMobile()) || Objects.isNull(userProfile.getName())) {
+            return new UserLoginResponse(false,false,0L,userProfile.getOauthId());
+        }
+
+        // 정보제공 동의 해줬다면 바로 회원가입 시키기
         UserOauthCreateRequest createRequest =
                 new UserOauthCreateRequest(userProfile.getName(), userProfile.getMobile(), userProfile.getEmail(),
-                        userProfile.getBirthday());
+                        userProfile.getBirthday(),userProfile.getOauthId());
 
-        UserOauthCreateResponse createResponse=userAdaptor.createOauthUser(createRequest);
+        UserOauthCreateResponse createResponse = userAdaptor.createOauthUser(createRequest);
 
-        return new UserLoginResponse(true,false,createResponse.getId(),createResponse.getUserStatusName());
+        return new UserLoginResponse(true, false, createResponse.getId(), createResponse.getUserStatusName());
 
     }
 

From 34fc4136cb1a91ba876a4eb11894db379da9d654 Mon Sep 17 00:00:00 2001
From: masiljangajji <hjk172262@gmail.com>
Date: Fri, 22 Mar 2024 17:01:18 +0900
Subject: [PATCH 141/147] =?UTF-8?q?feat:=20UserController=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=EC=A0=9C=EA=B3=B5=20=EB=B9=84=EB=8F=99=EC=9D=98?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B6=94=EA=B0=80=EC=A0=81=EC=9D=B8=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=9E=85=EB=A0=A5=EB=B0=9B=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/user/adaptor/UserAdaptor.java       | 17 +++++++++++++
 .../front/user/controller/UserController.java | 24 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java b/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
index 08b8ab2c..e9f2b359 100644
--- a/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
+++ b/src/main/java/store/mybooks/front/user/adaptor/UserAdaptor.java
@@ -17,6 +17,7 @@
 import store.mybooks.front.user.dto.request.UserModifyRequest;
 import store.mybooks.front.user.dto.request.UserOauthCreateRequest;
 import store.mybooks.front.user.dto.request.UserOauthLoginRequest;
+import store.mybooks.front.user.dto.request.UserOauthRequest;
 import store.mybooks.front.user.dto.request.UserPasswordModifyRequest;
 import store.mybooks.front.user.dto.request.UserStatusModifyRequest;
 import store.mybooks.front.user.dto.response.UserCreateResponse;
@@ -168,6 +169,22 @@ public UserOauthCreateResponse createOauthUser(UserOauthCreateRequest createRequ
         return response.getBody();
     }
 
+    public UserOauthCreateResponse createAndLoginOauthUser(UserOauthRequest request){
+        ResponseEntity<UserOauthCreateResponse> responseEntity =
+                restTemplate.exchange(gatewayAdaptorProperties.getAddress() + URL + "/oauth/no-info",
+                        HttpMethod.POST,
+                        new HttpEntity<>(request, Utils.getHttpHeader()),
+                        new ParameterizedTypeReference<>() {
+                        });
+
+        if (responseEntity.getStatusCode() != HttpStatus.CREATED) {
+            throw new RuntimeException();
+        }
+        return responseEntity.getBody();
+    }
+
+
+
 
     /**
      * methodName : findUserById
diff --git a/src/main/java/store/mybooks/front/user/controller/UserController.java b/src/main/java/store/mybooks/front/user/controller/UserController.java
index cc62b7d3..3cf48e3b 100644
--- a/src/main/java/store/mybooks/front/user/controller/UserController.java
+++ b/src/main/java/store/mybooks/front/user/controller/UserController.java
@@ -28,11 +28,13 @@
 import store.mybooks.front.user.dto.request.UserGradeModifyRequest;
 import store.mybooks.front.user.dto.request.UserLoginRequest;
 import store.mybooks.front.user.dto.request.UserModifyRequest;
+import store.mybooks.front.user.dto.request.UserOauthRequest;
 import store.mybooks.front.user.dto.request.UserPasswordModifyRequest;
 import store.mybooks.front.user.dto.request.UserStatusModifyRequest;
 import store.mybooks.front.user.dto.response.UserEncryptedPasswordResponse;
 import store.mybooks.front.user.dto.response.UserGetResponse;
 import store.mybooks.front.user.dto.response.UserLoginResponse;
+import store.mybooks.front.user.dto.response.UserOauthCreateResponse;
 import store.mybooks.front.utils.CookieUtils;
 import store.mybooks.front.utils.Utils;
 
@@ -137,6 +139,28 @@ public String verifyLockUser(@ModelAttribute UserPasswordModifyRequest request)
         return "redirect:/";
     }
 
+    @GetMapping("/verification/social/{oauthId}")
+    public String socialUserForm(HttpServletRequest request,@PathVariable("oauthId")String oauthId) {
+        request.setAttribute("nowDate",LocalDate.now());
+        request.setAttribute("oauthId",oauthId);
+        return "social";
+    }
+
+    @PostMapping("/social")
+    public String createAndLoginOauthUser(@ModelAttribute UserOauthRequest oauthRequest, HttpServletRequest request, HttpServletResponse response) {
+
+        UserOauthCreateResponse createResponse = userAdaptor.createAndLoginOauthUser(oauthRequest);
+
+
+        TokenCreateResponse tokenCreateResponse =
+                tokenAdaptor.createToken(
+                        new TokenCreateRequest(false, createResponse.getId(),
+                                createResponse.getUserStatusName(), String.valueOf(UUID.randomUUID()),
+                                Utils.getUserIp(request), Utils.getUserAgent(request)));
+
+        CookieUtils.addJwtCookie(response, tokenCreateResponse.getAccessToken());
+        return "redirect:/";
+    }
 
     /**
      * methodName : myPageForm

From 067d27b716f94a80d8441ce4a732c2a4ff67c0e8 Mon Sep 17 00:00:00 2001
From: damho <ydh4745@gamil.com>
Date: Fri, 22 Mar 2024 17:02:46 +0900
Subject: [PATCH 142/147] =?UTF-8?q?refactor:=20=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header/my-books-header-bottom.html        |  1 +
 .../resources/templates/point-history.html    | 24 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
index ade4e380..53be07cb 100644
--- a/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
+++ b/src/main/resources/templates/common/fragment/my-book/header/my-books-header-bottom.html
@@ -76,6 +76,7 @@
                                         <li class="nav-item"><a href="/user">마이페이지</a></li>
                                         <li class="nav-item"><a href="/user/address">내 주소</a></li>
                                         <li class="nav-item"><a href="/user-coupon">쿠폰</a></li>
+                                        <li class="nav-item"><a href="/user/point-history">포인트</a></li>
                                         <li class="nav-item"><a href="register">주문목록</a></li>
                                         <li class="nav-item"><a href="mail-success.html">결제내역</a></li>
                                         <li class="nav-item"><a href="/review">리뷰내역</a></li>
diff --git a/src/main/resources/templates/point-history.html b/src/main/resources/templates/point-history.html
index c9ba1543..2c867a25 100644
--- a/src/main/resources/templates/point-history.html
+++ b/src/main/resources/templates/point-history.html
@@ -26,19 +26,19 @@
                     </tr>
             </tbody>
         </table>
-    </div>
-    <div class="mt-3" th:block th:if="${points.totalPages > 1}">
-        <div class="pagination">
-            <div class="page-item">
-                <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
-            </div>
-            <div class="pagination" id="pageNumContainer"></div>
-            <div class="page-item">
-                <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+        <div class="mt-3" th:block th:if="${points.totalPages > 1}">
+            <div class="pagination">
+                <div class="page-item">
+                    <a class="page-link" id="prevLink" th:text="'<'" th:href="@{#}"></a>
+                </div>
+                <div class="pagination" id="pageNumContainer"></div>
+                <div class="page-item">
+                    <a class="page-link" id="nextLink" th:text="'>'" th:href="@{#}"></a>
+                </div>
             </div>
         </div>
-        <script src="/admin/js/page/setPrevious.js"></script>
-        <script src="/admin/js/page/setNext.js"></script>
-        <script src="/admin/js/page/setLastPage.js"></script>
     </div>
+    <script src="/admin/js/page/setPrevious.js"></script>
+    <script src="/admin/js/page/setNext.js"></script>
+    <script src="/admin/js/page/setLastPage.js"></script>
 </div>
\ No newline at end of file

From 391c01ba26c30fa3cba9442a8001744f423da3d6 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 22:06:46 +0900
Subject: [PATCH 143/147] =?UTF-8?q?refactor:=20properties=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.properties | 18 +--------------
 .../resources/application-prod.properties     |  9 --------
 src/main/resources/application.properties     | 22 +++++++------------
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 5043bc41..94de8592 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -5,20 +5,4 @@ logging.level.root = debug
 
 # Logging file
 logging.file.name=./logs/resource.log
-logging.file.path=./logs
-
-
-
-
-# OAuth2 User Payco Configuration
-oauth2.user.payco.clientId=67b877c819e74256a1d27b5b37647366
-oauth2.user.payco.clientSecret=da6beeed938047f6b3148c8d8d86b27a
-oauth2.user.payco.redirectUri=93d29b6eed9842a38f2e05a0fef269e6
-
-
-
-# cookie
-
-cookie.domain=localhost
-
-my-books.redis.database=21
\ No newline at end of file
+logging.file.path=./logs
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 82d64da6..cca3441f 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -6,20 +6,11 @@ logging.file.name=/home/administrator/log/resource.log
 logging.file.path=/home/administrator/log
 
 
-
-
-
-
-
 # OAuth2 User Payco Configuration
 oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
 oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
 oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
 
-
-
-# cookie
-
 cookie.domain=my-books.store
 
 my-books.redis.database=22
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c0c5a864..789a7ceb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -22,21 +22,15 @@ my-books.redis.host=133.186.241.167
 my-books.redis.port=6379
 my-books.redis.password=*N2vya7H@muDTwdNMR!
 my-books.redis.admin-expiration=3600000
-## ?????
-#spring.profiles.active=dev
+my-books.redis.database=21
+
 toss.api.key=081bdd46905c4d92aff5a8d51c0e2501
 toss.api.client-key=1c7a8079bed84ba881abb9dd32cf048f
-#
-## ???
-store.mybooks.front.config.gateway.address=c0722344686f4afba3ebd708d26c1380
-# Log Levels
-logging.level.root=INFO
-# Logging file
-logging.file.name=/home/administrator/log/resource.log
-logging.file.path=/home/administrator/log
+
 # OAuth2 User Payco Configuration
-oauth2.user.payco.clientId=48f2dddcf1fb47e2b12112c6274a4b78
-oauth2.user.payco.clientSecret=52497d49c33c4a0fbb7b0b0280714d26
-oauth2.user.payco.redirectUri=7298e380b6a0480aa781ebe1adb32ffe
+oauth2.user.payco.clientId=67b877c819e74256a1d27b5b37647366
+oauth2.user.payco.clientSecret=da6beeed938047f6b3148c8d8d86b27a
+oauth2.user.payco.redirectUri=93d29b6eed9842a38f2e05a0fef269e6
+
 # cookie
-cookie.domain=my-books.store
+cookie.domain=localhost
\ No newline at end of file

From 396e535ba30d0ae172c085c93bd93e6cf5282697 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 22:07:30 +0900
Subject: [PATCH 144/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=A0=84=EC=B2=B4=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95=EA=B0=80=EB=8A=A5,=20=EC=82=AC?=
 =?UTF-8?q?=EC=A7=84=ED=8F=AC=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/book/book-update.html          | 162 ++++++++++++++----
 1 file changed, 132 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/templates/admin/view/book/book-update.html b/src/main/resources/templates/admin/view/book/book-update.html
index cab1c821..726d190d 100644
--- a/src/main/resources/templates/admin/view/book/book-update.html
+++ b/src/main/resources/templates/admin/view/book/book-update.html
@@ -8,9 +8,8 @@
             width: 100%;
         }
     </style>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.js"></script>
-    <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/js/bootstrap-multiselect.js"></script>
+    <link rel="stylesheet" href="https://uicdn.toast.com/editor/latest/toastui-editor.min.css"/>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" rel="stylesheet"/>
 </head>
 
 
@@ -24,31 +23,44 @@
                             <h3>도서 수정</h3>
                         </div>
 
-                        <form class="row" th:action="@{/admin/book/update/{id}(id=${book.id})}" method="post">
+                        <form id="updateForm" class="row" th:action="@{/admin/book/update/{id}(id=${book.id})}" method="post" enctype="multipart/form-data">
                             <div class="col-md-6">
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <div class="form-group">
                                             <label for="name">도서명</label>
                                             <input class="form-control" type="text" id="name" name="name"
-                                                   th:value="${book.name}" readonly>
+                                                   th:value="${book.name}" required
+                                                   minlength="1"
+                                                   maxlength="100">
                                         </div>
                                     </div>
                                     <div class="col-sm-6">
                                         <div class="form-group">
                                             <label for="isbn">ISBN(13자리)</label>
                                             <input class="form-control" type="text" id="isbn" name="isbn"
-                                                   th:value="${book.isbn}" readonly>
+                                                   th:value="${book.isbn}" required
+                                                   pattern="\d{13}">
                                         </div>
                                     </div>
                                 </div>
 
                                 <div class="row">
                                     <div class="col-sm-6">
-                                        <div class="form-group">
+                                        <div class="form-group mb-0">
                                             <label for="publisherId">출판사</label>
-                                            <input class="form-control" type="text" id="publisherId" name="publisherId"
-                                                   th:value="${book.publisher.name}" readonly>
+                                        </div>
+                                        <div class="form-group ">
+                                            <select class="form-select custom-select" id="publisherId"
+                                                    name="publisherId"
+                                                    aria-label="publisherId">
+                                                <option selected>출판사 선택</option>
+                                                <option th:each="publisher : ${publishers}"
+                                                        th:value="${publisher.id}"
+                                                        th:text="${publisher.name}"
+                                                        th:selected="${publisher.id == book.publisher.id}">
+                                                </option>
+                                            </select>
                                         </div>
                                     </div>
 
@@ -56,7 +68,7 @@ <h3>도서 수정</h3>
                                         <div class="form-group">
                                             <label for="publishDate">출판일자</label>
                                             <input class="form-control" type="date" id="publishDate"
-                                                   name="publishDate" th:value="${book.publishDate}" readonly>
+                                                   name="publishDate" th:value="${book.publishDate}" required>
                                         </div>
                                     </div>
                                 </div>
@@ -64,14 +76,16 @@ <h3>도서 수정</h3>
                                 <div class="col-sm-15">
                                     <div class="form-group">
                                         <label for="index">목차</label>
-                                        <div id="index" class="form-control" style="height: 16rem; overflow-y: auto;" readonly th:utext="${book.index}"></div>
+                                        <div id="editorIndex"></div>
+                                        <input type="hidden" id="index" name="index">
                                     </div>
                                 </div>
 
                                 <div class="col-sm-15">
                                     <div class="form-group">
-                                        <label for="content">설명</label>
-                                        <div id="content" class="form-control" style="height: 32rem; overflow-y: auto;" readonly th:utext="${book.explanation}"></div>
+                                        <label for="explanation">설명</label>
+                                        <div id="editorExplanation"></div>
+                                        <input type="hidden" id="explanation" name="explanation">
                                     </div>
                                 </div>
                             </div>
@@ -81,15 +95,15 @@ <h3>도서 수정</h3>
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <div class="form-group mb-0">
-                                            <label for="authorList">저자</label>
+                                            <label for="authorList">저자 검색</label>
                                         </div>
                                         <div class="form-group">
-                                            <select id="authorList" class="form-control">
-                                                <option value="">저자 목록</option>
+                                            <select id="authorList" name="authorList" multiple="multiple" size="10" class="form-control">
                                                 <option th:each="author : ${authors}"
-                                                        th:if="${#lists.contains(bookAuthorList, author.id)}"
-                                                        th:text="${author.name + ': ' + (author.content.length() > 10 ? author.content.substring(0, 10) + '...' : author.content)}"
-                                                        disabled>
+                                                        th:value="${author.id}"
+                                                        th:title="${author.content}"
+                                                        th:text="${author.name}"
+                                                        th:selected="${#lists.contains(bookAuthorList, author.id)}">
                                                 </option>
                                             </select>
                                         </div>
@@ -99,7 +113,8 @@ <h3>도서 수정</h3>
                                         <div class="form-group">
                                             <label for="page">페이지수</label>
                                             <input class="form-control" type="number" id="page" name="page"
-                                                   th:value="${book.page}" readonly>
+                                                   th:value="${book.page}" required
+                                                   min="1">
                                         </div>
                                     </div>
                                 </div>
@@ -109,7 +124,7 @@ <h3>도서 수정</h3>
                                         <div class="form-group">
                                             <label for="originalCost">정가</label>
                                             <input class="form-control" type="number" id="originalCost"
-                                                   name="originalCost" th:value="${book.originalCost}" readonly>
+                                                   name="originalCost" th:value="${book.originalCost}" required min="1">
                                         </div>
                                     </div>
                                     <div class="col-sm-6">
@@ -155,7 +170,8 @@ <h3>도서 수정</h3>
                                         </div>
                                         <div class="form-group">
                                             <select id="categoryList" name="categoryList" multiple="multiple" size="10">
-                                                <option th:each="category : ${categories}" th:value="${category.id}" th:text="${category.name}"
+                                                <option th:each="category : ${categories}" th:value="${category.id}"
+                                                        th:text="${category.name}"
                                                         th:selected="${#lists.contains(bookCategoryList, category.id)}"></option>
                                             </select>
                                         </div>
@@ -167,7 +183,8 @@ <h3>도서 수정</h3>
                                             <label for="tagList">태그</label>
                                         </div>
                                         <div class="form-group">
-                                            <select id="tagList" name="tagList" multiple="multiple" size="10" class="form-control">
+                                            <select id="tagList" name="tagList" multiple="multiple" size="10"
+                                                    class="form-control">
                                                 <option th:each="tag : ${tags}"
                                                         th:value="${tag.id}"
                                                         th:text="${tag.name}"
@@ -185,21 +202,33 @@ <h3>도서 수정</h3>
                                             <div class="col-4">
                                                 <div class="form-check">
                                                     <input class="form-check-input" type="radio" name="isPacking"
-                                                           id="packTrue" value = "true" th:checked="${book.isPacking}">
+                                                           id="packTrue" value="true" th:checked="${book.isPacking}">
                                                     <label class="form-check-label" for="packTrue">가능</label>
                                                 </div>
                                             </div>
                                             <div class="col-4">
                                                 <div class="form-check">
                                                     <input class="form-check-input" type="radio" name="isPacking"
-                                                           id="packFalse" value = "false" th:checked="${!book.isPacking}">
+                                                           id="packFalse" value="false" th:checked="${!book.isPacking}">
                                                     <label class="form-check-label" for="packFalse">불가능</label>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
+                                <div class="col-sm-6">
+                                    <label>썸네일 이미지 업로드</label>
+                                    <div class="form-group">
+                                        <input id="thumbnailImage" name="thumbnailImage" type="file" class="file">
+                                    </div>
+                                </div>
 
+                                <div class="col-sm-6">
+                                    <label>본문 이미지 업로드</label>
+                                    <div class="form-group">
+                                        <input id="contentImage" name="contentImage" type="file" class="file" multiple>
+                                    </div>
+                                </div>
 
                                 <div class="form-group row mt-5">
                                     <div class="col-sm-auto">
@@ -217,7 +246,80 @@ <h3>도서 수정</h3>
             </div>
         </div>
     </div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/js/bootstrap-multiselect.js"></script>
+    <script src="https://uicdn.toast.com/editor/latest/toastui-editor-all.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
+    <script th:inline="javascript">
+        var bookIndex = /*[[${book.index}]]*/ '';
+        var bookExplanation = /*[[${book.explanation}]]*/ '';
+    </script>
     <script>
+        $(document).ready(function () {
+            $('#publisherId').select2({
+                placeholder: "출판사 선택",
+                allowClear: true,
+                width: '100%'
+            });
+        });
+
+        $(document).ready(function () {
+            const editorIndex = new toastui.Editor({
+                el: document.querySelector('#editorIndex'),
+                height: '350px',
+                initialEditType: 'wysiwyg',
+                previewStyle: 'vertical',
+                usageStatistics: false,
+                initialValue: bookIndex,
+                toolbarItems: [
+                    ['heading', 'bold', 'italic', 'strike'],
+                    ['hr', 'quote'],
+                    ['ul', 'ol', 'task', 'indent', 'outdent'],
+                    ['table', 'code', 'codeblock']
+                ]
+            });
+
+            const editorExplanation = new toastui.Editor({
+                el: document.querySelector('#editorExplanation'),
+                height: '500px',
+                initialEditType: 'wysiwyg',
+                previewStyle: 'vertical',
+                usageStatistics: false,
+                initialValue: bookExplanation,
+                toolbarItems: [
+                    ['heading', 'bold', 'italic', 'strike'],
+                    ['hr', 'quote'],
+                    ['ul', 'ol', 'task', 'indent', 'outdent'],
+                    ['table', 'code', 'codeblock']
+                ]
+            });
+            $('#updateForm').on('submit', function () {
+                document.getElementById('index').value = editorIndex.getHTML();
+                document.getElementById('explanation').value = editorExplanation.getHTML();
+            });
+        });
+
+        $(document).ready(function () {
+            $('#authorList').multiselect({
+                nonSelectedText: '저자 선택',
+                maxHeight: 400,
+                includeSelectAllOption: false,
+                numberDisplayed: 1,
+                enableFiltering: true,
+                enableCaseInsensitiveFiltering: true,
+                filterPlaceholder: '저자 검색'
+            });
+
+            $('#authorSearch').on('keyup', function () {
+                var searchTerm = $(this).val().toLowerCase();
+                $('#authorList option').each(function () {
+                    var text = $(this).text().toLowerCase();
+                    var match = text.indexOf(searchTerm) > -1;
+                });
+                $('#authorList').multiselect('rebuild');
+            });
+        });
+
         $(document).ready(function () {
             $('#categoryList').multiselect({
                 nonSelectedText: '카테고리 선택(최대 10개)',
@@ -227,7 +329,7 @@ <h3>도서 수정</h3>
                 enableFiltering: true,
                 enableCaseInsensitiveFiltering: true,
                 filterPlaceholder: '카테고리 검색',
-                onChange: function(option, checked) {
+                onChange: function (option, checked) {
                     var selectedOptions = $('#categoryList option:selected');
                     var count = selectedOptions.length;
                     if (count > 10) {
@@ -237,9 +339,9 @@ <h3>도서 수정</h3>
                     }
                 }
             });
-            $('#categorySearch').on('keyup', function() {
+            $('#categorySearch').on('keyup', function () {
                 var searchTerm = $(this).val().toLowerCase();
-                $('#categoryList option').each(function() {
+                $('#categoryList option').each(function () {
                     var text = $(this).text().toLowerCase();
                     var match = text.indexOf(searchTerm) > -1;
                     $(this).toggle(match);
@@ -258,9 +360,9 @@ <h3>도서 수정</h3>
                 enableCaseInsensitiveFiltering: true,
                 filterPlaceholder: '태그 검색'
             });
-            $('#tagSearch').on('keyup', function() {
+            $('#tagSearch').on('keyup', function () {
                 var searchTerm = $(this).val().toLowerCase();
-                $('#tagList option').each(function() {
+                $('#tagList option').each(function () {
                     var text = $(this).text().toLowerCase();
                     var match = text.indexOf(searchTerm) > -1;
                     $(this).toggle(match);

From 2aaf8ffdb287a0b21953f2f5b54b8c02d8c8a13f Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 22:07:42 +0900
Subject: [PATCH 145/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=ED=8F=BC=20=EC=9C=84=EC=A6=88=EC=9C=85=20?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/book/book-register.html        | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/admin/view/book/book-register.html b/src/main/resources/templates/admin/view/book/book-register.html
index a38a59d2..fba8235f 100644
--- a/src/main/resources/templates/admin/view/book/book-register.html
+++ b/src/main/resources/templates/admin/view/book/book-register.html
@@ -55,7 +55,8 @@ <h3>도서 추가</h3>
                                                     aria-label="publisherId">
                                                 <option selected>출판사 선택</option>
                                                 <option th:each="publisher : ${publishers}"
-                                                        th:value="${publisher.id}" th:text="${publisher.name}"></option>
+                                                        th:value="${publisher.id}"
+                                                        th:text="${publisher.name}"></option>
                                             </select>
                                         </div>
                                     </div>
@@ -72,8 +73,8 @@ <h3>도서 추가</h3>
 
                                 <div class="col-sm-15">
                                     <div class="form-group">
-                                        <label for="explanation">목차</label>
-                                        <div id="editor1"></div>
+                                        <label for="index">목차</label>
+                                        <div id="editorIndex"></div>
                                         <input type="hidden" id="index" name="index">
                                     </div>
                                 </div>
@@ -81,7 +82,7 @@ <h3>도서 추가</h3>
                                 <div class="col-sm-15">
                                     <div class="form-group">
                                         <label for="explanation">설명</label>
-                                        <div id="editor"></div>
+                                        <div id="editorExplanation"></div>
                                         <input type="hidden" id="explanation" name="explanation">
                                     </div>
                                 </div>
@@ -253,9 +254,9 @@ <h3>도서 추가</h3>
         });
 
         $(document).ready(function () {
-            const editor = new toastui.Editor({
-                el: document.querySelector('#editor'),
-                height: '500px',
+            const editorIndex = new toastui.Editor({
+                el: document.querySelector('#editorIndex'),
+                height: '350px',
                 initialEditType: 'wysiwyg',
                 previewStyle: 'vertical',
                 usageStatistics: false,
@@ -266,9 +267,10 @@ <h3>도서 추가</h3>
                     ['table', 'code', 'codeblock']
                 ]
             });
-            const editor1 = new toastui.Editor({
-                el: document.querySelector('#editor1'),
-                height: '350px',
+
+            const editorExplanation = new toastui.Editor({
+                el: document.querySelector('#editorExplanation'),
+                height: '500px',
                 initialEditType: 'wysiwyg',
                 previewStyle: 'vertical',
                 usageStatistics: false,
@@ -279,10 +281,9 @@ <h3>도서 추가</h3>
                     ['table', 'code', 'codeblock']
                 ]
             });
-            $('#registerForm').on('submit', function (e) {
-                document.getElementById('explanation').value = editor.getHTML();
-                document.getElementById('index').value = editor1.getHTML();
-
+            $('#registerForm').on('submit', function () {
+                document.getElementById('index').value = editorIndex.getHTML();
+                document.getElementById('explanation').value = editorExplanation.getHTML();
             });
         });
 

From f168cb6dc974741ca96182cab0ce5b4230d09d6d Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 22:09:43 +0900
Subject: [PATCH 146/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/book/adaptor/BookAdminAdaptor.java  | 216 ------------------
 .../book/controller/BookAdminController.java  | 137 -----------
 .../book/model/request/BookModifyRequest.java |  38 ++-
 .../admin/book/service/BookAdminService.java  |   5 +-
 4 files changed, 38 insertions(+), 358 deletions(-)
 delete mode 100644 src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
 delete mode 100644 src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java

diff --git a/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java b/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
deleted file mode 100644
index 3d937ae6..00000000
--- a/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package store.mybooks.front.admin.book.adaptor;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-import lombok.RequiredArgsConstructor;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-import store.mybooks.front.admin.book.model.request.BookCreateRequest;
-import store.mybooks.front.admin.book.model.request.BookModifyRequest;
-import store.mybooks.front.admin.book.model.response.BookBriefResponse;
-import store.mybooks.front.admin.book.model.response.BookCartResponse;
-import store.mybooks.front.admin.book.model.response.BookCreateResponse;
-import store.mybooks.front.admin.book.model.response.BookDetailResponse;
-import store.mybooks.front.admin.book.model.response.BookGetResponseForCoupon;
-import store.mybooks.front.admin.book.model.response.BookModifyResponse;
-import store.mybooks.front.admin.book.model.response.BookStatusGetResponse;
-import store.mybooks.front.auth.Annotation.RequiredAuthorization;
-import store.mybooks.front.config.GatewayAdaptorProperties;
-import store.mybooks.front.pageable.dto.response.PageResponse;
-import store.mybooks.front.utils.Utils;
-
-/**
- * packageName    : store.mybooks.front.admin.book.adaptor <br/>
- * fileName       : BookAdminAdaptor<br/>
- * author         : newjaehun <br/>
- * date           : 2/26/24<br/>
- * description    :<br/>
- * ===========================================================<br/>
- * DATE              AUTHOR             NOTE<br/>
- * -----------------------------------------------------------<br/>
- * 2/26/24        newjaehun       최초 생성<br/>
- */
-@Component
-@RequiredArgsConstructor
-public class BookAdminAdaptor {
-    private final RestTemplate restTemplate;
-
-    private final GatewayAdaptorProperties gatewayAdaptorProperties;
-
-    private static final String URL = "/api/books";
-    private static final String ADMIN_URL = "/api/admin/books";
-
-    /**
-     * methodName : getPagedBriefBooks
-     * author : newjaehun
-     * description : 관리자 도서페이지에 보여줄 페이징된 도서정보.
-     *
-     * @param pageable Pageable
-     * @return pageResponse
-     */
-    public PageResponse<BookBriefResponse> getPagedBriefBooks(Pageable pageable) {
-        ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + URL + "?page=" + pageable.getPageNumber() + "&size="
-                        + pageable.getPageSize(),
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<>() {
-                });
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-
-    /**
-     * methodName : getDetailBook
-     * author : newjaehun
-     * description : 도서 ID로 도서 상세정보 가져오기.
-     *
-     * @param bookId Long
-     * @return bookDetailResponse BookDetailResponse
-     */
-    public BookDetailResponse getDetailBook(Long bookId) {
-        ResponseEntity<BookDetailResponse> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + URL + "/{id}",
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<>() {
-                },
-                bookId);
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-
-    /**
-     * methodName : createBook
-     * author : newjaehun
-     * description : 도서 추가.
-     *
-     * @param bookCreateRequest BookCreateRequest
-     * @return bookCreateResponse
-     */
-    @RequiredAuthorization
-    public BookCreateResponse createBook(BookCreateRequest bookCreateRequest, MultipartFile thumbnailImage,
-                                         List<MultipartFile> contentImages)
-            throws IOException {
-        HttpHeaders headers = Utils.getAuthHeader();
-        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-        MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
-        parts.add("request", bookCreateRequest);
-        parts.add("thumbnail", new FileSystemResource(convert(thumbnailImage)));
-        for (MultipartFile files : contentImages) {
-            parts.add("content", new FileSystemResource(convert(files)));
-        }
-
-        HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
-
-        ResponseEntity<BookCreateResponse> responseEntity = restTemplate.postForEntity(
-                gatewayAdaptorProperties.getAddress() + ADMIN_URL,
-                requestHttpEntity,
-                BookCreateResponse.class);
-
-        return Utils.getResponseEntity(responseEntity, HttpStatus.CREATED);
-    }
-
-    @RequiredAuthorization
-    private File convert(MultipartFile file) throws IOException {
-        File convFile = new File(Objects.requireNonNull(file.getOriginalFilename()));
-        try (FileOutputStream fileOutputStream = new FileOutputStream(convFile)) {
-            fileOutputStream.write(file.getBytes());
-        }
-        return convFile;
-    }
-
-    /**
-     * methodName : updateBook
-     * author : newjaehun
-     * description : 도서 수정.
-     *
-     * @param bookId        Long
-     * @param modifyRequest BookModifyRequest
-     * @return bookModifyResponse
-     */
-    @RequiredAuthorization
-    public BookModifyResponse updateBook(Long bookId, BookModifyRequest modifyRequest) {
-        ResponseEntity<BookModifyResponse> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + ADMIN_URL + "/{id}",
-                HttpMethod.PUT,
-                new HttpEntity<>(modifyRequest, Utils.getAuthHeader()),
-                new ParameterizedTypeReference<>() {
-                }, bookId);
-
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-
-    /**
-     * methodName : getBookStatus
-     * author : newjaehun
-     * description : 전체 도서상태 리스트 반환.
-     *
-     * @return list
-     */
-    @RequiredAuthorization
-    public List<BookStatusGetResponse> getBookStatus() {
-        ResponseEntity<List<BookStatusGetResponse>> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + "/api/admin/books-statuses",
-                HttpMethod.GET,
-                new HttpEntity<>(Utils.getAuthHeader()),
-                new ParameterizedTypeReference<>() {
-                }
-        );
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-
-    /**
-     * methodName : getCartBook
-     * author : fiat_lux
-     * description : 카트의 책 정보 반환
-     *
-     * @param bookId the book id
-     * @return BookCartResponse
-     */
-    public BookCartResponse getCartBook(Long bookId) {
-        HttpEntity<Void> requestHttpEntity = new HttpEntity<>(Utils.getHttpHeader());
-
-        ResponseEntity<BookCartResponse> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + URL + "/cart-books" + "/" + bookId,
-                HttpMethod.GET,
-                requestHttpEntity,
-                new ParameterizedTypeReference<>() {
-                }
-        );
-
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-
-    /**
-     * methodName : getBookForCoupon <br>
-     * author : damho-lee <br>
-     * description : BookId, Name 리스트 반환.<br>
-     *
-     * @return list
-     */
-    @RequiredAuthorization
-    public List<BookGetResponseForCoupon> getBookForCoupon() {
-        ResponseEntity<List<BookGetResponseForCoupon>> exchange = restTemplate.exchange(
-                gatewayAdaptorProperties.getAddress() + ADMIN_URL + "/for-coupon",
-                HttpMethod.GET,
-                new HttpEntity<>(Utils.getAuthHeader()),
-                new ParameterizedTypeReference<>() {
-                }
-        );
-        return Utils.getResponseEntity(exchange, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java b/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java
deleted file mode 100644
index 9022f8b4..00000000
--- a/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package store.mybooks.front.admin.book.controller;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-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 org.springframework.web.bind.annotation.RequestParam;
-import store.mybooks.front.admin.author.dto.response.AuthorGetResponse;
-import org.springframework.web.multipart.MultipartFile;
-import store.mybooks.front.admin.author.service.AuthorService;
-import store.mybooks.front.admin.book.model.request.BookCreateRequest;
-import store.mybooks.front.admin.book.model.request.BookModifyRequest;
-import store.mybooks.front.admin.book.model.response.BookDetailResponse;
-import store.mybooks.front.admin.book.service.BookAdminService;
-import store.mybooks.front.admin.category.model.response.CategoryIdAndName;
-import store.mybooks.front.admin.category.service.CategoryAdminService;
-import store.mybooks.front.admin.publisher.service.PublisherService;
-import store.mybooks.front.admin.tag.model.response.TagGetResponseForBookDetail;
-import store.mybooks.front.admin.tag.service.TagService;
-
-/**
- * packageName    : store.mybooks.front.admin.book.controller <br/>
- * fileName       : BookAdminController<br/>
- * author         : newjaehun <br/>
- * date           : 2/26/24<br/>
- * description    :<br/>
- * ===========================================================<br/>
- * DATE              AUTHOR             NOTE<br/>
- * -----------------------------------------------------------<br/>
- * 2/26/24        newjaehun       최초 생성<br/>
- */
-@Controller
-@RequiredArgsConstructor
-@RequestMapping("/admin/book")
-public class BookAdminController {
-    private final BookAdminService bookAdminService;
-    private final PublisherService publisherService;
-    private final CategoryAdminService categoryAdminService;
-    private final TagService tagService;
-    private final AuthorService authorService;
-
-    /**
-     * methodName : getBookPage
-     * author : newjaehun
-     * description : 사이드바에서 책을 눌렀을 때 페이지.
-     *
-     * @param pageable Pageable
-     * @param model    Model
-     * @return string
-     */
-    @GetMapping
-    public String getBookPage(@PageableDefault(size = 8) Pageable pageable, Model model) {
-        model.addAttribute("books", bookAdminService.getBooks(pageable));
-        return "admin/view/book/book";
-    }
-
-    /**
-     * methodName : getBookRegisterPage
-     * author : newjaehun
-     * description : 도서 등록 페이지.
-     *
-     * @param model Model
-     * @return string
-     */
-    @GetMapping("/register")
-    public String getBookRegisterPage(Model model) {
-        model.addAttribute("publishers", publisherService.getAllPublishers());
-        model.addAttribute("categories", categoryAdminService.getCategories());
-        model.addAttribute("tags", tagService.getTags());
-        model.addAttribute("authors", authorService.getAllAuthors());
-        model.addAttribute("bookStatuses", bookAdminService.getBookStatus());
-        return "admin/view/book/book-register";
-    }
-
-    /**
-     * methodName : createBook
-     * author : newjaehun
-     * description : 도서 등록 요청 받는 메소드.
-     *
-     * @param bookCreateRequest BookCreateRequest
-     * @return string
-     */
-    @PostMapping("/register")
-    public String createBook(@Valid @ModelAttribute BookCreateRequest bookCreateRequest, @RequestParam("thumbnailImage")
-    MultipartFile thumbnailImage, @RequestParam("contentImage") List<MultipartFile> contentImages) throws IOException {
-        bookAdminService.createBook(bookCreateRequest, thumbnailImage, contentImages);
-        return "redirect:/admin/book/register";
-    }
-
-    /**
-     * methodName : getBookUpdatePage
-     * author : newjaehun
-     * description : 도서 업데이트 페이지.
-     *
-     * @param bookId BookId
-     * @param model  Model
-     * @return string
-     */
-    @GetMapping("/update")
-    public String getBookUpdatePage(@RequestParam("id") Long bookId, Model model) {
-        BookDetailResponse book = bookAdminService.getBook(bookId);
-        model.addAttribute("book", book);
-        model.addAttribute("bookAuthorList", book.getAuthorList().stream().map(AuthorGetResponse::getId).collect(Collectors.toList()));
-        model.addAttribute("bookTagList",
-                book.getTagList().stream().map(TagGetResponseForBookDetail::getId).collect(Collectors.toList()));
-        model.addAttribute("bookCategoryList", book.getCategoryList().stream().map(CategoryIdAndName::getId).collect(Collectors.toList()));
-
-        model.addAttribute("categories", categoryAdminService.getCategories());
-        model.addAttribute("tags", tagService.getTags());
-        model.addAttribute("authors", authorService.getAllAuthors());
-        model.addAttribute("bookStatuses", bookAdminService.getBookStatus());
-        return "admin/view/book/book-update";
-    }
-
-    /**
-     * methodName : updateBook
-     * author : newjaehun
-     * description : 도서 업데이트 요청.
-     *
-     * @param modifyRequest ModifyRequest
-     * @return string
-     */
-    @PostMapping("/update/{id}")
-    public String updateBook(@RequestParam("id") Long bookId, @ModelAttribute BookModifyRequest modifyRequest) {
-        bookAdminService.updateBook(bookId, modifyRequest);
-        return "redirect:/admin/book/update?id=" + bookId;
-    }
-}
diff --git a/src/main/java/store/mybooks/front/admin/book/model/request/BookModifyRequest.java b/src/main/java/store/mybooks/front/admin/book/model/request/BookModifyRequest.java
index 7c2f57df..81031d58 100644
--- a/src/main/java/store/mybooks/front/admin/book/model/request/BookModifyRequest.java
+++ b/src/main/java/store/mybooks/front/admin/book/model/request/BookModifyRequest.java
@@ -1,13 +1,18 @@
 package store.mybooks.front.admin.book.model.request;
 
+import java.time.LocalDate;
 import java.util.List;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PastOrPresent;
 import javax.validation.constraints.Positive;
 import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * packageName    : store.mybooks.front.admin.book.model.request <br/>
@@ -23,19 +28,46 @@
 @Getter
 @AllArgsConstructor
 public class BookModifyRequest {
-    @NotNull
-    @Positive
-    private Integer saleCost;
     @NotBlank
     @Size(min = 1, max = 20)
     private String bookStatusId;
     @NotNull
+    @Min(1)
+    @Max(100)
+    private Integer publisherId;
+    @NotBlank
+    @Size(min = 1, max = 100)
+    private String name;
+    @NotBlank
+    @Size(min = 13, max = 13)
+    private String isbn;
+    @NotNull
+    @PastOrPresent
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate publishDate;
+    @NotNull
+    @Positive
+    private Integer page;
+    @NotBlank
+    private String index;
+    @NotBlank
+    private String explanation;
+    @NotNull
+    @Positive
+    private Integer originalCost;
+    @NotNull
+    @Positive
+    private Integer saleCost;
+    @NotNull
     @PositiveOrZero
     private Integer stock;
     @NotNull
     private Boolean isPacking;
     @NotNull
     @Size(min = 1)
+    private List<Integer> authorList;
+    @NotNull
+    @Size(min = 1, max = 10)
     private List<Integer> categoryList;
     private List<Integer> tagList;
 }
diff --git a/src/main/java/store/mybooks/front/admin/book/service/BookAdminService.java b/src/main/java/store/mybooks/front/admin/book/service/BookAdminService.java
index d9626f79..b2baf4e3 100644
--- a/src/main/java/store/mybooks/front/admin/book/service/BookAdminService.java
+++ b/src/main/java/store/mybooks/front/admin/book/service/BookAdminService.java
@@ -45,8 +45,9 @@ public void createBook(BookCreateRequest bookCreateRequest, MultipartFile thumbn
     }
 
 
-    public void updateBook(Long bookId, BookModifyRequest modifyRequest) {
-        bookAdminAdaptor.updateBook(bookId, modifyRequest);
+    public void updateBook(Long bookId, BookModifyRequest modifyRequest, MultipartFile thumbnailImage,
+                           List<MultipartFile> contentImages) throws IOException {
+        bookAdminAdaptor.updateBook(bookId, modifyRequest, thumbnailImage, contentImages);
     }
 
     public List<BookStatusGetResponse> getBookStatus() {

From d8d14a7f6925baf4ad8509314753a9303f24fb78 Mon Sep 17 00:00:00 2001
From: newjaehun <sjh030798@gmail.com>
Date: Fri, 22 Mar 2024 22:10:58 +0900
Subject: [PATCH 147/147] =?UTF-8?q?refactor:=20=EB=8F=84=EC=84=9C=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/book/adaptor/BookAdminAdaptor.java  | 235 ++++++++++++++++++
 .../book/controller/BookAdminController.java  | 139 +++++++++++
 2 files changed, 374 insertions(+)
 create mode 100644 src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
 create mode 100644 src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java

diff --git a/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java b/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
new file mode 100644
index 00000000..cca6b49e
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/book/adaptor/BookAdminAdaptor.java
@@ -0,0 +1,235 @@
+package store.mybooks.front.admin.book.adaptor;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import store.mybooks.front.admin.book.model.request.BookCreateRequest;
+import store.mybooks.front.admin.book.model.request.BookModifyRequest;
+import store.mybooks.front.admin.book.model.response.BookBriefResponse;
+import store.mybooks.front.admin.book.model.response.BookCartResponse;
+import store.mybooks.front.admin.book.model.response.BookCreateResponse;
+import store.mybooks.front.admin.book.model.response.BookDetailResponse;
+import store.mybooks.front.admin.book.model.response.BookGetResponseForCoupon;
+import store.mybooks.front.admin.book.model.response.BookModifyResponse;
+import store.mybooks.front.admin.book.model.response.BookStatusGetResponse;
+import store.mybooks.front.auth.Annotation.RequiredAuthorization;
+import store.mybooks.front.config.GatewayAdaptorProperties;
+import store.mybooks.front.pageable.dto.response.PageResponse;
+import store.mybooks.front.utils.Utils;
+
+/**
+ * packageName    : store.mybooks.front.admin.book.adaptor <br/>
+ * fileName       : BookAdminAdaptor<br/>
+ * author         : newjaehun <br/>
+ * date           : 2/26/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 2/26/24        newjaehun       최초 생성<br/>
+ */
+@Component
+@RequiredArgsConstructor
+public class BookAdminAdaptor {
+    private final RestTemplate restTemplate;
+
+    private final GatewayAdaptorProperties gatewayAdaptorProperties;
+
+    private static final String URL = "/api/books";
+    private static final String ADMIN_URL = "/api/admin/books";
+
+    /**
+     * methodName : getPagedBriefBooks
+     * author : newjaehun
+     * description : 관리자 도서페이지에 보여줄 페이징된 도서정보.
+     *
+     * @param pageable Pageable
+     * @return pageResponse
+     */
+    public PageResponse<BookBriefResponse> getPagedBriefBooks(Pageable pageable) {
+        ResponseEntity<PageResponse<BookBriefResponse>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "?page=" + pageable.getPageNumber() + "&size="
+                        + pageable.getPageSize(),
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<>() {
+                });
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    /**
+     * methodName : getDetailBook
+     * author : newjaehun
+     * description : 도서 ID로 도서 상세정보 가져오기.
+     *
+     * @param bookId Long
+     * @return bookDetailResponse BookDetailResponse
+     */
+    public BookDetailResponse getDetailBook(Long bookId) {
+        ResponseEntity<BookDetailResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/{id}",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<>() {
+                },
+                bookId);
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    /**
+     * methodName : createBook
+     * author : newjaehun
+     * description : 도서 추가.
+     *
+     * @param bookCreateRequest BookCreateRequest
+     * @return bookCreateResponse
+     */
+    @RequiredAuthorization
+    public BookCreateResponse createBook(BookCreateRequest bookCreateRequest, MultipartFile thumbnailImage,
+                                         List<MultipartFile> contentImages)
+            throws IOException {
+        HttpHeaders headers = Utils.getAuthHeader();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
+        parts.add("request", bookCreateRequest);
+        parts.add("thumbnail", new FileSystemResource(convert(thumbnailImage)));
+        for (MultipartFile files : contentImages) {
+            parts.add("content", new FileSystemResource(convert(files)));
+        }
+
+        HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
+
+        ResponseEntity<BookCreateResponse> responseEntity = restTemplate.postForEntity(
+                gatewayAdaptorProperties.getAddress() + ADMIN_URL,
+                requestHttpEntity,
+                BookCreateResponse.class);
+
+        return Utils.getResponseEntity(responseEntity, HttpStatus.CREATED);
+    }
+
+    @RequiredAuthorization
+    private File convert(MultipartFile file) throws IOException {
+        File convFile = new File(Objects.requireNonNull(file.getOriginalFilename()));
+        try (FileOutputStream fileOutputStream = new FileOutputStream(convFile)) {
+            fileOutputStream.write(file.getBytes());
+        }
+        return convFile;
+    }
+
+    /**
+     * methodName : updateBook
+     * author : newjaehun
+     * description : 도서 수정.
+     *
+     * @param bookId        Long
+     * @param modifyRequest BookModifyRequest
+     * @return bookModifyResponse
+     */
+    @RequiredAuthorization
+    public void updateBook(Long bookId, BookModifyRequest modifyRequest, MultipartFile thumbnailImage,
+                           List<MultipartFile> contentImages) throws IOException {
+        HttpHeaders headers = Utils.getAuthHeader();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
+        parts.add("request", modifyRequest);
+        if (thumbnailImage != null && !thumbnailImage.isEmpty()) {
+            parts.add("thumbnail", new FileSystemResource(convert(thumbnailImage)));
+        }
+        if (contentImages != null && !contentImages.isEmpty()) {
+            for (MultipartFile file : contentImages) {
+                if (!file.isEmpty()) {
+                    parts.add("content", new FileSystemResource(convert(file)));
+                }
+            }
+        }
+
+        HttpEntity<MultiValueMap<String, Object>> requestHttpEntity = new HttpEntity<>(parts, headers);
+
+        ResponseEntity<Void> responseEntity = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + ADMIN_URL + "/" + bookId,
+                HttpMethod.PUT,
+                requestHttpEntity,
+                Void.class);
+
+
+        Utils.getResponseEntity(responseEntity, HttpStatus.OK);
+    }
+
+
+    /**
+     * methodName : getBookStatus
+     * author : newjaehun
+     * description : 전체 도서상태 리스트 반환.
+     *
+     * @return list
+     */
+    @RequiredAuthorization
+    public List<BookStatusGetResponse> getBookStatus() {
+        ResponseEntity<List<BookStatusGetResponse>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + "/api/admin/books-statuses",
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                }
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    /**
+     * methodName : getCartBook
+     * author : fiat_lux
+     * description : 카트의 책 정보 반환
+     *
+     * @param bookId the book id
+     * @return BookCartResponse
+     */
+    public BookCartResponse getCartBook(Long bookId) {
+        HttpEntity<Void> requestHttpEntity = new HttpEntity<>(Utils.getHttpHeader());
+
+        ResponseEntity<BookCartResponse> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + URL + "/cart-books" + "/" + bookId,
+                HttpMethod.GET,
+                requestHttpEntity,
+                new ParameterizedTypeReference<>() {
+                }
+        );
+
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+
+    /**
+     * methodName : getBookForCoupon <br>
+     * author : damho-lee <br>
+     * description : BookId, Name 리스트 반환.<br>
+     *
+     * @return list
+     */
+    @RequiredAuthorization
+    public List<BookGetResponseForCoupon> getBookForCoupon() {
+        ResponseEntity<List<BookGetResponseForCoupon>> exchange = restTemplate.exchange(
+                gatewayAdaptorProperties.getAddress() + ADMIN_URL + "/for-coupon",
+                HttpMethod.GET,
+                new HttpEntity<>(Utils.getAuthHeader()),
+                new ParameterizedTypeReference<>() {
+                }
+        );
+        return Utils.getResponseEntity(exchange, HttpStatus.OK);
+    }
+}
diff --git a/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java b/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java
new file mode 100644
index 00000000..5f915491
--- /dev/null
+++ b/src/main/java/store/mybooks/front/admin/book/controller/BookAdminController.java
@@ -0,0 +1,139 @@
+package store.mybooks.front.admin.book.controller;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+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 org.springframework.web.bind.annotation.RequestParam;
+import store.mybooks.front.admin.author.dto.response.AuthorGetResponse;
+import org.springframework.web.multipart.MultipartFile;
+import store.mybooks.front.admin.author.service.AuthorService;
+import store.mybooks.front.admin.book.model.request.BookCreateRequest;
+import store.mybooks.front.admin.book.model.request.BookModifyRequest;
+import store.mybooks.front.admin.book.model.response.BookDetailResponse;
+import store.mybooks.front.admin.book.service.BookAdminService;
+import store.mybooks.front.admin.category.model.response.CategoryIdAndName;
+import store.mybooks.front.admin.category.service.CategoryAdminService;
+import store.mybooks.front.admin.publisher.service.PublisherService;
+import store.mybooks.front.admin.tag.model.response.TagGetResponseForBookDetail;
+import store.mybooks.front.admin.tag.service.TagService;
+
+/**
+ * packageName    : store.mybooks.front.admin.book.controller <br/>
+ * fileName       : BookAdminController<br/>
+ * author         : newjaehun <br/>
+ * date           : 2/26/24<br/>
+ * description    :<br/>
+ * ===========================================================<br/>
+ * DATE              AUTHOR             NOTE<br/>
+ * -----------------------------------------------------------<br/>
+ * 2/26/24        newjaehun       최초 생성<br/>
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/admin/book")
+public class BookAdminController {
+    private final BookAdminService bookAdminService;
+    private final PublisherService publisherService;
+    private final CategoryAdminService categoryAdminService;
+    private final TagService tagService;
+    private final AuthorService authorService;
+
+    /**
+     * methodName : getBookPage
+     * author : newjaehun
+     * description : 사이드바에서 책을 눌렀을 때 페이지.
+     *
+     * @param pageable Pageable
+     * @param model    Model
+     * @return string
+     */
+    @GetMapping
+    public String getBookPage(@PageableDefault(size = 8) Pageable pageable, Model model) {
+        model.addAttribute("books", bookAdminService.getBooks(pageable));
+        return "admin/view/book/book";
+    }
+
+    /**
+     * methodName : getBookRegisterPage
+     * author : newjaehun
+     * description : 도서 등록 페이지.
+     *
+     * @param model Model
+     * @return string
+     */
+    @GetMapping("/register")
+    public String getBookRegisterPage(Model model) {
+        model.addAttribute("publishers", publisherService.getAllPublishers());
+        model.addAttribute("categories", categoryAdminService.getCategories());
+        model.addAttribute("tags", tagService.getTags());
+        model.addAttribute("authors", authorService.getAllAuthors());
+        model.addAttribute("bookStatuses", bookAdminService.getBookStatus());
+        return "admin/view/book/book-register";
+    }
+
+    /**
+     * methodName : createBook
+     * author : newjaehun
+     * description : 도서 등록 요청 받는 메소드.
+     *
+     * @param bookCreateRequest BookCreateRequest
+     * @return string
+     */
+    @PostMapping("/register")
+    public String createBook(@Valid @ModelAttribute BookCreateRequest bookCreateRequest, @RequestParam("thumbnailImage")
+    MultipartFile thumbnailImage, @RequestParam("contentImage") List<MultipartFile> contentImages) throws IOException {
+        bookAdminService.createBook(bookCreateRequest, thumbnailImage, contentImages);
+        return "redirect:/admin/book/register";
+    }
+
+    /**
+     * methodName : getBookUpdatePage
+     * author : newjaehun
+     * description : 도서 업데이트 페이지.
+     *
+     * @param bookId BookId
+     * @param model  Model
+     * @return string
+     */
+    @GetMapping("/update")
+    public String getBookUpdatePage(@RequestParam("id") Long bookId, Model model) {
+        BookDetailResponse book = bookAdminService.getBook(bookId);
+        model.addAttribute("book", book);
+        model.addAttribute("bookAuthorList", book.getAuthorList().stream().map(AuthorGetResponse::getId).collect(Collectors.toList()));
+        model.addAttribute("bookTagList",
+                book.getTagList().stream().map(TagGetResponseForBookDetail::getId).collect(Collectors.toList()));
+        model.addAttribute("bookCategoryList", book.getCategoryList().stream().map(CategoryIdAndName::getId).collect(Collectors.toList()));
+
+        model.addAttribute("publishers", publisherService.getAllPublishers());
+        model.addAttribute("categories", categoryAdminService.getCategories());
+        model.addAttribute("tags", tagService.getTags());
+        model.addAttribute("authors", authorService.getAllAuthors());
+        model.addAttribute("bookStatuses", bookAdminService.getBookStatus());
+        return "admin/view/book/book-update";
+    }
+
+    /**
+     * methodName : updateBook
+     * author : newjaehun
+     * description : 도서 업데이트 요청.
+     *
+     * @param modifyRequest ModifyRequest
+     * @return string
+     */
+    @PostMapping("/update/{id}")
+    public String updateBook(@RequestParam("id") Long bookId, @Valid @ModelAttribute BookModifyRequest modifyRequest, @RequestParam(value = "thumbnailImage", required = false)
+    MultipartFile thumbnailImage, @RequestParam(value = "contentImage", required = false) List<MultipartFile> contentImages) throws IOException {
+        bookAdminService.updateBook(bookId, modifyRequest, thumbnailImage, contentImages);
+        return "redirect:/admin/book/update?id=" + bookId;
+    }
+}