Fix: PaymentLog와 Payment를 연결하여 결제 건 매칭이 가능하도록 수정 (#417)

Author: soyeon1806

roome/src/main/java/com/roome/domain/payment/dto/PaymentLogResponseDto.java

@@ -1,5 +1,6 @@
 package com.roome.domain.payment.dto;
 
+import com.roome.domain.payment.entity.Payment;
 import com.roome.domain.payment.entity.PaymentLog;
 import com.roome.domain.payment.entity.PaymentStatus;
 import lombok.AllArgsConstructor;
@@ -16,15 +17,20 @@
 public class PaymentLogResponseDto {
 
     private Long id;
+    private Long paymentId; // 연결된 결제 건 ID (매칭/추적용)
+    private String orderId;  // 연결된 결제의 주문 ID
     private int amount;
     private int earnedPoints;
     private String paymentKey;
     private LocalDateTime createdAt;
     private PaymentStatus status;
 
     public static PaymentLogResponseDto from(PaymentLog paymentLog, PaymentStatus status) {
+        Payment payment = paymentLog.getPayment();
         return PaymentLogResponseDto.builder()
                 .id(paymentLog.getId())
+                .paymentId(payment != null ? payment.getId() : null)
+                .orderId(payment != null ? payment.getOrderId() : null)
                 .amount(paymentLog.getAmount())
                 .earnedPoints(paymentLog.getEarnedPoints())
                 .paymentKey(paymentLog.getPaymentKey())

roome/src/main/java/com/roome/domain/payment/entity/PaymentLog.java

@@ -22,6 +22,12 @@ public class PaymentLog {
     @JoinColumn(name = "user_id", nullable = false)
     private User user; // 결제한 사용자
 
+    // 이 로그가 속한 결제 건 (로그를 Payment와 매칭하기 위한 연결)
+    // (기존 로그 호환을 위해 nullable, 신규 로그는 항상 설정)
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "payment_id")
+    private Payment payment;
+
     @Column(nullable = false)
     private int amount; // 결제 금액
 

roome/src/main/java/com/roome/domain/payment/repository/PaymentLogRepository.java

@@ -6,12 +6,20 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface PaymentLogRepository extends JpaRepository<PaymentLog, Long> {
 
   // 특정 사용자(userId)의 결제 기록 조회
   List<PaymentLog> findByUserId(Long userId);
 
+  // 연결된 결제(payment)를 함께 조회하여 조회 시 N+1을 방지한다.
+  // 기존 로그(payment=null) 호환을 위해 LEFT JOIN FETCH를 사용한다.
+  @Query(value = "SELECT pl FROM PaymentLog pl LEFT JOIN FETCH pl.payment WHERE pl.user = :user",
+      countQuery = "SELECT COUNT(pl) FROM PaymentLog pl WHERE pl.user = :user")
+  Page<PaymentLog> findByUserWithPayment(@Param("user") User user, Pageable pageable);
+
   Page<PaymentLog> findByUser(User user, Pageable pageable);
 
   // 특정 결제 키(paymentKey)로 결제 내역 조회

roome/src/main/java/com/roome/domain/payment/service/PaymentService.java

@@ -331,7 +331,7 @@ public List<PaymentLogResponseDto> getPaymentHistory(Long userId, int page, int
             .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
 
     PageRequest pageRequest = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
-    Page<PaymentLog> paymentLogs = paymentLogRepository.findByUser(user, pageRequest);
+    Page<PaymentLog> paymentLogs = paymentLogRepository.findByUserWithPayment(user, pageRequest);
 
     return paymentLogs.stream()
             .map(log -> {
@@ -347,6 +347,7 @@ public List<PaymentLogResponseDto> getPaymentHistory(Long userId, int page, int
   private void savePaymentLog(Payment payment, String paymentKey) {
     PaymentLog paymentLog = PaymentLog.builder()
             .user(payment.getUser())
+            .payment(payment)
             .amount(payment.getAmount())
             .earnedPoints(payment.getPurchasedPoints())
             .paymentKey(paymentKey)
@@ -357,6 +358,7 @@ private void savePaymentLog(Payment payment, String paymentKey) {
   private void saveRefundLog(Payment payment, int refundAmount, String paymentKey) {
     PaymentLog refundLog = PaymentLog.builder()
             .user(payment.getUser())
+            .payment(payment)
             .amount(-refundAmount)
             .earnedPoints(-payment.getPurchasedPoints())
             .paymentKey(paymentKey)

roome/src/test/java/com/roome/domain/payment/repository/PaymentLogRepositoryTest.java

@@ -0,0 +1,112 @@
+package com.roome.domain.payment.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.roome.domain.config.TestQueryDslConfig;
+import com.roome.domain.payment.entity.Payment;
+import com.roome.domain.payment.entity.PaymentLog;
+import com.roome.domain.payment.entity.PaymentStatus;
+import com.roome.domain.user.entity.Provider;
+import com.roome.domain.user.entity.Status;
+import com.roome.domain.user.entity.User;
+import com.roome.domain.user.repository.UserRepository;
+import com.roome.global.config.JpaConfig;
+import jakarta.persistence.EntityManager;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.test.context.ActiveProfiles;
+
+@ActiveProfiles("test")
+@Import({TestQueryDslConfig.class, JpaConfig.class})
+@DataJpaTest
+class PaymentLogRepositoryTest {
+
+  @Autowired
+  private PaymentLogRepository paymentLogRepository;
+
+  @Autowired
+  private PaymentRepository paymentRepository;
+
+  @Autowired
+  private UserRepository userRepository;
+
+  @Autowired
+  private EntityManager entityManager;
+
+  @Test
+  @DisplayName("결제 로그는 연결된 Payment를 통해 주문 건과 매칭할 수 있다.")
+  void paymentLog_LinkedToPayment() {
+    // given
+    User user = userRepository.save(createUser("user@gmail.com", "provId-1"));
+    Payment payment = paymentRepository.save(payment(user, "order-1"));
+    paymentLogRepository.save(PaymentLog.builder()
+        .user(user).payment(payment)
+        .amount(5_000).earnedPoints(550).paymentKey("pk1")
+        .build());
+    entityManager.flush();
+    entityManager.clear();
+
+    // when
+    Page<PaymentLog> result = paymentLogRepository.findByUserWithPayment(
+        user, PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")));
+
+    // then: 로그에서 연결된 결제 건의 orderId를 추적할 수 있다
+    List<PaymentLog> logs = result.getContent();
+    assertThat(logs).hasSize(1);
+    assertThat(logs.get(0).getPayment()).isNotNull();
+    assertThat(logs.get(0).getPayment().getOrderId()).isEqualTo("order-1");
+  }
+
+  @Test
+  @DisplayName("payment가 연결되지 않은 기존 로그도 조회에서 누락되지 않는다 (LEFT JOIN).")
+  void legacyLog_WithoutPayment_StillReturned() {
+    // given: payment 연결이 없는 레거시 로그
+    User user = userRepository.save(createUser("legacy@gmail.com", "provId-2"));
+    paymentLogRepository.save(PaymentLog.builder()
+        .user(user).payment(null)
+        .amount(1_000).earnedPoints(100).paymentKey("pk-legacy")
+        .build());
+    entityManager.flush();
+    entityManager.clear();
+
+    // when
+    Page<PaymentLog> result = paymentLogRepository.findByUserWithPayment(
+        user, PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")));
+
+    // then
+    assertThat(result.getContent()).hasSize(1);
+    assertThat(result.getContent().get(0).getPayment()).isNull();
+  }
+
+  private Payment payment(User user, String orderId) {
+    return Payment.builder()
+        .user(user)
+        .orderId(orderId)
+        .amount(5_000)
+        .purchasedPoints(550)
+        .status(PaymentStatus.SUCCESS)
+        .build();
+  }
+
+  private User createUser(String email, String providerId) {
+    return User.builder()
+        .email(email)
+        .name("user")
+        .nickname("nickname")
+        .profileImage("profile")
+        .provider(Provider.GOOGLE)
+        .providerId(providerId)
+        .status(Status.ONLINE)
+        .lastLogin(LocalDateTime.of(2025, 1, 1, 1, 1))
+        .refreshToken("refToken")
+        .build();
+  }
+}