[feat] 활동 상태 필터 추가

Author: kangkings

src/main/java/org/ject/support/admin/member/dto/projection/SearchMemberSemesterProjection.java

@@ -1,5 +1,6 @@
 package org.ject.support.admin.member.dto.projection;
 
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
@@ -10,6 +11,7 @@ public record SearchMemberSemesterProjection(
 	JobFamily jobFamily,
 	String phoneNumber,
 	CareerDetails careerDetails,
-	ExperiencePeriod experiencePeriod
+	ExperiencePeriod experiencePeriod,
+	ActivityStatus status
 ) {
 }

src/main/java/org/ject/support/admin/member/dto/request/MemberSemesterSearchCondition.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.domain.RecruitTypeDetail;
@@ -35,7 +36,9 @@ public record MemberSemesterSearchCondition(
 	// 신분 (다중 선택)
 	List<CareerDetails> careerDetails,
 	// 팀 (다중 선택)
-	List<@Positive Long> teamIds
+	List<@Positive Long> teamIds,
+	// 활동 상태 (다중 선택)
+	List<ActivityStatus> statuses
 ) {
 	//size가 없으면 기본 30개
 	public int getSizeOrDefault() {

src/main/java/org/ject/support/admin/member/dto/response/SearchMemberSemesterResponse.java

@@ -1,6 +1,7 @@
 package org.ject.support.admin.member.dto.response;
 
 import org.ject.support.admin.member.dto.projection.SearchMemberSemesterProjection;
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
@@ -11,7 +12,8 @@ public record SearchMemberSemesterResponse(
 	JobFamily jobFamily,
 	String phoneNumber,
 	CareerDetails careerDetails,
-	ExperiencePeriod experiencePeriod
+	ExperiencePeriod experiencePeriod,
+	ActivityStatus status
 ) {
 	public static SearchMemberSemesterResponse from(SearchMemberSemesterProjection projection) {
 		return new SearchMemberSemesterResponse(
@@ -20,7 +22,8 @@ public static SearchMemberSemesterResponse from(SearchMemberSemesterProjection p
 			projection.jobFamily(),
 			projection.phoneNumber(),
 			projection.careerDetails(),
-			projection.experiencePeriod()
+			projection.experiencePeriod(),
+			projection.status()
 		);
 	}
 }

src/main/java/org/ject/support/admin/member/service/AdminMemberUseCase.java

@@ -5,14 +5,15 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.ject.support.admin.member.dto.projection.SearchMemberSemesterProjection;
 import org.ject.support.admin.member.dto.request.CreateMemberSemesterRequest;
 import org.ject.support.admin.member.dto.request.MemberSemesterSearchCondition;
 import org.ject.support.admin.member.dto.response.SearchMemberSemesterResponse;
 import org.ject.support.admin.member.dto.result.SearchMemberSemesterPageResult;
 import org.ject.support.common.response.CursorPageResponse;
+import org.ject.support.domain.member.ActivityStatus;
+import org.ject.support.domain.member.MemberType;
 import org.ject.support.domain.member.exception.MemberException;
 import org.ject.support.domain.recruit.service.SemesterInquiryUsecase;
 import org.springframework.stereotype.Service;
@@ -53,6 +54,8 @@ public CursorPageResponse<SearchMemberSemesterResponse> searchMemberSemester(
 		validateSemester(condition.semesterId());
 		// 팀 유효성 체크
 		validateTeams(condition.semesterId(), condition.teamIds());
+		// 활동 상태 체크
+		validateStatuses(condition.statuses(), MemberType.SEMESTER);
 		// size만큼 조회 + 전체 행 수 조회
 		SearchMemberSemesterPageResult pageResult = adminMemberActivityService.searchMemberSemesterList(condition);
 		// 페이징 값 처리
@@ -125,4 +128,11 @@ private void validateTeams(Long semesterId, List<Long> teamIds) {
 		}
 	}
 
+	// 구성원 유형에서 허용되는 활동 상태인지 검증
+	private void validateStatuses(List<ActivityStatus> statuses, MemberType type) {
+		if (!ActivityStatus.isAllAvailableFor(statuses, type)) {
+			throw new MemberException(INVALID_ACTIVITY_STATUS);
+		}
+	}
+
 }

src/main/java/org/ject/support/domain/member/ActivityStatus.java

@@ -1,15 +1,34 @@
 package org.ject.support.domain.member;
 
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public enum ActivityStatus {
-    ACTIVE("활동중"),
+    ACTIVE("활동 중"),
     COMPLETED("완주"),
-    ENDED("활동종료"),
-    DROPOUT("중도하차");
+    WITHDRAWN("탈퇴"),
+    ENDED("활동 종료"),
+    DROPOUT("중도 이탈");
 
     private final String description;
+
+    public boolean isAvailableFor(MemberType type) {
+        return switch (type) {
+            case SEMESTER -> this == ACTIVE || this == COMPLETED || this == WITHDRAWN;
+            case MAKERS, SUPPORTERS -> this == ACTIVE || this == ENDED || this == DROPOUT;
+        };
+    }
+
+    public static boolean isAllAvailableFor(List<ActivityStatus> statuses, MemberType type) {
+        if (statuses == null || statuses.isEmpty()) {
+            return true;
+        }
+
+        return statuses.stream()
+            .allMatch(status -> status.isAvailableFor(type));
+    }
 }

src/main/java/org/ject/support/domain/member/entity/MemberActivity.java

@@ -111,4 +111,13 @@ public static MemberActivity createSemesterActivity(
     //Todo: 메이커스 구성원 활동과 관리 항목 생성
 
     //Todo: 운영 서포터즈 구성원 활동과 관리 항목 생성
+
+    // 구성원 유형에 맞는 활동 상태로 변경
+    public void updateActivityStatus(ActivityStatus activityStatus) {
+        if (!activityStatus.isAvailableFor(memberType)) {
+            throw new MemberException(MemberErrorCode.INVALID_ACTIVITY_STATUS);
+        }
+
+        this.activityStatus = activityStatus;
+    }
 }

src/main/java/org/ject/support/domain/member/exception/MemberErrorCode.java

@@ -18,6 +18,7 @@ public enum MemberErrorCode implements ErrorCode {
     ALREADY_EXIST_MEMBER_SEMESTER_ACTIVITY(CONFLICT, "MEMBER-6", "해당 기수에 이미 등록된 일반 구성원 활동입니다."),
     NOT_FOUND_TEAM_OF_SEMESTER(NOT_FOUND, "MEMBER-7", "해당 기수의 팀을 찾을 수 없습니다."),
     REQUIRED_SEMESTER_FOR_TEAM_FILTER(BAD_REQUEST, "MEMBER-8", "팀 필터를 사용할 때는 기수를 함께 선택해야 합니다."),
+    INVALID_ACTIVITY_STATUS(BAD_REQUEST, "MEMBER-9", "구성원 유형에 맞지 않는 활동 상태입니다."),
     ;
 
     private final HttpStatus httpStatus;

src/main/java/org/ject/support/domain/member/repository/MemberActivityQueryRepositoryImpl.java

@@ -8,6 +8,7 @@
 
 import org.ject.support.admin.member.dto.projection.SearchMemberSemesterProjection;
 import org.ject.support.admin.member.dto.request.MemberSemesterSearchCondition;
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.member.MemberType;
@@ -36,7 +37,8 @@ public List<SearchMemberSemesterProjection> searchMemberSemesters(MemberSemester
 			memberActivity.jobFamily,
 			member.phoneNumber,
 			memberActivity.careerDetails,
-			memberActivity.experiencePeriod
+			memberActivity.experiencePeriod,
+			memberActivity.activityStatus
 			))
 			.from(memberActivity)
 			.join(member).on(member.id.eq(memberActivity.memberId))
@@ -47,7 +49,8 @@ public List<SearchMemberSemesterProjection> searchMemberSemesters(MemberSemester
 				jobFamilyIn(condition.jobFamilies()),
 				careerDetailsIn(condition.careerDetails()),
 				teamIdIn(condition.teamIds()),
-				recruitTypeDetailsIn(condition.recruitTypeDetails()),
+				recruitTypeDetailIn(condition.recruitTypeDetails()),
+				statusIn(condition.statuses()),
 				member.isDeleted.isFalse(),
 				memberActivity.isDeleted.isFalse(),
 				memberActivity.memberType.eq(MemberType.SEMESTER)
@@ -67,7 +70,8 @@ public long countMemberSemesters(MemberSemesterSearchCondition condition) {
 				jobFamilyIn(condition.jobFamilies()),
 				careerDetailsIn(condition.careerDetails()),
 				teamIdIn(condition.teamIds()),
-				recruitTypeDetailsIn(condition.recruitTypeDetails()),
+				recruitTypeDetailIn(condition.recruitTypeDetails()),
+				statusIn(condition.statuses()),
 				member.isDeleted.isFalse(),
 				memberActivity.isDeleted.isFalse(),
 				memberActivity.memberType.eq(MemberType.SEMESTER)
@@ -103,9 +107,15 @@ private BooleanExpression teamIdIn(List<Long> teamIds) {
 			: memberSemester.teamId.in(teamIds);
 	}
 
-	private BooleanExpression recruitTypeDetailsIn(List<RecruitTypeDetail> recruitTypeDetails) {
+	private BooleanExpression recruitTypeDetailIn(List<RecruitTypeDetail> recruitTypeDetails) {
 		return recruitTypeDetails == null || recruitTypeDetails.isEmpty()
 			? null
 			: memberActivity.recruitTypeDetail.in(recruitTypeDetails);
 	}
+
+	private BooleanExpression statusIn(List<ActivityStatus> statuses) {
+		return statuses == null || statuses.isEmpty()
+			? null
+			: memberActivity.activityStatus.in(statuses);
+	}
 }

src/test/java/org/ject/support/admin/member/controller/AdminMemberSemesterControllerTest.java

@@ -13,6 +13,7 @@
 import java.util.Comparator;
 import java.util.List;
 import org.ject.support.admin.member.dto.request.CreateMemberSemesterRequest;
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
@@ -232,11 +233,13 @@ class AdminMemberSemesterControllerTest {
 				.param("jobFamilies", "BE")
 				.param("recruitTypeDetails", "REGULAR")
 				.param("careerDetails", "EMPLOYEE")
-				.param("teamIds", String.valueOf(team.getId())))
+				.param("teamIds", String.valueOf(team.getId()))
+				.param("statuses", ActivityStatus.ACTIVE.name()))
 			.andExpect(status().isOk())
 			.andExpect(jsonPath("$.status").value("SUCCESS"))
 			.andExpect(jsonPath("$.data.content", hasSize(1)))
 			.andExpect(jsonPath("$.data.content[0].memberActivityId").value(matched.getId()))
+			.andExpect(jsonPath("$.data.content[0].status").value(ActivityStatus.ACTIVE.name()))
 			.andExpect(jsonPath("$.data.totalCount").value(1));
 	}
 
@@ -259,6 +262,16 @@ class AdminMemberSemesterControllerTest {
 			.andExpect(status().isBadRequest());
 	}
 
+	@Test
+	@DisplayName("일반 구성원에서 사용할 수 없는 활동 상태면 목록을 조회하지 않는다")
+	void 일반_구성원에서_사용할_수_없는_활동_상태면_목록을_조회하지_않는다() throws Exception {
+		// when & then
+		mockMvc.perform(get("/admin/members/semester")
+				.param("statuses", ActivityStatus.DROPOUT.name()))
+			.andExpect(status().isBadRequest())
+			.andExpect(jsonPath("$.status").value(MemberErrorCode.INVALID_ACTIVITY_STATUS.getCode()));
+	}
+
 	private CreateMemberSemesterRequest createMemberSemesterRequest(String email, Long semesterId, Long teamId) {
 		return new CreateMemberSemesterRequest(
 			"김젝트",

src/test/java/org/ject/support/admin/member/service/AdminMemberActivityServiceTest.java

@@ -14,6 +14,7 @@
 import org.ject.support.admin.member.dto.request.MemberSemesterSearchCondition;
 import org.ject.support.admin.member.dto.result.SearchMemberSemesterPageResult;
 import org.ject.support.common.response.CursorPageResponse;
+import org.ject.support.domain.member.ActivityStatus;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
@@ -114,7 +115,8 @@ class AdminMemberActivityServiceTest {
           List.of(JobFamily.BE),
           List.of(RecruitTypeDetail.REGULAR),
           List.of(CareerDetails.EMPLOYEE),
-          List.of(1L,2L,3L)
+          List.of(1L,2L,3L),
+          List.of(ActivityStatus.ACTIVE)
         );
 
         List<SearchMemberSemesterProjection> projections = List.of(
@@ -124,7 +126,8 @@ class AdminMemberActivityServiceTest {
                 JobFamily.BE,
                 "01012345678",
                 CareerDetails.EMPLOYEE,
-                ExperiencePeriod.ONE_TO_TWO
+                ExperiencePeriod.ONE_TO_TWO,
+                ActivityStatus.ACTIVE
             )
         );
         given(memberActivityRepository.searchMemberSemesters(condition, condition.getSizeOrDefault()+1)).willReturn(projections);