diff --git a/api/pom.xml b/api/pom.xml
index fbf8d717..3c46b71d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
ca.bc.gov.educ
educ-grad-batch-graduation-api
- 1.8.63
+ 1.8.64
educ-grad-batch-graduation-api
Ministry of Education GRAD BATCH GRADUATION API
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
index 150ce728..71a756ff 100644
--- 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/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java
index 17e1f3c8..2397e04a 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java
@@ -26,7 +26,8 @@ public class DistributionRunYearlyProcessor implements ItemProcessor 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
index 0c432552..2a9f022b 100644
--- 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");