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 7200bd5..1b30523 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 @@ -15,7 +15,7 @@ public static DayProgress determineDayProgress(List problem .allMatch(status -> status == ProblemSubmitStatus.NOT_STARTED); boolean allFinished = problemStatuses.stream() - .allMatch(status -> status == ProblemSubmitStatus.CORRECT || status == ProblemSubmitStatus.INCORRECT); + .allMatch(status -> status == ProblemSubmitStatus.CORRECT || status == ProblemSubmitStatus.INCORRECT || status == ProblemSubmitStatus.RETRY_CORRECT); if (allNotStarted) { return INCOMPLETE; diff --git a/src/main/java/com/moplus/moplus_server/domain/auth/dto/response/LoginResponse.java b/src/main/java/com/moplus/moplus_server/domain/auth/dto/response/LoginResponse.java index b1cdb1d..6651f32 100644 --- a/src/main/java/com/moplus/moplus_server/domain/auth/dto/response/LoginResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/auth/dto/response/LoginResponse.java @@ -11,7 +11,7 @@ public record LoginResponse( ) { public static LoginResponse of(Member member, TokenResponse tokenPairResponse) { - return new LoginResponse(member.getId(), member.getName(), member.getOauthInfo().getOauthEmail(), + return new LoginResponse(member.getId(), member.getOauthInfo().getName(), member.getOauthInfo().getOauthEmail(), tokenPairResponse.accessToken(), tokenPairResponse.refreshToken()); }