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 b0aa4150..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 @@ -28,12 +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 + //--> 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/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");