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 findByUserAndLessonAndUserCouponAndStatus(User user, Lesson le Optional 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 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 findAllWithAssociationsByIds(@Param("ids") List 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 payments = paymentRepository.findAllWithAssociationsByIds(paymentIds); Map map = payments.stream() - .collect(Collectors.toMap(Payment::getPaymentId, p -> p)); + .collect(Collectors.toMap(Payment::getId, p -> p)); List allSuccessPayments = paymentIds.stream() .map(map::get) .toList(); @@ -228,7 +228,7 @@ public PaymentCancelHistoryPageDto viewAllFailureTransaction(Long userId, int pa List payments = paymentRepository.findAllWithAssociationsByIds(paymentIds); Map map = payments.stream() - .collect(Collectors.toMap(Payment::getPaymentId, p -> p)); + .collect(Collectors.toMap(Payment::getId, p -> p)); List allFailurePayments = paymentIds.stream() .map(map::get) .toList();