Merge pull request #339 from Podo-Store/develop

fix: orderItem 테이블에서 title 제거

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/admin/controller/AdminController.java

@@ -149,7 +149,7 @@ public ResponseEntity<?> setPaymentStatus(@AuthenticationPrincipal UserEntity us
 
             if (dto.getOrderStatus() != null) {
                 if (dto.getOrderStatus() == OrderStatus.REJECT)
-                    mailSendService.joinCancelEmail(userInfo.getEmail(), order.getOrderItem().getFirst().getTitle());
+                    mailSendService.joinCancelEmail(userInfo.getEmail(), order.getOrderItem().getFirst().getProduct().getTitle());
 
                 order.setOrderStatus(dto.getOrderStatus());
             }

src/main/java/PodoeMarket/podoemarket/admin/service/AdminService.java

@@ -170,7 +170,7 @@ public OrderManagementResponseDTO getAllOrders(final OrderStatus orderStatus, fi
                     .map(order -> OrderManagementResponseDTO.OrderDTO.builder()
                             .id(order.getId())
                             .orderDate(order.getCreatedAt())
-                            .title(order.getOrderItem().getFirst().getTitle())
+                            .title(order.getOrderItem().getFirst().getProduct().getTitle())
                             .writer(order.getOrderItem().getFirst().getProduct().getWriter())
                             .customer(order.getOrderItem().getFirst().getUser().getNickname())
                             .orderStatus(order.getOrderStatus())
@@ -205,7 +205,7 @@ public OrderManagementResponseDTO getAllOrderItems(final String search, final Or
                     .map(orderItem -> OrderManagementResponseDTO.OrderDTO.builder()
                             .id(orderItem.getOrder().getId())
                             .orderDate(orderItem.getCreatedAt())
-                            .title(orderItem.getTitle())
+                            .title(orderItem.getProduct().getTitle())
                             .writer(orderItem.getProduct().getWriter())
                             .customer(orderItem.getUser().getNickname())
                             .orderStatus(orderItem.getOrder().getOrderStatus())

src/main/java/PodoeMarket/podoemarket/common/entity/OrderItemEntity.java

@@ -50,9 +50,6 @@ public class OrderItemEntity {
     @Column(nullable = false)
     private Integer totalPrice;
 
-    @Column(nullable = false)
-    private String title;
-
     @Column(nullable = false, updatable = false)
     private LocalDateTime createdAt;
 

src/main/java/PodoeMarket/podoemarket/common/repository/OrderItemRepository.java

@@ -37,7 +37,7 @@ public interface OrderItemRepository extends JpaRepository<OrderItemEntity, Long
     SELECT oi FROM OrderItemEntity oi
     JOIN oi.product p
     JOIN p.user u
-    WHERE oi.title LIKE %:keyword%
+    WHERE p.title LIKE %:keyword%
     OR p.writer LIKE %:keyword%
     OR u.nickname LIKE %:keyword%
     """)
@@ -49,7 +49,7 @@ Page<OrderItemEntity> findOrderItemsByKeyword(@Param("keyword") String keyword,
     JOIN oi.product p
     JOIN p.user u
     JOIN oi.order o
-    WHERE (oi.title LIKE %:keyword%
+    WHERE (p.title LIKE %:keyword%
     OR p.writer LIKE %:keyword%
     OR u.nickname LIKE %:keyword%)
     AND(o.orderStatus = :orderStatus)

src/main/java/PodoeMarket/podoemarket/order/service/OrderService.java

@@ -105,7 +105,7 @@ public OrderInfoResponseDTO orderSuccess(Long orderId) {
             OrderInfoResponseDTO orderInfo = OrderInfoResponseDTO.builder()
                     .orderId(orderId)
                     .orderDate(order.getCreatedAt())
-                    .title(orderItem.getFirst().getTitle())
+                    .title(orderItem.getFirst().getProduct().getTitle())
                     .script(orderItem.getFirst().getScript())
                     .scriptPrice(orderItem.getFirst().getScriptPrice())
                     .performanceAmount(orderItem.getFirst().getPerformanceAmount())
@@ -192,7 +192,6 @@ protected OrdersEntity orderCreate(final OrdersEntity ordersEntity, final OrderR
                 orderItem.setPerformanceAmount(orderItemDTO.getPerformanceAmount());
                 orderItem.setPerformancePrice(performancePrice);
                 orderItem.setTotalPrice(totalPrice);
-                orderItem.setTitle(product.getTitle());
                 orderItem.setUser(user);
 
                 return orderItem;
@@ -236,7 +235,6 @@ private List<OrderCompleteResponseDTO> orderResult(final OrdersEntity ordersEnti
                             .id(ordersEntity.getId())
                             .orderDate(ordersEntity.getCreatedAt())
                             .orderNum(ordersEntity.getId())
-                            .title(orderItem.getTitle())
                             .scriptPrice(orderItem.getScriptPrice())
                             .performancePrice(orderItem.getPerformancePrice())
                             .totalPrice(orderItem.getTotalPrice())

src/main/java/PodoeMarket/podoemarket/profile/service/MypageService.java

@@ -167,7 +167,7 @@ public OrderScriptsResponseDTO getUserOrderScripts(UserEntity userInfo) {
             for (OrderItemEntity orderItem : allOrderItems) {
                 final OrderScriptsResponseDTO.DateScriptOrderResponseDTO.OrderScriptDTO orderItemDTO =  new OrderScriptsResponseDTO.DateScriptOrderResponseDTO.OrderScriptDTO();
                 orderItemDTO.setId(orderItem.getId());
-                orderItemDTO.setTitle(orderItem.getTitle());
+                orderItemDTO.setTitle(orderItem.getProduct().getTitle());
                 orderItemDTO.setScript(orderItem.getScript());
 
                 if(orderItem.getProduct() != null) { // 삭제된 작품이 아닐 경우
@@ -218,7 +218,7 @@ public OrderPerformanceResponseDTO getUserOrderPerformances(UserEntity userInfo)
                     // 각 주문 항목에 대한 제품 정보 가져옴
                     final OrderPerformanceResponseDTO.DatePerformanceOrderDTO.OrderPerformanceDTO orderItemDTO = new OrderPerformanceResponseDTO.DatePerformanceOrderDTO.OrderPerformanceDTO();
                     orderItemDTO.setId(orderItem.getId());
-                    orderItemDTO.setTitle(orderItem.getTitle());
+                    orderItemDTO.setTitle(orderItem.getProduct().getTitle());
                     orderItemDTO.setPerformanceAmount(orderItem.getPerformanceAmount());
 
                     if(LocalDateTime.now().isAfter(orderItem.getCreatedAt().plusYears(1)))
@@ -300,7 +300,7 @@ public ApplyResponseDTO getApplyInfo(final UUID orderItemId) {
 
             applyResponseDTO.setOrderItemId(orderItem.getId());
             applyResponseDTO.setImagePath(orderItem.getProduct().getImagePath() != null ? bucketURL + URLEncoder.encode(orderItem.getProduct().getImagePath(), StandardCharsets.UTF_8): "");
-            applyResponseDTO.setTitle(orderItem.getTitle());
+            applyResponseDTO.setTitle(orderItem.getProduct().getTitle());
             applyResponseDTO.setWriter(orderItem.getProduct().getWriter());
             applyResponseDTO.setPerformanceAmount(orderItem.getPerformanceAmount());
 
@@ -414,7 +414,7 @@ public RefundResponseDTO getRefundInfo(final UUID orderItemId) {
 
             return RefundResponseDTO.builder()
                     .scriptImage(orderItem.getProduct().getImagePath())
-                    .title(orderItem.getTitle())
+                    .title(orderItem.getProduct().getTitle())
                     .writer(orderItem.getProduct().getWriter())
                     .performancePrice(orderItem.getProduct().getPerformancePrice())
                     .orderDate(orderItem.getCreatedAt())