diff --git a/src/main/java/com/moplus/moplus_server/client/submit/dto/response/DayProgress.java b/src/main/java/com/moplus/moplus_server/client/submit/dto/response/DayProgress.java index 5e9251d..7200bd5 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/dto/response/DayProgress.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/dto/response/DayProgress.java @@ -11,11 +11,18 @@ public static DayProgress determineDayProgress(List problem if (problemStatuses.isEmpty()) { return INCOMPLETE; } - else if (problemStatuses.contains(ProblemSubmitStatus.IN_PROGRESS)) { - return IN_PROGRESS; - } - else{ + boolean allNotStarted = problemStatuses.stream() + .allMatch(status -> status == ProblemSubmitStatus.NOT_STARTED); + + boolean allFinished = problemStatuses.stream() + .allMatch(status -> status == ProblemSubmitStatus.CORRECT || status == ProblemSubmitStatus.INCORRECT); + + if (allNotStarted) { + return INCOMPLETE; + } else if (allFinished) { return COMPLETE; + } else { + return IN_PROGRESS; } } }