Merge pull request #479 from bcgov/develop/alex-GRAD2-2377

GRAD2-2377
bcgov · Apr 20, 2024 · 9c6b7a3 · 9c6b7a3
2 parents 954280c + 773bc96
commit 9c6b7a3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java
@@ -519,6 +519,12 @@ public DistributionRunProcessor itemProcessorDisRun() {
         return new DistributionRunProcessor();
     }
 
+    @Bean
+    @StepScope
+    public DistributionRunYearlyProcessor itemProcessorYearlyDisRun() {
+        return new DistributionRunYearlyProcessor();
+    }
+
     @Bean
     @StepScope
     public DistributionRunYearlyNonGradProcessor itemProcessorDisRunYearlyNonGradByMincode() {
@@ -571,7 +577,7 @@ public Step slaveStepDisRunYearly(JobRepository jobRepository, PlatformTransacti
         return new StepBuilder("slaveStepDisRun", jobRepository)
                 .<StudentCredentialDistribution, StudentCredentialDistribution>chunk(1, transactionManager)
                 .reader(itemReaderDisRun())
-                .processor(itemProcessorDisRun())
+                .processor(itemProcessorYearlyDisRun())
                 .writer(itemWriterDisRun())
                 .build();
     }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunProcessor.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunProcessor.java
@@ -27,7 +27,7 @@ public class DistributionRunProcessor implements ItemProcessor<StudentCredential
 	public StudentCredentialDistribution process(StudentCredentialDistribution item) throws Exception {
 		LOGGER.info("Processing partitionData = {}", item.getCredentialTypeCode());
 		summaryDTO.setBatchId(batchId);
-		return restUtils.processDistribution(item, summaryDTO);
+		return restUtils.processDistribution(item, summaryDTO, false);
 
 	}
 

diff --git a/...ain/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java b/...ain/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java
@@ -26,7 +26,7 @@ public class DistributionRunYearlyProcessor implements ItemProcessor<StudentCred
 	public StudentCredentialDistribution process(StudentCredentialDistribution item) throws Exception {
 		LOGGER.info("Processing partitionData = {}", item.getCredentialTypeCode());
 		summaryDTO.setBatchId(batchId);
-		return restUtils.processDistribution(item, summaryDTO);
+		return restUtils.processDistribution(item, summaryDTO, true);
 
 	}
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/rest/RestUtils.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/rest/RestUtils.java
@@ -7,6 +7,7 @@
 import ca.bc.gov.educ.api.batchgraduation.util.EducGradBatchGraduationApiUtils;
 import ca.bc.gov.educ.api.batchgraduation.util.ThreadLocalStateUtil;
 import io.github.resilience4j.retry.annotation.Retry;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -402,24 +403,32 @@ public List<GraduationStudentRecord> getStudentData(List<UUID> studentIds) {
                 .retrieve().bodyToMono(responseType).block();
     }
 
-    public StudentCredentialDistribution processDistribution(StudentCredentialDistribution item, DistributionSummaryDTO summary) {
+    public StudentCredentialDistribution processDistribution(StudentCredentialDistribution item, DistributionSummaryDTO summary, boolean useSchoolAtGrad) {
         LOGGER.info(STUDENT_PROCESS,item.getStudentID());
         summary.setProcessedCount(summary.getProcessedCount() + 1L);
         StudentCredentialDistribution scObj = summary.getGlobalList().stream().filter(pr -> pr.getStudentID().compareTo(item.getStudentID()) == 0)
                 .findAny()
                 .orElse(null);
         if(scObj != null) {
-            item.setSchoolOfRecord(scObj.getSchoolOfRecord());
+            if(useSchoolAtGrad) {
+                item.setSchoolOfRecord(StringUtils.isBlank(scObj.getSchoolAtGrad()) ? scObj.getSchoolOfRecord() : scObj.getSchoolAtGrad());
+            } else {
+                item.setSchoolOfRecord(scObj.getSchoolOfRecord());
+            }
             item.setPen(scObj.getPen());
             item.setLegalLastName(scObj.getLegalLastName());
             item.setLegalFirstName(scObj.getLegalFirstName());
             item.setLegalMiddleNames(scObj.getLegalMiddleNames());
         } else {
-            GraduationStudentRecordDistribution stuRec =this.getStudentData(item.getStudentID().toString());
+            GraduationStudentRecordDistribution stuRec = getStudentData(item.getStudentID().toString());
             if (stuRec != null) {
                 item.setProgram(stuRec.getProgram());
                 item.setHonoursStanding(stuRec.getHonoursStanding());
-                item.setSchoolOfRecord(stuRec.getSchoolOfRecord());
+                if(useSchoolAtGrad) {
+                    item.setSchoolOfRecord(StringUtils.isBlank(stuRec.getSchoolAtGrad()) ? stuRec.getSchoolOfRecord() : stuRec.getSchoolAtGrad());
+                } else {
+                    item.setSchoolOfRecord(stuRec.getSchoolOfRecord());
+                }
                 item.setProgramCompletionDate(stuRec.getProgramCompletionDate());
                 item.setStudentID(stuRec.getStudentID());
                 item.setPen(stuRec.getPen());

diff --git a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java
@@ -444,7 +444,7 @@ public void testProcessDistribution() {
         summary.setBatchId(batchId);
         summary.setGlobalList(globalList);
 
-        StudentCredentialDistribution res = this.restUtils.processDistribution(scd,summary);
+        StudentCredentialDistribution res = this.restUtils.processDistribution(scd,summary, false);
         assertNotNull(res);
     }
 
@@ -491,7 +491,7 @@ public void testProcessDistribution_elsecase() {
         summary.setBatchId(batchId);
         summary.setGlobalList(globalList);
 
-        StudentCredentialDistribution res = this.restUtils.processDistribution(scd2,summary);
+        StudentCredentialDistribution res = this.restUtils.processDistribution(scd2,summary, false);
         assertNotNull(res);
     }
 
@@ -538,7 +538,7 @@ public void testProcessDistribution_elsecase_null() {
         summary.setBatchId(batchId);
         summary.setGlobalList(globalList);
 
-        StudentCredentialDistribution res = this.restUtils.processDistribution(scd2,summary);
+        StudentCredentialDistribution res = this.restUtils.processDistribution(scd2,summary, false);
         assertNotNull(res);
     }