From 0565538b7f620be287fd61717a9ec2866428faa8 Mon Sep 17 00:00:00 2001 From: arybakov Date: Tue, 11 Jun 2024 11:27:45 -0600 Subject: [PATCH 1/4] GRAD2-2758 YE Distribution Run to Revert the bundling back to SCHOOL OF RECORD --- .../batchgraduation/processor/DistributionRunProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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..b0aa4150 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,12 @@ 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); } From 4b6e8152744f02ce60bbf5c87adef9d3cecd0dd4 Mon Sep 17 00:00:00 2001 From: arybakov Date: Tue, 11 Jun 2024 11:32:49 -0600 Subject: [PATCH 2/4] GRAD2-2758 YE Distribution Run to Revert the bundling back to SCHOOL OF RECORD --- .../batchgraduation/processor/DistributionRunProcessor.java | 3 ++- .../api/batchgraduation/service/GraduationReportService.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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"); From b6a43b76efdc39f49683991eaa5602d6d76bbfb3 Mon Sep 17 00:00:00 2001 From: arybakov Date: Wed, 12 Jun 2024 10:49:02 -0600 Subject: [PATCH 3/4] GRAD2-2758 YE Distribution Run to Revert the bundling back to SCHOOL OF RECORD --- .../processor/DistributionRunYearlyProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } } From 8196c4ed7dbfbb2c5dbfc60d948b6b1cfc1844db Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:03:04 -0700 Subject: [PATCH 4/4] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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