From 662d593c038cb237fb6e1a907550ee0857918367 Mon Sep 17 00:00:00 2001
From: dunowljj <uuufg3322@gmail.com>
Date: Sun, 26 Nov 2023 12:00:24 +0900
Subject: [PATCH] =?UTF-8?q?Fix=20:=20DIG-111=20=EB=8B=89=EB=84=A4=EC=9E=84?=
 =?UTF-8?q?=20=EC=A4=91=EB=B3=B5=EC=B2=B4=ED=81=AC=20=EA=B3=84=EC=86=8D=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=9C=BC=EB=A1=9C=20=ED=8C=90=EB=8B=A8?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 컨트롤러에 잘못된 인수 위치 수정
- 변수명 명확하게 loginNickname으로 수정
---
 .../ogjg/daitgym/user/controller/UserController.java   |  4 ++--
 .../java/com/ogjg/daitgym/user/service/UserHelper.java | 10 +++++++---
 .../com/ogjg/daitgym/user/service/UserService.java     |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ogjg/daitgym/user/controller/UserController.java b/src/main/java/com/ogjg/daitgym/user/controller/UserController.java
index e755dbb9..caa10d78 100644
--- a/src/main/java/com/ogjg/daitgym/user/controller/UserController.java
+++ b/src/main/java/com/ogjg/daitgym/user/controller/UserController.java
@@ -50,10 +50,10 @@ public ApiResponse<?> logout(HttpServletResponse response,
      */
     @GetMapping("/check-duplication")
     public ApiResponse<?> checkNicknameDuplication(
-            @RequestParam("nickname") String nickname,
+            @RequestParam("nickname") String newNickname,
             @AuthenticationPrincipal OAuth2JwtUserDetails userDetails
     ) {
-        String message = userService.checkNicknameDuplication(nickname, userDetails.getNickname());
+        String message = userService.checkNicknameDuplication(userDetails.getNickname(), newNickname);
         return new ApiResponse<>(ErrorCode.SUCCESS.changeMessage(message));
     }
 
diff --git a/src/main/java/com/ogjg/daitgym/user/service/UserHelper.java b/src/main/java/com/ogjg/daitgym/user/service/UserHelper.java
index f45cc667..337e7abf 100644
--- a/src/main/java/com/ogjg/daitgym/user/service/UserHelper.java
+++ b/src/main/java/com/ogjg/daitgym/user/service/UserHelper.java
@@ -25,10 +25,14 @@ public User findUserByEmail(String email) {
     }
 
     public boolean isUserNotFoundByEmail(String loginEmail) {
-        return !userRepository.findByEmail(loginEmail).isPresent();
+        return userRepository.findByEmail(loginEmail).isEmpty();
     }
 
-    public boolean isNicknameAlreadyExist(String nickname, String newNickname) {
-        return !nickname.equals(newNickname) && userRepository.findByNickname(newNickname).isPresent();
+    public boolean isNicknameAlreadyExist(String loginNickname, String newNickname) {
+        return isNotMyNickname(loginNickname, newNickname) && userRepository.findByNickname(newNickname).isPresent();
+    }
+
+    private boolean isNotMyNickname(String loginNickname, String newNickname) {
+        return !loginNickname.equals(newNickname);
     }
 }
diff --git a/src/main/java/com/ogjg/daitgym/user/service/UserService.java b/src/main/java/com/ogjg/daitgym/user/service/UserService.java
index 588104c8..0475fefc 100644
--- a/src/main/java/com/ogjg/daitgym/user/service/UserService.java
+++ b/src/main/java/com/ogjg/daitgym/user/service/UserService.java
@@ -272,8 +272,8 @@ public EditInitialNicknameResponse editInitialNickname(String loginEmail, EditNi
     }
 
     @Transactional(readOnly = true)
-    public String checkNicknameDuplication(String nickname, String newNickname) {
-        if (userHelper.isNicknameAlreadyExist(nickname, newNickname)) {
+    public String checkNicknameDuplication(String loginNickname, String newNickname) {
+        if (userHelper.isNicknameAlreadyExist(loginNickname, newNickname)) {
             return "중복";
         }
         return "사용가능";