feature : 유저 언어 기본 1번으로 세팅, 유저 정보 get 요청 시 선택한 언어 노출

Author: minjee2758

src/main/java/org/ezcode/codetest/application/usermanagement/auth/service/AuthService.java

@@ -16,6 +16,8 @@
 import org.ezcode.codetest.application.usermanagement.user.dto.response.ChangeUserPasswordResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.LogoutResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.VerifyFindPasswordResponse;
+import org.ezcode.codetest.domain.language.model.entity.Language;
+import org.ezcode.codetest.domain.language.service.LanguageDomainService;
 import org.ezcode.codetest.domain.user.exception.AuthException;
 import org.ezcode.codetest.domain.user.exception.UserException;
 import org.ezcode.codetest.domain.user.exception.code.AuthExceptionCode;
@@ -41,6 +43,7 @@
 public class AuthService {
 
 	private final UserDomainService userDomainService;
+	private final LanguageDomainService languageDomainService;
 	private final JwtUtil jwtUtil;
 	private final RedisTemplate<String, String> redisTemplate;
 	private final MailService mailService;
@@ -80,12 +83,14 @@ private void userRegisterationProcess(SignupRequest request) {
 	//3. 만약 아예 첫 가입 유저일 때
 	private void createNewUser(SignupRequest request, String encodedPassword) {
 		String nickname = userDomainService.generateUniqueNickname();
+		Language language = languageDomainService.getLanguage(1L); //기본적으로 1번 언어로 가입 시 세팅
 		User newUser = User.emailUser(
 			request.getEmail(),
 			encodedPassword,
 			request.getUsername(),
 			nickname,
-			request.getAge()
+			request.getAge(),
+			language
 		);
 
 		userDomainService.createUser(newUser);

src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/response/UserInfoResponse.java

@@ -1,5 +1,6 @@
 package org.ezcode.codetest.application.usermanagement.user.dto.response;
 
+import org.ezcode.codetest.domain.language.model.entity.Language;
 import org.ezcode.codetest.domain.user.model.entity.User;
 import org.ezcode.codetest.domain.user.model.enums.Tier;
 import org.ezcode.codetest.domain.user.model.enums.UserRole;
@@ -47,10 +48,14 @@ public class UserInfoResponse {
 	@Schema(description = "사용자가 푼 문제 총 개수", example = "1235")
 	private final int totalSolvedCount;
 
+	@Schema(description = "사용자가 선택한 언어. 기본적으로 1번 언어로 세팅됩니다", example = "1")
+	private final Language language;
+
 	@Builder
 	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) {
+        int totalSolvedCount,
+		Language language) {
 		this.username = username;
 		this.email = email;
 		this.nickname = nickname;
@@ -63,6 +68,7 @@ public UserInfoResponse(String username, String email, String nickname, UserRole
 		this.userRole = userRole;
         this.verified = verified;
         this.totalSolvedCount = totalSolvedCount;
+		this.language = language;
     }
 
 	public static UserInfoResponse fromEntity(User user) {

src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java

@@ -69,6 +69,7 @@ public UserInfoResponse getUserInfo(AuthUser authUser) {
 			.tier(user.getTier())
 			.verified(user.isVerified())
 			.totalSolvedCount(userSubmissionCount)
+			.language(user.getLanguage())
 			.build();
 	}
 

src/main/java/org/ezcode/codetest/domain/user/model/entity/User.java

@@ -4,20 +4,23 @@
 import java.util.List;
 
 import org.ezcode.codetest.common.base.entity.BaseEntity;
+import org.ezcode.codetest.domain.language.model.entity.Language;
 import org.ezcode.codetest.domain.user.model.enums.Tier;
 import org.ezcode.codetest.domain.user.model.enums.UserRole;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -72,17 +75,20 @@ public class User extends BaseEntity {
 	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<UserAuthType> userAuthTypes = new ArrayList<>();
 
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "language_id")
+	private Language language;
+
 	private boolean verified; //이메일 인증 여부
 
 	private boolean gitPushStatus; //깃허브 자동 push 여부
 
-
 	/*
 	처음 유저 생성(가입) 시에는 기본 정보만 받음
 	- 이메일, 비번, 이름, 별명, 나이
 	-> 이후 회원정보 업데이트할 때, 원하는 정보를 입력할 수 있도록 함
 	 */
-	public static User emailUser(String email, String password, String username, String nickname, Integer age){
+	public static User emailUser(String email, String password, String username, String nickname, Integer age, Language language) {
 		return User.builder()
 			.email(email)
 			.password(password)
@@ -94,14 +100,15 @@ public static User emailUser(String email, String password, String username, Str
 			.isDeleted(false)
 			.verified(false)
 			.gitPushStatus(false)
+			.language(language)
 			.build();
 	}
 
 	/*
 	OAuth2로 로그인한 유저 저장
 	구글 이외의 다른 소셜 로그인 확장 가능성을 고려해 socialUser 이름 유지
 	 */
-	public static User socialUser(String email, String username, String nickname, String password){
+	public static User socialUser(String email, String username, String nickname, String password, Language language) {
 		return User.builder()
 			.email(email)
 			.username(username)
@@ -112,11 +119,12 @@ public static User socialUser(String email, String username, String nickname, St
 			.isDeleted(false)
 			.verified(false)
 			.gitPushStatus(false)
+			.language(language)
 			.build();
 	}
 
 	//깃허브 아이디와 url을 함께 저장하기 위해 따로 저장
-	public static User githubUser(String email, String username, String nickname, String password, String githubUrl){
+	public static User githubUser(String email, String username, String nickname, String password, String githubUrl, Language language){
 		return User.builder()
 			.email(email)
 			.username(username)
@@ -128,13 +136,14 @@ public static User githubUser(String email, String username, String nickname, St
 			.verified(false)
 			.githubUrl(githubUrl)
 			.gitPushStatus(false)
+			.language(language)
 			.build();
 	}
 
 
 	@Builder
 	public User(String email, String password, String username, String nickname,
-		Integer age, Tier tier, UserRole role, boolean isDeleted, boolean verified, String githubUrl, boolean gitPushStatus) {
+		Integer age, Tier tier, UserRole role, boolean isDeleted, boolean verified, String githubUrl, boolean gitPushStatus, Language language) {
 		this.email = email;
 		this.password = password;
 		this.username = username;
@@ -146,6 +155,7 @@ public User(String email, String password, String username, String nickname,
 		this.verified = verified;
 		this.githubUrl = githubUrl;
 		this.gitPushStatus = gitPushStatus;
+		this.language = language;
 	}
 
 	/*