Merge pull request #245 from marinesnow34/test

Fix: 쿠폰 볼 때 만료 안보이게 수정
readyvery · May 16, 2024 · 28de5fb · 28de5fb
2 parents 4728b71 + efa0761
commit 28de5fb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java b/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java
@@ -1,5 +1,6 @@
 package com.readyvery.readyverydemo.src.coupon.dto;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ public CouponsRes toCouponsRes(List<Coupon> coupons) {
 			//filter로 isUsed가 false인 쿠폰만 가져옴
 			.coupons(coupons.stream()
 				.filter(coupon -> coupon.getIssueCount() - coupon.getUseCount() > 0)
+				.filter(coupon -> coupon.getCouponDetail().getExpire().isAfter(LocalDateTime.now()))
 				.map(this::toCouponDto)
 				.toList())
 			.build();
@@ -27,7 +29,6 @@ private CouponDto toCouponDto(Coupon coupon) {
 			.couponName(coupon.getCouponDetail().getName())
 			.description(coupon.getCouponDetail().getDescription())
 			.expirationDate(coupon.getCouponDetail().getExpire())
-			.leftCoupon(coupon.getIssueCount() - coupon.getUseCount())
 			.publisher(coupon.getCouponDetail().getStore() == null
 				? "레디베리" : coupon.getCouponDetail().getStore().getName())
 			.salePrice(coupon.getCouponDetail().getSalePrice())