From 9af8a391a28178f8563b94122ad75f19b2cabbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?user=20=EC=9D=B4=EB=A6=84?= <user 이메일>
Date: Tue, 5 Mar 2024 12:42:07 +0900
Subject: [PATCH] =?UTF-8?q?develop=20[develop]=20(fix)=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=EB=B3=84=20=EA=B8=B0=EC=A4=80=20=EC=9D=B4=EB=B2=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B0=B8=EC=97=AC=EC=9D=B4=EB=A0=A5=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yello/server/domain/event/service/EventService.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yello/server/domain/event/service/EventService.java b/src/main/java/com/yello/server/domain/event/service/EventService.java
index 09ac1eeb..7378c16b 100644
--- a/src/main/java/com/yello/server/domain/event/service/EventService.java
+++ b/src/main/java/com/yello/server/domain/event/service/EventService.java
@@ -68,8 +68,8 @@ public class EventService {
 
     private final EventRepository eventRepository;
     private final ObjectMapper objectMapper;
-    private final UserRepository userRepository;
     private final UserDataRepository userDataRepository;
+    private final UserRepository userRepository;
 
     public List<EventResponse> getEvents(Long userId) throws JsonProcessingException {
         // exception
@@ -99,7 +99,7 @@ public List<EventResponse> getEvents(Long userId) throws JsonProcessingException
             if (!eventTimeList.isEmpty()) {
                 final EventTime eventTime = eventTimeList.get(0);
 
-                // 현재 시각이 이벤트 시간에 유효하고, 남은 보상 카운트가 0인 이력
+                // 현재 시각이 이벤트 시간에 유효하고, 날짜별 기준, 남은 보상 카운트가 0인 이력
                 eventInstanceList.addAll(
                     eventRepository.findInstanceAllByEventTimeAndUser(
                             eventTime, user)
@@ -107,9 +107,10 @@ public List<EventResponse> getEvents(Long userId) throws JsonProcessingException
                         .filter(eventInstance ->
                             eventInstance.getInstanceDate().isAfter(event.getStartDate())
                                 && eventInstance.getInstanceDate().isBefore(event.getEndDate())
+                                && eventInstance.getInstanceDate().toLocalDate().isEqual(now.toLocalDate())
                                 && nowTime.isAfter(eventInstance.getEventTime().getStartTime())
                                 && nowTime.isBefore(eventInstance.getEventTime().getEndTime())
-                                && eventInstance.getRemainEventCount()==0
+                                && eventInstance.getRemainEventCount() == 0
                         )
                         .toList()
                 );
@@ -278,7 +279,7 @@ public EventRewardResponse rewardAdmob(Long userId, AdmobRewardRequest request)
         }
 
         // history 있으면 userId로 세팅
-        if (eventHistory.get().getUser()!=null) {
+        if (eventHistory.get().getUser() != null) {
             throw new EventForbiddenException(DUPLICATE_ADMOB_REWARD_EXCEPTION);
         }
         eventHistory.get().update(user);