refactor/367 메인현황-상품명 정렬 추가,

Author: yoostill

src/main/java/com/back/domain/dashboard/artist/dto/request/ArtistSettlementSearchRequest.java

@@ -36,8 +36,8 @@ public record ArtistSettlementSearchRequest(
         Integer size,
 
         /** 정렬 기준 */
-        @Pattern(regexp = "^(date|grossAmount|commission|netAmount|status)$",
-                message = "sort는 date, grossAmount, commission, netAmount, status 중 하나여야 합니다")
+        @Pattern(regexp = "^(date|productName|grossAmount|commission|netAmount|status)$",
+                message = "sort는 date, productName, grossAmount, commission, netAmount, status 중 하나여야 합니다")
         String sort,
 
         /** 정렬 방향 */

src/main/java/com/back/domain/dashboard/artist/service/ArtistDashboardServiceImpl.java

@@ -1667,11 +1667,25 @@ private ArtistSettlementResponse.Table createSettlementTableFromOrders(
             ArtistSettlementSearchRequest request,
             Long artistId) {
 
-        // 1. 배송 완료된 주문 조회 (정렬 없이 전체 조회)
-        List<com.back.domain.order.order.entity.Order> allOrders =
-                orderRepository.findDeliveredOrdersByArtistInPeriod(artist, startDate, endDate);
+        // 1. 정렬 필드 확인
+        String sortField = request.sort() != null ? request.sort() : "date";
+        String sortOrder = request.order() != null ? request.order() : "DESC";
+        boolean isProductNameSort = "productName".equals(sortField);
+
+        // 2. 배송 완료된 주문 조회
+        List<com.back.domain.order.order.entity.Order> allOrders;
+        
+        if (isProductNameSort) {
+            // 상품명 정렬: DB에서 정렬된 상태로 조회
+            allOrders = orderRepository.findDeliveredOrdersByArtistInPeriodSortedByProductName(
+                    artist, startDate, endDate, sortOrder);
+        } else {
+            // 일반 조회 (정렬은 메모리에서 처리)
+            allOrders = orderRepository.findDeliveredOrdersByArtistInPeriod(
+                    artist, startDate, endDate);
+        }
 
-        // 2. 주문을 OrderItem 단위로 변환 (작가의 상품만)
+        // 3. 주문을 OrderItem 단위로 변환 (작가의 상품만)
         List<SettlementOrderItem> settlementItems = allOrders.stream()
                 .flatMap(order -> order.getOrderItems().stream()
                         .filter(item -> item.getProduct().getUser().getId().equals(artistId))
@@ -1684,17 +1698,19 @@ private ArtistSettlementResponse.Table createSettlementTableFromOrders(
                         )))
                 .toList();
 
-        // 3. 정렬 적용
-        settlementItems = sortSettlementItems(settlementItems, request.sort(), request.order());
+        // 4. 정렬 적용 (상품명 정렬이 아닌 경우만 메모리 정렬)
+        if (!isProductNameSort) {
+            settlementItems = sortSettlementItems(settlementItems, sortField, sortOrder);
+        }
 
-        // 4. 페이징 처리
+        // 5. 페이징 처리
         int start = request.page() * request.size();
         int end = Math.min(start + request.size(), settlementItems.size());
         List<SettlementOrderItem> pagedItems = start < settlementItems.size()
                 ? settlementItems.subList(start, end)
                 : List.of();
 
-        // 5. DTO 변환
+        // 6. DTO 변환
         List<ArtistSettlementResponse.Settlement> content = pagedItems.stream()
                 .map(this::convertToSettlementDtoFromOrder)
                 .toList();
@@ -1716,7 +1732,8 @@ private ArtistSettlementResponse.Table createSettlementTableFromOrders(
     }
 
     /**
-     * 정산 아이템 정렬
+     * 정산 아이템 정렬 (메모리 정렬)
+     * productName 정렬은 DB에서 처리하므로 여기서는 제외
      */
     private List<SettlementOrderItem> sortSettlementItems(
             List<SettlementOrderItem> items, String sortField, String sortOrder) {
@@ -1726,6 +1743,7 @@ private List<SettlementOrderItem> sortSettlementItems(
         return items.stream()
                 .sorted((a, b) -> {
                     int cmp = switch (sortField) {
+                        case "productName" -> a.productName.compareTo(b.productName);
                         case "grossAmount" -> Integer.compare(a.grossAmount, b.grossAmount);
                         case "commission" -> Integer.compare(a.grossAmount / 10, b.grossAmount / 10);
                         case "netAmount" -> Integer.compare(a.grossAmount * 9 / 10, b.grossAmount * 9 / 10);

src/main/java/com/back/domain/order/order/repository/OrderRepository.java

@@ -328,4 +328,29 @@ List<Order> findDeliveredOrdersByArtistInPeriod(
             @Param("startDate") java.time.LocalDateTime startDate,
             @Param("endDate") java.time.LocalDateTime endDate
     );
+
+    /**
+     * - 특정 기간 내 DELIVERED 상태 주문만
+     * - 작가가 판매한 상품의 주문만
+     * - 상품명 기준 정렬 (ASC/DESC)
+     */
+    @Query("SELECT DISTINCT o FROM Order o " +
+            "JOIN o.orderItems oi " +
+            "JOIN oi.product p " +
+            "WHERE p.user = :artist " +
+            "AND o.status = com.back.domain.order.order.entity.OrderStatus.DELIVERED " +
+            "AND o.orderDate >= :startDate " +
+            "AND o.orderDate <= :endDate " +
+            "AND p.name = (SELECT MIN(p2.name) FROM OrderItem oi2 JOIN oi2.product p2 " +
+            "              WHERE oi2.order = o AND p2.user = :artist) " +
+            "ORDER BY " +
+            "CASE WHEN :direction = 'ASC' THEN p.name END ASC, " +
+            "CASE WHEN :direction = 'DESC' THEN p.name END DESC, " +
+            "o.orderDate DESC")
+    List<Order> findDeliveredOrdersByArtistInPeriodSortedByProductName(
+            @Param("artist") User artist,
+            @Param("startDate") java.time.LocalDateTime startDate,
+            @Param("endDate") java.time.LocalDateTime endDate,
+            @Param("direction") String direction
+    );
 }