Skip to content

refactor : language response #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minjee2758 merged 2 commits into from
Aug 28, 2025
Merged

refactor : language response #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f90731
refactor : language response
minjee2758 Aug 28, 2025
543efd2
refactor : url
minjee2758 Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...va/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<AuthType> userAuthTypes;
Expand All @@ -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<AuthType> userAuthTypes) {
this.username = username;
this.email = email;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ResponseEntity<UserInfoResponse> getUserInfo(@AuthenticationPrincipal Aut
}

@Operation(summary = "내 정보 수정", description = "닉네임, 블로그, 깃허브, 소개 등 개인 정보를 추가하거나 수정합니다.")
@PutMapping("/users")
@PutMapping("/users")
public ResponseEntity<UserInfoResponse> modifyUserInfo(
@AuthenticationPrincipal AuthUser authUser,
@Valid @RequestPart("request") ModifyUserInfoRequest request,
Expand Down