Merge branch 'refs/heads/bugfix/findByKakaoid' into develop

fofo-project · May 5, 2024 · 243aa89 · 243aa89
2 parents c3eae79 + 15621d0
commit 243aa89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/fofo/core/domain/member/MemberAppender.java b/src/main/java/com/fofo/core/domain/member/MemberAppender.java
@@ -31,7 +31,7 @@ public class MemberAppender {
     @Transactional
     public long append(final Member member, final Address address, final List<MultipartFile> multipartFile) throws IOException {
         MemberEntity memberEntity = member.toEntity();
-        if (memberRepository.findByKakaoId(member.kakaoId()).isPresent()) {
+        if (memberRepository.findByKakaoIdAndStatusNot(member.kakaoId(), ActiveStatus.DELETED).isPresent()) {
             throw new CoreApiException(CoreErrorType.DUPLICATE_MEMBER_ERROR);
         }
 

diff --git a/src/main/java/com/fofo/core/storage/MemberRepository.java b/src/main/java/com/fofo/core/storage/MemberRepository.java
@@ -10,7 +10,7 @@
 
 public interface MemberRepository extends JpaRepository<MemberEntity, Long>, MemberCustomRepository {
 
-    Optional<MemberEntity> findByKakaoId(String kakaoId);
+    Optional<MemberEntity> findByKakaoIdAndStatusNot(String kakaoId, ActiveStatus status);
 
     Optional<MemberEntity> findByIdAndStatusNot(Long id, ActiveStatus status);