Merge pull request #283 from CodIN-INU/develop

hotfix: 닉네임 변경 기능에서 삭제된 닉네임, 자기 자신의 닉네임 사용가능하도록 수정

Author: doma17

src/main/java/inu/codin/codin/common/security/service/AuthCommonService.java

@@ -2,6 +2,7 @@
 
 import inu.codin.codin.common.exception.NotFoundException;
 import inu.codin.codin.common.security.dto.SignUpAndLoginRequestDto;
+import inu.codin.codin.common.security.util.SecurityUtils;
 import inu.codin.codin.domain.user.dto.request.UserProfileRequestDto;
 import inu.codin.codin.domain.user.entity.UserEntity;
 import inu.codin.codin.domain.user.exception.UserCreateFailException;
@@ -33,7 +34,7 @@ public AuthCommonService(UserRepository userRepository, S3Service s3Service, Jwt
     }
 
     public void completeUserProfile(UserProfileRequestDto userProfileRequestDto, MultipartFile userImage, HttpServletResponse response) {
-        Optional<UserEntity> nickNameDuplicate = userRepository.findByNicknameAndDeletedAtIsNull(userProfileRequestDto.getNickname());
+        Optional<UserEntity> nickNameDuplicate = userRepository.findByNicknameAndDeletedAtIsNull(SecurityUtils.getCurrentUserId(), userProfileRequestDto.getNickname());
         if (nickNameDuplicate.isPresent()){
             throw new UserNicknameDuplicateException("이미 사용중인 닉네임입니다.");
         }

src/main/java/inu/codin/codin/domain/user/repository/UserRepository.java

@@ -18,7 +18,8 @@ public interface UserRepository extends MongoRepository<UserEntity, ObjectId> {
     @Query("{'email':  ?0, 'deletedAt': null, 'status':  { $in:  ['ACTIVE'] }}")
     Optional<UserEntity> findByEmail(String email);
 
-    Optional<UserEntity> findByNicknameAndDeletedAtIsNull(String nickname);
+    @Query("{'_id': {$ne: ?0}, 'nickname': ?1, 'deletedAt': null}")
+    Optional<UserEntity> findByNicknameAndDeletedAtIsNull(ObjectId userId, String nickname);
 
     @Query("{'email':  ?0, 'deletedAt': null, 'status':  { $in:  ['DISABLED'] }}")
     Optional<UserEntity> findByEmailAndDisabled(String email);

src/main/java/inu/codin/codin/domain/user/service/UserService.java

@@ -30,6 +30,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -148,9 +149,8 @@ public UserInfoResponseDto getUserInfo() {
         return UserInfoResponseDto.of(user);
     }
     public void updateUserInfo(@Valid UserNicknameRequestDto userNicknameRequestDto) {
-
-        Optional<UserEntity> nickNameDuplicate = userRepository.findByNicknameAndDeletedAtIsNull(userNicknameRequestDto.getNickname());
-        if (nickNameDuplicate.isPresent()){
+        Optional<UserEntity> nickNameDuplicate = userRepository.findByNicknameAndDeletedAtIsNull(SecurityUtils.getCurrentUserId(), userNicknameRequestDto.getNickname());
+        if (nickNameDuplicate.isPresent()) {
             throw new UserNicknameDuplicateException("이미 사용중인 닉네임입니다.");
         }