diff --git a/src/main/java/com/teami/domain/reward/service/RewardService.java b/src/main/java/com/teami/domain/reward/service/RewardService.java index 4c51c14..cf4e771 100644 --- a/src/main/java/com/teami/domain/reward/service/RewardService.java +++ b/src/main/java/com/teami/domain/reward/service/RewardService.java @@ -1,5 +1,6 @@ package com.teami.domain.reward.service; +import com.teami.domain.calendar.entitty.Calendar; import com.teami.domain.calendar.entitty.CalendarMission; import com.teami.domain.calendar.repository.CalendarMissionRepository; import com.teami.domain.calendar.repository.CalendarRepository; @@ -41,7 +42,9 @@ public List find5CalendarMissions(Long calendarId, LocalDate no List calendarMissionList = new ArrayList<>(); for (int i = 0; i < 5; i++) { now = now.minusDays(1); - calendarMissionList.add(calendarMissionRepository.findCalendarMissionByCalendarIdAndDate(calendarId, now)); + CalendarMission calendarMission = calendarMissionRepository.findCalendarMissionByCalendarIdAndDate(calendarId, now); + if(calendarMission != null) + calendarMissionList.add(calendarMission); } return calendarMissionList; @@ -53,6 +56,8 @@ public Reward createReward_Mission1(Member member) { Long calendarId = calendarRepository.findByMemberAndIsComplete(member, false).get().getId(); List calendarMissions = find5CalendarMissions(calendarId, LocalDate.now()); + if(calendarMissions.size() != 5) return null; + for (int i = 0; i < 5; i++) { if (calendarMissions.get(i).isComplete() == false) { return null;