[feat] 사용자 정보 수정 api 개발

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -38,6 +38,11 @@ public enum ErrorCode implements ResponseCode {
      */
     USER_NOT_FOUND(HttpStatus.NOT_FOUND, 70000, "존재하지 않는 USER 입니다."),
     USER_ALREADY_FOLLOWED(HttpStatus.BAD_REQUEST, 70001, "이미 팔로우한 사용자입니다."),
+    USER_NICKNAME_TOO_LONG(HttpStatus.BAD_REQUEST, 70002, "사용자 닉네임은 10자 이하여야 합니다."),
+    USER_NICKNAME_CANNOT_BE_BLANK(HttpStatus.BAD_REQUEST, 70003, "사용자 닉네임은 비어있을 수 없습니다."),
+    USER_NICKNAME_CANNOT_BE_SAME(HttpStatus.BAD_REQUEST, 70004, "사용자 닉네임은 이전과 동일할 수 없습니다."),
+    USER_NICKNAME_UPDATE_TOO_FREQUENT(HttpStatus.BAD_REQUEST, 70005, "사용자 닉네임은 6개월에 한번 변경할 수 있습니다."),
+    USER_NICKNAME_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, 70006, "다른 사용자가 이미 사용중인 닉네임입니다."),
 
     /**
      * 75000 : follow error

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -26,6 +26,16 @@ public enum SwaggerResponseDescription {
     USER_SEARCH(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND
     ))),
+    USER_UPDATE(new LinkedHashSet<>(Set.of(
+            USER_NOT_FOUND,
+            ALIAS_NAME_NOT_MATCH,
+            USER_NICKNAME_TOO_LONG,
+            USER_NICKNAME_CANNOT_BE_BLANK,
+            USER_NICKNAME_CANNOT_BE_SAME,
+            USER_NICKNAME_UPDATE_TOO_FREQUENT,
+            USER_NICKNAME_ALREADY_EXISTS
+    ))),
+
 
     // Follow
     CHANGE_FOLLOW_STATE(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/user/adapter/in/web/UserCommandController.java

@@ -12,20 +12,18 @@
 import konkuk.thip.common.swagger.annotation.ExceptionDescription;
 import konkuk.thip.user.adapter.in.web.request.UserFollowRequest;
 import konkuk.thip.user.adapter.in.web.request.UserSignupRequest;
+import konkuk.thip.user.adapter.in.web.request.UserUpdateRequest;
 import konkuk.thip.user.adapter.in.web.response.UserFollowResponse;
 import konkuk.thip.user.adapter.in.web.response.UserSignupResponse;
 import konkuk.thip.user.application.port.in.UserFollowUsecase;
 import konkuk.thip.user.application.port.in.UserSignupUseCase;
+import konkuk.thip.user.application.port.in.UserUpdateUseCase;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static konkuk.thip.common.security.constant.AuthParameters.JWT_HEADER_KEY;
 import static konkuk.thip.common.security.constant.AuthParameters.JWT_PREFIX;
-import static konkuk.thip.common.swagger.SwaggerResponseDescription.CHANGE_FOLLOW_STATE;
-import static konkuk.thip.common.swagger.SwaggerResponseDescription.USER_SIGNUP;
+import static konkuk.thip.common.swagger.SwaggerResponseDescription.*;
 
 @Tag(name = "User Command API", description = "사용자가 주체가 되는 정보 수정")
 @RestController
@@ -34,6 +32,8 @@ public class UserCommandController {
 
     private final UserSignupUseCase userSignupUseCase;
     private final UserFollowUsecase userFollowUsecase;
+    private final UserUpdateUseCase userUpdateUseCase;
+
     private final JwtUtil jwtUtil;
 
     @Operation(
@@ -60,9 +60,22 @@ public BaseResponse<UserSignupResponse> signup(@Valid @RequestBody final UserSig
     public BaseResponse<UserFollowResponse> followUser(
             @Parameter(hidden = true) @UserId final Long userId,
             @Parameter(description = "팔로우/언팔로우할 사용자 ID") @PathVariable final Long followingUserId,
-            @RequestBody @Valid final UserFollowRequest request) {
+            @RequestBody @Valid final UserFollowRequest userFollowRequest) {
         return BaseResponse.ok(UserFollowResponse.of(userFollowUsecase.changeFollowingState(
-                UserFollowRequest.toCommand(userId, followingUserId, request.type())
+                userFollowRequest.toCommand(userId, followingUserId)
         )));
     }
+
+    @Operation(
+            summary = "사용자 정보 수정",
+            description = "사용자가 자신의 정보를 수정합니다. 닉네임과 칭호(Alias)를 수정할 수 있습니다."
+    )
+    @ExceptionDescription(USER_UPDATE)
+    @PatchMapping("/users")
+    public BaseResponse<Void> updateUser(
+            @Parameter(hidden = true) @UserId final Long userId,
+            @RequestBody @Valid final UserUpdateRequest userUpdateRequest) {
+        userUpdateUseCase.updateUser(userUpdateRequest.toCommand(userId));
+        return BaseResponse.ok(null);
+    }
 }

src/main/java/konkuk/thip/user/adapter/in/web/request/UserFollowRequest.java

@@ -10,7 +10,7 @@ public record UserFollowRequest(
         @NotNull(message = "type은 필수 파라미터입니다.")
         Boolean type
 ) {
-        public static UserFollowCommand toCommand(Long userId, Long targetUserId, Boolean type) {
+        public UserFollowCommand toCommand(Long userId, Long targetUserId) {
                 return new UserFollowCommand(userId, targetUserId, type);
         }
 }

src/main/java/konkuk/thip/user/adapter/in/web/request/UserUpdateRequest.java

@@ -0,0 +1,20 @@
+package konkuk.thip.user.adapter.in.web.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import konkuk.thip.user.application.port.in.dto.UserUpdateCommand;
+
+@Schema(description = "사용자 정보 수정 요청 DTO")
+public record UserUpdateRequest(
+
+        @Schema(description = "사용자 수정 칭호", example = "문학가")
+        @NotBlank(message = "칭호는 필수입니다.")
+        String aliasName,
+
+        @Schema(description = "사용자 수정 닉네임", example = "thip")
+        String nickname
+) {
+    public UserUpdateCommand toCommand(Long userId) {
+        return new UserUpdateCommand(aliasName, nickname, userId);
+    }
+}

src/main/java/konkuk/thip/user/adapter/out/jpa/UserJpaEntity.java

@@ -5,7 +5,8 @@
 import konkuk.thip.common.entity.BaseJpaEntity;
 import konkuk.thip.user.domain.User;
 import lombok.*;
-import org.springframework.util.Assert;
+
+import java.time.LocalDate;
 
 @Entity
 @Table(name = "users")
@@ -23,6 +24,9 @@ public class UserJpaEntity extends BaseJpaEntity {
     @Column(length = 60, nullable = false)
     private String nickname;
 
+    @Column(name = "nickname_updated_at", nullable = false)
+    private LocalDate nicknameUpdatedAt; // 날짜 형식으로 저장 (예: "2023-10-01")
+
     @Column(name = "oauth2_id", length = 50, nullable = false)
     private String oauth2Id;
 
@@ -37,9 +41,17 @@ public class UserJpaEntity extends BaseJpaEntity {
     @JoinColumn(name = "user_alias_id", nullable = false)
     private AliasJpaEntity aliasForUserJpaEntity;
 
+    public void updateIncludeAliasFrom(User user, AliasJpaEntity aliasJpaEntity) {
+        this.nickname = user.getNickname();
+        this.nicknameUpdatedAt = user.getNicknameUpdatedAt();
+        this.role = UserRole.from(user.getUserRole());
+        this.followerCount = user.getFollowerCount();
+        this.aliasForUserJpaEntity = aliasJpaEntity;
+    }
+
     public void updateFrom(User user) {
         this.nickname = user.getNickname();
-        Assert.notNull(user.getAlias(), "Alias must not be null");
+        this.nicknameUpdatedAt = user.getNicknameUpdatedAt();
         this.role = UserRole.from(user.getUserRole());
         this.followerCount = user.getFollowerCount();
     }

src/main/java/konkuk/thip/user/adapter/out/mapper/UserMapper.java

@@ -13,6 +13,7 @@ public class UserMapper {
     public UserJpaEntity toJpaEntity(User user, AliasJpaEntity aliasJpaEntity) {
         return UserJpaEntity.builder()
                 .nickname(user.getNickname())
+                .nicknameUpdatedAt(user.getNicknameUpdatedAt())
                 .role(UserRole.from(user.getUserRole()))
                 .oauth2Id(user.getOauth2Id())
                 .followerCount(user.getFollowerCount())
@@ -24,6 +25,7 @@ public User toDomainEntity(UserJpaEntity userJpaEntity) {
         return User.builder()
                 .id(userJpaEntity.getUserId())
                 .nickname(userJpaEntity.getNickname())
+                .nicknameUpdatedAt(userJpaEntity.getNicknameUpdatedAt())
                 .userRole(userJpaEntity.getRole().getType())
                 .oauth2Id(userJpaEntity.getOauth2Id())
                 .followerCount(userJpaEntity.getFollowerCount())

src/main/java/konkuk/thip/user/adapter/out/persistence/UserCommandPersistenceAdapter.java

@@ -52,4 +52,20 @@ public Map<Long, User> findByIds(List<Long> userIds) {
                 .map(userMapper::toDomainEntity)
                 .collect(Collectors.toMap(User::getId, Function.identity()));
     }
+
+    @Override
+    public void update(User user) {
+        UserJpaEntity userJpaEntity = userJpaRepository.findById(user.getId()).orElseThrow(
+                () -> new EntityNotFoundException(USER_NOT_FOUND)
+        );
+
+        aliasJpaRepository.findByValue(user.getAlias().getValue()).ifPresentOrElse(
+                aliasJpaEntity -> userJpaEntity.updateIncludeAliasFrom(user, aliasJpaEntity),
+                () -> {
+                    throw new EntityNotFoundException(ALIAS_NOT_FOUND);
+                }
+        );
+
+        userJpaRepository.save(userJpaEntity);
+    }
 }

src/main/java/konkuk/thip/user/adapter/out/persistence/UserQueryPersistenceAdapter.java

@@ -23,6 +23,11 @@ public boolean existsByNickname(String nickname) {
         return userJpaRepository.existsByNickname(nickname);
     }
 
+    @Override
+    public boolean existsByNicknameAndUserIdNot(String nickname, Long userId) {
+        return userJpaRepository.existsByNicknameAndUserIdNot(nickname, userId);
+    }
+
     @Override
     public Set<Long> findUserIdsParticipatedInRoomsByBookId(Long bookId) {
         return  userJpaRepository.findUserIdsByBookId(bookId);

src/main/java/konkuk/thip/user/adapter/out/persistence/repository/UserJpaRepository.java

@@ -9,4 +9,6 @@ public interface UserJpaRepository extends JpaRepository<UserJpaEntity, Long>, U
     Optional<UserJpaEntity> findByOauth2Id(String oauth2Id);
     boolean existsByNickname(String nickname);
     Optional<UserJpaEntity> findById(Long userId);
+
+    boolean existsByNicknameAndUserIdNot(String nickname, Long userId);
 }

src/main/java/konkuk/thip/user/application/port/in/UserUpdateUseCase.java

@@ -0,0 +1,7 @@
+package konkuk.thip.user.application.port.in;
+
+import konkuk.thip.user.application.port.in.dto.UserUpdateCommand;
+
+public interface UserUpdateUseCase {
+    void updateUser(UserUpdateCommand command);
+}

src/main/java/konkuk/thip/user/application/port/in/dto/UserUpdateCommand.java

@@ -0,0 +1,8 @@
+package konkuk.thip.user.application.port.in.dto;
+
+public record UserUpdateCommand(
+        String aliasName,
+        String nickname,
+        Long userId
+) {
+}

src/main/java/konkuk/thip/user/application/port/out/UserCommandPort.java

@@ -10,4 +10,5 @@ public interface UserCommandPort {
     Long save(User user);
     User findById(Long userId);
     Map<Long, User> findByIds(List<Long> userIds);
+    void update(User user);
 }

src/main/java/konkuk/thip/user/application/port/out/UserQueryPort.java

@@ -8,6 +8,9 @@
 
 public interface UserQueryPort {
     boolean existsByNickname(String nickname);
+
+    boolean existsByNicknameAndUserIdNot(String nickname, Long userId);
+
     Set<Long> findUserIdsParticipatedInRoomsByBookId(Long bookId);
 
     UserViewAliasChoiceResult getAllAliasesAndCategories();

src/main/java/konkuk/thip/user/application/service/UserSignupService.java

@@ -9,6 +9,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+
 import static konkuk.thip.user.adapter.out.jpa.UserRole.USER;
 
 
@@ -23,7 +25,7 @@ public class UserSignupService implements UserSignupUseCase {
     public Long signup(UserSignupCommand command) {
         Alias alias = Alias.from(command.aliasName());
         User user = User.withoutId(
-                command.nickname(), USER.getType(), command.oauth2Id(), alias
+                command.nickname(), LocalDate.now(), USER.getType(), command.oauth2Id(), alias
         );
 
         return userCommandPort.save(user);

src/main/java/konkuk/thip/user/application/service/UserUpdateService.java

@@ -0,0 +1,36 @@
+package konkuk.thip.user.application.service;
+
+import konkuk.thip.common.exception.BusinessException;
+import konkuk.thip.common.exception.code.ErrorCode;
+import konkuk.thip.user.application.port.in.UserUpdateUseCase;
+import konkuk.thip.user.application.port.in.dto.UserUpdateCommand;
+import konkuk.thip.user.application.port.out.UserCommandPort;
+import konkuk.thip.user.application.port.out.UserQueryPort;
+import konkuk.thip.user.domain.Alias;
+import konkuk.thip.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class UserUpdateService implements UserUpdateUseCase {
+
+    private final UserCommandPort userCommandPort;
+    private final UserQueryPort userQueryPort;
+
+    @Override
+    @Transactional
+    public void updateUser(UserUpdateCommand command) {
+        Alias alias = Alias.from(command.aliasName());
+        boolean isNicknameUpdateRequest = command.nickname() != null; // 닉네임이 null이 아니면 닉네임 업데이트 요청
+
+        User user = userCommandPort.findById(command.userId());
+        user.updateUserInfo(command.nickname(), alias, isNicknameUpdateRequest);
+
+        if(isNicknameUpdateRequest && userQueryPort.existsByNicknameAndUserIdNot(command.nickname(), command.userId())) {
+            throw new BusinessException(ErrorCode.USER_NICKNAME_ALREADY_EXISTS);
+        }
+        userCommandPort.update(user);
+    }
+}

src/main/java/konkuk/thip/user/domain/User.java

@@ -6,6 +6,8 @@
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 
+import java.time.LocalDate;
+
 @Getter
 @SuperBuilder
 public class User extends BaseDomainEntity {
@@ -14,6 +16,8 @@ public class User extends BaseDomainEntity {
 
     private String nickname;
 
+    private LocalDate nicknameUpdatedAt;
+
     private String userRole;
 
     private String oauth2Id;
@@ -22,10 +26,11 @@ public class User extends BaseDomainEntity {
 
     private Alias alias;
 
-    public static User withoutId(String nickname, String userRole, String oauth2Id, Alias alias) {
+    public static User withoutId(String nickname, LocalDate nicknameUpdatedAt, String userRole, String oauth2Id, Alias alias) {
         return User.builder()
                 .id(null)
                 .nickname(nickname)
+                .nicknameUpdatedAt(nicknameUpdatedAt)
                 .userRole(userRole)
                 .oauth2Id(oauth2Id)
                 .followerCount(0)
@@ -44,4 +49,29 @@ public void decreaseFollowerCount() {
         followerCount--;
     }
 
+    public void updateUserInfo(String nickname, Alias alias, boolean isNicknameUpdateRequest) {
+        if(isNicknameUpdateRequest) {
+            validateCanUpdateNickname(nickname);
+            this.nickname = nickname;
+            this.nicknameUpdatedAt = LocalDate.now();
+        }
+        this.alias = alias;
+    }
+
+    private void validateCanUpdateNickname(String nickname) {
+        if(nickname.isBlank()) { // 빈칸 불가
+            throw new InvalidStateException(ErrorCode.USER_NICKNAME_CANNOT_BE_BLANK);
+        }
+        if(nickname.length() > 10) { // 10자 이상 불가
+            throw new InvalidStateException(ErrorCode.USER_NICKNAME_TOO_LONG);
+        }
+        // 닉네임을 변경한지 6개월이 지나지 않았으면 닉네임 업데이트 불가
+        if(nicknameUpdatedAt != null && nicknameUpdatedAt.isAfter(LocalDate.now().minusMonths(6))) {
+            throw new InvalidStateException(ErrorCode.USER_NICKNAME_UPDATE_TOO_FREQUENT);
+        }
+        if(nickname.equals(this.nickname)) { // 현재 닉네임과 같으면 업데이트 불가
+            throw new InvalidStateException(ErrorCode.USER_NICKNAME_CANNOT_BE_SAME);
+        }
+    }
+
 }

src/test/java/konkuk/thip/book/adapter/in/web/BookChangeSavedControllerTest.java

@@ -12,8 +12,8 @@
 import konkuk.thip.user.adapter.out.jpa.AliasJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserRole;
-import konkuk.thip.user.adapter.out.persistence.repository.alias.AliasJpaRepository;
 import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
+import konkuk.thip.user.adapter.out.persistence.repository.alias.AliasJpaRepository;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -26,6 +26,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 
+import java.time.LocalDate;
 import java.util.Optional;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -72,6 +73,7 @@ void setUp() {
         UserJpaEntity user = userJpaRepository.save(UserJpaEntity.builder()
                 .oauth2Id("kakao_432708231")
                 .nickname("User1")
+                .nicknameUpdatedAt(LocalDate.now().minusMonths(7))
                 .role(UserRole.USER)
                 .aliasForUserJpaEntity(alias)
                 .build());

src/test/java/konkuk/thip/book/adapter/in/web/BookDetailSearchControllerTest.java

@@ -66,6 +66,7 @@ void setup() {
         UserJpaEntity user = userJpaRepository.save(UserJpaEntity.builder()
                 .oauth2Id("kakao_432708231")
                 .nickname("User1")
+                .nicknameUpdatedAt(LocalDate.now().minusMonths(7))
                 .role(UserRole.USER)
                 .aliasForUserJpaEntity(alias)
                 .build());