feat: 유저 세팅 로직 구현 및 AuthService에서 회원가입 처리 이관

Author: larama-C

src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/AuthService.java

@@ -9,6 +9,7 @@
 import com.back.web7_9_codecrete_be.domain.users.entity.SocialType;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.domain.users.repository.UserRepository;
+import com.back.web7_9_codecrete_be.domain.users.service.UserService;
 import com.back.web7_9_codecrete_be.domain.users.util.NicknameGenerator;
 import com.back.web7_9_codecrete_be.global.error.code.AuthErrorCode;
 import com.back.web7_9_codecrete_be.global.error.code.UserErrorCode;
@@ -19,13 +20,13 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.security.SecureRandom;
-import java.time.LocalDate;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
 public class AuthService {
     private final UserRepository userRepository;
+    private final UserService userService;
     private final PasswordEncoder passwordEncoder;
     private final EmailService emailService;
     private final TokenService tokenService;
@@ -51,17 +52,7 @@ public void signUp(SignupRequest req) {
             throw new BusinessException(UserErrorCode.NICKNAME_DUPLICATED);
         }
 
-        User user = User.builder()
-                .email(req.getEmail())
-                .nickname(req.getNickname())
-                .password(passwordEncoder.encode(req.getPassword()))
-                .birth(LocalDate.parse(req.getBirth()))
-                .profileImage(req.getProfileImage())
-                .socialType(SocialType.LOCAL)
-                .socialId(null)
-                .build();
-
-        userRepository.save(user);
+        userService.createLocalUser(req, passwordEncoder.encode(req.getPassword()));
 
         emailService.clearVerifiedEmail(req.getEmail());
     }
@@ -174,17 +165,13 @@ private User registerKakaoUser(KakaoUserInfo info) {
 
         String nickname = nicknameGenerator.generate();
 
-        User user = User.builder()
-                .email(info.getEmail())
-                .nickname(nickname)
-                .password(null)
-                .birth(null)
-                .profileImage(info.getProfileImageUrl())
-                .socialType(SocialType.KAKAO)
-                .socialId(info.getSocialId())
-                .build();
-
-        return userRepository.save(user);
+        return userService.createSocialUser(
+                info.getEmail(),
+                nickname,
+                info.getProfileImageUrl(),
+                SocialType.KAKAO,
+                info.getSocialId()
+        );
     }
 
     @Transactional
@@ -223,16 +210,12 @@ private User registerGoogleUser(GoogleUserInfo info) {
 
         String nickname = nicknameGenerator.generate();
 
-        User user = User.builder()
-                .email(info.getEmail())
-                .nickname(nickname)
-                .password(null)
-                .birth(null)
-                .profileImage(info.getProfileImageUrl())
-                .socialType(SocialType.GOOGLE)
-                .socialId(info.getSocialId())
-                .build();
-
-        return userRepository.save(user);
+        return userService.createSocialUser(
+                info.getEmail(),
+                nickname,
+                info.getProfileImageUrl(),
+                SocialType.GOOGLE,
+                info.getSocialId()
+        );
     }
 }

src/main/java/com/back/web7_9_codecrete_be/domain/users/service/UserService.java

@@ -1,12 +1,17 @@
 package com.back.web7_9_codecrete_be.domain.users.service;
 
 
+import com.back.web7_9_codecrete_be.domain.auth.dto.request.SignupRequest;
 import com.back.web7_9_codecrete_be.domain.auth.service.TokenService;
 import com.back.web7_9_codecrete_be.domain.email.service.EmailService;
+import com.back.web7_9_codecrete_be.domain.users.dto.request.UserSettingUpdateRequest;
 import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdateNicknameRequest;
 import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdatePasswordRequest;
 import com.back.web7_9_codecrete_be.domain.users.dto.response.UserResponse;
+import com.back.web7_9_codecrete_be.domain.users.dto.response.UserSettingResponse;
+import com.back.web7_9_codecrete_be.domain.users.entity.SocialType;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
+import com.back.web7_9_codecrete_be.domain.users.entity.UserSetting;
 import com.back.web7_9_codecrete_be.domain.users.repository.UserRepository;
 import com.back.web7_9_codecrete_be.domain.users.repository.UserRestoreTokenRedisRepository;
 import com.back.web7_9_codecrete_be.global.error.code.UserErrorCode;
@@ -19,6 +24,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
@@ -43,6 +49,52 @@ public UserResponse getMyInfo(User user) {
         return UserResponse.from(user);
     }
 
+    // 회원 가입(로컬)
+    public User createLocalUser(SignupRequest req, String encodedPassword) {
+
+        User user = User.builder()
+                .email(req.getEmail())
+                .nickname(req.getNickname())
+                .password(encodedPassword)
+                .birth(LocalDate.parse(req.getBirth()))
+                .profileImage(req.getProfileImage())
+                .socialType(SocialType.LOCAL)
+                .socialId(null)
+                .build();
+
+        user.initSetting();
+
+        userRepository.save(user);
+
+        return user;
+    }
+
+    // 회원 가입(소셜)
+    public User createSocialUser(
+            String email,
+            String nickname,
+            String profileImage,
+            SocialType socialType,
+            String socialId
+    ) {
+
+        User user = User.builder()
+                .email(email)
+                .nickname(nickname)
+                .password(null)
+                .birth(null)
+                .profileImage(profileImage)
+                .socialType(socialType)
+                .socialId(socialId)
+                .build();
+
+        user.initSetting();
+
+        userRepository.save(user);
+
+        return user;
+    }
+
     // 닉네임 수정
     public UserResponse updateNickname(User user, UserUpdateNicknameRequest req) {
         validateActiveUser(user);
@@ -176,4 +228,29 @@ public void restoreByToken(String token) {
         userRestoreTokenRedisRepository.delete(token);
     }
 
+    @Transactional(readOnly = true)
+    public UserSettingResponse getMySettings(User user) {
+        validateActiveUser(user);
+
+        User managedUser = userRepository.findById(user.getId())
+                .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));
+
+        return UserSettingResponse.from(managedUser.getUserSetting());
+    }
+
+    public void updateMySettings(User user, UserSettingUpdateRequest req) {
+        validateActiveUser(user);
+
+        User managedUser = userRepository.findById(user.getId())
+                .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));
+
+        UserSetting setting = managedUser.getUserSetting();
+
+        if (req.getEmailNotifications() != null) {
+            setting.changeEmailNotifications(req.getEmailNotifications());
+        }
+        if (req.getDarkMode() != null) {
+            setting.changeDarkMode(req.getDarkMode());
+        }
+    }
 }