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
@@ -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;
Expand All @@ -12,20 +11,20 @@
@Repository
public interface OAuthInfoRepository extends JpaRepository<OAuthInfo, Long> {

@Query("""
SELECT o FROM OAuthInfo o
WHERE o.deletedAt is null AND o.provider = :provider AND o.providerId = :providerId
""")
Optional<OAuthInfo> 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<OAuthInfo> 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<OAuthInfo> findByUserId(Long userId);
@Query("""
select o from OAuthInfo o
where o.deletedAt is null AND o.user.id = :userId
""")
Optional<OAuthInfo> findByUserId(Long userId);

boolean existsByProviderIdAndProvider(@NotNull String providerId,
@NotNull SocialProvider socialProvider);
boolean existsByProviderIdAndProviderAndDeletedAtIsNull(String providerId,
SocialProvider socialProvider);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down