diff --git a/src/main/java/org/runimo/runimo/user/repository/OAuthInfoRepository.java b/src/main/java/org/runimo/runimo/user/repository/OAuthInfoRepository.java index 5acbb0c6..c7620617 100644 --- a/src/main/java/org/runimo/runimo/user/repository/OAuthInfoRepository.java +++ b/src/main/java/org/runimo/runimo/user/repository/OAuthInfoRepository.java @@ -1,6 +1,5 @@ package org.runimo.runimo.user.repository; -import jakarta.validation.constraints.NotNull; import java.util.Optional; import org.runimo.runimo.user.domain.OAuthInfo; import org.runimo.runimo.user.domain.SocialProvider; @@ -12,20 +11,20 @@ @Repository public interface OAuthInfoRepository extends JpaRepository { - @Query(""" - SELECT o FROM OAuthInfo o - WHERE o.deletedAt is null AND o.provider = :provider AND o.providerId = :providerId - """) - Optional findByProviderAndProviderId(SocialProvider provider, String providerId); + @Query(""" + SELECT o FROM OAuthInfo o + WHERE o.deletedAt is null AND o.provider = :provider AND o.providerId = :providerId + """) + Optional findByProviderAndProviderId(SocialProvider provider, String providerId); - SocialProvider user(User user); + SocialProvider user(User user); - @Query(""" - select o from OAuthInfo o - where o.deletedAt is null AND o.user.id = :userId - """) - Optional findByUserId(Long userId); + @Query(""" + select o from OAuthInfo o + where o.deletedAt is null AND o.user.id = :userId + """) + Optional findByUserId(Long userId); - boolean existsByProviderIdAndProvider(@NotNull String providerId, - @NotNull SocialProvider socialProvider); + boolean existsByProviderIdAndProviderAndDeletedAtIsNull(String providerId, + SocialProvider socialProvider); } diff --git a/src/main/java/org/runimo/runimo/user/service/UserRegisterService.java b/src/main/java/org/runimo/runimo/user/service/UserRegisterService.java index d3bdd596..2e2e08ef 100644 --- a/src/main/java/org/runimo/runimo/user/service/UserRegisterService.java +++ b/src/main/java/org/runimo/runimo/user/service/UserRegisterService.java @@ -30,7 +30,7 @@ public User registerUser(UserRegisterCommand command) { } public void validateExistingUser(String providerId, SocialProvider socialProvider) { - if (oAuthInfoRepository.existsByProviderIdAndProvider( + if (oAuthInfoRepository.existsByProviderIdAndProviderAndDeletedAtIsNull( providerId, socialProvider)) { throw new SignUpException(UserHttpResponseCode.SIGNIN_FAIL_ALREADY_EXIST); }