🐛 fix: git 충돌 해결

Author: jiwon1217

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

@@ -7,17 +7,21 @@
 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 {
@@ -34,10 +38,10 @@ 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(OAUTH_USER, AuthenticationUser.from(user));
         return new UserPrincipal(user, oAuth2User.getAttributes());
@@ -50,11 +54,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

@@ -67,8 +67,9 @@ public void validateNicknameDuplicate(String nickname) {
     @Transactional
     public User updateUserNickname(Long userId, String nickname) {
         User user =
-            userRepository.findById(userId)
-                .orElseThrow(() -> new RuntimeException("E404001: 존재하지 않는 회원입니다."));
+                userRepository
+                        .findById(userId)
+                        .orElseThrow(() -> new RuntimeException("E404001: 존재하지 않는 회원입니다."));
         user.updateNickname(nickname);
 
         return userRepository.save(user);

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

@@ -1,16 +1,13 @@
 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 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()
-        );
+        return new AuthenticationUser(user.getId(), user.getNickname(), user.getProviderId());
     }
 }

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

@@ -1,5 +1,3 @@
 package io.f1.backend.domain.user.dto;
 
-public record SignupResponseDto(Long id, String nickname) {
-
-}
+public record SignupResponseDto(Long id, String nickname) {}

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

@@ -1,14 +1,17 @@
 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 {
 

backend/src/main/java/io/f1/backend/domain/user/mapper/UserMapper.java

@@ -5,8 +5,7 @@
 
 public class UserMapper {
 
-    private UserMapper() {
-    }
+    private UserMapper() {}
 
     public static SignupResponseDto toSignupResponse(User user) {
         return new SignupResponseDto(user.getId(), user.getNickname());

backend/src/main/java/io/f1/backend/global/config/SecurityConfig.java

@@ -59,11 +59,8 @@ public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
                                         .clearAuthentication(true)
                                         .invalidateHttpSession(true)
                                         .permitAll())
-                .sessionManagement(session ->
-                    session
-                        .sessionFixation().migrateSession()
-                        .maximumSessions(1)
-                );
+                .sessionManagement(
+                        session -> session.sessionFixation().migrateSession().maximumSessions(1));
         return http.build();
     }
 }

backend/src/main/java/io/f1/backend/global/util/SecurityUtils.java

@@ -2,28 +2,29 @@
 
 import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.domain.user.entity.User;
-import java.util.Collections;
+
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import java.util.Collections;
+
 public class SecurityUtils {
 
-    private SecurityUtils() {
-    }
+    private SecurityUtils() {}
 
     public static void setAuthentication(User user) {
         UserPrincipal userPrincipal = new UserPrincipal(user, Collections.emptyMap());
         UsernamePasswordAuthenticationToken authentication =
-            new UsernamePasswordAuthenticationToken(
-                userPrincipal, null, userPrincipal.getAuthorities());
+                new UsernamePasswordAuthenticationToken(
+                        userPrincipal, null, userPrincipal.getAuthorities());
         SecurityContextHolder.getContext().setAuthentication(authentication);
     }
 
     public static UserPrincipal getCurrentUserPrincipal() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null
-            && authentication.getPrincipal() instanceof UserPrincipal userPrincipal) {
+                && authentication.getPrincipal() instanceof UserPrincipal userPrincipal) {
             return userPrincipal;
         }
         throw new RuntimeException("E401001: 로그인이 필요합니다.");