Merge pull request #494 from bcgov/grad-release

Grad release 1.21.0
bcgov · Jun 19, 2024 · 45f1362 · 45f1362
2 parents fda090b + 8196c4e
commit 45f1362
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
     <artifactId>educ-grad-batch-graduation-api</artifactId>
-    <version>1.8.63</version>
+    <version>1.8.64</version>
     <name>educ-grad-batch-graduation-api</name>
     <description>Ministry of Education GRAD BATCH GRADUATION API</description>
 

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
@@ -3,7 +3,6 @@
 import ca.bc.gov.educ.api.batchgraduation.model.DistributionSummaryDTO;
 import ca.bc.gov.educ.api.batchgraduation.model.StudentCredentialDistribution;
 import ca.bc.gov.educ.api.batchgraduation.rest.RestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.ItemProcessor;
@@ -29,10 +28,13 @@ public StudentCredentialDistribution process(StudentCredentialDistribution item)
 		LOGGER.info("Processing partitionData = {}", item.getCredentialTypeCode());
 		summaryDTO.setBatchId(batchId);
 		boolean useSchoolAtGrad = false;
+		//--> Revert code back to school of record GRAD2-2758
+		/**
 		String credentialType = summaryDTO.getCredentialType();
 		if (StringUtils.equalsAnyIgnoreCase(credentialType, "OC", "RC")) {
 			useSchoolAtGrad = true;
-		}
+		} **/
+		//<--
 		return restUtils.processDistribution(item, summaryDTO, useSchoolAtGrad);
 
 	}

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,8 @@ 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, true);
+		//--> Revert code back to school of record GRAD2-2758 (set useSchoolAtGrad to false)
+		return restUtils.processDistribution(item, summaryDTO, false);
 
 	}
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java
@@ -102,7 +102,10 @@ private StudentCredentialDistribution populateStudentCredentialDistribution(Repo
 		}
 		dist.setStudentID(data.getGraduationStudentRecordId());
 		dist.setPaperType(paperType);
-		dist.setSchoolOfRecord(StringUtils.isBlank(data.getMincodeAtGrad()) ? data.getMincode() : data.getMincodeAtGrad());
+		//--> Revert code back to school of record GRAD2-2758
+		/** dist.setSchoolOfRecord(StringUtils.isBlank(data.getMincodeAtGrad()) ? data.getMincode() : data.getMincodeAtGrad()); **/
+		dist.setSchoolOfRecord(data.getMincode());
+		//<--
 		dist.setSchoolAtGrad(data.getMincodeAtGrad());
 		dist.setSchoolOfRecordOrigin(data.getMincode());
 		dist.setDocumentStatusCode("COMPL");