From ef53f2fd202c314785e9cfab1b87341920484876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=82=98=EC=83=81=EC=97=B0?= <reddynor@naver.com>
Date: Wed, 30 Jul 2025 23:53:40 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20entity=20=EC=BB=AC=EB=9F=BC=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../threestar/trainus/domain/payment/entity/Payment.java    | 2 +-
 .../domain/payment/repository/PaymentRepository.java        | 6 +++---
 .../trainus/domain/payment/service/PaymentService.java      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java b/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java
index 3422c6a..4f0fe5f 100644
--- a/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java
+++ b/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java
@@ -37,7 +37,7 @@ public class Payment extends BaseDateEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long paymentId;
+	private Long id;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "user_id", nullable = false)
diff --git a/src/main/java/com/threestar/trainus/domain/payment/repository/PaymentRepository.java b/src/main/java/com/threestar/trainus/domain/payment/repository/PaymentRepository.java
index 864714a..d4b459e 100644
--- a/src/main/java/com/threestar/trainus/domain/payment/repository/PaymentRepository.java
+++ b/src/main/java/com/threestar/trainus/domain/payment/repository/PaymentRepository.java
@@ -22,7 +22,7 @@ Optional<Payment> findByUserAndLessonAndUserCouponAndStatus(User user, Lesson le
 	Optional<Payment> findByUserAndLessonAndUserCouponIsNullAndStatus(User user, Lesson lesson, PaymentStatus status);
 
 	@Query(value = """
-		SELECT p.payment_id FROM payments p
+		SELECT p.id FROM payments p
 		WHERE p.user_id = :userId
 		AND p.status = :status
 		ORDER BY p.pay_date DESC 
@@ -39,12 +39,12 @@ List<Long> findPaymentIdsByUserAndStatus(
 			SELECT p FROM Payment p
 			LEFT JOIN FETCH p.lesson
 			LEFT JOIN FETCH p.userCoupon
-			WHERE p.paymentId IN :ids
+			WHERE p.id IN :ids
 		""")
 	List<Payment> findAllWithAssociationsByIds(@Param("ids") List<Long> ids);
 
 	@Query(value = """
-			SELECT count(*) FROM (SELECT payment_id FROM payments WHERE user_id = :userId AND status = :status LIMIT :limit) t
+			SELECT count(*) FROM (SELECT id FROM payments WHERE user_id = :userId AND status = :status LIMIT :limit) t
 		""", nativeQuery = true
 	)
 	Integer count(
diff --git a/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java b/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java
index 6195dcf..865ab28 100644
--- a/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java
+++ b/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java
@@ -198,7 +198,7 @@ public PaymentSuccessHistoryPageDto viewAllSuccessTransaction(Long userId, int p
 
 		List<Payment> payments = paymentRepository.findAllWithAssociationsByIds(paymentIds);
 		Map<Long, Payment> map = payments.stream()
-			.collect(Collectors.toMap(Payment::getPaymentId, p -> p));
+			.collect(Collectors.toMap(Payment::getId, p -> p));
 		List<Payment> allSuccessPayments = paymentIds.stream()
 			.map(map::get)
 			.toList();
@@ -228,7 +228,7 @@ public PaymentCancelHistoryPageDto viewAllFailureTransaction(Long userId, int pa
 
 		List<Payment> payments = paymentRepository.findAllWithAssociationsByIds(paymentIds);
 		Map<Long, Payment> map = payments.stream()
-			.collect(Collectors.toMap(Payment::getPaymentId, p -> p));
+			.collect(Collectors.toMap(Payment::getId, p -> p));
 		List<Payment> allFailurePayments = paymentIds.stream()
 			.map(map::get)
 			.toList();