GRAD2-2322

School Reports Archive Process: Backend endpoints and Processing To Complete

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java

@@ -138,9 +138,9 @@ public Step archiveStudentsJobStep(JobRepository jobRepository, PlatformTransact
     }
 
     @Bean
-    public Step masterStepArchiveStudents(JobRepository jobRepository, PlatformTransactionManager transactionManager, EducGradBatchGraduationApiConstants constants) {
-        return new StepBuilder("masterStepArchiveStudents", jobRepository)
-                .partitioner("archiveSchoolReportsPartitioner", partitionerArchiveStudents())
+    public Step masterStepArchiveSchoolReports(JobRepository jobRepository, PlatformTransactionManager transactionManager, EducGradBatchGraduationApiConstants constants) {
+        return new StepBuilder("masterStepArchiveSchoolReports", jobRepository)
+                .partitioner("archiveSchoolReportsPartitioner", partitionerArchiveSchooReports())
                 .step(archiveSchoolReportsJobStep(jobRepository, transactionManager, constants))
                 .gridSize(constants.getNumberOfPartitions())
                 .taskExecutor(taskExecutor())
@@ -188,7 +188,7 @@ public RegGradAlgPartitioner partitionerRegGrad() {
 
     @Bean
     @StepScope
-    public ArchiveSchoolReportsPartitioner partitionerArchiveStudents() {
+    public ArchiveSchoolReportsPartitioner partitionerArchiveSchooReports() {
         return new ArchiveSchoolReportsPartitioner();
     }
 
@@ -1116,7 +1116,7 @@ public Job archiveSchoolReportsBatchJob(JobRepository jobRepository, PlatformTra
         return new JobBuilder("archiveSchoolReportsBatchJob", jobRepository)
                 .incrementer(new RunIdIncrementer())
                 .listener(listener)
-                .start(masterStepArchiveStudents(jobRepository, transactionManager, constants))
+                .start(masterStepArchiveSchoolReports(jobRepository, transactionManager, constants))
                 .on("*")
                 .end().build()
                 .build();

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/listener/ArchiveSchoolReportsCompletionNotificationListener.java

@@ -33,7 +33,7 @@ public void afterJob(JobExecution jobExecution) {
 			ExecutionContext jobContext = jobExecution.getExecutionContext();
 			Long jobExecutionId = jobExecution.getId();
 			String jobType = jobParameters.getString("jobType");
-			LOGGER.info("{} Archive Students Job {} completed in {} s with jobExecution status {}", jobType, jobExecutionId, elapsedTimeMillis / 1000, jobExecution.getStatus());
+			LOGGER.info("{} Archive School Reports Job {} completed in {} s with jobExecution status {}", jobType, jobExecutionId, elapsedTimeMillis / 1000, jobExecution.getStatus());
 
 			String status = jobExecution.getStatus().toString();
 			Date startTime = DateUtils.toDate(jobExecution.getStartTime());

api/src/test/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherControllerTest.java

@@ -430,6 +430,7 @@ public void testArchiveSchoolReportsBatchJob() {
         ThreadLocalStateUtil.setCurrentUser("Batch Process");
         StudentSearchRequest request = new StudentSearchRequest();
         request.setSchoolOfRecords(List.of("12345678"));
+        request.setReportTypes(List.of("NONGRADREG"));
 
         String searchData = jsonTransformer.marshall(request);
 

api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java

@@ -1694,7 +1694,7 @@ public void testGetTotalSchoolReportsForArchiving() {
     }
 
     @Test
-    public void testGetTotalStudentsForArchivingError() {
+    public void testGetTotalSchoolReportsForArchivingError() {
         List<String> schools = Arrays.asList("12345678","11223344");
 
         mockTokenResponseObject();