[Feat] 회원정보 조회/수정 API 개발 (#63)

soonge2 · web-flow · commit 93a467e0f454 · 2025-05-07T00:44:41.000+09:00
* feat: 회원정보 조회 응답 DTO 구현 (#53) * feat: 회원정보 조회 서비스 구현 (#53) * feat: 회원정보 조회 컨트롤러 구현 (#53) * feat: 회원정보 수정 요청 및 응답 DTO 구현 (#54) * feat: 닉네임 유효성 검사 로직 구현 (#54) * feat: 회원정보 수정 서비스 구현 (#54) * fix: 닉네임이 기존과 동일한 경우 중복 검사 없이 바로 반환 (#54) * feat: 회원정보 수정 컨트롤러 구현 (#54)
diff --git a/src/main/java/com/moa/moa_server/domain/group/handler/GroupErrorCode.java b/src/main/java/com/moa/moa_server/domain/group/handler/GroupErrorCode.java
@@ -11,7 +11,7 @@ public enum GroupErrorCode implements BaseErrorCode {
     CANNOT_JOIN_PUBLIC_GROUP(HttpStatus.BAD_REQUEST),
     INVALID_INPUT(HttpStatus.BAD_REQUEST),
     INVITE_CODE_GENERATION_FAILED(HttpStatus.INTERNAL_SERVER_ERROR),
-    DUPLICATE_NAME(HttpStatus.CONFLICT);
+    DUPLICATED_NAME(HttpStatus.CONFLICT);
 
     private final HttpStatus status;
 
diff --git a/src/main/java/com/moa/moa_server/domain/group/service/GroupService.java b/src/main/java/com/moa/moa_server/domain/group/service/GroupService.java
@@ -101,7 +101,7 @@ public GroupCreateResponse createGroup(Long userId, GroupCreateRequest request)
 
         // 그룹 이름 중복 검사
         if (groupRepository.existsByName(request.name())) {
-            throw new GroupException(GroupErrorCode.DUPLICATE_NAME);
+            throw new GroupException(GroupErrorCode.DUPLICATED_NAME);
         }
 
         // 초대 코드 생성
diff --git a/src/main/java/com/moa/moa_server/domain/user/controller/UserController.java b/src/main/java/com/moa/moa_server/domain/user/controller/UserController.java
@@ -1,16 +1,16 @@
 package com.moa.moa_server.domain.user.controller;
 
 import com.moa.moa_server.domain.global.dto.ApiResponse;
+import com.moa.moa_server.domain.user.dto.request.UserUpdateRequest;
 import com.moa.moa_server.domain.user.dto.response.GroupLabelResponse;
 import com.moa.moa_server.domain.user.dto.response.JoinedGroupResponse;
+import com.moa.moa_server.domain.user.dto.response.UserInfoResponse;
+import com.moa.moa_server.domain.user.dto.response.UserUpdateResponse;
 import com.moa.moa_server.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -38,4 +38,21 @@ public ResponseEntity<ApiResponse> getJoinedGroups(
         JoinedGroupResponse response = userService.getJoinedGroups(userId, cursor, size);
         return ResponseEntity.ok(new ApiResponse("SUCCESS", response));
     }
+
+    @GetMapping
+    public ResponseEntity<ApiResponse> getUserInfo(
+            @AuthenticationPrincipal Long userId
+    ) {
+        UserInfoResponse response = userService.getUserInfo(userId);
+        return ResponseEntity.ok(new ApiResponse("SUCCESS", response));
+    }
+
+    @PatchMapping
+    public ResponseEntity<ApiResponse> updateUserInfo(
+            @AuthenticationPrincipal Long userId,
+            @RequestBody UserUpdateRequest request
+    ) {
+        UserUpdateResponse response = userService.updateUserInfo(userId, request);
+        return ResponseEntity.ok(new ApiResponse("SUCCESS", response));
+    }
 }
diff --git a/src/main/java/com/moa/moa_server/domain/user/dto/request/UserUpdateRequest.java b/src/main/java/com/moa/moa_server/domain/user/dto/request/UserUpdateRequest.java
@@ -0,0 +1,5 @@
+package com.moa.moa_server.domain.user.dto.request;
+
+public record UserUpdateRequest(
+        String nickname
+) {}
diff --git a/src/main/java/com/moa/moa_server/domain/user/dto/response/UserInfoResponse.java b/src/main/java/com/moa/moa_server/domain/user/dto/response/UserInfoResponse.java
@@ -0,0 +1,9 @@
+package com.moa.moa_server.domain.user.dto.response;
+
+public record UserInfoResponse(
+        String nickname
+) {
+    public static UserInfoResponse from(String nickname) {
+        return new UserInfoResponse(nickname);
+    }
+}
diff --git a/src/main/java/com/moa/moa_server/domain/user/dto/response/UserUpdateResponse.java b/src/main/java/com/moa/moa_server/domain/user/dto/response/UserUpdateResponse.java
@@ -0,0 +1,5 @@
+package com.moa.moa_server.domain.user.dto.response;
+
+public record UserUpdateResponse(
+        String nickname
+) {}
diff --git a/src/main/java/com/moa/moa_server/domain/user/entity/User.java b/src/main/java/com/moa/moa_server/domain/user/entity/User.java
@@ -48,4 +48,8 @@ public enum UserStatus {
         WITHDRAWN,
         DORMANT,
     }
+
+    public void updateNickname(String nickname) {
+        this.nickname = nickname;
+    }
 }
diff --git a/src/main/java/com/moa/moa_server/domain/user/handler/UserErrorCode.java b/src/main/java/com/moa/moa_server/domain/user/handler/UserErrorCode.java
@@ -7,7 +7,9 @@ public enum UserErrorCode implements BaseErrorCode {
 
     USER_NOT_FOUND(HttpStatus.NOT_FOUND),
     USER_WITHDRAWN(HttpStatus.UNAUTHORIZED),
-    INVALID_CURSOR_FORMAT(HttpStatus.BAD_REQUEST),;
+    INVALID_CURSOR_FORMAT(HttpStatus.BAD_REQUEST),
+    INVALID_NICKNAME(HttpStatus.BAD_REQUEST),
+    DUPLICATED_NICKNAME(HttpStatus.CONFLICT);
 
     private final HttpStatus status;
 
diff --git a/src/main/java/com/moa/moa_server/domain/user/repository/UserRepository.java b/src/main/java/com/moa/moa_server/domain/user/repository/UserRepository.java
@@ -4,4 +4,5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
+    boolean existsByNickname(String nickname);
 }
diff --git a/src/main/java/com/moa/moa_server/domain/user/service/UserService.java b/src/main/java/com/moa/moa_server/domain/user/service/UserService.java
@@ -5,18 +5,18 @@
 import com.moa.moa_server.domain.group.entity.GroupMember;
 import com.moa.moa_server.domain.group.repository.GroupMemberRepository;
 import com.moa.moa_server.domain.group.service.GroupService;
-import com.moa.moa_server.domain.user.dto.response.GroupDetail;
-import com.moa.moa_server.domain.user.dto.response.GroupLabel;
-import com.moa.moa_server.domain.user.dto.response.GroupLabelResponse;
-import com.moa.moa_server.domain.user.dto.response.JoinedGroupResponse;
+import com.moa.moa_server.domain.user.dto.request.UserUpdateRequest;
+import com.moa.moa_server.domain.user.dto.response.*;
 import com.moa.moa_server.domain.user.entity.User;
 import com.moa.moa_server.domain.user.handler.UserErrorCode;
 import com.moa.moa_server.domain.user.handler.UserException;
 import com.moa.moa_server.domain.user.repository.UserRepository;
 import com.moa.moa_server.domain.user.util.AuthUserValidator;
+import com.moa.moa_server.domain.user.util.UserValidator;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedList;
@@ -95,4 +95,39 @@ public JoinedGroupResponse getJoinedGroups(Long userId, @Nullable String cursor,
 
         return new JoinedGroupResponse(groups, nextCursor, hasNext, groups.size());
     }
+
+    @Transactional(readOnly = true)
+    public UserInfoResponse getUserInfo(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new UserException(UserErrorCode.USER_NOT_FOUND));
+        AuthUserValidator.validateActive(user);
+
+        return UserInfoResponse.from(user.getNickname());
+    }
+
+    @Transactional(isolation = Isolation.READ_COMMITTED)
+    public UserUpdateResponse updateUserInfo(Long userId, UserUpdateRequest request) {
+        String newNickname = request.nickname();
+
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new UserException(UserErrorCode.USER_NOT_FOUND));
+        AuthUserValidator.validateActive(user);
+
+        // 닉네임 유효성 검사
+        UserValidator.validateNickname(newNickname);
+
+        // 동일 닉네임이면 중복 처리 없이 바로 반환
+        if (user.getNickname().equals(newNickname)) {
+            return new UserUpdateResponse(user.getNickname());
+        }
+
+        // 닉네임 중복 검사
+        if (userRepository.existsByNickname(newNickname)) {
+            throw new UserException(UserErrorCode.DUPLICATED_NICKNAME);
+        }
+
+        // 닉네임 변경
+        user.updateNickname(newNickname);
+        return new UserUpdateResponse(newNickname);
+    }
 }
diff --git a/src/main/java/com/moa/moa_server/domain/user/util/UserValidator.java b/src/main/java/com/moa/moa_server/domain/user/util/UserValidator.java
@@ -0,0 +1,21 @@
+package com.moa.moa_server.domain.user.util;
+
+import com.moa.moa_server.domain.user.handler.UserErrorCode;
+import com.moa.moa_server.domain.user.handler.UserException;
+
+import java.util.regex.Pattern;
+
+public class UserValidator {
+
+    private static final Pattern NICKNAME_PATTERN = Pattern.compile("^(?![\\d\\s])[가-힣a-zA-Z0-9]{2,10}$");
+
+    private UserValidator() {
+        throw new AssertionError("유틸 클래스는 인스턴스화할 수 없습니다.");
+    }
+
+    public static void validateNickname(String nickname) {
+        if (nickname == null || nickname.isBlank() || !NICKNAME_PATTERN.matcher(nickname).matches()) {
+            throw new UserException(UserErrorCode.INVALID_NICKNAME);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public GroupCreateResponse createGroup(Long userId, GroupCreateRequest request)`
`101`	`101`
`102`	`102`	`// 그룹 이름 중복 검사`
`103`	`103`	`if (groupRepository.existsByName(request.name())) {`
`104`		`- throw new GroupException(GroupErrorCode.DUPLICATE_NAME);`
	`104`	`+ throw new GroupException(GroupErrorCode.DUPLICATED_NAME);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// 초대 코드 생성`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,8 @@ public enum UserStatus {`
`48`	`48`	`WITHDRAWN,`
`49`	`49`	`DORMANT,`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ public void updateNickname(String nickname) {`
	`53`	`+ this.nickname = nickname;`
	`54`	`+ }`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@`
`4`	`4`	`import org.springframework.data.jpa.repository.JpaRepository;`
`5`	`5`
`6`	`6`	`public interface UserRepository extends JpaRepository<User, Long> {`
	`7`	`+ boolean existsByNickname(String nickname);`
`7`	`8`	`}`