Merge pull request #20 from nayoung238/refactor/optimize-query

Refactor: optimize query

Author: nayoung238

src/main/java/banking/payment/api/PaymentController.java

@@ -3,8 +3,8 @@
 import banking.auth.entity.UserPrincipal;
 import banking.payment.dto.request.PaymentRefundRequest;
 import banking.payment.dto.request.PaymentRequest;
+import banking.payment.dto.response.PaymentView;
 import banking.payment.dto.response.RefundPaymentResponse;
-import banking.payment.entity.PaymentView;
 import banking.payment.service.PaymentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;

src/main/java/banking/payment/dto/response/PaymentResponse.java renamed to src/main/java/banking/payment/dto/response/PaymentView.java

@@ -13,7 +13,7 @@
 
 @Schema(description = "결제 응답 DTO")
 @Builder
-public record PaymentResponse (
+public record PaymentView (
 
     @Schema(description = "결제 DB PK", example = "1")
     Long paymentId,
@@ -24,7 +24,7 @@ public record PaymentResponse (
     @Schema(description = "결제하는 계좌 번호", example = "5792214-80232581")
     String withdrawalAccountNumber,
 
-    @Schema(description = "수취인 이름", example = "홍길동")
+    @Schema(description = "수취인 이름", example = "jisoo")
     String payeeName,
 
     @Schema(description = "결제 금액", example = "50000")
@@ -40,9 +40,9 @@ public record PaymentResponse (
     @Schema(description = "결제일", example = "2024.06.11 15:20")
     LocalDateTime paidAt
 ) {
-    public static PaymentResponse of(Payment payment, PaymentTransferDetailResponse transferResponse,
-									 String withdrawalAccountNumber, String payeeName) {
-        return PaymentResponse.builder()
+    public static PaymentView of(Payment payment, PaymentTransferDetailResponse transferResponse,
+                                 String withdrawalAccountNumber, String payeeName) {
+        return PaymentView.builder()
             .paymentId(payment.getId())
             .paymentStatus(payment.getPaymentStatus())
             .withdrawalAccountNumber(withdrawalAccountNumber)

src/main/java/banking/payment/entity/PaymentView.java

@@ -1,11 +1,26 @@
 package banking.payment.repository;
 
-import banking.payment.entity.PaymentView;
-import org.springframework.data.jpa.repository.JpaRepository;
+import banking.payment.dto.response.PaymentView;
+import banking.payment.entity.Payment;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
-public interface PaymentViewRepository extends JpaRepository<PaymentView, Long> {
+public interface PaymentViewRepository extends CrudRepository<Payment, Long> {
 
-	Optional<PaymentView> findByPaymentId(Long paymentId);
+	@Query(
+		"SELECT new banking.payment.dto.response.PaymentView (" +
+			"p.id, p.paymentStatus, " +
+			"a.accountNumber, " +
+			"COALESCE(u.name, '탈퇴한 사용자'), " +
+			"t.amount, t.exchangeRate, t.currency, t.createdAt) " +
+			"FROM Payment p " +
+			"INNER JOIN Transfer t ON p.transferId = t.id " +
+			"INNER JOIN Account a ON t.withdrawalAccountId = a.id " +
+			"LEFT JOIN User u ON p.payeeId = u.id " +
+			"WHERE p.id = :paymentId"
+	)
+	Optional<PaymentView> findByPaymentId(@Param("paymentId") Long paymentId);
 }

src/main/java/banking/payment/repository/PaymentViewRepository.java

@@ -5,9 +5,9 @@
 import banking.common.exception.CustomException;
 import banking.common.exception.ErrorCode;
 import banking.payment.dto.request.PaymentRefundRequest;
+import banking.payment.dto.response.PaymentView;
 import banking.payment.dto.response.RefundPaymentResponse;
 import banking.payment.entity.Payment;
-import banking.payment.entity.PaymentView;
 import banking.payment.enums.PaymentStatus;
 import banking.payment.repository.PaymentRepository;
 import banking.payment.dto.request.PaymentRequest;

src/main/java/banking/payment/service/PaymentService.java

@@ -174,7 +174,7 @@ else if (transfers.get(0).getTransferType().equals(TransferType.DEPOSIT)) {
     public Transfer saveWithdrawalTransferDetail(Account withdrawalAccount, AccountPublicInfoResponse depositAccountPublicInfo, BigDecimal exchangeRate, BigDecimal amount) {
         Transfer transfer = Transfer.builder()
             .transferGroupId(createTransferGroupId(withdrawalAccount.getAccountNumber(), depositAccountPublicInfo.accountNumber()))
-            .transferOwnerId(withdrawalAccount.getId())
+            .transferOwnerId(withdrawalAccount.getUser().getId())
             .transferType(TransferType.WITHDRAWAL)
             .withdrawalAccountId(withdrawalAccount.getId())
             .depositAccountId(depositAccountPublicInfo.accountId())

src/main/java/banking/transfer/service/TransferService.java

@@ -10,7 +10,7 @@
 import banking.common.jwt.TestJwtUtil;
 import banking.payment.dto.request.PaymentRefundRequest;
 import banking.payment.dto.request.PaymentRequest;
-import banking.payment.entity.PaymentView;
+import banking.payment.dto.response.PaymentView;
 import banking.payment.enums.PaymentStatus;
 import banking.payment.service.PaymentService;
 import banking.user.entity.Role;
@@ -135,7 +135,7 @@ void refund_succeed_test () {
 
         // given4 - 결제 취소 요청 DTO 생성
         PaymentRefundRequest refundRequest = PaymentRefundRequest.builder()
-            .paymentId(paymentView.getPaymentId())
+            .paymentId(paymentView.paymentId())
             .withdrawalAccountPassword(withdrawalAccount.getPassword())
             .build();
 
@@ -182,7 +182,7 @@ void find_payment_details_test () throws Exception {
 
         // When & Then
         mockMvc.perform(
-            get("/payment/{paymentId}", paymentView.getPaymentId())
+            get("/payment/{paymentId}", paymentView.paymentId())
                 .header("Authorization", "Bearer " + TestJwtUtil.generateTestAccessToken(withdrawalAccountUser.getId(), Role.USER))
                 .contentType(MediaType.APPLICATION_JSON)
             )