Dev > Main 브랜치 병합

1. Oauth 테스트는 Dev에서 불가능하므로 Main 브랜치에 병합후 테스트합니다.

Author: NamDoHyeon2

src/main/java/hs/kr/backend/devpals/domain/user/entity/UserEntity.java

@@ -79,11 +79,10 @@ public class UserEntity {
 
 
     // 유저 업데이트
-    public void updateUserInfo(String nickname, String bio, String github, Boolean beginner,
+    public void updateUserInfo(String nickname, String bio, Boolean beginner,
                                List<Long> positionIds, List<Long> skillIds, List<Map<String, Object>> career) {
         if (nickname != null) { this.nickname = nickname; }
         if (bio != null) { this.bio = bio; }
-        if (github != null) { this.github = github; }
         if (beginner != null) { this.beginner = beginner; }
         if (positionIds != null) { this.positionIds = new ArrayList<>(positionIds); }
         if (skillIds != null) { this.skillIds = new ArrayList<>(skillIds); }
@@ -122,6 +121,9 @@ public void increaseWarning() {
         this.warning++;
     }
 
+    //github 주소 업데이트
+    public void updateGithub(String github) {this.github = github;}
+
     //회원가입 유저 정보 저장
     public UserEntity(String email, String password, String nickname, Boolean beginner) {
         this.email = email;

src/main/java/hs/kr/backend/devpals/domain/user/service/UserProfileService.java

@@ -98,7 +98,6 @@ public ResponseEntity<ApiResponse<UserResponse>> userUpdateInfo(String token, Us
         user.updateUserInfo(
                 request.getNickname(),
                 request.getBio(),
-                request.getGithub(),
                 request.getBeginner(),
                 positionIds,
                 skillIds,

src/main/java/hs/kr/backend/devpals/infra/oauth2/CustomOauth2UserService.java

@@ -42,9 +42,14 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         }
 
         UserEntity user = userRepository.findByEmail(email)
-                .orElseGet(() -> userRepository.save(new UserEntity(email, "SOCIAL_LOGIN_USER", name, true)));
+                .orElseGet(() -> new UserEntity(email, "SOCIAL_LOGIN_USER", name, true));
+
+        if ("github".equals(provider)) {
+            String githubUrl = oAuth2User.getAttribute("html_url");
+            user.updateGithub(githubUrl);
+        }
+        userRepository.save(user);
 
-        // attributes에 email이 없는 경우 추가해줌 (DefaultOAuth2User 생성시 필요)
         Map<String, Object> attributesMap = new java.util.HashMap<>(oAuth2User.getAttributes());
         attributesMap.put("email", email);