Merge pull request #266 from bcgov/develop/alex-GRAD2-2758

Develop/alex grad2 2758
bcgov · Jun 12, 2024 · bf9584c · bf9584c
2 parents a6e1587 + aed615d
commit bf9584c
Showing 1 changed file with 10 additions and 0 deletions.
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()) {