Merge pull request #67 from lotteon2/hotfix

✏️ 시작일과 종료일 기준으로 쿠폰의 유효성 판단
lotteon2 · Jan 19, 2024 · 3fbd541 · 3fbd541
2 parents 44b911d + 8464338
commit 3fbd541
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 47 deletions.
diff --git a/src/main/java/kr/bb/store/domain/coupon/repository/CouponRepositoryCustomImpl.java b/src/main/java/kr/bb/store/domain/coupon/repository/CouponRepositoryCustomImpl.java
@@ -54,7 +54,7 @@ public List<Coupon> findAllValidateCouponsByStoreId(Long storeId, LocalDate now)
                 .selectFrom(coupon)
                 .where(
                         coupon.store.id.eq(storeId),
-                        isCouponUnexpired(now),
+                        isValidDate(now),
                         coupon.isDeleted.isFalse()
                 )
                 .fetch();
@@ -82,7 +82,7 @@ public List<CouponWithIssueStatusDto> findStoreCouponsForUser(Long userId, Long
                 .from(coupon)
                 .where(
                         coupon.store.id.eq(storeId),
-                        isCouponUnexpired(now),
+                        isValidDate(now),
                         coupon.isDeleted.isFalse()
                 )
                 .fetch();
@@ -106,7 +106,7 @@ public List<CouponWithAvailabilityDto> findAvailableCoupons(Long totalAmount, Lo
                         coupon.store.id.eq(storeId),
                         issuedCoupon.id.userId.eq(userId),
                         issuedCoupon.isUsed.isFalse(),
-                        isCouponUnexpired(now),
+                        isValidDate(now),
                         coupon.isDeleted.isFalse()
                 )
                 .fetch();
@@ -129,7 +129,7 @@ public List<CouponDto> findMyValidCoupons(Long userId, LocalDate now) {
                 .where(
                         issuedCoupon.id.userId.eq(userId),
                         issuedCoupon.isUsed.isFalse(),
-                        isCouponUnexpired(now),
+                        isValidDate(now),
                         coupon.isDeleted.isFalse()
                 )
                 .fetch();
@@ -145,14 +145,15 @@ public Integer findMyValidCouponCount(Long userId, LocalDate now) {
                 .where(
                         issuedCoupon.id.userId.eq(userId),
                         issuedCoupon.isUsed.isFalse(),
-                        isCouponUnexpired(now),
+                        isValidDate(now),
                         coupon.isDeleted.isFalse()
                 )
                 .fetchFirst());
     }
 
-    private BooleanExpression isCouponUnexpired(LocalDate now) {
-        return coupon.endDate.after(now).or(coupon.endDate.eq(now));
+    private BooleanExpression isValidDate(LocalDate now) {
+        return coupon.startDate.before(now).or(coupon.startDate.eq(now))
+                .and(coupon.endDate.after(now).or(coupon.endDate.eq(now)));
     }
 
 }
diff --git a/src/test/java/kr/bb/store/domain/RedisContainerTestEnv.java b/src/test/java/kr/bb/store/domain/RedisContainerTestEnv.java
@@ -1,10 +1,14 @@
 package kr.bb.store.domain;
 
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
+@Testcontainers
+@SpringBootTest
 @ActiveProfiles("test")
 public class RedisContainerTestEnv {
     static final String REDIS_IMAGE = "redis:6-alpine";

diff --git a/src/test/java/kr/bb/store/domain/cargo/facade/CargoFacadeTest.java b/src/test/java/kr/bb/store/domain/cargo/facade/CargoFacadeTest.java
@@ -12,12 +12,10 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.persistence.EntityManager;
 import java.util.List;
@@ -26,8 +24,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Testcontainers
-@SpringBootTest
 class CargoFacadeTest extends RedisContainerTestEnv {
     @Autowired
     private CargoFacade cargoFacade;

diff --git a/src/test/java/kr/bb/store/domain/cargo/service/CargoServiceTest.java b/src/test/java/kr/bb/store/domain/cargo/service/CargoServiceTest.java
@@ -16,9 +16,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.persistence.EntityManager;
 import java.util.List;
@@ -27,8 +25,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.groups.Tuple.tuple;
 
-@Testcontainers
-@SpringBootTest
 class CargoServiceTest extends RedisContainerTestEnv {
 
     @Autowired

diff --git a/src/test/java/kr/bb/store/domain/coupon/handler/CouponCreatorTest.java b/src/test/java/kr/bb/store/domain/coupon/handler/CouponCreatorTest.java
@@ -11,17 +11,13 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Testcontainers
-@SpringBootTest
 @Transactional
 class CouponCreatorTest extends RedisContainerTestEnv {
     @Autowired

diff --git a/src/test/java/kr/bb/store/domain/coupon/handler/CouponIssuerTest.java b/src/test/java/kr/bb/store/domain/coupon/handler/CouponIssuerTest.java
@@ -9,16 +9,14 @@
 import kr.bb.store.domain.coupon.exception.ExpiredCouponException;
 import kr.bb.store.domain.coupon.repository.CouponRepository;
 import kr.bb.store.domain.coupon.repository.IssuedCouponRepository;
-import kr.bb.store.util.RedisOperation;
-import kr.bb.store.util.RedisUtils;
 import kr.bb.store.domain.store.entity.Store;
 import kr.bb.store.domain.store.repository.StoreRepository;
+import kr.bb.store.util.RedisOperation;
+import kr.bb.store.util.RedisUtils;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.persistence.EntityManager;
 import java.time.LocalDate;
@@ -27,8 +25,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Testcontainers
-@SpringBootTest
 @Transactional
 class CouponIssuerTest extends RedisContainerTestEnv {
     @Autowired

diff --git a/src/test/java/kr/bb/store/domain/coupon/handler/CouponManagerTest.java b/src/test/java/kr/bb/store/domain/coupon/handler/CouponManagerTest.java
@@ -11,18 +11,14 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.persistence.EntityManager;
 import java.time.LocalDate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Testcontainers
-@SpringBootTest
 @Transactional
 class CouponManagerTest extends RedisContainerTestEnv {
     @Autowired

diff --git a/src/test/java/kr/bb/store/domain/coupon/handler/CouponReaderTest.java b/src/test/java/kr/bb/store/domain/coupon/handler/CouponReaderTest.java
@@ -15,7 +15,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
@@ -24,7 +23,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest
 @Transactional
 class CouponReaderTest extends RedisContainerTestEnv {
     @Autowired

diff --git a/src/test/java/kr/bb/store/domain/coupon/service/CouponServiceTest.java b/src/test/java/kr/bb/store/domain/coupon/service/CouponServiceTest.java
@@ -12,16 +12,14 @@
 import kr.bb.store.domain.coupon.exception.UnAuthorizedCouponException;
 import kr.bb.store.domain.coupon.repository.CouponRepository;
 import kr.bb.store.domain.coupon.repository.IssuedCouponRepository;
-import kr.bb.store.util.RedisUtils;
-import kr.bb.store.util.RedisOperation;
 import kr.bb.store.domain.store.entity.Store;
 import kr.bb.store.domain.store.repository.StoreRepository;
+import kr.bb.store.util.RedisOperation;
+import kr.bb.store.util.RedisUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -32,8 +30,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@Testcontainers
-@SpringBootTest
 class CouponServiceTest extends RedisContainerTestEnv {
     @Autowired
     private CouponService couponService;

diff --git a/src/test/java/kr/bb/store/domain/question/handler/QuestionReaderTest.java b/src/test/java/kr/bb/store/domain/question/handler/QuestionReaderTest.java
@@ -22,7 +22,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 class QuestionReaderTest extends BasicIntegrationTestEnv {
     @Autowired
     private QuestionReader questionReader;

diff --git a/src/test/java/kr/bb/store/domain/question/service/QuestionServiceTest.java b/src/test/java/kr/bb/store/domain/question/service/QuestionServiceTest.java
@@ -15,7 +15,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 class QuestionServiceTest extends BasicIntegrationTestEnv {
     @Autowired
     private QuestionService questionService;

diff --git a/src/test/java/kr/bb/store/domain/store/facade/StoreFacadeTest.java b/src/test/java/kr/bb/store/domain/store/facade/StoreFacadeTest.java
@@ -25,10 +25,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.BDDMockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import java.util.List;
@@ -37,8 +35,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 
-@SpringBootTest
-@Transactional
 class StoreFacadeTest extends BasicIntegrationTestEnv {
     @Autowired
     private StoreFacade storeFacade;

diff --git a/src/test/java/kr/bb/store/domain/store/handler/GugunReaderTest.java b/src/test/java/kr/bb/store/domain/store/handler/GugunReaderTest.java
@@ -9,16 +9,12 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@SpringBootTest
-@Transactional
 class GugunReaderTest extends BasicIntegrationTestEnv {
     @Autowired
     private GugunReader gugunReader;