Merge pull request #54 from JocketDan/feat/user-edit

Feat/user edit 프로필 수정 api

Author: 2SEONGA

auth/src/main/java/com/jocketdan/auth/controller/UserController.java

@@ -55,6 +55,14 @@ public ResponseEntity<CommonResponse<UserResponse>> getMyProfile(
         return ResponseEntity.ok(CommonResponse.success(userFacade.getProfile(userDetails)));
     }
 
+    @PatchMapping("/edit")
+    public ResponseEntity<CommonResponse<Void>> patchNickName(
+            @AuthenticationPrincipal UserDetails userDetails,
+            @RequestBody @Valid EditProfileRequest request) {
+        userFacade.changeNickName(userDetails, request);
+        return ResponseEntity.ok(CommonResponse.success("프로필 변경이 완료되었습니다.", null));
+    }
+
     @DeleteMapping("")
     public ResponseEntity<CommonResponse<Void>> withdraw(
             @AuthenticationPrincipal UserDetails userDetails,

auth/src/main/java/com/jocketdan/auth/dto/EditProfileRequest.java

@@ -0,0 +1,13 @@
+package com.jocketdan.auth.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.jackson.Jacksonized;
+
+@Getter
+@Builder
+@Jacksonized
+public class EditProfileRequest {
+    private String newNickName;
+    private String emoji;
+}

auth/src/main/java/com/jocketdan/auth/dto/UserResponse.java

@@ -2,8 +2,8 @@
 
 import com.jocketdan.auth.entity.User;
 
-public record UserResponse(String email, String nickname, String provider) {
+public record UserResponse(String email, String nickname, String provider, String emoji) {
     public static UserResponse of(User user) {
-        return new UserResponse(user.getEmail(), user.getNickname(), String.valueOf(user.getProvider()));
+        return new UserResponse(user.getEmail(), user.getNickname(), String.valueOf(user.getProvider()), user.getEmoji());
     }
 }

auth/src/main/java/com/jocketdan/auth/entity/User.java

@@ -10,7 +10,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -31,7 +30,7 @@ public class User extends BaseTimeEntity {
 
     private String password; // 자체 회원가입한 유저만 저장 -> 소셜 로그인의 경우 토큰으로 처리
 
-    @Column(nullable = false)
+    @Column(unique = true, nullable = false, length = 20)
     private String nickname;
 
     @Column(nullable = false)
@@ -52,24 +51,31 @@ public class User extends BaseTimeEntity {
     @Column(nullable = false)
     private boolean credentialsNonExpired = true;
 
+    @Column(length = 10)
+    private String emoji;
+
     public static User signup(String email, String password, String nickname, String role, AuthProvider provider) {
         User user = new User();
         user.email = email;
         user.password = password;
         user.nickname = nickname;
         user.role = role;
         user.provider = provider;
+        user.emoji = "👤";
         return user;
     }
     public void changeIdForTest(Long id){
         this.id = id;
     }
+    public void changePassword(String password){
+        this.password = password;
+    }
 
     public void changeNickname(String name){
         this.nickname = name;
     }
-    public void changePassword(String password){
-        this.password = password;
-    }
 
+    public void changeEmoji(String emoji) {
+        this.emoji = emoji.trim();
+    }
 }

auth/src/main/java/com/jocketdan/auth/exception/DuplicateNicknameException.java

@@ -0,0 +1,8 @@
+package com.jocketdan.auth.exception;
+
+public class DuplicateNicknameException extends RuntimeException {
+
+    public DuplicateNicknameException(String message) {
+        super(message);
+    }
+}

auth/src/main/java/com/jocketdan/auth/service/user/UserFacade.java

@@ -39,6 +39,12 @@ public UserResponse getProfile(UserDetails userDetails) {
         return userService.getProfileById(userDetails);
     }
 
+
+    // 유저 정보 변경
+    public void changeNickName(UserDetails userDetails, EditProfileRequest request){
+        userService.changeProfile(userDetails, request);
+    }
+
     // 회원 탈퇴
     public void withdraw(UserDetails userDetails, HttpServletRequest req, HttpServletResponse res) {
         String refreshToken = tokenCookieService.getRefreshToken(req);

auth/src/main/java/com/jocketdan/auth/service/user/UserService.java

@@ -1,20 +1,22 @@
 package com.jocketdan.auth.service.user;
 
+import com.jocketdan.auth.dto.EditProfileRequest;
 import com.jocketdan.auth.dto.UserResponse;
 import com.jocketdan.auth.entity.User;
+import com.jocketdan.auth.exception.DuplicateNicknameException;
 import com.jocketdan.auth.exception.UserNotFoundException;
 import com.jocketdan.auth.repository.UserRepository;
 import com.jocketdan.auth.service.auth.TokenService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * 기존의 복잡한 기능은 각 서비스로 분리 후,
- * 정말 유저 관리만 초점
- * */
+ * 기존의 복잡한 기능은 각 서비스로 분리 후, 정말 유저 관리만 초점
+ */
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -24,28 +26,68 @@ public class UserService {
     private final TokenService tokenService;
 
     public UserResponse getProfileById(UserDetails userDetails) {
-        User user = userRepository.findByEmail(userDetails.getUsername())
-                .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
+        User user = findUser(userDetails.getUsername());
         return UserResponse.of(user);
     }
 
+    //    @Transactional(isolation = Isolation.READ_COMMITTED)
     @Transactional
-    public void changeNickname(Long userId, String newNickName) {
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
-        if (userRepository.existsByNickname(newNickName)) {
-            throw new IllegalArgumentException("이미 사용 중인 닉네임입니다.");
+    public void changeProfile(UserDetails userDetails, EditProfileRequest request) {
+        User user = findUser(userDetails.getUsername());
+        try {
+            if (request.getNewNickName() != null
+                    && !request.getNewNickName().isBlank()
+                    && !user.getNickname().equals(request.getNewNickName().trim())
+            ) {
+                validateNickname(request.getNewNickName()); // 검증
+                user.changeNickname(request.getNewNickName()); //  이후 저장
+            }
+
+            if (request.getEmoji() != null && !request.getEmoji()
+                    .isBlank()) {
+                validateEmoji(request.getEmoji());
+                user.changeEmoji(request.getEmoji());
+            }
+            log.info("회원 프로필 변경 완료: email={}", user.getEmail());
+        } catch (DataIntegrityViolationException e) {
+            log.warn("닉네임 중복 시도: email={}, nickname={}",
+                    user.getEmail(), request.getNewNickName());
+            throw new DuplicateNicknameException("이미 사용 중인 닉네임입니다.");
+        } catch (IllegalArgumentException e){
+            throw new IllegalArgumentException("형식에 맞지 않습니다.");
         }
-        user.changeNickname(newNickName);
-        userRepository.save(user);
     }
 
     @Transactional
     public void withdrawUser(String email) {
-        User user = userRepository.findByEmail(email)
-                .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
+        User user = findUser(email);
         tokenService.revokeAllRefreshTokensByUserId(user.getId());
         userRepository.delete(user);
         log.info("회원 탈퇴 완료: email={}", email);
     }
+
+    private User findUser(String email) {
+        return userRepository.findByEmail(email)
+                .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
+    }
+
+    private void validateEmoji(String emoji) {
+        if (emoji.length() > 10) {
+            throw new IllegalArgumentException("이모지는 10자 이하여야 합니다.");
+        }
+    }
+
+    private void validateNickname(String nickname) {
+        if (nickname == null || nickname.isBlank()) {
+            throw new IllegalArgumentException("닉네임은 필수입니다.");
+        }
+        String trimmed = nickname.trim();
+        if (trimmed.length() < 2 || trimmed.length() > 20) {
+            throw new IllegalArgumentException("닉네임은 2~20자여야 합니다.");
+        }
+        // 특수문자 검증
+        if (!trimmed.matches("^[a-zA-Z0-9가-힣_]+$")) {
+            throw new IllegalArgumentException("닉네임은 영문, 한글, 숫자, _만 가능합니다.");
+        }
+    }
 }