From 524fdc37fbd3496a3f181c82b139d0c35283063d Mon Sep 17 00:00:00 2001 From: HongGit Date: Mon, 31 Mar 2025 00:38:19 +0900 Subject: [PATCH] =?UTF-8?q?[hotfix]=20=EC=86=8C=EC=85=9C=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=84=B1=EA=B3=B5=20=EC=8B=9C=20oauth=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=A6=AC=ED=84=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moplus_server/client/submit/dto/response/DayProgress.java | 2 +- .../moplus_server/domain/auth/dto/response/LoginResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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()); }