chore: conflict 해결

softeerbootcamp4th · Aug 23, 2024 · 6983ef0 · 6983ef0
1 parent e54c111
commit 6983ef0
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/Server/src/main/java/JGS/CasperEvent/domain/event/service/eventService/RushEventService.java b/Server/src/main/java/JGS/CasperEvent/domain/event/service/eventService/RushEventService.java
@@ -94,17 +94,13 @@ public void apply(BaseUser user, int optionId) {
     // 진행중인 게임의 응모 비율 반환
     public RushEventResultResponseDto getRushEventRate(BaseUser user) {
         LocalDate today = LocalDate.now();
-
-        Long todayEventId = eventCacheService.getTodayEvent(today).rushEventId();
-
-        // 해당 유저의 optionId 를 가져옴
-        int optionId = eventCacheService.getOptionId(today, user.getPhoneNumber());
+        Long todayEventId = eventCacheService.getTodayEvent(today).getRushEventId();
+        Optional<Integer> optionId = rushParticipantsRepository.getOptionIdByUserId(user.getPhoneNumber());
 
         long leftOptionCount = rushParticipantsRepository.countByRushEvent_RushEventIdAndOptionId(todayEventId, 1);
         long rightOptionCount = rushParticipantsRepository.countByRushEvent_RushEventIdAndOptionId(todayEventId, 2);
 
-        return new RushEventRateResponseDto(
-                optionId,
+        return RushEventResultResponseDto.of(optionId.orElseThrow(() -> new CustomException("유저가 응모한 선택지가 존재하지 않습니다.", CustomErrorCode.USER_NOT_FOUND)),
                 leftOptionCount, rightOptionCount);
     }
 
@@ -233,11 +229,8 @@ public void setRushEvents() {
             rushEvents.add(rushEvent);
         }
 
-        LocalDate today = LocalDate.now();
-
-        eventCacheService.setCacheValue(today);
+        eventCacheService.setCacheValue(LocalDate.now());
         eventCacheService.setAllRushEvent();
-        eventCacheService.clearUserOptionCache();
         rushEventRedisService.clearAllrushEventRate();
     }