[DDING-107] 최종 합격 지원자 동아리원 명단 등록 API 구현

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

@@ -4,6 +4,7 @@
 import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;
 import ddingdong.ddingdongBE.domain.scorehistory.entity.Score;
 import ddingdong.ddingdongBE.domain.user.entity.User;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -40,7 +41,7 @@ public class Club extends BaseEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
-    @OneToMany(mappedBy = "club")
+    @OneToMany(mappedBy = "club", cascade = CascadeType.ALL)
     private List<ClubMember> clubMembers = new ArrayList<>();
 
     private String name;
@@ -122,4 +123,9 @@ public BigDecimal editScore(Score score) {
         this.score = score;
         return this.score.getValue();
     }
+
+    public void addClubMember(ClubMember clubMember) {
+        this.clubMembers.add(clubMember);
+        clubMember.setClubFormConvenience(this);
+    }
 }

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

@@ -69,4 +69,8 @@ public void updateInformation(ClubMember updateClubMember) {
         this.position = updateClubMember.getPosition();
         this.department = updateClubMember.getDepartment();
     }
+
+    public void setClubFormConvenience(Club club) {
+        this.club = club;
+    }
 }

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

@@ -68,17 +68,20 @@ void deleteForm(
     @ResponseStatus(HttpStatus.OK)
     @SecurityRequirement(name = "AccessToken")
     @GetMapping("/my/forms")
-    List<FormListResponse> getAllMyForm(
-            @AuthenticationPrincipal PrincipalDetails principalDetails
-    );
+    List<FormListResponse> getAllMyForm(@AuthenticationPrincipal PrincipalDetails principalDetails);
 
     @Operation(summary = "동아리 지원 폼지 상세조회 API")
     @ApiResponse(responseCode = "200", description = "동아리 지원 폼지 상세조회 성공",
             content = @Content(schema = @Schema(implementation = FormResponse.class)))
     @ResponseStatus(HttpStatus.OK)
     @SecurityRequirement(name = "AccessToken")
     @GetMapping("/my/forms/{formId}")
-    FormResponse getForm(
-            @PathVariable("formId") Long formId
-    );
+    FormResponse getForm(@PathVariable("formId") Long formId);
+
+    @Operation(summary = "동아리 최종 합격 지원자 동아리원 명단 등록API")
+    @ApiResponse(responseCode = "200", description = "최종 합격 지원자 동아리원 명단 등록 성공")
+    @ResponseStatus(HttpStatus.CREATED)
+    @SecurityRequirement(name = "AccessToken")
+    @GetMapping("/my/forms/{formId}/members/register-applicants")
+    void registerMember(@PathVariable("formId") Long formId);
 }

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

@@ -58,4 +58,9 @@ public FormResponse getForm(Long formId) {
         FormQuery query = facadeCentralFormService.getForm(formId);
         return FormResponse.from(query);
     }
+
+    @Override
+    public void registerMember(Long formId) {
+        facadeCentralFormService.registerApplicantAsMember(formId);
+    }
 }

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

@@ -18,4 +18,6 @@ public interface FacadeCentralFormService {
     List<FormListQuery> getAllMyForm(User user);
 
     FormQuery getForm(Long formId);
+
+    void registerApplicantAsMember(Long formId);
 }

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

@@ -1,9 +1,12 @@
 package ddingdong.ddingdongBE.domain.form.service;
 
+import static ddingdong.ddingdongBE.domain.club.entity.Position.MEMBER;
+
 import ddingdong.ddingdongBE.common.exception.AuthenticationException.NonHaveAuthority;
 import ddingdong.ddingdongBE.common.utils.TimeUtils;
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.club.service.ClubService;
+import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.CreateFormCommand;
@@ -12,6 +15,8 @@
 import ddingdong.ddingdongBE.domain.form.service.dto.command.UpdateFormCommand.UpdateFormFieldCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.FormListQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.FormQuery;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
+import ddingdong.ddingdongBE.domain.formapplication.service.FormApplicationService;
 import ddingdong.ddingdongBE.domain.user.entity.User;
 import java.time.LocalDate;
 import java.util.List;
@@ -28,6 +33,7 @@ public class FacadeCentralFormServiceImpl implements FacadeCentralFormService {
     private final FormService formService;
     private final FormFieldService formFieldService;
     private final ClubService clubService;
+    private final FormApplicationService formApplicationService;
 
     @Transactional
     @Override
@@ -79,6 +85,23 @@ public FormQuery getForm(Long formId) {
         return FormQuery.of(form, formFields);
     }
 
+    @Override
+    @Transactional
+    public void registerApplicantAsMember(Long formId) {
+        List<FormApplication> finalPassedFormApplications = formApplicationService.getAllFinalPassedByFormId(formId);
+        finalPassedFormApplications.forEach(formApplication -> {
+            Club club = formApplication.getForm().getClub();
+            ClubMember clubMember = ClubMember.builder()
+                    .name(formApplication.getName())
+                    .studentNumber(formApplication.getStudentNumber())
+                    .department(formApplication.getDepartment())
+                    .phoneNumber(formApplication.getPhoneNumber())
+                    .position(MEMBER)
+                    .build();
+            club.addClubMember(clubMember);
+        });
+    }
+
     private FormListQuery buildFormListQuery(Form form) {
         boolean isActive = TimeUtils.isDateInRange(LocalDate.now(), form.getStartDate(), form.getEndDate());
         return FormListQuery.from(form, isActive);

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

@@ -26,6 +26,12 @@ public class FormApplication extends BaseEntity {
     @Column(nullable = false)
     private String department;
 
+    @Column(nullable = false)
+    private String phoneNumber;
+
+    @Column(nullable = false)
+    private String email;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false, name = "status")
     private FormApplicationStatus status;
@@ -34,10 +40,13 @@ public class FormApplication extends BaseEntity {
     private Form form;
 
     @Builder
-    private FormApplication(String name, String studentNumber, String department, FormApplicationStatus status, Form form) {
+    private FormApplication(String name, String studentNumber, String department, String phoneNumber, String email,
+                            FormApplicationStatus status, Form form) {
         this.name = name;
         this.studentNumber = studentNumber;
         this.department = department;
+        this.phoneNumber = phoneNumber;
+        this.email = email;
         this.status = status;
         this.form = form;
     }

src/main/java/ddingdong/ddingdongBE/domain/formapplication/repository/FormApplicationRepository.java

@@ -1,6 +1,7 @@
 package ddingdong.ddingdongBE.domain.formapplication.repository;
 
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
+import java.util.List;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -21,4 +22,7 @@ Slice<FormApplication> findPageByFormIdOrderById(
             @Param("currentCursorId") Long currentCursorId
     );
 
+    @Query(value = "select fa from FormApplication fa where fa.form.id = :formId and fa.status = 'FINAL_PASS'")
+    List<FormApplication> findAllFinalPassedByFormId(@Param("formId") Long formId);
+
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FormApplicationService.java

@@ -14,4 +14,6 @@ public interface FormApplicationService {
     FormApplication getById(Long applicationId);
 
     List<FormApplication> getAllById(List<Long> applicationIds);
+
+    List<FormApplication> getAllFinalPassedByFormId(Long formId);
 }

src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/GeneralFormApplicationService.java

@@ -37,6 +37,11 @@ public List<FormApplication> getAllById(List<Long> applicationIds) {
         return formApplicationRepository.findAllById(applicationIds);
     }
 
+    @Override
+    public List<FormApplication> getAllFinalPassedByFormId(Long formId) {
+        return formApplicationRepository.findAllFinalPassedByFormId(formId);
+    }
+
     @Override
     public FormApplication getById(Long applicationId) {
         return formApplicationRepository.findById(applicationId)

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

@@ -0,0 +1,5 @@
+ALTER TABLE form_application
+    ADD email VARCHAR(255) NULL;
+
+ALTER TABLE form_application
+    ADD phone_number VARCHAR(255) NULL;

src/test/java/ddingdong/ddingdongBE/domain/form/repository/FormApplicationRepositoryTest.java

@@ -1,5 +1,7 @@
 package ddingdong.ddingdongBE.domain.form.repository;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.navercorp.fixturemonkey.FixtureMonkey;
 import ddingdong.ddingdongBE.common.support.DataJpaTestSupport;
 import ddingdong.ddingdongBE.common.support.FixtureMonkeyFactory;
@@ -13,18 +15,15 @@
 import ddingdong.ddingdongBE.domain.user.entity.Role;
 import ddingdong.ddingdongBE.domain.user.entity.User;
 import ddingdong.ddingdongBE.domain.user.repository.UserRepository;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Slice;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 class FormApplicationRepositoryTest extends DataJpaTestSupport {
 
     @Autowired
@@ -98,7 +97,6 @@ void findPageByFormIdOrderById() {
         Form savedForm1 = formRepository.save(form1);
         Form savedForm2 = formRepository.save(form2);
 
-
         FormApplication formApplication1 = FormApplication.builder()
                 .name("지원자1")
                 .studentNumber("60201111")
@@ -138,15 +136,78 @@ void findPageByFormIdOrderById() {
                 .status(FormApplicationStatus.SUBMITTED)
                 .form(savedForm1)
                 .build();
-        formApplicationRepository.saveAll(List.of(formApplication1, formApplication2, formApplication3, formApplication4, formApplication5));
+        formApplicationRepository.saveAll(
+                List.of(formApplication1, formApplication2, formApplication3, formApplication4, formApplication5));
 
         int size = 2;
         Long currentCursorId = -1L;
         // when
-        Slice<FormApplication> newestFormApplications = formApplicationRepository.findPageByFormIdOrderById(savedForm1.getId(), size, currentCursorId);
+        Slice<FormApplication> newestFormApplications = formApplicationRepository.findPageByFormIdOrderById(
+                savedForm1.getId(), size, currentCursorId);
         // then
         List<FormApplication> retrievedApplications = newestFormApplications.getContent();
         assertThat(retrievedApplications.size()).isEqualTo(2);
         assertThat(retrievedApplications.get(0).getId()).isGreaterThan(retrievedApplications.get(1).getId());
     }
+
+    @DisplayName("최종 합격한 지원서를 폼 ID로 조회한다")
+    @Test
+    void findFinalPassApplicationsByFormId() {
+        //given
+        Form formA = formRepository.save(Form.builder()
+                .title("formA")
+                .startDate(LocalDate.now())
+                .endDate(LocalDate.now())
+                .hasInterview(false)
+                .sections(List.of())
+                .build());
+        Form formB = formRepository.save(Form.builder()
+                .title("formB")
+                .startDate(LocalDate.now())
+                .endDate(LocalDate.now())
+                .hasInterview(false)
+                .sections(List.of())
+                .build());
+
+        FormApplication applicationA = FormApplication.builder()
+                .name("nameA")
+                .studentNumber("test")
+                .department("test")
+                .phoneNumber("test")
+                .email("[email protected]")
+                .status(FormApplicationStatus.FINAL_PASS)
+                .form(formA)
+                .build();
+
+        FormApplication applicationB = FormApplication.builder()
+                .name("nameB")
+                .studentNumber("test")
+                .department("test")
+                .phoneNumber("test")
+                .email("[email protected]")
+                .status(FormApplicationStatus.SUBMITTED)
+                .form(formA)
+                .build();
+
+        FormApplication applicationC = FormApplication.builder()
+                .name("nameC")
+                .studentNumber("test")
+                .department("test")
+                .phoneNumber("test")
+                .email("[email protected]")
+                .status(FormApplicationStatus.FINAL_PASS)
+                .form(formB)
+                .build();
+
+        formApplicationRepository.saveAll(List.of(applicationA, applicationB, applicationC));
+
+        //when
+        List<FormApplication> result = formApplicationRepository.findAllFinalPassedByFormId(
+                formA.getId());
+
+        //then
+        assertThat(result).hasSize(1)
+                .extracting(FormApplication::getName)
+                .containsExactly("nameA");
+    }
 }