Merge branch 'development' of https://github.com/TrandPick/TrendPick_Pro

into development
TrandPick · Jun 13, 2023 · 4641a15 · 4641a15
2 parents a80caae + fbda1bb
commit 4641a15
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 173 deletions.
diff --git a/.github/workflows/work-2.yml b/.github/workflows/work-2.yml
@@ -101,4 +101,5 @@ jobs:
           method: kubeconfig
           kubeconfig: ${{ secrets.KUBE_CONFIG }}
       - run: |
-          kubectl set image deployment.apps/trendpick-1 trendpick-1=ghcr.io/angelsooho/trendpick-1:${{ needs.tag.outputs.tag_name }}
+          kubectl set image deployment.apps/trendpick-1 trendpick-1=ghcr.io/trandpick/trendpick-1:${{ needs.tag.outputs.tag_name }}
+          
diff --git a/build.gradle b/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.jetbrains:annotations:24.0.0'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     // log
     implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.8'
@@ -61,12 +62,10 @@ dependencies {
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
-    // cache
-    implementation 'org.springframework.boot:spring-boot-starter-cache'
-
     // swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
 
+    // cache
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.session:spring-session-core'

diff --git a/src/main/java/project/trendpick_pro/domain/cart/controller/CartController.java b/src/main/java/project/trendpick_pro/domain/cart/controller/CartController.java
@@ -43,6 +43,7 @@ public String showCart( Model model) {
 
     @PreAuthorize("hasAuthority({'MEMBER'})")
     @GetMapping("/add")
+    @ResponseBody
     public String addItemToCart(CartItemRequest cartItemRequests, Model model) {
         model.addAttribute("cartItemRequest", cartItemRequests);
         return "trendpick/usr/cart/add";

diff --git a/...ain/java/project/trendpick_pro/domain/notification/controller/NotificationController.java b/...ain/java/project/trendpick_pro/domain/notification/controller/NotificationController.java
diff --git a/src/main/java/project/trendpick_pro/domain/notification/entity/Notification.java b/src/main/java/project/trendpick_pro/domain/notification/entity/Notification.java
diff --git a/...ava/project/trendpick_pro/domain/notification/entity/dto/request/NotificationRequest.java b/...ava/project/trendpick_pro/domain/notification/entity/dto/request/NotificationRequest.java
diff --git a/...a/project/trendpick_pro/domain/notification/entity/dto/response/NotificationResponse.java b/...a/project/trendpick_pro/domain/notification/entity/dto/response/NotificationResponse.java
diff --git a/...ain/java/project/trendpick_pro/domain/notification/repository/NotificationRepository.java b/...ain/java/project/trendpick_pro/domain/notification/repository/NotificationRepository.java
diff --git a/src/main/java/project/trendpick_pro/domain/notification/service/NotificationService.java b/src/main/java/project/trendpick_pro/domain/notification/service/NotificationService.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -10,4 +10,14 @@ spring:
         enabled: true
   data:
     redis:
-      host: 172.17.0.1
+      host: 172.17.0.1
+management:
+  endpoint:
+    health:
+      probes:
+        enabled: true
+  health:
+    livenessstate:
+      enabled: true
+    readinessstate:
+      enabled: true
diff --git a/src/main/resources/templates/trendpick/orders/order-form.html b/src/main/resources/templates/trendpick/orders/order-form.html
@@ -60,7 +60,6 @@ <h1>주문상품 정보</h1>
             <table class="table w-full table-compact mb-8">
                 <thead>
                 <tr>
-                    <th scope="col"></th>
                     <th class="text-center" scope="col">번호</th>
                     <th class="text-center" scope="col">상품명</th>
                     <th class="text-center" scope="col">주문수량</th>
@@ -69,8 +68,8 @@ <h1>주문상품 정보</h1>
                 </thead>
                 <tbody>
                 <tr th:each="orderItem, itemStat : ${orderForm.orderItems}" class="bg-blue-50">
-                    <td class="text-center"><input type="hidden" th:field="*{orderItems[__${itemStat.index}__].cartItemId}" th:value="${orderItem.cartItemId}" /></td>
-                    <td class="text-center"><input type="hidden" th:field="*{orderItems[__${itemStat.index}__].productId}" th:value="${orderItem.productId}" /></td>
+                    <input type="hidden" th:field="*{orderItems[__${itemStat.index}__].cartItemId}" th:value="${orderItem.cartItemId}" />
+                    <input type="hidden" th:field="*{orderItems[__${itemStat.index}__].productId}" th:value="${orderItem.productId}" />
                     <td class="text-center" th:text="${itemStat.count}">1</td>
                     <td class="text-center"><input class="text-center" type="text" id="Product" th:data-total-product="${orderItem.productName}" th:field="*{orderItems[__${itemStat.index}__].productName}" th:value="${orderItem.productName}" readonly="readonly" /></td>
                     <td class="text-center"><input class="text-center" type="number" th:field="*{orderItems[__${itemStat.index}__].count}" th:value="${orderItem.count}" readonly="readonly" /></td>