Skip to content

Commit

Permalink
Merge pull request #254 from bcgov/develop/alex-GRAD2-2377
Browse files Browse the repository at this point in the history
GRAD2-2377
  • Loading branch information
arybakov-cgi authored Apr 19, 2024
2 parents 135bb34 + 8be02c5 commit f555a16
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -732,33 +732,28 @@ private synchronized List<ReportGradStudentData> getNextPageStudentsFromGradStud
if(studentsInBatch != null && !schools.isEmpty()) {
boolean isDistrictSchool = schools.get(0).length() == 3;
if(isDistrictSchool) {
studentsInBatch.removeIf(st -> ((StringUtils.isBlank(st.getMincodeAtGrad()) || StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.substring(st.getMincode(), 0, 3))));
studentsInBatch.removeIf(st -> ((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() && (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))));
}
boolean isSchoolSchool = schools.get(0).length() > 3;
if(isSchoolSchool) {
studentsInBatch.removeIf(st -> ((StringUtils.isBlank(st.getMincodeAtGrad()) || StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.trimToEmpty(st.getMincode()))));
studentsInBatch.removeIf(st -> ((StringUtils.isNotBlank(st.getMincodeAtGrad()) && !StringUtils.equals(st.getMincode(), st.getMincodeAtGrad())) && !schools.contains(StringUtils.trimToEmpty(st.getMincodeAtGrad()))));
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()))));
}
}
for(SchoolReportEntity e: students.getContent()) {
String paperType = e.getPaperType();
String certificateTypeCode = e.getCertificateTypeCode(); //either transcript or certificate codes
ReportGradStudentData s = getReportGradStudentDataByGraduationStudentRecordIdFromList(e.getGraduationStudentRecordId(), studentsInBatch);
if(s != null) {
if(s != null && "CUR".equalsIgnoreCase(s.getStudentStatus())) {
ReportGradStudentData dataResult = SerializationUtils.clone(s);
dataResult.setPaperType(paperType);
if ("YED4".equalsIgnoreCase(paperType)) {
dataResult.setTranscriptTypeCode(certificateTypeCode);
} else {
dataResult.setCertificateTypeCode(certificateTypeCode);
}
if("YED4".equalsIgnoreCase(paperType) && "CUR".equalsIgnoreCase(s.getStudentStatus())) {
result.add(dataResult);
}
if (!"YED4".equalsIgnoreCase(paperType)) {
result.add(dataResult);
}
result.add(dataResult);
}
}
return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@ public void testGetSchoolReportGradStudentData() {
reportGradStudentData.setGraduationStudentRecordId(studentId);
reportGradStudentData.setTranscriptTypeCode("BC2018-IND");
reportGradStudentData.setMincode("12345678");
reportGradStudentData.setStudentStatus("CUR");

GradCertificateTypes certificateTypes = new GradCertificateTypes();
certificateTypes.setCode("E");
Expand All @@ -1480,6 +1481,7 @@ public void testGetSchoolReportGradStudentData() {

reportGradStudentData = new ReportGradStudentData();
reportGradStudentData.setGraduationStudentRecordId(studentId);
reportGradStudentData.setStudentStatus("CUR");

reportGradStudentDataList.add(reportGradStudentData);

Expand All @@ -1488,6 +1490,7 @@ public void testGetSchoolReportGradStudentData() {
reportGradStudentData.setTranscriptTypeCode("BC2004-IND");
reportGradStudentData.setMincode("12345678");
reportGradStudentData.setMincodeAtGrad("09876543");
reportGradStudentData.setStudentStatus("CUR");

reportGradStudentDataList.add(reportGradStudentData);

Expand Down Expand Up @@ -1688,6 +1691,7 @@ public void testGetSchoolReportGradStudentDataForSchools() {
reportGradStudentData.setGraduationStudentRecordId(studentId);
reportGradStudentData.setTranscriptTypeCode("BC2018-IND");
reportGradStudentData.setMincode(mincode);
reportGradStudentData.setStudentStatus("CUR");

GradCertificateTypes certificateTypes = new GradCertificateTypes();
certificateTypes.setCode("E");
Expand All @@ -1698,6 +1702,7 @@ public void testGetSchoolReportGradStudentDataForSchools() {

reportGradStudentData = new ReportGradStudentData();
reportGradStudentData.setGraduationStudentRecordId(studentId);
reportGradStudentData.setStudentStatus("CUR");

reportGradStudentDataList.add(reportGradStudentData);

Expand All @@ -1706,6 +1711,7 @@ public void testGetSchoolReportGradStudentDataForSchools() {
reportGradStudentData.setTranscriptTypeCode("BC2004-IND");
reportGradStudentData.setMincode(mincode);
reportGradStudentData.setMincodeAtGrad("09876543");
reportGradStudentData.setStudentStatus("CUR");

reportGradStudentDataList.add(reportGradStudentData);

Expand Down

0 comments on commit f555a16

Please sign in to comment.