Merge pull request #158 from Bamdoliro/perf/#151

[개선] 원서 반려시 재제출 가능하도록 변경
Bamdoliro · Oct 13, 2024 · d835b71 · d835b71
2 parents 1e1ed60 + aeb552b
commit d835b71
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/src/main/java/com/bamdoliro/maru/application/form/SubmitFormUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/SubmitFormUseCase.java
@@ -11,6 +11,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @RequiredArgsConstructor
 @UseCase
 public class SubmitFormUseCase {
@@ -39,7 +41,12 @@ public void execute(User user, SubmitFormRequest request) {
     }
 
     private void validateOnlyOneFormPerUser(User user) {
-        if (formRepository.existsByUserId(user.getId())) {
+        Optional<Form> form = formRepository.findByUser(user);
+        if (form.isPresent()) {
+            if (form.get().isRejected()) {
+                formRepository.delete(form.get());
+                return;
+            }
             throw new FormAlreadySubmittedException();
         }
     }

diff --git a/src/main/java/com/bamdoliro/maru/infrastructure/persistence/form/FormRepository.java b/src/main/java/com/bamdoliro/maru/infrastructure/persistence/form/FormRepository.java
@@ -14,6 +14,8 @@ public interface FormRepository extends JpaRepository<Form, Long>, FormRepositor
 
     Optional<Form> findByUser(User user);
 
+    void deleteByUser(User user);
+
     @Query("SELECT MAX(f.examinationNumber) " +
             "FROM Form f " +
             "WHERE f.examinationNumber BETWEEN :minValue AND :maxValue")

diff --git a/src/test/java/com/bamdoliro/maru/application/form/SubmitFormUseCaseTest.java b/src/test/java/com/bamdoliro/maru/application/form/SubmitFormUseCaseTest.java
@@ -16,6 +16,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.Optional;
+
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
@@ -45,7 +47,8 @@ class SubmitFormUseCaseTest {
         SubmitFormRequest request = FormFixture.createFormRequest(FormType.REGULAR);
         User user = UserFixture.createUser();
 
-        given(formRepository.existsByUserId(user.getId())).willReturn(false);
+        given(formRepository.findByUser(user)).willReturn(Optional.empty());
+
         willDoNothing().given(assignExaminationNumberService).execute(any(Form.class));
         willDoNothing().given(calculateFormScoreService).execute(any(Form.class));
 
@@ -54,26 +57,49 @@ class SubmitFormUseCaseTest {
 
         // then
 
-        verify(formRepository, times(1)).existsByUserId(user.getId());
+        verify(formRepository, times(1)).findByUser(user);
         verify(calculateFormScoreService, times(1)).execute(any(Form.class));
         verify(assignExaminationNumberService, times(1)).execute(any(Form.class));
         verify(formRepository, times(1)).save(any(Form.class));
     }
 
     @Test
-    void 원서를_제출할_때_이미_제출한_원서가_있으면_에러가_발생한다() {
+    void 원서를_제출할_때_이미_제출한_원서가_반려상태가_아니면서_있으면_에러가_발생한다() {
         // given
         SubmitFormRequest request = FormFixture.createFormRequest(FormType.REGULAR);
         User user = UserFixture.createUser();
+        Form form = FormFixture.createForm(FormType.REGULAR);
 
-        given(formRepository.existsByUserId(user.getId())).willReturn(true);
+        given(formRepository.findByUser(user)).willReturn(Optional.of(form));
 
         // when and then
         assertThrows(FormAlreadySubmittedException.class, () -> submitFormUseCase.execute(user, request));
 
-        verify(formRepository, times(1)).existsByUserId(user.getId());
+        verify(formRepository, times(1)).findByUser(user);
         verify(calculateFormScoreService, never()).execute(any(Form.class));
         verify(assignExaminationNumberService, never()).execute(any(Form.class));
+        verify(formRepository, never()).delete(any(Form.class));
         verify(formRepository, never()).save(any(Form.class));
     }
+
+    @Test
+    void 원서를_제출할_때_이미_제출한_원서가_반려상태면_다시_작성한다() {
+        //given
+        SubmitFormRequest request = FormFixture.createFormRequest(FormType.REGULAR);
+        User user = UserFixture.createUser();
+        Form form = FormFixture.createForm(FormType.REGULAR);
+        form.reject();
+
+        given(formRepository.findByUser(user)).willReturn(Optional.of(form));
+
+        //when
+        submitFormUseCase.execute(user, request);
+
+        //then
+        verify(formRepository, times(1)).findByUser(user);
+        verify(calculateFormScoreService, times(1)).execute(any(Form.class));
+        verify(assignExaminationNumberService, times(1)).execute(any(Form.class));
+        verify(formRepository, times(1)).delete(any(Form.class));
+        verify(formRepository, times(1)).save(any(Form.class));
+    }
 }