Skip to content

Commit 28de5fb

Browse files
authored
Merge pull request #245 from marinesnow34/test
Fix: 쿠폰 볼 때 만료 안보이게 수정
2 parents 4728b71 + efa0761 commit 28de5fb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.readyvery.readyverydemo.src.coupon.dto;
22

3+
import java.time.LocalDateTime;
34
import java.util.List;
45

56
import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ public CouponsRes toCouponsRes(List<Coupon> coupons) {
1617
//filter로 isUsed가 false인 쿠폰만 가져옴
1718
.coupons(coupons.stream()
1819
.filter(coupon -> coupon.getIssueCount() - coupon.getUseCount() > 0)
20+
.filter(coupon -> coupon.getCouponDetail().getExpire().isAfter(LocalDateTime.now()))
1921
.map(this::toCouponDto)
2022
.toList())
2123
.build();
@@ -27,7 +29,6 @@ private CouponDto toCouponDto(Coupon coupon) {
2729
.couponName(coupon.getCouponDetail().getName())
2830
.description(coupon.getCouponDetail().getDescription())
2931
.expirationDate(coupon.getCouponDetail().getExpire())
30-
.leftCoupon(coupon.getIssueCount() - coupon.getUseCount())
3132
.publisher(coupon.getCouponDetail().getStore() == null
3233
? "레디베리" : coupon.getCouponDetail().getStore().getName())
3334
.salePrice(coupon.getCouponDetail().getSalePrice())

0 commit comments

Comments
 (0)