♻️ refactor: UserPrincipal 필드 수정(User -> AuthenticationUser)

Author: jiwon1217

backend/src/main/java/io/f1/backend/domain/user/app/CustomOAuthUserService.java

@@ -2,24 +2,20 @@
 
 import io.f1.backend.domain.stat.entity.Stat;
 import io.f1.backend.domain.user.dao.UserRepository;
-import io.f1.backend.domain.user.dto.SessionUser;
+import io.f1.backend.domain.user.dto.AuthenticationUser;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.domain.user.entity.User;
-
 import jakarta.servlet.http.HttpSession;
-
+import java.time.LocalDateTime;
+import java.util.Objects;
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.util.Objects;
-
 @Service
 @RequiredArgsConstructor
 public class CustomOAuthUserService extends DefaultOAuth2UserService {
@@ -36,12 +32,12 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
         String providerId = Objects.requireNonNull(oAuth2User.getAttribute("id")).toString();
 
         User user =
-                userRepository
-                        .findByProviderAndProviderId(provider, providerId)
-                        .map(this::updateLastLogin)
-                        .orElseGet(() -> createNewUser(provider, providerId));
+            userRepository
+                .findByProviderAndProviderId(provider, providerId)
+                .map(this::updateLastLogin)
+                .orElseGet(() -> createNewUser(provider, providerId));
 
-        httpSession.setAttribute("OAuthUser", new SessionUser(user));
+        httpSession.setAttribute("OAuthUser", AuthenticationUser.from(user));
         return new UserPrincipal(user, oAuth2User.getAttributes());
     }
 
@@ -52,11 +48,11 @@ private User updateLastLogin(User user) {
 
     private User createNewUser(String provider, String providerId) {
         User user =
-                User.builder()
-                        .provider(provider)
-                        .providerId(providerId)
-                        .lastLogin(LocalDateTime.now())
-                        .build();
+            User.builder()
+                .provider(provider)
+                .providerId(providerId)
+                .lastLogin(LocalDateTime.now())
+                .build();
 
         Stat stat = Stat.builder().totalGames(0L).winningGames(0L).score(0L).user(user).build();
 

backend/src/main/java/io/f1/backend/domain/user/app/UserService.java

@@ -3,7 +3,7 @@
 import static io.f1.backend.domain.user.mapper.UserMapper.toSignupResponse;
 
 import io.f1.backend.domain.user.dao.UserRepository;
-import io.f1.backend.domain.user.dto.SessionUser;
+import io.f1.backend.domain.user.dto.AuthenticationUser;
 import io.f1.backend.domain.user.dto.SignupRequestDto;
 import io.f1.backend.domain.user.dto.SignupResponseDto;
 import io.f1.backend.domain.user.entity.User;
@@ -21,25 +21,26 @@ public class UserService {
 
     @Transactional
     public SignupResponseDto signup(HttpSession session, SignupRequestDto signupRequest) {
-        SessionUser sessionUser = extractSessionUser(session);
+        AuthenticationUser authenticationUser = extractSessionUser(session);
 
         String nickname = signupRequest.nickname();
         validateNicknameFormat(nickname);
         validateNicknameDuplicate(nickname);
 
-        User user = updateUserNickname(sessionUser.getUserId(), nickname);
+        User user = updateUserNickname(authenticationUser.userId(), nickname);
         updateSessionAfterSignup(session, user);
         SecurityUtils.setAuthentication(user);
 
         return toSignupResponse(user);
     }
 
-    private SessionUser extractSessionUser(HttpSession session) {
-        SessionUser sessionUser = (SessionUser) session.getAttribute("OAuthUser");
-        if (sessionUser == null) {
+    private AuthenticationUser extractSessionUser(HttpSession session) {
+        AuthenticationUser authenticationUser = (AuthenticationUser) session.getAttribute(
+            "OAuthUser");
+        if (authenticationUser == null) {
             throw new RuntimeException("E401001: 로그인이 필요합니다.");
         }
-        return sessionUser;
+        return authenticationUser;
     }
 
     private void validateNicknameFormat(String nickname) {
@@ -73,6 +74,6 @@ public User updateUserNickname(Long userId, String nickname) {
 
     private void updateSessionAfterSignup(HttpSession session, User user) {
         session.removeAttribute("OAuthUser");
-        session.setAttribute("user", new SessionUser(user));
+        session.setAttribute("user", AuthenticationUser.from(user));
     }
 }

backend/src/main/java/io/f1/backend/domain/user/dto/AuthenticationUser.java

@@ -0,0 +1,16 @@
+package io.f1.backend.domain.user.dto;
+
+import io.f1.backend.domain.user.entity.User;
+import java.io.Serializable;
+
+public record AuthenticationUser(Long userId, String nickname, String providerId) implements
+    Serializable {
+
+    public static AuthenticationUser from(User user) {
+        return new AuthenticationUser(
+            user.getId(),
+            user.getNickname(),
+            user.getProviderId()
+        );
+    }
+}

backend/src/main/java/io/f1/backend/domain/user/dto/SessionUser.java

@@ -1,26 +1,23 @@
 package io.f1.backend.domain.user.dto;
 
 import io.f1.backend.domain.user.entity.User;
-
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 import lombok.Getter;
-
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
 @Getter
 public class UserPrincipal implements UserDetails, OAuth2User {
 
     public static final String ROLE_USER = "ROLE_USER";
-    private final User user;
+    private final AuthenticationUser authenticationUser;
     private final Map<String, Object> attributes;
 
     public UserPrincipal(User user, Map<String, Object> attributes) {
-        this.user = user;
+        this.authenticationUser = AuthenticationUser.from(user);
         this.attributes = attributes;
     }
 
@@ -30,16 +27,16 @@ public Map<String, Object> getAttributes() {
     }
 
     public Long getUserId() {
-        return user.getId();
+        return authenticationUser.userId();
     }
 
     public String getUserNickname() {
-        return user.getNickname();
+        return authenticationUser.nickname();
     }
 
     @Override
     public String getName() {
-        return user.getProviderId();
+        return authenticationUser.providerId();
     }
 
     @Override
@@ -54,7 +51,7 @@ public String getPassword() {
 
     @Override
     public String getUsername() {
-        return user.getProviderId();
+        return authenticationUser.providerId();
     }
 
     @Override