diff --git a/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java b/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java index 5ffaa5b1..43ed822e 100644 --- a/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java +++ b/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java @@ -2,7 +2,7 @@ import java.util.List; -import org.ezcode.codetest.domain.language.model.entity.Language; +import org.ezcode.codetest.application.submission.dto.response.language.LanguageResponse; import org.ezcode.codetest.domain.user.model.entity.User; import org.ezcode.codetest.domain.user.model.enums.AuthType; import org.ezcode.codetest.domain.user.model.enums.Tier; @@ -51,8 +51,8 @@ public class UserInfoResponse { @Schema(description = "사용자가 푼 문제 총 개수", example = "1235") private final int totalSolvedCount; - @Schema(description = "사용자가 선택한 언어. 기본적으로 1번 언어로 세팅됩니다", example = "1") - private final Language language; + @Schema(description = "사용자가 선택한 언어 정보") + private final LanguageResponse language; @Schema(description = "사용자가 가입한 경로(자체/소셜)의 리스트를 보여줍니다", example = "[GOOGLE, GITHUB, EMAIL]") private final List userAuthTypes; @@ -61,7 +61,7 @@ public class UserInfoResponse { public UserInfoResponse(String username, String email, String nickname, UserRole userRole, Tier tier, Integer age, String githubUrl, String blogUrl, String profileImageUrl, String introduction, boolean verified, int totalSolvedCount, - Language language, + LanguageResponse language, List userAuthTypes) { this.username = username; this.email = email; diff --git a/src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java b/src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java index 12ac6715..6a41b981 100644 --- a/src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java +++ b/src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java @@ -10,6 +10,7 @@ import org.ezcode.codetest.application.usermanagement.user.dto.response.UserProfileImageResponse; import org.ezcode.codetest.application.usermanagement.user.dto.response.UserReviewTokenResponse; import org.ezcode.codetest.application.usermanagement.user.model.UsersByWeek; +import org.ezcode.codetest.application.submission.dto.response.language.LanguageResponse; import org.ezcode.codetest.domain.language.model.entity.Language; import org.ezcode.codetest.domain.language.service.LanguageDomainService; import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount; @@ -77,7 +78,7 @@ public UserInfoResponse getUserInfo(AuthUser authUser) { .tier(user.getTier()) .verified(user.isVerified()) .totalSolvedCount(userSubmissionCount) - .language(user.getLanguage()) + .language(LanguageResponse.from(user.getLanguage())) .userAuthTypes(authTypes) .build(); } @@ -117,7 +118,7 @@ public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest .githubUrl(user.getGithubUrl()) .userRole(user.getRole()) .tier(user.getTier()) - .language(user.getLanguage()) + .language(LanguageResponse.from(user.getLanguage())) .build(); } diff --git a/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java b/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java index 3a844206..9dc7e60b 100644 --- a/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java +++ b/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java @@ -46,7 +46,7 @@ public ResponseEntity getUserInfo(@AuthenticationPrincipal Aut } @Operation(summary = "내 정보 수정", description = "닉네임, 블로그, 깃허브, 소개 등 개인 정보를 추가하거나 수정합니다.") - @PutMapping("/users") + @PutMapping("/users") public ResponseEntity modifyUserInfo( @AuthenticationPrincipal AuthUser authUser, @Valid @RequestPart("request") ModifyUserInfoRequest request,