[DDING-131] 동아리원 개별 삭제 및 생성 API 구현 (#311)

Author: KoSeonJe

src/main/java/ddingdong/ddingdongBE/domain/clubmember/api/ClubMemberApi.java

@@ -0,0 +1,35 @@
+package ddingdong.ddingdongBE.domain.clubmember.api;
+
+import ddingdong.ddingdongBE.auth.PrincipalDetails;
+import ddingdong.ddingdongBE.domain.clubmember.api.dto.request.CreateClubMemberRequest;
+import io.swagger.v3.oas.annotations.Operation;
+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 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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@Tag(name = "ClubMember - Central", description = "ClubMember API")
+@RequestMapping("/server/club-members")
+public interface ClubMemberApi {
+
+    @Operation(summary = "동아리원 개별 삭제 API")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @ApiResponse(responseCode = "204", description = "동아리원 개별 삭제 성공")
+    @SecurityRequirement(name = "AccessToken")
+    @DeleteMapping("/{id}")
+    void delete(@AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("id") Long clubMemberId);
+
+    @Operation(summary = "동아리원 개별 추가 API")
+    @ResponseStatus(HttpStatus.CREATED)
+    @ApiResponse(responseCode = "201", description = "동아리원 개별 생성 성공")
+    @SecurityRequirement(name = "AccessToken")
+    @PostMapping
+    void create(@AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody CreateClubMemberRequest request);
+}

src/main/java/ddingdong/ddingdongBE/domain/clubmember/api/ClubMemberController.java

@@ -0,0 +1,26 @@
+package ddingdong.ddingdongBE.domain.clubmember.api;
+
+import ddingdong.ddingdongBE.auth.PrincipalDetails;
+import ddingdong.ddingdongBE.domain.clubmember.api.dto.request.CreateClubMemberRequest;
+import ddingdong.ddingdongBE.domain.clubmember.service.FacadeCentralClubMemberService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class ClubMemberController implements ClubMemberApi{
+
+    private final FacadeCentralClubMemberService facadeCentralClubMemberService;
+
+    @Override
+    public void delete(PrincipalDetails principalDetails, Long clubMemberId) {
+        Long userId = principalDetails.getUser().getId();
+        facadeCentralClubMemberService.delete(userId, clubMemberId);
+    }
+
+    @Override
+    public void create(PrincipalDetails principalDetails, CreateClubMemberRequest request) {
+        Long userId = principalDetails.getUser().getId();
+        facadeCentralClubMemberService.create(request.toCommand(userId));
+    }
+}

src/main/java/ddingdong/ddingdongBE/domain/clubmember/api/dto/request/CreateClubMemberRequest.java

@@ -0,0 +1,50 @@
+package ddingdong.ddingdongBE.domain.clubmember.api.dto.request;
+
+import ddingdong.ddingdongBE.domain.club.entity.Position;
+import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.CreateClubMemberCommand;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Schema(
+        name = "CreateClubMemberRequest",
+        description = "동아리원 정보 생성 요청"
+)
+@Builder
+public record CreateClubMemberRequest(
+
+        @Schema(description = "이름", example = "홍길동")
+        @NotNull(message = "이름은 필수로 입력해야 합니다.")
+        String name,
+
+        @Schema(description = "학번", example = "60001234")
+        @NotNull(message = "학번은 필수로 입력해야 합니다.")
+        String studentNumber,
+
+        @Schema(description = "전화번호", example = "010-1234-5678")
+        @NotNull(message = "전화번호는 필수로 입력해야 합니다.")
+        String phoneNumber,
+
+        @Schema(description = "동아리원 역할",
+                example = "LEADER",
+                allowableValues = {"LEADER", "EXECUTION", "MEMBER"}
+        )
+        @NotNull(message = "역할은 필수로 입력해야 합니다.")
+        String position,
+
+        @Schema(description = "학과(부)", example = "융합소프트웨어학부")
+        @NotNull(message = "학과(부)는 필수로 입력해야 합니다.")
+        String department
+) {
+
+    public CreateClubMemberCommand toCommand(Long userId) {
+        return CreateClubMemberCommand.builder()
+                .userId(userId)
+                .name(name)
+                .studentNumber(studentNumber)
+                .phoneNumber(phoneNumber)
+                .position(Position.from(position))
+                .department(department)
+                .build();
+    }
+}

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

@@ -14,10 +14,12 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import java.time.LocalDateTime;
+import java.util.Objects;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
 
@@ -73,4 +75,10 @@ public void updateInformation(ClubMember updateClubMember) {
     public void setClubForConvenience(Club club) {
         this.club = club;
     }
+
+    public void validateBelongsToClub(@NonNull final Club targetClub) {
+        if (this.club == null || !Objects.equals(this.club.getId(), targetClub.getId())) {
+            throw new IllegalArgumentException("동아리원은 해당 동아리에 속해 있지 않습니다");
+        }
+    }
 }

src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/ClubMemberService.java

@@ -10,4 +10,8 @@ public interface ClubMemberService {
     void saveAll(List<ClubMember> clubMembers);
 
     void deleteAll(List<ClubMember> clubMembers);
+
+    void delete(ClubMember clubMember);
+
+    void save(ClubMember clubMember);
 }

src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/FacadeCentralClubMemberService.java

@@ -1,5 +1,6 @@
 package ddingdong.ddingdongBE.domain.clubmember.service;
 
+import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.CreateClubMemberCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.UpdateClubMemberCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.UpdateClubMemberListCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.query.AllClubMemberInfoQuery;
@@ -14,4 +15,7 @@ public interface FacadeCentralClubMemberService {
 
     void update(UpdateClubMemberCommand updateClubMemberCommand);
 
+    void delete(Long userId, Long clubMemberId);
+
+    void create(CreateClubMemberCommand command);
 }

src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/FacadeCentralClubMemberServiceImpl.java

@@ -3,6 +3,7 @@
 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.dto.command.CreateClubMemberCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.UpdateClubMemberCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.UpdateClubMemberListCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.query.AllClubMemberInfoQuery;
@@ -63,6 +64,23 @@ public void update(UpdateClubMemberCommand command) {
         clubMember.updateInformation(command.toEntity());
     }
 
+    @Override
+    @Transactional
+    public void delete(Long userId, Long clubMemberId) {
+        Club club = clubService.getByUserId(userId);
+        ClubMember clubMember = clubMemberService.getById(clubMemberId);
+        clubMember.validateBelongsToClub(club);
+        clubMemberService.delete(clubMember);
+    }
+
+    @Override
+    @Transactional
+    public void create(final CreateClubMemberCommand command) {
+        Club club = clubService.getByUserId(command.userId());
+        ClubMember clubMember = command.toEntity(club);
+        clubMemberService.save(clubMember);
+        club.addClubMember(clubMember);
+    }
 
     private List<ClubMember> filterCreatedMembers(List<ClubMember> updatedClubMembers, Set<Long> updatedMemberIds,
                                                   Set<Long> currentMemberIds) {

src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/GeneralClubMemberService.java

@@ -33,4 +33,15 @@ public void deleteAll(List<ClubMember> clubMembers) {
         clubMemberRepository.deleteAllInBatch(clubMembers);
     }
 
+    @Override
+    @Transactional
+    public void delete(ClubMember clubMember) {
+        clubMemberRepository.delete(clubMember);
+    }
+
+    @Override
+    @Transactional
+    public void save(ClubMember clubMember) {
+        clubMemberRepository.save(clubMember);
+    }
 }

src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/dto/command/CreateClubMemberCommand.java

@@ -0,0 +1,28 @@
+package ddingdong.ddingdongBE.domain.clubmember.service.dto.command;
+
+import ddingdong.ddingdongBE.domain.club.entity.Club;
+import ddingdong.ddingdongBE.domain.club.entity.Position;
+import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;
+import lombok.Builder;
+
+@Builder
+public record CreateClubMemberCommand(
+        Long userId,
+        String name,
+        String studentNumber,
+        String phoneNumber,
+        Position position,
+        String department
+) {
+
+    public ClubMember toEntity(Club club) {
+        return ClubMember.builder()
+                .name(name)
+                .studentNumber(studentNumber)
+                .phoneNumber(phoneNumber)
+                .position(position)
+                .department(department)
+                .club(club)
+                .build();
+    }
+}

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

@@ -0,0 +1,30 @@
+package ddingdong.ddingdongBE.common.fixture;
+
+import ddingdong.ddingdongBE.domain.club.entity.Club;
+import ddingdong.ddingdongBE.domain.club.entity.Location;
+import ddingdong.ddingdongBE.domain.club.entity.PhoneNumber;
+import ddingdong.ddingdongBE.domain.scorehistory.entity.Score;
+import ddingdong.ddingdongBE.domain.user.entity.User;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+
+public class ClubFixture {
+
+    public static Club createClub(final User user) {
+        return Club.builder()
+                .user(user)
+                .clubMembers(new ArrayList<>())
+                .name("컴퓨터공학과 동아리")
+                .category("학술")
+                .tag("프로그래밍, 개발, IT")
+                .leader("김동아")
+                .phoneNumber(PhoneNumber.from("010-1234-5678"))
+                .location(Location.from("S3014"))  // S + 4자리 숫자
+                .regularMeeting("매주 수요일 18:00")
+                .introduction("컴퓨터공학과 학생들이 함께 공부하고 프로젝트를 진행하는 동아리입니다.")
+                .activity("알고리즘 스터디, 웹 개발 프로젝트, 해커톤 참가")
+                .ideal("함께 성장하는 개발자 커뮤니티")
+                .score(Score.from(BigDecimal.valueOf(85.5)))
+                .build();
+    }
+}