Merge pull request #246 from readyvery/test

축제용 배포
readyvery · May 19, 2024 · e500fa1 · e500fa1
2 parents 4f984b1 + 28de5fb
commit e500fa1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Grade.java b/src/main/java/com/readyvery/readyverydemo/domain/Grade.java
@@ -6,7 +6,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum Grade {
-
+	EVENT("EVENT", 0.0D),
 	ORDA("ORDA", 4.0D),
 	DEFAULT("Earlier", 6.3D);
 

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())