[DDING-133] 지원자 동아리 명단 연동시 기존 인원 초기화 로직 구현 (#312)

Author: KoSeonJe

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

@@ -123,4 +123,9 @@ public void addClubMember(ClubMember clubMember) {
     public String getClubUrl() {
         return DDINDONG_SERVICE_CLUB_URL + id;
     }
+
+    public void addClubMembers(List<ClubMember> clubMembers) {
+        this.clubMembers.addAll(clubMembers);
+        clubMembers.forEach(clubMember -> clubMember.setClubForConvenience(this));
+    }
 }

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

@@ -1,8 +1,11 @@
 package ddingdong.ddingdongBE.domain.clubmember.entity;
 
+import static ddingdong.ddingdongBE.domain.club.entity.Position.MEMBER;
+
 import ddingdong.ddingdongBE.common.BaseEntity;
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.club.entity.Position;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -64,6 +67,16 @@ public ClubMember(Long id, Club club, String name, String studentNumber, String
         this.department = department;
     }
 
+    public static ClubMember createFromFormApplication(FormApplication formApplication) {
+        return ClubMember.builder()
+                .name(formApplication.getName())
+                .studentNumber(formApplication.getStudentNumber())
+                .department(formApplication.getDepartment())
+                .phoneNumber(formApplication.getPhoneNumber())
+                .position(MEMBER)
+                .build();
+    }
+
     public void updateInformation(ClubMember updateClubMember) {
         this.name = updateClubMember.getName();
         this.studentNumber = updateClubMember.getStudentNumber();

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

@@ -117,7 +117,10 @@ FormStatisticsResponse getFormStatistics(
     @ResponseStatus(HttpStatus.CREATED)
     @SecurityRequirement(name = "AccessToken")
     @PostMapping("/my/forms/{formId}/members/register-applicants")
-    void registerMembers(@PathVariable("formId") Long formId);
+    void registerMembers(
+            @AuthenticationPrincipal PrincipalDetails principalDetails,
+            @PathVariable("formId") Long formId
+    );
 
     @Operation(summary = "동아리 지원 결과 이메일 전송 API")
     @ApiResponse(responseCode = "201", description = "동아리 지원 결과 이메일 전송 성공")

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

@@ -92,8 +92,9 @@ public SingleFieldStatisticsResponse getTextFieldStatistics(Long fieldId) {
     }
 
     @Override
-    public void registerMembers(Long formId) {
-        facadeCentralFormService.registerApplicantAsMember(formId);
+    public void registerMembers(PrincipalDetails principalDetails, Long formId) {
+        Long userId = principalDetails.getUser().getId();
+        facadeCentralFormService.registerApplicantAsMember(userId, formId);
     }
 
     @Override

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

@@ -28,7 +28,7 @@ public interface FacadeCentralFormService {
 
     MultipleFieldStatisticsQuery getMultipleFieldStatistics(Long fieldId);
 
-    void registerApplicantAsMember(Long formId);
+    void registerApplicantAsMember(Long userId, Long formId);
 
     SingleFieldStatisticsQuery getTextFieldStatistics(Long fieldId);
 

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

@@ -1,14 +1,13 @@
 package ddingdong.ddingdongBE.domain.form.service;
 
-import static ddingdong.ddingdongBE.domain.club.entity.Position.MEMBER;
-
 import ddingdong.ddingdongBE.common.exception.FormException.InvalidFieldTypeException;
 import ddingdong.ddingdongBE.common.exception.FormException.InvalidFormEndDateException;
 import ddingdong.ddingdongBE.common.exception.FormException.NonHaveFormAuthority;
 import ddingdong.ddingdongBE.common.exception.FormException.OverlapFormPeriodException;
 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.clubmember.service.ClubMemberService;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.FileMetaData;
 import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
@@ -62,6 +61,7 @@ public class FacadeCentralFormServiceImpl implements FacadeCentralFormService {
     private final SesEmailService sesEmailService;
     private final FormAnswerService formAnswerService;
     private final FileMetaDataService fileMetaDataService;
+    private final ClubMemberService clubMemberService;
 
     @Transactional
     @Override
@@ -153,19 +153,17 @@ public MultipleFieldStatisticsQuery getMultipleFieldStatistics(Long fieldId) {
 
     @Override
     @Transactional
-    public void registerApplicantAsMember(Long formId) {
+    public void registerApplicantAsMember(Long userId, Long formId) {
+        Club club = clubService.getByUserId(userId);
+        List<ClubMember> originClubMembers = club.getClubMembers();
+        clubMemberService.deleteAll(originClubMembers);
+
         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);
-        });
+        List<ClubMember> finalPassedClubMembers = finalPassedFormApplications.stream()
+                .map(ClubMember::createFromFormApplication)
+                .toList();
+        club.addClubMembers(finalPassedClubMembers);
+        clubMemberService.saveAll(finalPassedClubMembers);
     }
 
     @Override

…lubmember/service/ClubMemberFixture.java …BE/common/fixture/ClubMemberFixture.javasrc/test/java/ddingdong/ddingdongBE/domain/clubmember/service/ClubMemberFixture.java renamed to src/test/java/ddingdong/ddingdongBE/common/fixture/ClubMemberFixture.java src/test/java/ddingdong/ddingdongBE/domain/clubmember/service/ClubMemberFixture.java renamed to src/test/java/ddingdong/ddingdongBE/common/fixture/ClubMemberFixture.java

@@ -1,4 +1,4 @@
-package ddingdong.ddingdongBE.domain.clubmember.service;
+package ddingdong.ddingdongBE.common.fixture;
 
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;

src/test/java/ddingdong/ddingdongBE/common/fixture/FormFixture.java

@@ -1,14 +1,28 @@
 package ddingdong.ddingdongBE.common.fixture;
 
+import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.form.entity.FieldType;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormAnswer;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationStatus;
 import java.time.LocalDate;
 import java.util.List;
 
 public class FormFixture {
 
+    public static Form createForm(Club club) {
+        return Form.builder()
+                .title("모집 지원서")
+                .description("동아리 모집을 위한 지원서입니다.")
+                .startDate(LocalDate.of(2025, 4, 1))
+                .endDate(LocalDate.of(2025, 4, 15))
+                .hasInterview(true)
+                .sections(List.of("자기소개", "지원 동기", "경력 및 경험"))
+                .build();
+    }
+
     public static Form formWithClubNull() {
         return Form.builder()
                 .title("모집 지원서")
@@ -38,4 +52,16 @@ public static FormAnswer formAnswerByFormField(FormField savedFormField) {
                 .formField(savedFormField)
                 .build();
     }
+
+    public static FormApplication createFormApplicationFinalPass(Form form) {
+        return FormApplication.builder()
+                .name("김철수")
+                .studentNumber("60191234")
+                .department("컴퓨터공학과")
+                .phoneNumber("010-1234-5678")
+                .email("chulsoo.kim@mju.ac.kr")
+                .status(FormApplicationStatus.FINAL_PASS) // 또는 적절한 enum 값
+                .form(form) // 기존에 생성된 Form 객체
+                .build();
+    }
 }

src/test/java/ddingdong/ddingdongBE/domain/club/service/FacadeCentralClubServiceImplTest.java

@@ -16,6 +16,7 @@
 import ddingdong.ddingdongBE.domain.filemetadata.entity.FileMetaData;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.FileStatus;
 import ddingdong.ddingdongBE.domain.filemetadata.repository.FileMetaDataRepository;
+import ddingdong.ddingdongBE.domain.form.repository.FormRepository;
 import ddingdong.ddingdongBE.domain.scorehistory.entity.Score;
 import ddingdong.ddingdongBE.domain.user.entity.User;
 import ddingdong.ddingdongBE.domain.user.repository.UserRepository;
@@ -40,6 +41,8 @@ class FacadeCentralClubServiceImplTest extends TestContainerSupport {
     private FileMetaDataRepository fileMetaDataRepository;
 
     private final FixtureMonkey fixture = FixtureMonkeyFactory.getNotNullBuilderIntrospectorMonkey();
+    @Autowired
+    private FormRepository formRepository;
 
     @DisplayName("중앙동아리: 내 동아리 정보 조회")
     @Test
@@ -120,5 +123,4 @@ void updateClubInfo() {
         Club result = clubRepository.findById(savedClub.getId()).orElseThrow();
         assertThat(result.getName()).isEqualTo("testname");
     }
-
 }

src/test/java/ddingdong/ddingdongBE/domain/clubmember/service/FacadeCentralClubMemberServiceTest.java

@@ -6,6 +6,7 @@
 import com.navercorp.fixturemonkey.FixtureMonkey;
 import ddingdong.ddingdongBE.common.exception.PersistenceException.ResourceNotFound;
 import ddingdong.ddingdongBE.common.fixture.ClubFixture;
+import ddingdong.ddingdongBE.common.fixture.ClubMemberFixture;
 import ddingdong.ddingdongBE.common.fixture.UserFixture;
 import ddingdong.ddingdongBE.common.support.FixtureMonkeyFactory;
 import ddingdong.ddingdongBE.common.support.TestContainerSupport;