fix: 환급쿠폰 조회/발급시 -> 만료 조건 추가

Author: 82everywin

src/main/java/com/appcenter/marketplace/domain/member_payback/repository/MemberPaybackRepositoryCustomImpl.java

@@ -33,7 +33,8 @@ public boolean existCouponByMemberId(Long memberId, Long paybackId) {
         return jpaQueryFactory.selectFrom(memberPayback)
                 .where(memberPayback.member.id.eq(memberId)
                         .and(memberPayback.payback.id.eq(paybackId))
-                        .and(memberPayback.isPayback.eq(false))) // 사용하지 않은 쿠폰만 체크
+                        .and(memberPayback.isPayback.eq(false)) // 사용하지 않은 쿠폰 체크
+                        .and(memberPayback.isExpired.eq(false))) // 만료되지 않은 쿠폰 체크
                 .fetchFirst() != null;
     }
 

src/main/java/com/appcenter/marketplace/domain/payback/repository/PaybackRepositoryCustomImpl.java

@@ -56,8 +56,10 @@ public List<PaybackRes> findCouponsForMembersByMarketId(Long marketId, Long memb
                         payback.description,
                         Expressions.asEnum(CouponType.PAYBACK),
                         memberId != null ?
-                                paybackCoupon.id.isNotNull().and(paybackCoupon.isPayback.eq(false)) :
-                                Expressions.FALSE))
+                                paybackCoupon.id.isNotNull() // true -> 발급 불가능
+                                        .and(paybackCoupon.isPayback.eq(false)) // 환급 진행중 or 미사용
+                                        .and(paybackCoupon.isExpired.eq(false)):  // 만료 전
+                                Expressions.FALSE)) // false -> 발급 가능
                 .from(payback)
                 .join(market).on(payback.market.id.eq(market.id))
                 .leftJoin(memberPayback).on(payback.eq(memberPayback.payback))
@@ -201,7 +203,9 @@ public List<CouponRes> findLatestPaybackList(Long memberId, LocalDateTime lastCr
                         market.thumbnail,
                         Expressions.TRUE, // Payback은 항상 available
                         memberId != null ?
-                                savedPayback.id.isNotNull().and(savedPayback.isPayback.eq(false)) : // 다시 발급 받을 수 있음
+                                savedPayback.id.isNotNull()
+                                        .and(savedPayback.isPayback.eq(false)) // 환급 진행중 or 미사용
+                                        .and(savedPayback.isExpired.eq(false)):  // 만료 전
                                 Expressions.FALSE,
                         payback.createdAt,
                         Expressions.asEnum(CouponType.PAYBACK)
@@ -236,7 +240,9 @@ public List<CouponRes> findPopularPaybackList(Long memberId, Integer lastOrderNo
                         market.thumbnail,
                         Expressions.TRUE, // Payback은 항상 available
                         memberId != null ?
-                                savedPayback.id.isNotNull().and(savedPayback.isPayback.eq(false)) :
+                                savedPayback.id.isNotNull()
+                                        .and(savedPayback.isPayback.eq(false)) // 환급 진행 중 or 미사용상태
+                                        .and(savedPayback.isExpired.eq(false)) : // 만료전
                                 Expressions.FALSE,
                         issuedPayback.id.count(),
                         market.orderNo, // orderNo 추가