Merge pull request #293 from maeil-mail/292

인증 번호 정합성 문제를 개선한다.

Author: le2sky

mail-core/src/main/java/maeilmail/subscribe/command/application/TemporalSubscribeManager.java

@@ -1,5 +1,6 @@
 package maeilmail.subscribe.command.application;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import maeilmail.subscribe.command.domain.TemporalSubscribe;
@@ -16,20 +17,37 @@ public class TemporalSubscribeManager {
     private final TemporalSubscribeRepository temporalSubscribeRepository;
 
     public void add(String email, String verifyCode) {
-        temporalSubscribeRepository.findByEmail(email).ifPresent(temporalSubscribeRepository::delete);
+        List<TemporalSubscribe> temporalSubscribes = temporalSubscribeRepository.findAllByEmail(email);
+        removeDataIfPresent(temporalSubscribes);
+
         TemporalSubscribe temporalSubscribe = new TemporalSubscribe(email, verifyCode);
         temporalSubscribeRepository.save(temporalSubscribe);
     }
 
+    private void removeDataIfPresent(List<TemporalSubscribe> temporalSubscribes) {
+        if (!temporalSubscribes.isEmpty()) {
+            List<Long> ids = temporalSubscribes.stream()
+                    .map(TemporalSubscribe::getId)
+                    .toList();
+
+            temporalSubscribeRepository.removeAllByIdIn(ids);
+        }
+    }
+
     public void verify(String email, String verifyCode) {
-        TemporalSubscribe temporalSubscribe = temporalSubscribeRepository.findByEmail(email)
+        List<TemporalSubscribe> temporalSubscribes = temporalSubscribeRepository.findAllByEmail(email);
+        temporalSubscribes.stream()
+                .filter(it -> isVerifiable(verifyCode, it))
+                .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException(INVALID_EMAIL_MESSAGE));
+    }
 
+    private boolean isVerifiable(String verifyCode, TemporalSubscribe temporalSubscribe) {
         try {
             temporalSubscribe.verify(verifyCode);
+            return true;
         } catch (Exception e) {
-            log.info("메일 인증 실패 email = {} message = {}", email, e.getMessage());
-            throw new IllegalArgumentException(INVALID_EMAIL_MESSAGE, e);
+            return false;
         }
     }
 }

mail-core/src/main/java/maeilmail/subscribe/command/domain/TemporalSubscribeRepository.java

@@ -1,9 +1,11 @@
 package maeilmail.subscribe.command.domain;
 
-import java.util.Optional;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TemporalSubscribeRepository extends JpaRepository<TemporalSubscribe, Long> {
 
-    Optional<TemporalSubscribe> findByEmail(String email);
+    List<TemporalSubscribe> findAllByEmail(String email);
+
+    void removeAllByIdIn(List<Long> ids);
 }

mail-core/src/test/java/maeilmail/subscribe/command/application/TemporalSubscribeManagerTest.java

@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import maeilmail.subscribe.command.domain.TemporalSubscribe;
+import maeilmail.subscribe.command.domain.TemporalSubscribeRepository;
 import maeilmail.support.IntegrationTestSupport;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -13,6 +15,9 @@ class TemporalSubscribeManagerTest extends IntegrationTestSupport {
     @Autowired
     private TemporalSubscribeManager temporalSubscribeManager;
 
+    @Autowired
+    private TemporalSubscribeRepository temporalSubscribeRepository;
+
     @Test
     @DisplayName("이메일이 인증되지 않으면 검증에 실패한다.")
     void cantVerify() {
@@ -33,13 +38,25 @@ void cantVerify2() {
 
     @Test
     @DisplayName("이메일 인증 코드가 같으면 검증에 성공한다.")
-    void cantVerify3() {
+    void canVerify() {
         temporalSubscribeManager.add("test3@naver.com", "3212");
 
         assertThatCode(() -> temporalSubscribeManager.verify("test3@naver.com", "3212"))
                 .doesNotThrowAnyException();
     }
 
+    @Test
+    @DisplayName("기존에 저장된 인증 코드가 N개인 경우, 하나의 인증 코드만 있어도 검증에 성공한다.")
+    void canVerify2() {
+        createTemporalSubscribe("test4@naver.com", "3212");
+        createTemporalSubscribe("test4@naver.com", "2111");
+        createTemporalSubscribe("test4@naver.com", "3222");
+        createTemporalSubscribe("test4@naver.com", "3221");
+
+        assertThatCode(() -> temporalSubscribeManager.verify("test4@naver.com", "3222"))
+                .doesNotThrowAnyException();
+    }
+
     @Test
     @DisplayName("이미 인증 코드를 받은 적이 있다면, 기존 인증 코드를 제거한다.")
     void deleteBefore() {
@@ -51,4 +68,25 @@ void deleteBefore() {
         assertThatCode(() -> temporalSubscribeManager.verify("test4@naver.com", "1234"))
                 .doesNotThrowAnyException();
     }
+
+    @Test
+    @DisplayName("기존에 저장된 인증 코드가 N개인 경우, 모든 인증 코드를 제거할 수 있다.")
+    void deleteAllBefore() {
+        createTemporalSubscribe("test4@naver.com", "3212");
+        createTemporalSubscribe("test4@naver.com", "2111");
+        createTemporalSubscribe("test4@naver.com", "3222");
+        createTemporalSubscribe("test4@naver.com", "3221");
+
+        temporalSubscribeManager.add("test4@naver.com", "1234");
+
+        assertThatCode(() -> temporalSubscribeManager.verify("test4@naver.com", "1234"))
+                .doesNotThrowAnyException();
+    }
+
+
+    private void createTemporalSubscribe(String email, String verifyCode) {
+        TemporalSubscribe temporalSubscribe = new TemporalSubscribe(email, verifyCode);
+
+        temporalSubscribeRepository.save(temporalSubscribe);
+    }
 }