Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>

@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
Expand All @@ -43,7 +43,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>

@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
Expand All @@ -56,7 +56,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>

@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
Expand All @@ -69,7 +69,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>

@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
Expand All @@ -82,7 +82,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>

@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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public List<CouncilApplicantResponse> 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();
}
Expand All @@ -141,7 +141,7 @@ public List<CouncilApplicantResponse> 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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

변경된 내용 확인했습니다~

))
.toList();
}
Expand Down