Merge pull request #22 from softeerbootcamp4th/fix/eckrin

[Fix] 이벤트 당첨자 수 스케줄링 로직 수정
softeerbootcamp4th · Aug 14, 2024 · 3eb767b · 3eb767b
2 parents e75a6ea + 5d1adfa
commit 3eb767b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/softeer/podoarrival/event/repository/EventRewardRepository.java b/src/main/java/com/softeer/podoarrival/event/repository/EventRewardRepository.java
@@ -4,6 +4,9 @@
 import com.softeer.podoarrival.event.model.entity.EventReward;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface EventRewardRepository extends JpaRepository<EventReward, Long> {
 	int countByEvent(Event event);
+    List<EventReward> findAllByEvent(Event event);
 }
diff --git a/src/main/java/com/softeer/podoarrival/event/scheduler/ArrivalEventMaxArrivalScheduler.java b/src/main/java/com/softeer/podoarrival/event/scheduler/ArrivalEventMaxArrivalScheduler.java
@@ -2,6 +2,7 @@
 
 import com.softeer.podoarrival.event.exception.EventTypeNotExistsException;
 import com.softeer.podoarrival.event.model.entity.Event;
+import com.softeer.podoarrival.event.model.entity.EventReward;
 import com.softeer.podoarrival.event.model.entity.EventType;
 import com.softeer.podoarrival.event.repository.EventRepository;
 import com.softeer.podoarrival.event.repository.EventRewardRepository;
@@ -15,6 +16,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 선착순 이벤트의 당첨자 수를 세팅하는 스케줄러
@@ -42,10 +44,14 @@ public void setEventArrivalCount() {
         EventType eventType = eventTypeRepository.findById(1L).orElseThrow(() -> new EventTypeNotExistsException("이벤트 타입이 존재하지 않습니다."));
         Event findEvent = eventRepository.findFirstByEventTypeAndStartAtBetween(eventType, startOfDay, endOfDay);
 
-        // 찾은 이벤트에 해당하는 reword개수 조회
-        int rewordCount = eventRewardRepository.countByEvent(findEvent);
+        // 찾은 이벤트에 해당하는 reward개수 조회
+        int rewardCount = 0;
+        List<EventReward> eventRewards = eventRewardRepository.findAllByEvent(findEvent);
+        for (EventReward eventReward : eventRewards) {
+            rewardCount += eventReward.getNumWinners();
+        }
 
-        ArrivalEventReleaseServiceRedisImpl.setMaxArrival(rewordCount);
-        ArrivalEventReleaseServiceJavaImpl.setMaxArrival(rewordCount);
+        ArrivalEventReleaseServiceRedisImpl.setMaxArrival(rewardCount);
+        ArrivalEventReleaseServiceJavaImpl.setMaxArrival(rewardCount);
     }
 }