Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@Repository
public interface UserJpaRepository extends JpaRepository<User, UUID> {

Optional<User> findByPhoneNumberAndName(String phoneNumber, String name);
Optional<User> findByPhoneNumberAndNameAndDeletedAtIsNull(String phoneNumber, String name);

@Query("SELECT u FROM User u " +
"LEFT JOIN FETCH u.userGroups " +
Expand Down