diff --git a/src/main/java/com/unionmate/backend/domain/applicant/domain/repository/ApplicationRepository.java b/src/main/java/com/unionmate/backend/domain/applicant/domain/repository/ApplicationRepository.java index cf78488..11bae99 100644 --- a/src/main/java/com/unionmate/backend/domain/applicant/domain/repository/ApplicationRepository.java +++ b/src/main/java/com/unionmate/backend/domain/applicant/domain/repository/ApplicationRepository.java @@ -25,7 +25,7 @@ public interface ApplicationRepository extends JpaRepository @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -43,7 +43,7 @@ public interface ApplicationRepository extends JpaRepository @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -56,7 +56,7 @@ public interface ApplicationRepository extends JpaRepository @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -69,7 +69,7 @@ public interface ApplicationRepository extends JpaRepository @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -82,7 +82,7 @@ public interface ApplicationRepository extends JpaRepository @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -97,7 +97,7 @@ and a.stage.recruitmentStatus in ( @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -110,7 +110,7 @@ and a.stage.recruitmentStatus in ( @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r @@ -123,7 +123,7 @@ and a.stage.recruitmentStatus in ( @Query(""" select new com.unionmate.backend.domain.council.application.dto.CouncilApplicantQueryRow( - a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r diff --git a/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantQueryRow.java b/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantQueryRow.java index bf38d16..f3a6295 100644 --- a/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantQueryRow.java +++ b/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantQueryRow.java @@ -3,17 +3,20 @@ import java.time.LocalDateTime; import com.unionmate.backend.domain.applicant.domain.entity.enums.EvaluationStatus; +import com.unionmate.backend.domain.recruitment.domain.entity.enums.RecruitmentStatus; public record CouncilApplicantQueryRow( String name, String email, String tel, LocalDateTime appliedAt, - EvaluationStatus evaluationStatus + EvaluationStatus evaluationStatus, + RecruitmentStatus recruitmentStatus ) { public static CouncilApplicantQueryRow of( - String name, String email, String tel, LocalDateTime appliedAt, EvaluationStatus evaluationStatus + String name, String email, String tel, LocalDateTime appliedAt, EvaluationStatus evaluationStatus, + RecruitmentStatus recruitmentStatus ) { - return new CouncilApplicantQueryRow(name, email, tel, appliedAt, evaluationStatus); + return new CouncilApplicantQueryRow(name, email, tel, appliedAt, evaluationStatus, recruitmentStatus); } } diff --git a/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantResponse.java b/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantResponse.java index 1e3f4f1..db2f3b8 100644 --- a/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantResponse.java +++ b/src/main/java/com/unionmate/backend/domain/council/application/dto/CouncilApplicantResponse.java @@ -3,6 +3,7 @@ import java.time.LocalDateTime; import com.unionmate.backend.domain.applicant.domain.entity.enums.EvaluationStatus; +import com.unionmate.backend.domain.recruitment.domain.entity.enums.RecruitmentStatus; import io.swagger.v3.oas.annotations.media.Schema; @@ -21,11 +22,15 @@ public record CouncilApplicantResponse( LocalDateTime appliedAt, @Schema(description = "평가 상태", example = "FAILED", allowableValues = {"SUBMITTED", "FAILED", "PASSED"}) - EvaluationStatus evaluationStatus + EvaluationStatus evaluationStatus, + + @Schema(description = "지원서 상태", example = "INTERVIEW") + RecruitmentStatus recruitmentStatus ) { public static CouncilApplicantResponse of( - String name, String email, String tel, LocalDateTime appliedAt, EvaluationStatus evaluationStatus + String name, String email, String tel, LocalDateTime appliedAt, EvaluationStatus evaluationStatus, + RecruitmentStatus recruitmentStatus ) { - return new CouncilApplicantResponse(name, email, tel, appliedAt, evaluationStatus); + return new CouncilApplicantResponse(name, email, tel, appliedAt, evaluationStatus, recruitmentStatus); } } diff --git a/src/main/java/com/unionmate/backend/domain/council/application/usecase/CouncilManageUsecase.java b/src/main/java/com/unionmate/backend/domain/council/application/usecase/CouncilManageUsecase.java index d105464..3ab6086 100644 --- a/src/main/java/com/unionmate/backend/domain/council/application/usecase/CouncilManageUsecase.java +++ b/src/main/java/com/unionmate/backend/domain/council/application/usecase/CouncilManageUsecase.java @@ -124,7 +124,7 @@ public List getDocumentScreeningApplicants( return rows.stream() .map(row -> CouncilApplicantResponse.of( - row.name(), row.email(), row.tel(), row.appliedAt(), row.evaluationStatus() + row.name(), row.email(), row.tel(), row.appliedAt(), row.evaluationStatus(), row.recruitmentStatus() )) .toList(); } @@ -141,7 +141,7 @@ public List getInterviewApplicants( return rows.stream() .map(row -> CouncilApplicantResponse.of( - row.name(), row.email(), row.tel(), row.appliedAt(), row.evaluationStatus() + row.name(), row.email(), row.tel(), row.appliedAt(), row.evaluationStatus(), row.recruitmentStatus() )) .toList(); }