diff --git a/src/main/java/com/recipe/app/src/user/application/UserService.java b/src/main/java/com/recipe/app/src/user/application/UserService.java index f490b3da..0f4c2c4e 100644 --- a/src/main/java/com/recipe/app/src/user/application/UserService.java +++ b/src/main/java/com/recipe/app/src/user/application/UserService.java @@ -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)); } diff --git a/src/main/java/com/recipe/app/src/user/infra/UserRepository.java b/src/main/java/com/recipe/app/src/user/infra/UserRepository.java index 27f9b010..14f2ba8b 100644 --- a/src/main/java/com/recipe/app/src/user/infra/UserRepository.java +++ b/src/main/java/com/recipe/app/src/user/infra/UserRepository.java @@ -9,5 +9,5 @@ @Repository public interface UserRepository extends JpaRepository { - Optional findBySocialId(String socialId); + Optional findBySocialIdAndDeletedAtIsNull(String socialId); } diff --git a/src/test/groovy/com/recipe/app/src/user/application/UserServiceTest.groovy b/src/test/groovy/com/recipe/app/src/user/application/UserServiceTest.groovy index 1161c0fe..fc89fa67 100644 --- a/src/test/groovy/com/recipe/app/src/user/application/UserServiceTest.groovy +++ b/src/test/groovy/com/recipe/app/src/user/application/UserServiceTest.groovy @@ -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" @@ -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" @@ -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"