Refactor: 회원가입 코드 정리

Taekgil99 · Dec 2, 2022 · b907533 · b907533
1 parent 263d4fb
commit b907533
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/backend/src/main/java/com/backend/domain/user/application/UserService.java b/backend/src/main/java/com/backend/domain/user/application/UserService.java
@@ -66,16 +66,16 @@ public User findVerifiedUser(long userId) {
 
     @Transactional
     public void createUser(User user) {
-        Optional<User> notExistUser = null;
         log.info("회원가입 시작");
         if (!isNotExistsEmailByOriginal(user.getEmail())) {
             log.info("신규 유저");
             verifyExistsEmailByOriginal(user.getEmail());
+            verifyExistsNicknameByOriginal(user.getNickname());
         } else {
             log.info("탈퇴했던 유저");
             user.setUserStatus(User.UserStatus.USER_EXIST);
             log.info("탈퇴했던 유저의 상태를 USER_EXIST로 변경");
-            notExistUser = userRepository.findByEmail(user.getEmail());
+            Optional<User> notExistUser = userRepository.findByEmail(user.getEmail());
             user.setUserId(notExistUser.get().getUserId());
             if (!Objects.equals(notExistUser.get().getNickname(), user.getNickname())) {
                 log.info("기존과 다른 닉네임 입력");
@@ -85,10 +85,6 @@ public void createUser(User user) {
             }
         }
 
-        if (notExistUser == null) {
-            verifyExistsNicknameByOriginal(user.getNickname());
-        }
-
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         log.info("비밀번호 암호화");
         pointService.addCash(user, 1000000, PointType.SignUpPoint);