[DDING-001] 폼지 수정 로직 개선 (#294)

Author: 5uhwann

src/main/java/ddingdong/ddingdongBE/domain/club/entity/Club.java

@@ -117,7 +117,7 @@ public BigDecimal editScore(Score score) {
 
     public void addClubMember(ClubMember clubMember) {
         this.clubMembers.add(clubMember);
-        clubMember.setClubFormConvenience(this);
+        clubMember.setClubForConvenience(this);
     }
 
     public String getClubUrl() {

src/main/java/ddingdong/ddingdongBE/domain/clubmember/entity/ClubMember.java

@@ -70,7 +70,7 @@ public void updateInformation(ClubMember updateClubMember) {
         this.department = updateClubMember.getDepartment();
     }
 
-    public void setClubFormConvenience(Club club) {
+    public void setClubForConvenience(Club club) {
         this.club = club;
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/controller/dto/request/UpdateFormRequest.java

@@ -39,6 +39,9 @@ public record UpdateFormRequest(
 ) {
 
     record UpdateFormFieldRequest(
+            @Schema(description = "폼지 질문 식별자", example = "1")
+            Long id,
+
             @Schema(description = "폼지 질문", example = "우리 동아리 들어올겁니까?")
             @NotNull(message = "질문는 null이 될 수 없습니다.")
             String question,
@@ -65,6 +68,7 @@ record UpdateFormFieldRequest(
 
         public UpdateFormFieldCommand toCommand() {
             return UpdateFormFieldCommand.builder()
+                    .id(id)
                     .question(question)
                     .type(FieldType.findType(type))
                     .options(options)

src/main/java/ddingdong/ddingdongBE/domain/form/controller/dto/response/FormResponse.java

@@ -29,6 +29,8 @@ public record FormResponse(
 
     @Builder
     record FormFieldListResponse(
+            @Schema(description = "폼지 질문 식별자", example = "1")
+            Long id,
             @Schema(description = "폼지 질문", example = "당신의 이름은?")
             String question,
             @Schema(description = "폼지 질문 유형", example = "CHECK_BOX")
@@ -45,6 +47,7 @@ record FormFieldListResponse(
 
         public static FormFieldListResponse from(FormFieldListQuery formFieldListQuery) {
             return FormFieldListResponse.builder()
+                    .id(formFieldListQuery.id())
                     .question(formFieldListQuery.question())
                     .type(formFieldListQuery.type())
                     .options(formFieldListQuery.options())

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

@@ -3,6 +3,7 @@
 import ddingdong.ddingdongBE.common.BaseEntity;
 import ddingdong.ddingdongBE.common.converter.StringListConverter;
 import ddingdong.ddingdongBE.domain.club.entity.Club;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
@@ -11,8 +12,12 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -48,6 +53,9 @@ public class Form extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     private Club club;
 
+    @OneToMany(mappedBy = "form", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<FormField> formFields = new ArrayList<>();
+
     @Builder
     private Form(
             String title,
@@ -56,7 +64,8 @@ private Form(
             LocalDate endDate,
             boolean hasInterview,
             List<String> sections,
-            Club club
+            Club club,
+            List<FormField> formFields
     ) {
         this.title = title;
         this.description = description;
@@ -65,6 +74,12 @@ private Form(
         this.hasInterview = hasInterview;
         this.sections = sections;
         this.club = club;
+        this.formFields = formFields;
+    }
+
+    public void addFormFields(FormField formField) {
+        this.formFields.add(formField);
+        formField.setFormForConvenience(this);
     }
 
     public void update(Form updateForm) {
@@ -80,6 +95,31 @@ public boolean isEqualsById(Long formId) {
         return this.id.equals(formId);
     }
 
+    public void updateFormFields(List<FormField> updatedFormFields) {
+        // 삭제될 폼 필드
+        List<FormField> deletedFormFields = this.formFields.stream()
+                .filter(formField -> updatedFormFields.stream()
+                        .filter(updatedFormField -> updatedFormField.getId() != null)
+                        .noneMatch(updatedField -> updatedField.getId().equals(formField.getId())))
+                .toList();
+        this.formFields.removeAll(deletedFormFields);
+
+        Map<Long, FormField> existingFieldMap = this.formFields.stream()
+                .collect(Collectors.toMap(FormField::getId, field -> field));
+
+        // 추가 및 업데이트
+        for (FormField updatedField : updatedFormFields) {
+            if (updatedField.getId() == null || !existingFieldMap.containsKey(updatedField.getId())) {
+                // 추가
+                addFormFields(updatedField);
+            } else {
+                // 업데이트
+                FormField existingField = existingFieldMap.get(updatedField.getId());
+                existingField.update(updatedField);
+            }
+        }
+    }
+
     public void updateEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }

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

@@ -23,61 +23,76 @@
 @Getter
 public class FormField extends BaseEntity {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
-
-  @Column(nullable = false)
-  private String question;
-
-  @Column(nullable = false)
-  private boolean required;
-
-  @Column(nullable = false)
-  private int fieldOrder;
-
-  @Column(nullable = false)
-  private String section;
-
-  @Convert(converter = StringListConverter.class)
-  private List<String> options;
-
-  @Enumerated(EnumType.STRING)
-  @Column(nullable = false)
-  private FieldType fieldType;
-
-  @ManyToOne(fetch = FetchType.LAZY)
-  private Form form;
-
-  @Builder
-  private FormField(
-      String question,
-      FieldType fieldType,
-      boolean required,
-      int fieldOrder,
-      String section,
-      List<String> options,
-      Form form
-  ) {
-    this.question = question;
-    this.fieldType = fieldType;
-    this.required = required;
-    this.fieldOrder = fieldOrder;
-    this.section = section;
-    this.options = options;
-    this.form = form;
-  }
-
-  public boolean isMultipleChoice() {
-    return this.fieldType == FieldType.CHECK_BOX || this.fieldType == FieldType.RADIO;
-  }
-
-  public boolean isTextType() {
-    return this.fieldType == FieldType.TEXT || this.fieldType == FieldType.LONG_TEXT
-            || this.fieldType == FieldType.FILE;
-  }
-
-  public boolean isFile() {
-    return this.fieldType == FieldType.FILE;
-  }
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String question;
+
+    @Column(nullable = false)
+    private boolean required;
+
+    @Column(nullable = false)
+    private int fieldOrder;
+
+    @Column(nullable = false)
+    private String section;
+
+    @Convert(converter = StringListConverter.class)
+    private List<String> options;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private FieldType fieldType;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Form form;
+
+    @Builder
+    private FormField(
+            Long id,
+            String question,
+            FieldType fieldType,
+            boolean required,
+            int fieldOrder,
+            String section,
+            List<String> options,
+            Form form
+    ) {
+        this.id = id;
+        this.question = question;
+        this.fieldType = fieldType;
+        this.required = required;
+        this.fieldOrder = fieldOrder;
+        this.section = section;
+        this.options = options;
+        this.form = form;
+    }
+
+    public boolean isMultipleChoice() {
+        return this.fieldType == FieldType.CHECK_BOX || this.fieldType == FieldType.RADIO;
+    }
+
+    public boolean isTextType() {
+        return this.fieldType == FieldType.TEXT || this.fieldType == FieldType.LONG_TEXT
+                || this.fieldType == FieldType.FILE;
+    }
+
+    public boolean isFile() {
+        return this.fieldType == FieldType.FILE;
+    }
+
+    public void setFormForConvenience(Form form) {
+        this.form = form;
+    }
+
+    public void update(FormField updatedField) {
+        this.question = updatedField.getQuestion();
+        this.fieldType = updatedField.getFieldType();
+        this.required = updatedField.isRequired();
+        this.fieldOrder = updatedField.getFieldOrder();
+        this.section = updatedField.getSection();
+        this.options = updatedField.getOptions();
+    }
 }

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

@@ -83,12 +83,8 @@ public void updateForm(UpdateFormCommand command) {
         Form updateForm = command.toEntity();
         originform.update(updateForm);
 
-        List<FormField> originFormFields = formFieldService.findAllByForm(originform);
-        formFieldService.deleteAll(originFormFields);
-
-        List<FormField> updateFormFields = toUpdateFormFields(originform,
-                command.formFieldCommands());
-        formFieldService.createAll(updateFormFields);
+        List<FormField> updatedFormFields = toUpdateFormFields(originform, command.formFieldCommands());
+        originform.updateFormFields(updatedFormFields);
     }
 
     @Transactional

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

@@ -23,6 +23,7 @@ public record UpdateFormCommand(
 
     @Builder
     public record UpdateFormFieldCommand(
+            Long id,
             String question,
             FieldType type,
             List<String> options,
@@ -33,6 +34,7 @@ public record UpdateFormFieldCommand(
 
         public FormField toEntity(Form form) {
             return FormField.builder()
+                    .id(id)
                     .form(form)
                     .question(question)
                     .fieldType(type)

src/main/java/ddingdong/ddingdongBE/domain/formapplication/entity/FormAnswer.java

@@ -4,6 +4,7 @@
 import ddingdong.ddingdongBE.common.converter.StringListConverter;
 import ddingdong.ddingdongBE.domain.form.entity.FieldType;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
+import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -12,22 +13,28 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLRestriction;
 
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
+@SQLDelete(sql = "update form_answer set deleted_at = CURRENT_TIMESTAMP where id=?")
+@SQLRestriction("deleted_at IS NULL")
 public class FormAnswer extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @Convert(converter = StringListConverter.class)
+    @Column(columnDefinition = "TEXT")
     private List<String> value;
 
     @JoinColumn(name = "application_id")
@@ -38,11 +45,20 @@ public class FormAnswer extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     private FormField formField;
 
+    @Column(columnDefinition = "TIMESTAMP")
+    private LocalDateTime deletedAt;
+
     @Builder
-    private FormAnswer(List<String> value, FormApplication formApplication, FormField formField) {
+    private FormAnswer(
+            List<String> value,
+            FormApplication formApplication,
+            FormField formField,
+            LocalDateTime deletedAt
+    ) {
         this.value = value;
         this.formApplication = formApplication;
         this.formField = formField;
+        this.deletedAt = deletedAt;
     }
 
     public boolean isFile() {