[DDING-000] 폼지 섹션별 생성 조회 롤백 (#298)

Author: Seooooo24

src/main/java/ddingdong/ddingdongBE/domain/form/entity/Form.java

@@ -123,8 +123,4 @@ public void updateFormFields(List<FormField> updatedFormFields) {
     public void updateEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
-
-    public boolean isLargerSectionThan(int sectionSize) {
-        return this.sections.size() > sectionSize;
-    }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/entity/FormField.java

@@ -13,7 +13,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import java.util.List;
-import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -23,8 +22,6 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class FormField extends BaseEntity {
-    private static final String COMMON_SECTION = "공통";
-    private static final int SINGLE_SECTION_SIZE = 1;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -98,32 +95,4 @@ public void update(FormField updatedField) {
         this.section = updatedField.getSection();
         this.options = updatedField.getOptions();
     }
-
-    public Stream<FormField> generateFormFieldsBySection(Form form) {
-        if (form.isLargerSectionThan(SINGLE_SECTION_SIZE)) {
-            return expandCommonSectionFormField(form);
-        }
-        return Stream.of(this);
-    }
-
-    private Stream<FormField> expandCommonSectionFormField(Form form) {
-        if (this.section.equals(COMMON_SECTION)) {
-            return form.getSections().stream()
-                    .filter(section -> !section.equals(COMMON_SECTION))
-                    .map(this::copyWithSection);
-        }
-        return Stream.of(this);
-    }
-
-    private FormField copyWithSection(String newSection) {
-        return FormField.builder()
-                .question(this.question)
-                .fieldType(this.fieldType)
-                .required(this.required)
-                .fieldOrder(this.fieldOrder)
-                .section(newSection)
-                .options(this.options)
-                .form(this.form)
-                .build();
-    }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/repository/FormFieldRepository.java

@@ -30,10 +30,11 @@ SELECT f.id AS id, f.question AS question, f.field_type AS type, f.section AS se
             SELECT *
               FROM form_field f
               WHERE f.form_id = :formId 
-                AND f.section = :section
+                AND (f.section = :section OR f.section = :defaultSection)
             """, nativeQuery = true)
     List<FormField> findAllByFormAndSection(
             @Param("formId") Long formId,
-            @Param("section") String section
+            @Param("section") String section,
+            @Param("defaultSection") String defaultSection
     );
 }

src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java

@@ -263,7 +263,6 @@ private List<FormField> toCreateFormFields(Form savedForm,
             List<CreateFormFieldCommand> createFormFieldCommands) {
         return createFormFieldCommands.stream()
                 .map(formFieldCommand -> formFieldCommand.toEntity(savedForm))
-                .flatMap(formField -> formField.generateFormFieldsBySection(savedForm))
                 .toList();
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/service/GeneralFormFieldService.java

@@ -14,25 +14,28 @@
 @Transactional(readOnly = true)
 public class GeneralFormFieldService implements FormFieldService {
 
-  private final FormFieldRepository formFieldRepository;
+    private static final String FORM_DEFAULT_SECTION = "공통";
 
-  @Transactional
-  @Override
-  public void createAll(List<FormField> formFields) {
-    formFieldRepository.saveAll(formFields);
-  }
+    private final FormFieldRepository formFieldRepository;
+
+    @Transactional
+    @Override
+    public void createAll(List<FormField> formFields) {
+        formFieldRepository.saveAll(formFields);
+    }
 
 
-  @Override
-  public FormField getById(Long id) {
-    return formFieldRepository.findById(id)
-        .orElseThrow(() -> new ResourceNotFound("FormField(fieldId=" + id + ")를 찾을 수 없습니다."));
-  }
+    @Override
+    public FormField getById(Long id) {
+        return formFieldRepository.findById(id)
+                .orElseThrow(
+                        () -> new ResourceNotFound("FormField(fieldId=" + id + ")를 찾을 수 없습니다."));
+    }
 
-  @Override
-  public List<FormField> findAllByForm(Form form) {
-    return formFieldRepository.findAllByForm(form);
-  }
+    @Override
+    public List<FormField> findAllByForm(Form form) {
+        return formFieldRepository.findAllByForm(form);
+    }
 
     @Transactional
     @Override
@@ -42,6 +45,7 @@ public void deleteAll(List<FormField> originFormFields) {
 
     @Override
     public List<FormField> getAllByFormAndSection(Form form, String section) {
-        return formFieldRepository.findAllByFormAndSection(form.getId(), section);
+        return formFieldRepository.findAllByFormAndSection(form.getId(), section,
+                FORM_DEFAULT_SECTION);
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/service/dto/command/CreateFormCommand.java

@@ -42,19 +42,6 @@ public FormField toEntity(Form savedForm) {
                     .form(savedForm)
                     .build();
         }
-
-        public FormField toEntityWithSection(Form savedForm, String section) {
-            return FormField.builder()
-                    .question(question)
-                    .fieldType(type)
-                    .options(options)
-                    .required(required)
-                    .fieldOrder(order)
-                    .section(section)
-                    .form(savedForm)
-                    .build();
-        }
-
     }
 
     public Form toEntity(Club club) {