diff --git a/src/main/java/com/tookscan/tookscan/account/repository/impl/UserRepositoryImpl.java b/src/main/java/com/tookscan/tookscan/account/repository/impl/UserRepositoryImpl.java index caebb2ec..dc5f0fb9 100644 --- a/src/main/java/com/tookscan/tookscan/account/repository/impl/UserRepositoryImpl.java +++ b/src/main/java/com/tookscan/tookscan/account/repository/impl/UserRepositoryImpl.java @@ -52,7 +52,7 @@ public User save(User user) { @Override public User findByPhoneNumberAndNameOrElseThrow(String phoneNumber, String name) { - return userJpaRepository.findByPhoneNumberAndName(phoneNumber, name) + return userJpaRepository.findByPhoneNumberAndNameAndDeletedAtIsNull(phoneNumber, name) .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_ACCOUNT)); } diff --git a/src/main/java/com/tookscan/tookscan/account/repository/mysql/UserJpaRepository.java b/src/main/java/com/tookscan/tookscan/account/repository/mysql/UserJpaRepository.java index cd735838..63eac165 100644 --- a/src/main/java/com/tookscan/tookscan/account/repository/mysql/UserJpaRepository.java +++ b/src/main/java/com/tookscan/tookscan/account/repository/mysql/UserJpaRepository.java @@ -13,7 +13,7 @@ @Repository public interface UserJpaRepository extends JpaRepository { - Optional findByPhoneNumberAndName(String phoneNumber, String name); + Optional findByPhoneNumberAndNameAndDeletedAtIsNull(String phoneNumber, String name); @Query("SELECT u FROM User u " + "LEFT JOIN FETCH u.userGroups " +