JNU-econovation
diff --git a/‎server/Recruit-Api/build.gradle‎
Lines changed: 9 additions & 0 deletions b/‎server/Recruit-Api/build.gradle‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/controller/ApplicantController.java‎
Lines changed: 11 additions & 9 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/controller/ApplicantController.java‎
Lines changed: 11 additions & 9 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/handler/ApplicantRegisterEventConfirmEmailHandler.java‎
Lines changed: 7 additions & 4 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/handler/ApplicantRegisterEventConfirmEmailHandler.java‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/resolver/ApplicantResolver.java‎
Lines changed: 37 additions & 0 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/resolver/ApplicantResolver.java‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/service/AnswerCommandService.java‎
Lines changed: 3 additions & 4 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/service/AnswerCommandService.java‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/service/ApplicantService.java‎
Lines changed: 39 additions & 4 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/service/ApplicantService.java‎
Lines changed: 39 additions & 4 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/usecase/ApplicantQueryUseCase.java‎
Lines changed: 9 additions & 0 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/usecase/ApplicantQueryUseCase.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/validate/ApplicantValidator.java‎
Lines changed: 15 additions & 30 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/applicant/validate/ApplicantValidator.java‎
Lines changed: 15 additions & 30 deletions
diff --git a/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/controller/BoardRestController.java‎
Lines changed: 2 additions & 0 deletions b/‎server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/controller/BoardRestController.java‎
Lines changed: 2 additions & 0 deletions
@@ -29,6 +29,12 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     testImplementation 'org.springframework.security:spring-security-test'
 
+    // GraphQL
+    implementation 'org.springframework.boot:spring-boot-starter-graphql'
+    implementation 'com.graphql-java:graphql-java-extended-scalars:19.1'
+    testImplementation 'org.springframework.graphql:spring-graphql-test'
+
+
     // websocket client
     implementation 'org.webjars:webjars-locator-core'
     implementation 'org.webjars:sockjs-client:1.0.2'
@@ -49,6 +55,9 @@ dependencies {
     implementation project(':Recruit-Domain')
     implementation project(':Recruit-Infrastructure')
 
+    // quartz-scheduler
+    implementation("org.springframework.boot:spring-boot-starter-quartz:3.5.3")
+
     testRuntimeOnly 'com.h2database:h2'
 }
 
 
@@ -12,6 +12,8 @@
 import com.econovation.recruit.api.applicant.usecase.TimeTableLoadUseCase;
 import com.econovation.recruit.api.applicant.usecase.TimeTableRegisterUseCase;
 import com.econovation.recruit.api.applicant.validate.ApplicantValidator;
+import com.econovation.recruit.api.recruitment.usecase.RecruitmentUseCase;
+import com.econovation.recruit.api.recruitment.util.LatestRecruitmentVo;
 import com.econovation.recruitcommon.annotation.ApiErrorExceptionsExample;
 import com.econovation.recruitcommon.annotation.TimeTrace;
 import com.econovation.recruitcommon.annotation.XssProtected;
@@ -30,7 +32,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.springdoc.api.annotations.ParameterObject;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -49,16 +50,16 @@ public class ApplicantController {
     private final CommandGateway commandGateway;
     private final ApplicantValidator applicantValidator;
     private final ApplicantCommandUseCase applicantCommandUseCase;
-
-    @Value("${econovation.year}")
-    private Integer year;
+    private final RecruitmentUseCase applicationManagementUseCase;
+    private final LatestRecruitmentVo latestRecruitInfo;
 
     @Operation(summary = "지원자가 지원서를 작성합니다.", description = "반환 값은 생성된 지원자의 ID입니다.")
     @ApiErrorExceptionsExample(CreateApplicantExceptionDocs.class)
     @XssProtected
     @PostMapping("/applicants")
     @TimeTrace
     public ResponseEntity registerMongoApplicant(@RequestBody Map<String, Object> qna) {
+        int year = latestRecruitInfo.getYear();
         applicantValidator.validateRegisterApplicant(qna);
         String applicantId = UUID.randomUUID().toString();
         commandGateway.send(new CreateAnswerCommand(applicantId, year, qna));
@@ -143,8 +144,9 @@ public ResponseEntity<Map<Integer, List<String>>> getApplicantsByTimeTable() {
     @TimeTrace
     @PostMapping("/applicants/mail")
     public ResponseEntity sendEmail(@RequestBody EmailSendDto emailSendDto) {
+        int year = latestRecruitInfo.getYear();
         commonsEmailSender.send(
-                emailSendDto.getEmail(), emailSendDto.getApplicantId(), LocalDateTime.now());
+                emailSendDto.getEmail(), emailSendDto.getApplicantId(), year, LocalDateTime.now());
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
@@ -162,11 +164,11 @@ public ResponseEntity<Map<String, String>> updateStatus(
 
     @Operation(
             summary = "지원서의 합/불 상태를 조회합니다. (합/불 관리자 페이지 전용)",
-            description = """
-                    응답으로 오는 passState 값의 종류는 non-processed, non-passed, first-passed, final-passed 입니다.
+            description =
                     """
-    )
-    @GetMapping("year/{year}/applicants/pass-state")
+                    응답으로 오는 passState 값의 종류는 non-processed, non-passed, first-passed, final-passed 입니다.
+                    """)
+    @GetMapping("/year/{year}/applicants/pass-state")
     public ResponseEntity<List<GetApplicantsStatusResponse>> getApplicantsStatus(
             @PathVariable("year") Integer year, @RequestParam("order") String sortType) {
         List<GetApplicantsStatusResponse> result =
 
@@ -1,5 +1,6 @@
 package com.econovation.recruit.api.applicant.handler;
 
+import com.econovation.recruit.api.recruitment.util.LatestRecruitmentVo;
 import com.econovation.recruitdomain.domains.applicant.event.domainevent.ApplicantRegisterEvent;
 import com.econovation.recruitinfrastructure.apache.CommonsEmailSender;
 import java.time.LocalDateTime;
@@ -23,9 +24,7 @@
 @Slf4j
 public class ApplicantRegisterEventConfirmEmailHandler {
     private final CommonsEmailSender commonsEmailSender;
-
-    @Value("${econovation.year}")
-    private Integer year;
+    private final LatestRecruitmentVo latestRecruitInfo;
 
     @Value("${econovation.recruit.period.passedDate}")
     private String confirmRegisterEmail;
@@ -36,8 +35,12 @@ public class ApplicantRegisterEventConfirmEmailHandler {
             phase = TransactionPhase.AFTER_COMMIT)
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void handle(ApplicantRegisterEvent applicantRegistEvent) {
+        int year = latestRecruitInfo.getYear();
         LocalDateTime passedDate = LocalDateTime.parse(confirmRegisterEmail);
         commonsEmailSender.send(
-                applicantRegistEvent.getEmail(), applicantRegistEvent.getApplicantId(), passedDate);
+                applicantRegistEvent.getEmail(),
+                applicantRegistEvent.getApplicantId(),
+                year,
+                passedDate);
     }
 }
@@ -0,0 +1,37 @@
+package com.econovation.recruit.api.applicant.resolver;
+
+import com.econovation.recruit.api.applicant.dto.AnswersResponseDto;
+import com.econovation.recruit.api.applicant.usecase.ApplicantQueryUseCase;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.springframework.graphql.data.method.annotation.Argument;
+import org.springframework.graphql.data.method.annotation.QueryMapping;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+
+@Controller
+@RequiredArgsConstructor
+public class ApplicantResolver {
+
+    private final ApplicantQueryUseCase applicantQueryUseCase;
+
+    @QueryMapping
+    @PreAuthorize("hasAnyRole('ROLE_ROLE_PRESIDENT', 'ROLE_ROLE_OPERATION', 'ROLE_ROLE_TF')")
+    public AnswersResponseDto getApplicants(
+            @Argument Integer year,
+            @Argument Integer page,
+            @Argument String order,
+            @Argument String searchKeyword,
+            @Argument List<String> requestedQnaFields) {
+        return applicantQueryUseCase.executeFiltered(
+                year, page, order, searchKeyword, requestedQnaFields);
+    }
+
+    @QueryMapping
+    @PreAuthorize("hasAnyRole('ROLE_ROLE_PRESIDENT', 'ROLE_ROLE_OPERATION', 'ROLE_ROLE_TF')")
+    public Map<String, Object> getApplicant(
+            @Argument String applicantId, @Argument List<String> requestedQnaFields) {
+        return applicantQueryUseCase.executeFiltered(applicantId, requestedQnaFields);
+    }
+}
@@ -2,6 +2,7 @@
 
 import com.econovation.recruit.api.applicant.handler.ApplicantStateUpdateEventHandler;
 import com.econovation.recruit.api.applicant.usecase.ApplicantCommandUseCase;
+import com.econovation.recruit.api.recruitment.util.LatestRecruitmentVo;
 import com.econovation.recruitdomain.common.aop.domainEvent.Events;
 import com.econovation.recruitdomain.domains.applicant.domain.MongoAnswer;
 import com.econovation.recruitdomain.domains.applicant.domain.MongoAnswerAdaptor;
@@ -11,7 +12,6 @@
 import java.util.Map;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,9 +20,7 @@
 public class AnswerCommandService implements ApplicantCommandUseCase {
     private final MongoAnswerAdaptor answerAdaptor;
     private final ApplicantStateUpdateEventHandler applicantStateUpdateEventHandler;
-
-    @Value("${econovation.year}")
-    private Integer year;
+    private final LatestRecruitmentVo latestRecruitInfo;
 
     @Override
     @Transactional
@@ -42,6 +40,7 @@ public String execute(String applicantId, String afterState) {
 
     @Override
     public UUID execute(Map<String, Object> qna, UUID id) {
+        int year = latestRecruitInfo.getYear();
         ApplicantState nonProcessed = new ApplicantState();
         MongoAnswer answer =
                 MongoAnswer.builder()
 
@@ -7,18 +7,19 @@
 import com.econovation.recruit.api.applicant.dto.GetApplicantsStatusResponse;
 import com.econovation.recruit.api.applicant.query.AnswerQuery;
 import com.econovation.recruit.api.applicant.usecase.ApplicantQueryUseCase;
+import com.econovation.recruit.api.recruitment.util.LatestRecruitmentVo;
 import com.econovation.recruit.utils.sort.SortHelper;
 import com.econovation.recruit.utils.vo.PageInfo;
 import com.econovation.recruitdomain.domains.applicant.adaptor.AnswerAdaptor;
 import com.econovation.recruitdomain.domains.applicant.domain.MongoAnswer;
+import com.econovation.recruitdomain.domains.applicant.exception.ApplicantNotFoundException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.axonframework.messaging.responsetypes.ResponseTypes;
 import org.axonframework.queryhandling.QueryGateway;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,9 +29,7 @@ public class ApplicantService implements ApplicantQueryUseCase {
     private final AnswerAdaptor answerAdaptor;
     private final QueryGateway queryGateway;
     private final SortHelper<MongoAnswer> sortHelper;
-
-    @Value("${econovation.year}")
-    private Integer year;
+    private final LatestRecruitmentVo latestRecruitInfo;
 
     @Transactional(readOnly = true)
     public Map<String, Object> execute(String answerId) {
@@ -233,6 +232,7 @@ public Map<String, Object> execute(String applicantId, List<String> fields) {
 
     @Override
     public List<Map<String, Object>> execute(List<String> fields, Integer page) {
+        int year = latestRecruitInfo.getYear();
         List<MongoAnswer> byYear = answerAdaptor.findByYear(year, page);
         return splitByAnswers(fields, byYear);
     }
@@ -250,4 +250,39 @@ private List<Map<String, Object>> sortAndAddIds(List<MongoAnswer> result, String
         }
         return getQnaMapListWithIdAndPassState(result);
     }
+
+    @Transactional(readOnly = true)
+    public AnswersResponseDto executeFiltered(
+            Integer year,
+            Integer page,
+            String sortType,
+            String searchKeyword,
+            List<String> requestedQnaFields) {
+
+        PageInfo pageInfo = getPageInfo(year, page, searchKeyword);
+        List<MongoAnswer> sortedResult =
+                answerAdaptor.findByYearAndSearchKeywordAndRequestedFields(
+                        year, page, sortType, searchKeyword, requestedQnaFields);
+
+        List<Map<String, Object>> qnaMapList = getQnaMapListWithIdAndPassState(sortedResult);
+
+        if (qnaMapList.isEmpty()) {
+            return AnswersResponseDto.of(Collections.emptyList(), pageInfo);
+        }
+        return AnswersResponseDto.of(qnaMapList, pageInfo);
+    }
+
+    @Transactional(readOnly = true)
+    public Map<String, Object> executeFiltered(
+            String applicantId, List<String> requestedQnaFields) {
+        MongoAnswer mongoAnswer =
+                answerAdaptor
+                        .findByIdAndRequestedFields(applicantId, requestedQnaFields)
+                        .orElseThrow(() -> ApplicantNotFoundException.EXCEPTION);
+
+        Map<String, Object> qna = mongoAnswer.getQna();
+        qna.put("id", mongoAnswer.getId());
+        qna.put(PASS_STATE_KEY, mongoAnswer.getApplicantStateOrDefault());
+        return qna;
+    }
 }
@@ -46,4 +46,13 @@ List<Map<String, Object>> execute(
     List<MongoAnswer> getApplicantsByYear(Integer year);
 
     MongoAnswer getApplicantById(String applicantId);
+
+    AnswersResponseDto executeFiltered(
+            Integer year,
+            Integer page,
+            String sortType,
+            String searchKeyword,
+            List<String> requestedQnaFields);
+
+    Map<String, Object> executeFiltered(String applicantId, List<String> requestedQnaFields);
 }
@@ -1,36 +1,33 @@
 package com.econovation.recruit.api.applicant.validate;
 
+import com.econovation.recruit.api.recruitment.util.LatestRecruitmentVo;
 import com.econovation.recruitcommon.exception.RecruitCodeException;
 import com.econovation.recruitdomain.domains.applicant.domain.MongoAnswerAdaptor;
+import com.econovation.recruitdomain.domains.applicant.domain.state.RecruitmentStates;
 import com.econovation.recruitdomain.domains.applicant.exception.ApplicantDuplicateSubmitException;
 import com.econovation.recruitdomain.domains.applicant.exception.ApplicantOutOfDateException;
 import com.econovation.recruitdomain.domains.applicant.exception.ApplicantWrongPositionException;
 import io.vavr.collection.Seq;
 import io.vavr.control.Validation;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Map;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-@RequiredArgsConstructor
 public class ApplicantValidator {
     private final MongoAnswerAdaptor answerAdaptor;
+    private final LatestRecruitmentVo latestRecruitInfo;
+    private final boolean validateEnabled;
 
-    @Value("${econovation.recruit.period.start}")
-    private String recruitPeriodStart;
+    public ApplicantValidator(
+            MongoAnswerAdaptor answerAdaptor,
+            LatestRecruitmentVo latestRecruitInfo,
+            @Value("${econovation.recruit.valid.enabled}") boolean validateEnabled) {
 
-    @Value("${econovation.recruit.period.end}")
-    private String recruitPeriodEnd;
-
-    @Value("${econovation.year}")
-    private Integer year;
-
-    @Value("${econovation.recruit.valid.enabled}")
-    private boolean validateEnabled;
+        this.validateEnabled = validateEnabled;
+        this.latestRecruitInfo = latestRecruitInfo;
+        this.answerAdaptor = answerAdaptor;
+    }
 
     public Validation<Seq<RecruitCodeException>, Map<String, Object>> validateRegisterApplicant(
             Map<String, Object> qna) {
@@ -53,6 +50,7 @@ private Validation<RecruitCodeException, Object> validateIsRightPosition(
     private Validation<RecruitCodeException, Map<String, Object>> validateDuplicateStudentId(
             Map<String, Object> qna) {
         String studentId = qna.get("classOf").toString();
+        Integer year = latestRecruitInfo.getYear().intValue();
         if (answerAdaptor.existsByAnswer(studentId, year)) {
             throw ApplicantDuplicateSubmitException.EXCEPTION;
         }
@@ -64,24 +62,11 @@ private Validation<RecruitCodeException, Map<String, Object>> validateOutdated(
         if (!validateEnabled) {
             return Validation.valid(qna);
         }
-        ZoneId koreaZoneId = ZoneId.of("Asia/Seoul");
-        ZonedDateTime currentKoreaTime = ZonedDateTime.now(koreaZoneId);
 
-        // 비교할 날짜와 시간 설정 (시작 시간과 끝 시간을 설정해두어야 한다.)
-        LocalDateTime recruitPeriodStartDateTime = LocalDateTime.parse(recruitPeriodStart);
-        LocalDateTime recruitPeriodEndDateTime = LocalDateTime.parse(recruitPeriodEnd);
-        ZonedDateTime recruitPeriodStartZoneDateTime =
-                ZonedDateTime.of(recruitPeriodStartDateTime, koreaZoneId);
-        ZonedDateTime recruitPeriodEndZoneDateTime =
-                ZonedDateTime.of(recruitPeriodEndDateTime, koreaZoneId);
-
-        // 현재 시간이 2023년 09월 16일 00시 00분 00초 (한국 시간) 이후인지 확인
-        boolean isOutdated =
-                currentKoreaTime.isBefore(recruitPeriodStartZoneDateTime)
-                        || currentKoreaTime.isAfter(recruitPeriodEndZoneDateTime);
-        if (isOutdated) {
+        if (!latestRecruitInfo.getState().equals(RecruitmentStates.RECRUITING)) {
             throw ApplicantOutOfDateException.EXCEPTION;
         }
+
         return Validation.valid(qna);
     }
 }
@@ -95,6 +95,7 @@ public ResponseEntity deleteNavigation(
         return new ResponseEntity(HttpStatus.OK);
     }
 
+    @Deprecated(since = "2025-03-02")
     @Operation(summary = "지원서 칸반보드 열(세로줄) 생성", description = "지원서 칸반보드 열(세로줄) 생성")
     @ApiErrorExceptionsExample(CreateColumnsExceptionDocs.class)
     @PostMapping("/boards/navigations/{navigation-id}/columns")
@@ -113,6 +114,7 @@ public ResponseEntity<String> updateBoardColumn(
         return new ResponseEntity(COLUMN_SUCCESS_LOCATION_CHANGE_MESSAGE, HttpStatus.OK);
     }
 
+    @Deprecated(since = "2025-03-02")
     @Operation(
             summary = "지원서 세로줄 조회(by NavigationId)",
             description = "navigationId에 해당하는 모든 세로줄을 조회합니다., 세로줄이 없으면 빈 배열을 반환합니다.")
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ public ResponseEntity deleteNavigation(`
`95`	`95`	`return new ResponseEntity(HttpStatus.OK);`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ @Deprecated(since = "2025-03-02")`
`98`	`99`	`@Operation(summary = "지원서 칸반보드 열(세로줄) 생성", description = "지원서 칸반보드 열(세로줄) 생성")`
`99`	`100`	`@ApiErrorExceptionsExample(CreateColumnsExceptionDocs.class)`
`100`	`101`	`@PostMapping("/boards/navigations/{navigation-id}/columns")`
`@@ -113,6 +114,7 @@ public ResponseEntity<String> updateBoardColumn(`
`113`	`114`	`return new ResponseEntity(COLUMN_SUCCESS_LOCATION_CHANGE_MESSAGE, HttpStatus.OK);`
`114`	`115`	`}`
`115`	`116`
	`117`	`+ @Deprecated(since = "2025-03-02")`
`116`	`118`	`@Operation(`
`117`	`119`	`summary = "지원서 세로줄 조회(by NavigationId)",`
`118`	`120`	`description = "navigationId에 해당하는 모든 세로줄을 조회합니다., 세로줄이 없으면 빈 배열을 반환합니다.")`