Merge pull request #267 from bcgov/grad-release

Grad release 1.21.0
bcgov · Jun 19, 2024 · 1dfe0ac · 1dfe0ac
2 parents 8eb974e + 3295d42
commit 1dfe0ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
     <artifactId>educ-grad-graduation-report-api</artifactId>
-    <version>1.8.47</version>
+    <version>1.8.48</version>
     <name>educ-grad-graduation-report-api</name>
     <description>Grad Graduation Report API for GRAD team</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
@@ -747,13 +747,23 @@ private synchronized List<ReportGradStudentData> getNextPageStudentsFromGradStud
         if(studentsInBatch != null && !schools.isEmpty()) {
             boolean isDistrictSchool = schools.get(0).length() == 3;
             if(isDistrictSchool) {
+                //--> Revert code back to school of record GRAD2-2758
+                /**
                 studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && (StringUtils.isBlank(st.getMincodeAtGrad()) || StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.substring(st.getMincode(), 0, 3))));
                 studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && (StringUtils.isNotBlank(st.getMincodeAtGrad()) && !StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.substring(st.getMincodeAtGrad(), 0, 3))));
+                 **/
+                studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && !schools.contains(StringUtils.substring(st.getMincode(), 0, 3))));
+                //<--
             }
             boolean isSchoolSchool = schools.get(0).length() > 3;
             if(isSchoolSchool) {
+                //--> Revert code back to school of record GRAD2-2758
+                /**
                 studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && (StringUtils.isBlank(st.getMincodeAtGrad()) || StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.trimToEmpty(st.getMincode()))));
                 studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && (StringUtils.isNotBlank(st.getMincodeAtGrad()) && !StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.trimToEmpty(st.getMincodeAtGrad()))));
+                 **/
+                studentsInBatch.removeIf(st -> (schools != null && !schools.isEmpty() && !schools.contains(StringUtils.trimToEmpty(st.getMincode()))));
+                //<--
             }
         }
         for(SchoolReportEntity e: students.getContent()) {