feature : 유저 로그인 타입 추가

minjee2758 · minjee2758 · commit ec27eed8e3b2 · 2025-08-24T13:20:22.000+09:00
diff --git a/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/request/ModifyUserInfoRequest.java b/src/main/java/org/ezcode/codetest/application/usermanagement/user/dto/request/ModifyUserInfoRequest.java
@@ -17,6 +17,9 @@ public record ModifyUserInfoRequest(
 	String introduction,
 
 	@Schema(description = "나이", example = "28")
-	Integer age
+	Integer age,
+
+	@Schema(description = "언어 id", example = "1")
+	Long languageId
 ) {
 }
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
@@ -1,7 +1,10 @@
 package org.ezcode.codetest.application.usermanagement.user.dto.response;
 
+import java.util.List;
+
 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.AuthType;
 import org.ezcode.codetest.domain.user.model.enums.Tier;
 import org.ezcode.codetest.domain.user.model.enums.UserRole;
 
@@ -51,11 +54,15 @@ public class UserInfoResponse {
 	@Schema(description = "사용자가 선택한 언어. 기본적으로 1번 언어로 세팅됩니다", example = "1")
 	private final Language language;
 
+	@Schema(description = "사용자가 가입한 경로(자체/소셜)의 리스트를 보여줍니다", example = "[GOOGLE, GITHUB, EMAIL]")
+	private final List<AuthType> userAuthTypes;
+
 	@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,
-		Language language) {
+		Language language,
+		List<AuthType> userAuthTypes) {
 		this.username = username;
 		this.email = email;
 		this.nickname = nickname;
@@ -69,6 +76,7 @@ public UserInfoResponse(String username, String email, String nickname, UserRole
         this.verified = verified;
         this.totalSolvedCount = totalSolvedCount;
 		this.language = language;
+		this.userAuthTypes = userAuthTypes;
     }
 
 	public static UserInfoResponse fromEntity(User user) {
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
@@ -3,12 +3,15 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.ezcode.codetest.application.usermanagement.user.dto.response.GrantAdminRoleResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.UserDailySolvedHistoryResponse;
 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.domain.language.model.entity.Language;
+import org.ezcode.codetest.domain.language.service.LanguageDomainService;
 import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
 import org.ezcode.codetest.domain.submission.dto.WeeklySolveCount;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ChangeUserPasswordRequest;
@@ -23,6 +26,7 @@
 import org.ezcode.codetest.domain.user.exception.code.UserExceptionCode;
 import org.ezcode.codetest.domain.user.model.entity.AuthUser;
 import org.ezcode.codetest.domain.user.model.entity.User;
+import org.ezcode.codetest.domain.user.model.entity.UserAuthType;
 import org.ezcode.codetest.domain.user.model.enums.AuthType;
 import org.ezcode.codetest.domain.user.model.enums.UserRole;
 import org.ezcode.codetest.domain.user.service.MailService;
@@ -46,6 +50,7 @@
 public class UserService {
 
 	private final UserDomainService userDomainService;
+	private final LanguageDomainService languageDomainService;
 	private final SubmissionDomainService submissionDomainService;
 	private final RedisTemplate<String, String> redisTemplate;
 	private final S3Uploader s3Uploader;
@@ -55,6 +60,9 @@ public UserInfoResponse getUserInfo(AuthUser authUser) {
 		log.info("authUserEmail: {}, authUserID : {}", authUser.getEmail(), authUser.getId());
 		User user = userDomainService.getUserById(authUser.getId());
 		int userSubmissionCount = submissionDomainService.findSubmissionCountByUserId(user.getId());
+		List<UserAuthType> userAuthTypes = userDomainService.getUserAuthTypesByUser(user);
+		List<AuthType> authTypes = userAuthTypes.stream()
+			.map(UserAuthType::getAuthType).toList();
 
 		return UserInfoResponse.builder()
 			.username(user.getUsername())
@@ -70,19 +78,22 @@ public UserInfoResponse getUserInfo(AuthUser authUser) {
 			.verified(user.isVerified())
 			.totalSolvedCount(userSubmissionCount)
 			.language(user.getLanguage())
+			.userAuthTypes(authTypes)
 			.build();
 	}
 
 	@Transactional
 	public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest request, MultipartFile image) {
 		User user = userDomainService.getUserById(authUser.getId());
+		Language findLangauge = languageDomainService.getLanguage(request.languageId());
 
 		user.modifyUserInfo(
 			request.nickname(),
 			request.githubUrl(),
 			request.blogUrl(),
 			request.introduction(),
-			request.age());
+			request.age(),
+			findLangauge);
 
 		if (image != null && !image.isEmpty()) {
 			String profileImageUrl = uploadProfileImage(image);
@@ -106,6 +117,7 @@ public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest
 			.githubUrl(user.getGithubUrl())
 			.userRole(user.getRole())
 			.tier(user.getTier())
+			.language(user.getLanguage())
 			.build();
 	}
 
diff --git a/src/main/java/org/ezcode/codetest/domain/user/model/entity/User.java b/src/main/java/org/ezcode/codetest/domain/user/model/entity/User.java
@@ -162,12 +162,13 @@ public User(String email, String password, String username, String nickname,
 	유저 정보 업데이트
 	- 만약 입력 값이 없다면, 기존 값 유지
 	 */
-	public void modifyUserInfo(String nickname, String githubUrl, String blogUrl, String introduction, Integer age){
+	public void modifyUserInfo(String nickname, String githubUrl, String blogUrl, String introduction, Integer age, Language language) {
 		this.nickname = (nickname == null || nickname.isBlank()) ? this.nickname : nickname;
 		this.githubUrl = (githubUrl == null || githubUrl.isBlank()) ? this.githubUrl : githubUrl;
 		this.blogUrl = (blogUrl == null || blogUrl.isBlank()) ? this.blogUrl : blogUrl;
 		this.introduction = (introduction == null || introduction.isBlank()) ? this.introduction : introduction;
 		this.age = (age == null) ? this.age : age;
+		this.language = (language == null) ? this.language : language;
 	}
 
 
diff --git a/src/main/java/org/ezcode/codetest/domain/user/repository/UserAuthTypeRepository.java b/src/main/java/org/ezcode/codetest/domain/user/repository/UserAuthTypeRepository.java
@@ -10,4 +10,6 @@ public interface UserAuthTypeRepository {
 	void createUserAuthType(UserAuthType userAuthType);
 
 	List<AuthType> getUserAuthType(User user);
+
+    List<UserAuthType> getUserAuthTypesByUser(User user);
 }
diff --git a/src/main/java/org/ezcode/codetest/domain/user/service/UserDomainService.java b/src/main/java/org/ezcode/codetest/domain/user/service/UserDomainService.java
@@ -128,5 +128,8 @@ public User getUserByEmail(String email) {
 		return userRepository.getUserByEmail(email);
 	}
 
+	public List<UserAuthType> getUserAuthTypesByUser(User user) {
+		return userAuthTypeRepository.getUserAuthTypesByUser(user);
+	}
 
 }
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/user/UserAuthTypeRepositoryImpl.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/user/UserAuthTypeRepositoryImpl.java
@@ -27,4 +27,11 @@ public List<AuthType> getUserAuthType(User user) {
 			.map(UserAuthType::getAuthType).toList();
 	}
 
+	@Override
+	public List<UserAuthType> getUserAuthTypesByUser(User user) {
+		userAuthTypeJpaRepository.findUserAuthTypeByUser(user).stream()
+			.map(UserAuthType::getAuthType).toList();
+		return List.of();
+	}
+
 }
diff --git a/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java b/src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java
@@ -1,5 +1,6 @@
 package org.ezcode.codetest.presentation.usermanagement;
 
+import org.ezcode.codetest.application.submission.dto.response.language.LanguageResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ModifyUserInfoRequest;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ChangeUserPasswordRequest;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.ChangeUserPasswordResponse;
@@ -16,13 +17,9 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -99,5 +96,4 @@ public ResponseEntity<UserDailySolvedHistoryResponse> getUserDailySolvedHistory(
 	){
 		return ResponseEntity.status(HttpStatus.OK).body(userService.getUserDailySolvedHistory(authUser));
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@ public interface UserAuthTypeRepository {`
`10`	`10`	`void createUserAuthType(UserAuthType userAuthType);`
`11`	`11`
`12`	`12`	`List<AuthType> getUserAuthType(User user);`
	`13`	`+`
	`14`	`+ List<UserAuthType> getUserAuthTypesByUser(User user);`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,5 +128,8 @@ public User getUserByEmail(String email) {`
`128`	`128`	`return userRepository.getUserByEmail(email);`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ public List<UserAuthType> getUserAuthTypesByUser(User user) {`
	`132`	`+ return userAuthTypeRepository.getUserAuthTypesByUser(user);`
	`133`	`+ }`
`131`	`134`
`132`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,11 @@ public List<AuthType> getUserAuthType(User user) {`
`27`	`27`	`.map(UserAuthType::getAuthType).toList();`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ @Override`
	`31`	`+ public List<UserAuthType> getUserAuthTypesByUser(User user) {`
	`32`	`+ userAuthTypeJpaRepository.findUserAuthTypeByUser(user).stream()`
	`33`	`+ .map(UserAuthType::getAuthType).toList();`
	`34`	`+ return List.of();`
	`35`	`+ }`
	`36`	`+`
`30`	`37`	`}`