🚑 hotfix: 백그라운드 스케줄링 오동작에 의한 문제 해결

Team-Motivoo · Apr 21, 2024 · ad774e8 · ad774e8
1 parent d7a8274
commit ad774e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/motivoo-domain/src/main/java/sopt/org/motivoo/domain/mission/service/UserMissionManager.java b/motivoo-domain/src/main/java/sopt/org/motivoo/domain/mission/service/UserMissionManager.java
@@ -225,7 +225,7 @@ public Map<LocalDate, List<UserMission>> sortMissionsByDate(List<User> users) {
 
 		List<UserMission> myMissions = users.get(0).getUserMissions();
 		List<UserMission> opponentMissions = users.get(1).getUserMissions();
-		int totalMissionSize = myMissions.size();
+		int totalMissionSize = Math.max(myMissions.size(), opponentMissions.size());
 
 		Map<LocalDate, List<UserMission>> dateGroups = IntStream.range(0, totalMissionSize)
 			.filter(i ->

diff --git a/motivoo-domain/src/main/java/sopt/org/motivoo/domain/mission/service/UserMissionService.java b/motivoo-domain/src/main/java/sopt/org/motivoo/domain/mission/service/UserMissionService.java
@@ -16,7 +16,6 @@
 import sopt.org.motivoo.domain.health.entity.Health;
 import sopt.org.motivoo.domain.health.repository.HealthRetriever;
 import sopt.org.motivoo.domain.mission.dto.request.GoalStepCommand;
-import sopt.org.motivoo.domain.mission.dto.request.StepStatusCommand;
 import sopt.org.motivoo.domain.mission.dto.request.TodayMissionChoiceCommand;
 import sopt.org.motivoo.domain.mission.dto.response.GoalStepResult;
 import sopt.org.motivoo.domain.mission.dto.response.MissionHistoryResult;
@@ -75,6 +74,7 @@ public MissionHistoryResult getUserMissionHistory(final Long userId) {
 		if (myUser.getUserMissions().isEmpty()) {
 			return MissionHistoryResult.of(myUser, opponentUser);
 		}
+		log.info("미션 개수: {}, {}", myUser.getUserMissions().size(), opponentUser.getUserMissions().size());
 
 		Map<LocalDate, List<UserMission>> missionsByDate = groupUserMissionsByDate(userId, opponentUser.getId());
 		missionsByDate = userMissionManager.getMissionDateGroup(missionsByDate);
@@ -186,6 +186,12 @@ public TodayMissionResult getTodayMission(final Long userId) {
 
 		UserMission todayMission = user.getCurrentUserMission();
 
+		// *) Empty Mission이 생기지 않은 경우
+		if (!todayMission.isNowDate() && !opponentUser.getCurrentUserMission().isNowDate()) {
+			createEmptyMission(List.of(user, opponentUser));
+			return getMissionChoicesResult(user);
+		}
+
 		// 2) 필터링 로직을 한 번 이상 거친 경우 -> 저장된 미션 선택지 가져오기
 		if (isFiltered && todayMission.isEmptyUserMission()) {
 			log.info("2. 필터링 로직을 한 번 이상 거친 경우");