Merge pull request #193 from CoolPeace-yanolza/develop

1월 25일 17시 배포
CoolPeace-yanolza · Jan 25, 2024 · 941abe4 · 941abe4
2 parents c46154d + 3c1b7ea
commit 941abe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/com/coolpeace/domain/coupon/repository/CouponRepositoryImpl.java b/src/main/java/com/coolpeace/domain/coupon/repository/CouponRepositoryImpl.java
@@ -49,8 +49,7 @@ public Page<Coupon> findAllCoupons(Long memberId, Long accommodationId, SearchCo
                 case EXPOSURE_ON -> coupon.couponStatus.eq(EXPOSURE_ON);
                 case EXPOSURE_OFF -> coupon.couponStatus.eq(EXPOSURE_OFF)
                         .or(coupon.couponStatus.eq(EXPOSURE_WAIT));
-                case EXPIRED -> coupon.couponStatus.eq(EXPOSURE_END)
-                        .or(coupon.couponStatus.eq(DELETED));
+                case EXPIRED -> coupon.couponStatus.eq(EXPOSURE_END);
                 case All -> coupon.couponStatus.ne(DELETED);
             });
         } else {

diff --git a/src/main/java/com/coolpeace/domain/coupon/service/CouponService.java b/src/main/java/com/coolpeace/domain/coupon/service/CouponService.java
@@ -66,8 +66,7 @@ public CouponCategoryResponse getCouponCategories(Long memberId, Long accommodat
         long exposureOn = counts.getOrDefault(CouponStatusType.EXPOSURE_ON, 0L);
         long exposureOff = counts.getOrDefault(CouponStatusType.EXPOSURE_OFF, 0L)
                 + counts.getOrDefault(CouponStatusType.EXPOSURE_WAIT, 0L);
-        long expired = counts.getOrDefault(CouponStatusType.EXPOSURE_END, 0L)
-                + counts.getOrDefault(CouponStatusType.DELETED, 0L);
+        long expired = counts.getOrDefault(CouponStatusType.EXPOSURE_END, 0L);
 
         return CouponCategoryResponse.from(all, exposureOn, exposureOff, expired);
     }