[DDING-87] 동아리 지원 폼지 삭제 API 구현 (#232)

Author: KoSeonJe

src/main/java/ddingdong/ddingdongBE/common/exception/AuthenticationException.java

@@ -7,6 +7,7 @@ sealed public class AuthenticationException extends CustomException {
     public static final String UNREGISTERED_ID_ERROR_MESSAGE = "등록되지 않은 ID입니다.";
     public static final String INVALIDATED_PASSWORD_ERROR_MESSAGE = "잘못된 비밀번호입니다.";
     public static final String NON_EXIST_USER_ROLE_ERROR_MESSAGE = "유저 권한이 존재하지 않습니다.";
+    public static final String NON_HAVE_AUTHORITY_MESSAGE = "해당 유저에게 권한이 없습니다.";
 
     public AuthenticationException(String message, int errorCode) {
         super(message, errorCode);
@@ -32,4 +33,11 @@ public NonExistUserRole() {
             super(NON_EXIST_USER_ROLE_ERROR_MESSAGE, UNAUTHORIZED.value());
         }
     }
+
+    public static final class NonHaveAuthority extends AuthenticationException {
+
+        public NonHaveAuthority() {
+            super(NON_HAVE_AUTHORITY_MESSAGE, UNAUTHORIZED.value());
+        }
+    }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/api/CentralFormApi.java

@@ -7,8 +7,10 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -26,7 +28,7 @@ public interface CentralFormApi {
     @SecurityRequirement(name = "AccessToken")
     @PostMapping("/my/forms")
     void createForm(
-            @RequestBody CreateFormRequest createFormRequest,
+            @Valid @RequestBody CreateFormRequest createFormRequest,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     );
 
@@ -36,7 +38,17 @@ void createForm(
     @SecurityRequirement(name = "AccessToken")
     @PutMapping("/my/forms/{formId}")
     void updateForm(
-            @RequestBody UpdateFormRequest updateFormRequest,
+            @Valid @RequestBody UpdateFormRequest updateFormRequest,
+            @PathVariable("formId") Long formId,
+            @AuthenticationPrincipal PrincipalDetails principalDetails
+    );
+
+    @Operation(summary = "동아리 지원 폼지 삭제 API")
+    @ApiResponse(responseCode = "204", description = "동아리 지원 폼지 삭제 성공")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @SecurityRequirement(name = "AccessToken")
+    @DeleteMapping("/my/forms/{formId}")
+    void deleteForm(
             @PathVariable("formId") Long formId,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     );

src/main/java/ddingdong/ddingdongBE/domain/form/controller/CentralFormController.java

@@ -32,4 +32,10 @@ public void updateForm(
     ) {
         facadeCentralFormService.updateForm(updateFormRequest.toCommand(formId));
     }
+
+    @Override
+    public void deleteForm(Long formId, PrincipalDetails principalDetails) {
+        User user = principalDetails.getUser();
+        facadeCentralFormService.deleteForm(formId, user);
+    }
 }

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

@@ -2,10 +2,13 @@
 
 import ddingdong.ddingdongBE.domain.form.service.dto.command.CreateFormCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.UpdateFormCommand;
+import ddingdong.ddingdongBE.domain.user.entity.User;
 
 public interface FacadeCentralFormService {
 
     void createForm(CreateFormCommand command);
 
     void updateForm(UpdateFormCommand command);
+
+    void deleteForm(Long formId, User user);
 }

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

@@ -1,5 +1,6 @@
 package ddingdong.ddingdongBE.domain.form.service;
 
+import ddingdong.ddingdongBE.common.exception.AuthenticationException.NonHaveAuthority;
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.club.service.ClubService;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
@@ -8,7 +9,9 @@
 import ddingdong.ddingdongBE.domain.form.service.dto.command.CreateFormCommand.CreateFormFieldCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.UpdateFormCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.UpdateFormCommand.UpdateFormFieldCommand;
+import ddingdong.ddingdongBE.domain.user.entity.User;
 import java.util.List;
+import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +50,21 @@ public void updateForm(UpdateFormCommand updateFormCommand) {
         formFieldService.createAll(updateFormFields);
     }
 
+    @Transactional
+    @Override
+    public void deleteForm(Long formId, User user) {
+        Club club = clubService.getByUserId(user.getId());
+        Form form = formService.getById(formId);
+        validateEqualsClub(club, form);
+        formService.delete(form); //테이블 생성 시 외래 키에 cascade 설정하여 formField 삭제도 자동으로 됨.
+    }
+
+    private void validateEqualsClub(Club club, Form form) {
+        if (!Objects.equals(club.getId(), form.getClub().getId())) {
+            throw new NonHaveAuthority();
+        }
+    }
+
     private List<FormField> toUpdateFormFields(Form originform, List<UpdateFormFieldCommand> updateFormFieldCommands) {
         return updateFormFieldCommands.stream()
                 .map(formFieldCommand -> formFieldCommand.toEntity(originform))

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

@@ -7,4 +7,6 @@ public interface FormService {
     Form create(Form form);
 
     Form getById(Long formId);
+
+    void delete(Form form);
 }

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

@@ -1,11 +1,10 @@
 package ddingdong.ddingdongBE.domain.form.service;
 
+import ddingdong.ddingdongBE.common.exception.PersistenceException.ResourceNotFound;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
 import ddingdong.ddingdongBE.domain.form.repository.FormFieldRepository;
 import java.util.List;
-import java.util.Optional;
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,8 +26,9 @@ public void createAll(List<FormField> formFields) {
     @Override
     public FormField getById(Long id) {
         return formFieldRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("해당 field를 id로 찾을 수 없습니다: " + id));
-   
+                .orElseThrow(() -> new ResourceNotFound("FormField(fieldId=" + id + ")를 찾을 수 없습니다."));
+    }
+
     @Override
     public List<FormField> findAllByForm(Form form) {
         return formFieldRepository.findAllByForm(form);

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

@@ -25,4 +25,10 @@ public Form getById(Long formId) {
         return formRepository.findById(formId)
                 .orElseThrow(() -> new ResourceNotFound("Form(formId=" + formId + ")를 찾을 수 없습니다."));
     }
+
+    @Transactional
+    @Override
+    public void delete(Form form) {
+        formRepository.delete(form);
+    }
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplicaion/controller/UserFormController.java

@@ -14,6 +14,6 @@ public class UserFormController implements UserFormApi {
 
     @Override
     public void createFormResponse(Long formId, CreateFormApplicationRequest createFormApplicationRequest) {
-        facadeUserFormService.createFormApplication(formId, createFormApplicationRequest.toCommand());
+        facadeUserFormService.createFormApplication(createFormApplicationRequest.toCommand(formId));
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplicaion/controller/dto/request/CreateFormApplicationRequest.java

@@ -42,11 +42,12 @@ public CreateFormAnswerCommand toCommand() {
         }
     }
 
-    public CreateFormApplicationCommand toCommand() {
+    public CreateFormApplicationCommand toCommand(Long formId) {
         List<CreateFormAnswerCommand> createFormAnswerCommands = formAnswers.stream()
                 .map(CreateFormAnswerRequest::toCommand)
                 .toList();
         return CreateFormApplicationCommand.builder()
+                .formId(formId)
                 .name(name)
                 .studentNumber(studentNumber)
                 .department(department)

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

@@ -2,14 +2,20 @@
 
 import ddingdong.ddingdongBE.common.BaseEntity;
 import ddingdong.ddingdongBE.common.converter.StringListConverter;
-import ddingdong.ddingdongBE.domain.form.entity.FieldType;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
-import jakarta.persistence.*;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import java.util.List;
 
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -20,13 +26,14 @@ public class FormAnswer extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false)
     @Convert(converter = StringListConverter.class)
     private List<String> value;
 
+    @JoinColumn(name = "application_id")
     @ManyToOne(fetch = FetchType.LAZY)
     private FormApplication formApplication;
 
+    @JoinColumn(name = "field_id")
     @ManyToOne(fetch = FetchType.LAZY)
     private FormField formField;
 

src/main/java/ddingdong/ddingdongBE/domain/formapplicaion/service/FacadeUserFormService.java

@@ -4,6 +4,6 @@
 
 public interface FacadeUserFormService {
 
-    void createFormApplication(Long formId, CreateFormApplicationCommand createFormApplicationCommand);
+    void createFormApplication(CreateFormApplicationCommand createFormApplicationCommand);
 
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplicaion/service/FacadeUserFormServiceImpl.java

@@ -1,19 +1,17 @@
 package ddingdong.ddingdongBE.domain.formapplicaion.service;
 
 import ddingdong.ddingdongBE.domain.form.entity.Form;
-import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormAnswer;
-import ddingdong.ddingdongBE.domain.form.entity.FormField;
-import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormApplication;
 import ddingdong.ddingdongBE.domain.form.service.FormFieldService;
 import ddingdong.ddingdongBE.domain.form.service.FormService;
+import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormAnswer;
+import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormApplication;
 import ddingdong.ddingdongBE.domain.formapplicaion.service.dto.CreateFormApplicationCommand;
 import ddingdong.ddingdongBE.domain.formapplicaion.service.dto.CreateFormApplicationCommand.CreateFormAnswerCommand;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -26,21 +24,22 @@ public class FacadeUserFormServiceImpl implements FacadeUserFormService {
 
     @Transactional
     @Override
-    public void createFormApplication(Long formId, CreateFormApplicationCommand createFormApplicationCommand) {
-        Form form = formService.getById(formId);
+    public void createFormApplication(CreateFormApplicationCommand createFormApplicationCommand) {
+        Form form = formService.getById(createFormApplicationCommand.formId());
         FormApplication formApplication = createFormApplicationCommand.toEntity(form);
         FormApplication savedFormApplication = formApplicationService.create(formApplication);
 
         List<FormAnswer> formAnswers = toFormAnswers(savedFormApplication, createFormApplicationCommand.formAnswerCommands());
         formAnswerService.createAll(formAnswers);
     }
 
-    private List<FormAnswer> toFormAnswers(FormApplication savedFormApplication, List<CreateFormAnswerCommand> createFormAnswerCommands) {
+    private List<FormAnswer> toFormAnswers(
+            FormApplication savedFormApplication,
+            List<CreateFormAnswerCommand> createFormAnswerCommands
+    ) {
         return createFormAnswerCommands.stream()
-                .map(formAnswerCommand -> {
-                    FormField formField = formFieldService.getById(formAnswerCommand.fieldId());
-                    return formAnswerCommand.toEntity(savedFormApplication, formField);
-                })
+                .map(formAnswerCommand
+                        -> formAnswerCommand.toEntity(savedFormApplication, formFieldService.getById(formAnswerCommand.fieldId())))
                 .toList();
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplicaion/service/dto/CreateFormApplicationCommand.java

@@ -1,18 +1,16 @@
 package ddingdong.ddingdongBE.domain.formapplicaion.service.dto;
 
-import ddingdong.ddingdongBE.domain.form.entity.FieldType;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
-import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormAnswer;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
+import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormAnswer;
 import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormApplication;
 import ddingdong.ddingdongBE.domain.formapplicaion.entity.FormApplicationStatus;
-import lombok.Builder;
-
 import java.util.List;
+import lombok.Builder;
 
 @Builder
 public record CreateFormApplicationCommand(
-        Form form,
+        Long formId,
         String name,
         String studentNumber,
         String department,
@@ -22,8 +20,7 @@ public record CreateFormApplicationCommand(
     @Builder
     public record CreateFormAnswerCommand(
             Long fieldId,
-            List<String> value,
-            FieldType valueType
+            List<String> value
     ) {
         public FormAnswer toEntity(FormApplication formApplication, FormField formField) {
             return FormAnswer.builder()

src/main/resources/db/migration/V35_create_form_response_and_answer_table.sql

@@ -1,25 +1,23 @@
-CREATE TABLE form_response
+CREATE TABLE form_application
 (
     id             BIGINT       NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    submitted_at   TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
     name           VARCHAR(50)  NOT NULL,
     student_number VARCHAR(50)  NOT NULL,
     status         VARCHAR(50)  NOT NULL,
     form_id        BIGINT,
     created_at     TIMESTAMP DEFAULT CURRENT_TIMESTAMP NULL,
     updated_at     TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NULL,
-    CONSTRAINT fk_response_form FOREIGN KEY (form_id) REFERENCES form (id) ON DELETE CASCADE
+    CONSTRAINT fk_application_form FOREIGN KEY (form_id) REFERENCES form (id) ON DELETE CASCADE
 );
 
 CREATE TABLE form_answer
 (
     id             BIGINT       NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    value          VARCHAR(1500) NULL,
-    value_type     VARCHAR(50)  NOT NULL,
-    response_id    BIGINT,
+    value          TEXT NULL,
+    application_id    BIGINT,
     field_id       BIGINT,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NULL,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NULL,
-    CONSTRAINT fk_answer_response FOREIGN KEY (response_id) REFERENCES form_response (id) ON DELETE CASCADE,
+    CONSTRAINT fk_answer_application FOREIGN KEY (application_id) REFERENCES form_application (id) ON DELETE CASCADE,
     CONSTRAINT fk_answer_field FOREIGN KEY (field_id) REFERENCES form_field (id) ON DELETE CASCADE
 );