[DDING-000] 통계 조회시 파일조회 누락 에러 수정 (#302)

KoSeonJe · web-flow · commit e22303bc3427 · 2025-04-20T17:52:44.000+09:00
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FacadeUserFormApplicationServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FacadeUserFormApplicationServiceImpl.java
@@ -32,20 +32,19 @@ public class FacadeUserFormApplicationServiceImpl implements FacadeUserFormAppli
     @Override
     public void createFormApplication(CreateFormApplicationCommand createFormApplicationCommand) {
         Form form = formService.getById(createFormApplicationCommand.formId());
-        LocalDate now = LocalDate.now();
-        validateFormPeriod(form.getStartDate(), form.getEndDate(), now);
+        validateFormPeriod(form);
         FormApplication formApplication = createFormApplicationCommand.toEntity(form);
         FormApplication savedFormApplication = formApplicationService.create(formApplication);
 
         List<FormAnswer> formAnswers = toFormAnswers(savedFormApplication,
                 createFormApplicationCommand.formAnswerCommands());
-        updateFileMetaDataStatusToCoupled(formAnswers);
-        formAnswerService.createAll(formAnswers);
+        List<FormAnswer> createdFormAnswers = formAnswerService.createAll(formAnswers);
+
+        updateFileMetaDataStatusToCoupled(createdFormAnswers);
     }
 
-    private void validateFormPeriod(LocalDate startDate,
-            LocalDate endDate, LocalDate now) {
-        if (startDate.isAfter(now) || endDate.isBefore(now)) {
+    private void validateFormPeriod(Form form) { // TODO : Form 내부로 옮기기
+        if (form.getStartDate().isAfter(LocalDate.now()) || form.getEndDate().isBefore(LocalDate.now())) {
             throw new FormPeriodException();
         }
     }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FormAnswerService.java b/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FormAnswerService.java
@@ -8,7 +8,7 @@
 
 public interface FormAnswerService {
 
-    void createAll(List<FormAnswer> formAnswers);
+    List<FormAnswer> createAll(List<FormAnswer> formAnswers);
 
     List<FormAnswer> getAllByApplication(FormApplication formApplication);
 
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/GeneralFormAnswerService.java b/src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/GeneralFormAnswerService.java
@@ -20,8 +20,8 @@ public class GeneralFormAnswerService implements FormAnswerService {
 
     @Transactional
     @Override
-    public void createAll(List<FormAnswer> formAnswers) {
-        formAnswerRepository.saveAll(formAnswers);
+    public List<FormAnswer> createAll(List<FormAnswer> formAnswers) {
+        return formAnswerRepository.saveAll(formAnswers);
     }
 
     @Override
diff --git a/src/test/java/ddingdong/ddingdongBE/common/fixture/FormApplicationFixture.java b/src/test/java/ddingdong/ddingdongBE/common/fixture/FormApplicationFixture.java
@@ -0,0 +1,21 @@
+package ddingdong.ddingdongBE.common.fixture;
+
+import ddingdong.ddingdongBE.domain.form.entity.Form;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationStatus;
+
+public class FormApplicationFixture {
+
+    public static FormApplication create(String name, Form form) {
+        return FormApplication.builder()
+                .name(name)
+                .studentNumber("20231234")
+                .department("컴퓨터공학과")
+                .phoneNumber("010-1234-5678")
+                .email("example@email.com")
+                .status(FormApplicationStatus.SUBMITTED) // 예시 상태, 필요에 따라 바꿔도 됨
+                .form(form)
+                .deletedAt(null)
+                .build();
+    }
+}
diff --git a/src/test/java/ddingdong/ddingdongBE/common/support/FixtureMonkeyFactory.java b/src/test/java/ddingdong/ddingdongBE/common/support/FixtureMonkeyFactory.java
@@ -1,12 +1,7 @@
 package ddingdong.ddingdongBE.common.support;
 
 import com.navercorp.fixturemonkey.FixtureMonkey;
-import com.navercorp.fixturemonkey.api.generator.ArbitraryGeneratorContext;
 import com.navercorp.fixturemonkey.api.introspector.BuilderArbitraryIntrospector;
-import com.navercorp.fixturemonkey.api.jqwik.JavaArbitraryResolver;
-import com.navercorp.fixturemonkey.api.jqwik.JqwikPlugin;
-import net.jqwik.api.Arbitrary;
-import net.jqwik.api.arbitraries.StringArbitrary;
 
 public class FixtureMonkeyFactory {
 
@@ -20,18 +15,6 @@ public static FixtureMonkey getNotNullBuilderIntrospectorMonkey() {
         return FixtureMonkey.builder()
                 .objectIntrospector(BuilderArbitraryIntrospector.INSTANCE)
                 .defaultNotNull(true)
-                .plugin(
-                        new JqwikPlugin()
-                                .javaArbitraryResolver(new JavaArbitraryResolver() {
-                                    @Override
-                                    public Arbitrary<String> strings(StringArbitrary stringArbitrary, ArbitraryGeneratorContext context) {
-//                                        if (context.findAnnotation(MaxOfLength.class).isPresent()) {
-//                                            return stringArbitrary.ofMaxLength(10);
-//                                        }
-                                        return stringArbitrary;
-                                    }
-                                })
-                )
                 .build();
     }
 
diff --git a/src/test/java/ddingdong/ddingdongBE/domain/form/entity/FormStatusTest.java b/src/test/java/ddingdong/ddingdongBE/domain/form/entity/FormStatusTest.java
diff --git a/src/test/java/ddingdong/ddingdongBE/domain/form/entity/FormTest.java b/src/test/java/ddingdong/ddingdongBE/domain/form/entity/FormTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.LocalDate;
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -135,4 +136,29 @@ void shouldUpdateExistingFields() {
                 .contains("옵션1", "옵션2", "새 옵션");
     }
 
+    @DisplayName("현재 날짜가 기간 내 포함된다면 알맞는 FormStatus를 반환한다.")
+    @Test
+    void isDateInRange() {
+        // given
+        LocalDate now = LocalDate.now();
+        LocalDate startDate = now.minusDays(1);
+        LocalDate endDate = now.plusDays(1);
+
+        Form form = Form.builder()
+                .title("테스트 폼")
+                .description("설명")
+                .startDate(startDate)
+                .endDate(endDate)
+                .hasInterview(false)
+                .sections(List.of())
+                .club(null)
+                .formFields(List.of())
+                .build();
+
+        // when
+        FormStatus formStatus = form.getFormStatus(now);
+
+        // then
+        Assertions.assertThat(formStatus).isEqualTo(FormStatus.ONGOING);
+    }
 }
diff --git a/src/test/java/ddingdong/ddingdongBE/domain/formapplication/repository/FormApplicationRepositoryTest.java b/src/test/java/ddingdong/ddingdongBE/domain/formapplication/repository/FormApplicationRepositoryTest.java
@@ -2,9 +2,8 @@
 
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.navercorp.fixturemonkey.FixtureMonkey;
+import ddingdong.ddingdongBE.common.fixture.FormApplicationFixture;
 import ddingdong.ddingdongBE.common.support.DataJpaTestSupport;
-import ddingdong.ddingdongBE.common.support.FixtureMonkeyFactory;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.DomainType;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.FileMetaData;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.FileStatus;
@@ -29,26 +28,19 @@ class FormApplicationRepositoryTest extends DataJpaTestSupport {
     @Autowired
     private FormAnswerRepository formAnswerRepository;
 
-    private FixtureMonkey fixtureMonkey = FixtureMonkeyFactory.getNotNullBuilderIntrospectorMonkey();
-
     @DisplayName("폼 지원서id와 FileMetaData의 entityId와 조인하여 정보를 조회한다")
     @Test
     void findAllFileApplicationInfo() {
         // given
-        FormApplication formApplication = fixtureMonkey.giveMeBuilder(FormApplication.class)
-                .set("name", "이름1")
-                .set("form", null)
-                .sample();
+        FormApplication formApplication = FormApplicationFixture.create("이름1", null);
         FormApplication savedFormApplication = formApplicationRepository.save(formApplication);
         FormAnswer formAnswer = FormAnswer.builder()
                 .formApplication(savedFormApplication)
                 .value(List.of())
                 .build();
         FormAnswer savedFormAnswer = formAnswerRepository.save(formAnswer);
-        FormApplication formApplication2 = fixtureMonkey.giveMeBuilder(FormApplication.class)
-                .set("name", "이름2")
-                .set("form", null)
-                .sample();
+        FormApplication formApplication2 = FormApplicationFixture.create("이름2", null);
+
         FormApplication savedFormApplication2 = formApplicationRepository.save(formApplication2);
         FormAnswer formAnswer2 = FormAnswer.builder()
                 .formApplication(savedFormApplication2)

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public class GeneralFormAnswerService implements FormAnswerService {`
`20`	`20`
`21`	`21`	`@Transactional`
`22`	`22`	`@Override`
`23`		`- public void createAll(List<FormAnswer> formAnswers) {`
`24`		`- formAnswerRepository.saveAll(formAnswers);`
	`23`	`+ public List<FormAnswer> createAll(List<FormAnswer> formAnswers) {`
	`24`	`+ return formAnswerRepository.saveAll(formAnswers);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`