#270 feat: 정산 총금액 필드 dto에 한번만 사용되도록 dto 구조 수정

src/main/java/com/example/sharemind/payment/application/PaymentService.java

@@ -4,7 +4,7 @@
 import com.example.sharemind.customer.domain.Customer;
 import com.example.sharemind.payment.domain.Payment;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorHomeResponse;
-import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponse;
+import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponses;
 import com.example.sharemind.payment.dto.response.PaymentGetCustomerResponse;
 
 import java.util.List;
@@ -20,7 +20,7 @@ public interface PaymentService {
 
     List<Payment> getRefundWaitingPayments();
 
-    List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId, String status, String sort, Long customerId);
+    PaymentGetCounselorResponses getPaymentsByCounselor(Long paymentId, String status, String sort, Long customerId);
 
     void updateSettlementOngoingByCounselor(Long paymentId, Long customerId);
 

src/main/java/com/example/sharemind/payment/application/PaymentServiceImpl.java

@@ -12,6 +12,7 @@
 import com.example.sharemind.payment.domain.Payment;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorHomeResponse;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponse;
+import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponses;
 import com.example.sharemind.payment.dto.response.PaymentGetCustomerResponse;
 import com.example.sharemind.payment.exception.PaymentErrorCode;
 import com.example.sharemind.payment.exception.PaymentException;
@@ -97,7 +98,7 @@ public List<Payment> getRefundWaitingPayments() {
     }
 
     @Override
-    public List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId, String status,
+    public PaymentGetCounselorResponses getPaymentsByCounselor(Long paymentId, String status,
             String sort, Long customerId) {
         Counselor counselor = counselorService.getCounselorByCustomerId(customerId);
         PaymentCounselorStatus counselorStatus = PaymentCounselorStatus.getPaymentCounselorStatusByName(
@@ -147,7 +148,7 @@ public List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId,
                                 paymentId, counselor, counselorStatus, sortTime, pageable))
                         .map(payment -> PaymentGetCounselorResponse.of(payment, finalTotal));
 
-        return page.getContent();
+        return PaymentGetCounselorResponses.of(total, page.getContent());
     }
 
     @Transactional

src/main/java/com/example/sharemind/payment/dto/response/PaymentGetCounselorResponses.java

@@ -0,0 +1,29 @@
+package com.example.sharemind.payment.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class PaymentGetCounselorResponses {
+
+    @Schema(description = "금액 합계")
+    private final Long total;
+
+    @Schema(description = "정산 정보 목록")
+    private final List<PaymentGetCounselorResponse> paymentGetCounselorResponses;
+
+    @Builder
+    public PaymentGetCounselorResponses(Long total, List<PaymentGetCounselorResponse> paymentGetCounselorResponses) {
+        this.total = total;
+        this.paymentGetCounselorResponses = paymentGetCounselorResponses;
+    }
+
+    public static PaymentGetCounselorResponses of (Long total, List<PaymentGetCounselorResponse> paymentGetCounselorResponses) {
+        return PaymentGetCounselorResponses.builder()
+                .total(total)
+                .paymentGetCounselorResponses(paymentGetCounselorResponses)
+                .build();
+    }
+}

src/main/java/com/example/sharemind/payment/presentation/PaymentController.java

@@ -4,7 +4,7 @@
 import com.example.sharemind.global.jwt.CustomUserDetails;
 import com.example.sharemind.payment.application.PaymentService;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorHomeResponse;
-import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponse;
+import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponses;
 import com.example.sharemind.payment.dto.response.PaymentGetCustomerResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -100,7 +100,7 @@ public ResponseEntity<Void> updateRefundWaitingByCustomer(@PathVariable Long pay
                     2. 2번째 요청부터 paymentId는 직전 요청의 조회 결과 3개 중 마지막 paymentId""")
     })
     @GetMapping("/counselors")
-    public ResponseEntity<List<PaymentGetCounselorResponse>> getPaymentsByCounselor(@RequestParam String status,
+    public ResponseEntity<PaymentGetCounselorResponses> getPaymentsByCounselor(@RequestParam String status,
                                                                                     @RequestParam String sort,
                                                                                     @RequestParam Long paymentId,
                                                                                     @AuthenticationPrincipal CustomUserDetails customUserDetails) {