diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/point/PointRewardPolicyRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/point/PointRewardPolicyRepository.kt index 9587517..6463d5d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/point/PointRewardPolicyRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/point/PointRewardPolicyRepository.kt @@ -22,11 +22,13 @@ class PointRewardPolicyQueryRepositoryImpl( return queryFactory .selectFrom(pointRewardPolicy) .where( - pointRewardPolicy.isActive, - pointRewardPolicy.actionType.eq(actionType), - pointRewardPolicy.startDate.loe(nowDateTime), - pointRewardPolicy.endDate.goe(nowDateTime) - .or(pointRewardPolicy.endDate.isNull) + pointRewardPolicy.isActive + .and(pointRewardPolicy.actionType.eq(actionType)) + .and(pointRewardPolicy.startDate.loe(nowDateTime)) + .and( + pointRewardPolicy.endDate.goe(nowDateTime) + .or(pointRewardPolicy.endDate.isNull) + ) ) .orderBy(pointRewardPolicy.endDate.asc()) .fetchFirst()