Feat/#462 닉네임 변경 API 구현

backend/src/main/java/shook/shook/auth/application/AuthService.java

@@ -36,7 +36,7 @@ public TokenPair oAuthLogin(final String oauthType, final String authorizationCo
     }
 
     public ReissueAccessTokenResponse reissueAccessTokenByRefreshToken(final String refreshToken,
-        final String accessToken) {
+                                                                       final String accessToken) {
         final Claims claims = tokenProvider.parseClaims(refreshToken);
         final Long memberId = claims.get("memberId", Long.class);
         final String nickname = claims.get("nickname", String.class);

backend/src/main/java/shook/shook/auth/config/AuthConfig.java

@@ -20,8 +20,8 @@ public class AuthConfig implements WebMvcConfigurer {
     private final TokenInterceptor tokenInterceptor;
 
     public AuthConfig(final AuthArgumentResolver authArgumentResolver,
-        final LoginCheckerInterceptor loginCheckerInterceptor,
-        final TokenInterceptor tokenInterceptor
+                      final LoginCheckerInterceptor loginCheckerInterceptor,
+                      final TokenInterceptor tokenInterceptor
     ) {
         this.authArgumentResolver = authArgumentResolver;
         this.loginCheckerInterceptor = loginCheckerInterceptor;

backend/src/main/java/shook/shook/globalexception/ErrorCode.java

@@ -22,7 +22,7 @@ public enum ErrorCode {
     NOT_FOUND_OAUTH(1010, "현재 지원하지 않는 OAuth 요청입니다."),
     INVALID_REFRESH_TOKEN(1011, "존재하지 않는 refreshToken 입니다."),
     TOKEN_PAIR_NOT_MATCHING_EXCEPTION(1012, "올바르지 않은 TokenPair 입니다."),
-    ALREADY_EXIST_NICKNAME(1013, "존재하는 닉네임입니다."),
+    DUPLICATE_NICKNAME(1013, "중복되는 닉네임입니다."),
 
     // 2000: 킬링파트 - 좋아요, 댓글
 

backend/src/main/java/shook/shook/member/application/MemberService.java

@@ -43,6 +43,7 @@ public Member register(final String email) {
         final Member newMember = new Member(email, BASIC_NICKNAME);
         final Member savedMember = memberRepository.save(newMember);
         savedMember.updateNickname(savedMember.getNickname() + savedMember.getId());
+
         return savedMember;
     }
 
@@ -63,10 +64,7 @@ public Member findByIdAndNicknameThrowIfNotExist(final Long id, final Nickname n
     public void deleteById(final Long id, final MemberInfo memberInfo) {
         final Member member = getMemberIfValidRequest(id, memberInfo);
 
-        final List<KillingPartLike> membersExistLikes = likeRepository.findAllByMemberAndIsDeleted(
-            member,
-            false
-        );
+        final List<KillingPartLike> membersExistLikes = likeRepository.findAllByMemberAndIsDeleted(member, false);
 
         membersExistLikes.forEach(KillingPartLike::updateDeletion);
         commentRepository.deleteAllByMember(member);
@@ -77,16 +75,9 @@ private Member getMemberIfValidRequest(final Long memberId, final MemberInfo mem
         final long requestMemberId = memberInfo.getMemberId();
         final Member requestMember = findById(requestMemberId);
         final Member targetMember = findById(memberId);
-
         validateMemberAuthentication(requestMember, targetMember);
-        return targetMember;
-    }
 
-    private Member findById(final Long id) {
-        return memberRepository.findById(id)
-            .orElseThrow(() -> new MemberException.MemberNotExistException(
-                Map.of("Id", String.valueOf(id))
-            ));
+        return targetMember;
     }
 
     private void validateMemberAuthentication(final Member requestMember, final Member targetMember) {
@@ -100,13 +91,20 @@ private void validateMemberAuthentication(final Member requestMember, final Memb
         }
     }
 
+    private Member findById(final Long id) {
+        return memberRepository.findById(id)
+            .orElseThrow(() -> new MemberException.MemberNotExistException(
+                Map.of("Id", String.valueOf(id))
+            ));
+    }
+
     @Transactional
     public TokenPair updateNickname(final Long memberId, final MemberInfo memberInfo,
-        final NicknameUpdateRequest request) {
+                                    final NicknameUpdateRequest request) {
         final Member member = getMemberIfValidRequest(memberId, memberInfo);
         final Nickname nickname = new Nickname(request.getNickname());
 
-        if (isSameNickname(member, nickname)) {
+        if (member.hasSameNickname(nickname)) {
             return null;
         }
 
@@ -121,15 +119,8 @@ private TokenPair reissueTokenPair(final Long memberId, final String nickname) {
         final String reissuedAccessToken = tokenProvider.createAccessToken(memberId, nickname);
         final String reissuedRefreshToken = tokenProvider.createRefreshToken(memberId, nickname);
         inMemoryTokenPairRepository.addOrUpdateTokenPair(reissuedRefreshToken, reissuedAccessToken);
-        return new TokenPair(reissuedAccessToken, reissuedRefreshToken);
-    }
-
 
-    private boolean isSameNickname(final Member member, final Nickname nickname) {
-        final String originalNickname = member.getNickname();
-        final String nicknameForUpdate = nickname.getValue();
-
-        return originalNickname.equals(nicknameForUpdate);
+        return new TokenPair(reissuedAccessToken, reissuedRefreshToken);
     }
 
     private void validateDuplicateNickname(final Nickname nickname) {

backend/src/main/java/shook/shook/member/domain/Member.java

@@ -53,6 +53,10 @@ public void updateNickname(final Nickname newNickname) {
         this.nickname = newNickname;
     }
 
+    public boolean hasSameNickname(final Nickname nickname) {
+        return nickname.equals(this.nickname);
+    }
+
     public String getEmail() {
         return email.getValue();
     }

backend/src/main/java/shook/shook/member/exception/MemberException.java

@@ -97,11 +97,11 @@ public MemberNotExistException(final Map<String, String> inputValuesByProperty)
     public static class ExistNicknameException extends MemberException {
 
         public ExistNicknameException() {
-            super(ErrorCode.ALREADY_EXIST_NICKNAME);
+            super(ErrorCode.DUPLICATE_NICKNAME);
         }
 
         public ExistNicknameException(final Map<String, String> inputValuesByProperty) {
-            super(ErrorCode.ALREADY_EXIST_NICKNAME, inputValuesByProperty);
+            super(ErrorCode.DUPLICATE_NICKNAME, inputValuesByProperty);
         }
     }
 }

backend/src/main/java/shook/shook/member/ui/MemberController.java

@@ -2,6 +2,7 @@
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -42,7 +43,7 @@ public ResponseEntity<Void> deleteMember(
     public ResponseEntity<ReissueAccessTokenResponse> updateNickname(
         @PathVariable(name = "member_id") final Long memberId,
         @Authenticated final MemberInfo memberInfo,
-        @RequestBody final NicknameUpdateRequest request,
+        @Valid @RequestBody final NicknameUpdateRequest request,
         final HttpServletResponse response
     ) {
         final TokenPair tokenPair = memberService.updateNickname(memberId, memberInfo, request);

backend/src/test/java/shook/shook/member/application/MemberServiceTest.java

@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static shook.shook.auth.ui.Authority.MEMBER;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -16,6 +15,7 @@
 import shook.shook.auth.application.dto.TokenPair;
 import shook.shook.auth.exception.AuthorizationException;
 import shook.shook.auth.repository.InMemoryTokenPairRepository;
+import shook.shook.auth.ui.Authority;
 import shook.shook.auth.ui.argumentresolver.MemberInfo;
 import shook.shook.member.application.dto.NicknameUpdateRequest;
 import shook.shook.member.domain.Member;
@@ -168,7 +168,7 @@ void success_delete() {
 
         saveAndClearEntityManager();
         // when
-        memberService.deleteById(targetId, new MemberInfo(targetId, MEMBER));
+        memberService.deleteById(targetId, new MemberInfo(targetId, Authority.MEMBER));
 
         // then
         assertThat(likeRepository.findAllByMemberAndIsDeleted(savedMember, false)).isEmpty();
@@ -185,7 +185,7 @@ void fail_delete() {
 
         // when, then
         assertThatThrownBy(() ->
-                               memberService.deleteById(targetId, new MemberInfo(unsavedMemberId, MEMBER))
+                               memberService.deleteById(targetId, new MemberInfo(unsavedMemberId, Authority.MEMBER))
         ).isInstanceOf(MemberException.MemberNotExistException.class);
     }
 
@@ -199,7 +199,7 @@ void fail_delete_unauthenticated() {
         // when, then
         assertThatThrownBy(() ->
                                memberService.deleteById(targetMember.getId(),
-                                                        new MemberInfo(requestMember.getId(), MEMBER))
+                                                        new MemberInfo(requestMember.getId(), Authority.MEMBER))
         ).isInstanceOf(AuthorizationException.UnauthenticatedException.class);
     }
 
@@ -216,7 +216,8 @@ void success_update(final String newNickname) {
 
             // when
             final TokenPair tokenPair = memberService.updateNickname(savedMember.getId(),
-                                                                     new MemberInfo(savedMember.getId(), MEMBER),
+                                                                     new MemberInfo(savedMember.getId(),
+                                                                                    Authority.MEMBER),
                                                                      request);
 
             // then
@@ -236,18 +237,20 @@ void success_updateNickname_same_nickname_before() {
 
             // when
             // then
-            assertThat(memberService.updateNickname(savedMember.getId(), new MemberInfo(savedMember.getId(), MEMBER),
-                                                    request)).isNull();
+            assertThat(
+                memberService.updateNickname(savedMember.getId(),
+                                             new MemberInfo(savedMember.getId(), Authority.MEMBER),
+                                             request)).isNull();
         }
 
         @DisplayName("변경할 닉네임이 중복되면 예외를 던진다.")
         @Test
         void fail_updateNickname_duplicate_nickname() {
             // given
             final Member newMember = memberRepository.save(new Member("temp@email", "shook2"));
-            final String newNickname = "shook";  // 중복된 닉네임
-            final NicknameUpdateRequest request = new NicknameUpdateRequest(newNickname);
-            final MemberInfo newMemberInfo = new MemberInfo(newMember.getId(), MEMBER);
+            final String duplicateNickname = "shook";
+            final NicknameUpdateRequest request = new NicknameUpdateRequest(duplicateNickname);
+            final MemberInfo newMemberInfo = new MemberInfo(newMember.getId(), Authority.MEMBER);
 
             // when
             // then
@@ -265,7 +268,7 @@ void fail_updateNickname_empty_nickname(final String emptyValue) {
             // when
             // then
             assertThatThrownBy(() -> memberService.updateNickname(savedMember.getId(),
-                                                                  new MemberInfo(savedMember.getId(), MEMBER),
+                                                                  new MemberInfo(savedMember.getId(), Authority.MEMBER),
                                                                   request))
                 .isInstanceOf(MemberException.NullOrEmptyNicknameException.class);
         }
@@ -280,7 +283,7 @@ void fail_updateNickname_too_long_nickname(final String tooLongNickname) {
             // when
             // then
             assertThatThrownBy(() -> memberService.updateNickname(savedMember.getId(),
-                                                                  new MemberInfo(savedMember.getId(), MEMBER),
+                                                                  new MemberInfo(savedMember.getId(), Authority.MEMBER),
                                                                   request))
                 .isInstanceOf(MemberException.TooLongNicknameException.class);
         }

backend/src/test/java/shook/shook/member/domain/NicknameTest.java

@@ -37,7 +37,7 @@ void create_fail_lessThanOne(final String nickname) {
     @Test
     void create_fail_lengthOver20() {
         //given
-        final String nickname = ".".repeat(101);
+        final String nickname = ".".repeat(21);
 
         //when
         //then

backend/src/test/java/shook/shook/member/ui/MemberControllerTest.java

@@ -37,8 +37,8 @@ void deleteMember() {
 
         // when, then
         RestAssured.given().log().all()
-            .when().log().all()
             .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
+            .when().log().all()
             .delete("/members/{member_id}", member.getId())
             .then().log().all()
             .statusCode(HttpStatus.NO_CONTENT.value());
@@ -55,8 +55,8 @@ void deleteMember_forbidden() {
 
         // when, then
         RestAssured.given().log().all()
-            .when().log().all()
             .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
+            .when().log().all()
             .delete("/members/{member_id}", member.getId())
             .then().log().all()
             .statusCode(HttpStatus.FORBIDDEN.value());
@@ -73,10 +73,10 @@ void updateNickname_OK() {
         // when
         // then
         final ReissueAccessTokenResponse response = RestAssured.given().log().all()
+            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .contentType(ContentType.JSON)
             .body(request)
             .when().log().all()
-            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .patch("/members/{member_id}/nickname", member.getId())
             .then().log().all()
             .statusCode(HttpStatus.OK.value())
@@ -100,10 +100,10 @@ void updateNickname_noContent() {
         // when
         // then
         RestAssured.given().log().all()
+            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .contentType(ContentType.JSON)
             .body(request)
             .when().log().all()
-            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .patch("/members/{member_id}/nickname", member.getId())
             .then().log().all()
             .statusCode(HttpStatus.NO_CONTENT.value());
@@ -124,10 +124,10 @@ void updateNickname_badRequest(final String invalidNickname) {
         // when
         // then
         RestAssured.given().log().all()
+            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .contentType(ContentType.JSON)
             .body(request)
             .when().log().all()
-            .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
             .patch("/members/{member_id}/nickname", newMember.getId())
             .then().log().all()
             .statusCode(HttpStatus.BAD_REQUEST.value());