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

1.14.2 Hotfix sync from main #512

Merged
merged 6 commits into from
Feb 22, 2024
Merged

1.14.2 Hotfix sync from main #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26feb3e
Grad release 1.14.0
kamal-mohammed Feb 6, 2024
720bfc0
Hotfix on NPE in non grad reasons
arybakov-cgi Feb 16, 2024
e8868c8
Fix test
arybakov-cgi Feb 16, 2024
8647b15
Hotfix on NPE in non grad reasons
kamal-mohammed Feb 16, 2024
ccc0835
Update pom.xml
kamal-mohammed Feb 16, 2024
308d5ce
Update build.from.main.branch.deploy.to.dev.yml
kamal-mohammed Feb 16, 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 .github/workflows/build.from.main.branch.deploy.to.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ jobs:
- name: ZAP Scan
uses: zaproxy/[email protected]
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
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-graduation-api</artifactId>
<version>1.8.52</version>
<version>1.8.53</version>
<name>educ-grad-graduation-api</name>
<description>Ministry of Education GRAD GRADUATION API</description>

Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/ca/bc/gov/educ/api/graduation/service/GraduationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@ private List<Student> processStudentList(List<GraduationStudentRecord> gradStudL
}

private List<NonGradReason> getNonGradReasons(String gradProgramCode, List<GradRequirement> nonGradReasons) {
nonGradReasons.removeIf(a -> ("506".equalsIgnoreCase(a.getTranscriptRule()) || "506".equalsIgnoreCase(a.getRule())) && (StringUtils.isNotBlank(gradProgramCode) && gradProgramCode.contains("1950")));
List<NonGradReason> nList = new ArrayList<>();
if (nonGradReasons != null) {
nonGradReasons.removeIf(a -> ("506".equalsIgnoreCase(a.getTranscriptRule()) || "506".equalsIgnoreCase(a.getRule())) && (StringUtils.isNotBlank(gradProgramCode) && gradProgramCode.contains("1950")));
for (GradRequirement gR : nonGradReasons) {
NonGradReason obj = new NonGradReason();
obj.setCode(gR.getTranscriptRule());
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ private List<OptionalProgram> getOptionalProgramAchvReport(String gradProgramCod
op.setOptionalProgramCode(sPO.getOptionalProgramCode());
op.setOptionalProgramName(sPO.getOptionalProgramName());
op.setProgramCompletionDate(sPO.getOptionalProgramCompletionDate());
op.setNonGradReasons(new ArrayList<>());

GradAlgorithmOptionalStudentProgram existingData = (GradAlgorithmOptionalStudentProgram)jsonTransformer.unmarshall(sPO.getStudentOptionalProgramData(), GradAlgorithmOptionalStudentProgram.class);
if (existingData != null && existingData.getOptionalNonGradReasons() != null) {
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/java/ca/bc/gov/educ/api/graduation/service/GraduationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,7 @@ public void testCreateAndStoreSchoolReports() {
Mockito.when(gradStatusService.getStudentListByMinCode(mincode, "accessToken")).thenReturn(sList);
Mockito.when(schoolService.getSchoolDetails(mincode, "accessToken", exception)).thenReturn(sTrax);
int numberOfRecord = graduationService.createAndStoreSchoolReports(uniqueList,"REGALG","accessToken");
assertEquals(1,numberOfRecord);
assertEquals(2,numberOfRecord);
}

@Test
Expand Down
Loading