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 @@ -118,7 +118,7 @@ public UserSocialLoginResponse appleLogin(UserLoginRequest request) {

private User create(User user) {

return userRepository.findBySocialId(user.getSocialId())
return userRepository.findBySocialIdAndDeletedAtIsNull(user.getSocialId())
.orElseGet(() -> userRepository.save(user));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
@Repository
public interface UserRepository extends JpaRepository<User, Long> {

Optional<User> findBySocialId(String socialId);
Optional<User> findBySocialIdAndDeletedAtIsNull(String socialId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class UserServiceTest extends Specification {

userAuthClientService.getUserByNaverAuthInfo(request) >> user

userRepository.findBySocialId(user.socialId) >> Optional.of(user)
userRepository.findBySocialIdAndDeletedAtIsNull(user.socialId) >> Optional.of(user)

String accessToken = "access_token"
String refreshToken = "refresh_token"
Expand Down Expand Up @@ -141,7 +141,7 @@ class UserServiceTest extends Specification {

userAuthClientService.getUserByKakaoAuthInfo(request) >> user

userRepository.findBySocialId(user.socialId) >> Optional.of(user)
userRepository.findBySocialIdAndDeletedAtIsNull(user.socialId) >> Optional.of(user)

String accessToken = "access_token"
String refreshToken = "refresh_token"
Expand Down Expand Up @@ -197,7 +197,7 @@ class UserServiceTest extends Specification {

userAuthClientService.getUserByGoogleAuthInfo(request) >> user

userRepository.findBySocialId(user.socialId) >> Optional.of(user)
userRepository.findBySocialIdAndDeletedAtIsNull(user.socialId) >> Optional.of(user)

String accessToken = "access_token"
String refreshToken = "refresh_token"
Expand Down
Loading