From f3658b610f207005b6f7f88d9caf751cff5cab90 Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:23:06 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20CouncilApplicantQueryRow?= =?UTF-8?q?=EC=97=90=20RecruitmentStatus=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/CouncilApplicantQueryRow.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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); } } From 1a9fe2442b9bd3ebc834fa1dab58bac9cc0b2a84 Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:25:57 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20ApplicationRepository=20?= =?UTF-8?q?=EA=B0=81=20=EC=BF=BC=EB=A6=AC=EB=AC=B8=EC=97=90=20recruitmentS?= =?UTF-8?q?tatus=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/repository/ApplicationRepository.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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..7b3a85c 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 @@ -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, r.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, r.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, r.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, r.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, r.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, r.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, r.recruitmentStatus ) from Application a join a.recruitment r From 4bdbb46131beb93d81449efa4cdc63978a8d4bd5 Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:27:26 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20CouncilApplicationResponse?= =?UTF-8?q?=EC=97=90=20recruitmentStatus=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/CouncilApplicantResponse.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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); } } From b154d655c65db6c3a82e85f729114ce372c25314 Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:28:26 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20CouncilManageUsecase=20recruitm?= =?UTF-8?q?entStatus=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../council/application/usecase/CouncilManageUsecase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); } From fa2b74d1ef6f3fa7cdc5ada40a8760228823fa6c Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:33:25 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20ApplicationRepository=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EB=AC=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicant/domain/repository/ApplicationRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b3a85c..36a3af1 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, r.recruitmentStatus ) from Application a join a.recruitment r From 1e7f26c7d6881c0165fb2ea4bcc6d5d2256d7679 Mon Sep 17 00:00:00 2001 From: 1winhyun Date: Thu, 13 Nov 2025 15:47:37 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=EB=A0=88=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=EC=97=90=EC=84=9C=20=EB=BD=91=EC=95=84?= =?UTF-8?q?=EC=98=A4=EB=8A=94=20recruitmentStatus=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/repository/ApplicationRepository.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 36a3af1..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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + 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, r.recruitmentStatus + a.name, a.email, a.tel, a.createdAt, a.stage.evaluationStatus, a.stage.recruitmentStatus ) from Application a join a.recruitment r