Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grad release 1.21.0 #494

Merged
merged 5 commits into from
Jun 19, 2024
Merged

Grad release 1.21.0 #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0565538
GRAD2-2758
arybakov-cgi Jun 11, 2024
4b6e815
GRAD2-2758
arybakov-cgi Jun 11, 2024
b6a43b7
GRAD2-2758
arybakov-cgi Jun 12, 2024
aedaf38
Merge pull request #493 from bcgov/develop/alex-GRAD2-2758
arybakov-cgi Jun 12, 2024
8196c4e
Update pom.xml
githubmamatha Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 4 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

}
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunYearlyProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
}
5 changes: 4 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading