Skip to content

HD-36143 #639

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

Merged
alexmcdermid merged 1 commit into from
Apr 21, 2026
Merged

HD-36143 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 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 @@ -332,7 +332,7 @@
}
result.setCourse(setCourseObjForTranscript(sc, graduationDataStatus));
result.setMark(setMarkObjForTranscript(sc, graduationDataStatus.getGradStatus().getProgram(), provincially));
if ("1950".equalsIgnoreCase(graduationDataStatus.getGradProgram().getProgramCode()) && "3, 4".equalsIgnoreCase(sc.getGradReqMet())) {
if (graduationDataStatus.getGradProgram() != null && "1950".equalsIgnoreCase(graduationDataStatus.getGradProgram().getProgramCode()) && "3, 4".equalsIgnoreCase(sc.getGradReqMet())) {
result.setRequirement(StringUtils.substringBefore(sc.getGradReqMet(), ","));
result.setRequirementName(StringUtils.substringBefore(sc.getGradReqMetDetail(), ","));
} else {
Expand Down Expand Up @@ -502,21 +502,25 @@
notCompletedCourse = xml && diff <= 0;
}
if (!sc.isDuplicate() && !sc.isFailed() && !sc.isNotCompleted() && ((notCompletedCourse) || !sc.isProjected())) {
if ((graduationDataStatus.getGradStatus().getProgram().contains("SCCP") || graduationDataStatus.getGradStatus().getProgram().contains("1950")) && (sc.getSpecialCase().compareTo("E") == 0 || sc.getSpecialCase().compareTo("A") == 0)) {
if ((graduationDataStatus.getGradStatus().getProgram().contains("SCCP") || graduationDataStatus.getGradStatus().getProgram().contains("1950"))
&& sc.getSpecialCase() != null
&& (sc.getSpecialCase().compareTo("E") == 0 || sc.getSpecialCase().compareTo("A") == 0)) {
skipProcessing = true;
}
if (!skipProcessing) {
String finalPercent = getValue(sc.getProficiencyScore());
String cutoffDate = EducGraduationApiUtils.formatDate(graduationDataStatus.getGradProgram().getAssessmentReleaseDate(), EducGraduationApiConstants.DEFAULT_DATE_FORMAT);
if(sc.getSessionDate() != null) {
String sessionDate = sc.getSessionDate() + "/01";
Date temp = toLastDayOfMonth(EducGraduationApiUtils.parseDate(sessionDate, EducGraduationApiConstants.SECONDARY_DATE_FORMAT));
sessionDate = EducGraduationApiUtils.formatDate(temp, EducGraduationApiConstants.DEFAULT_DATE_FORMAT);

int diff = EducGraduationApiUtils.getDifferenceInMonths(sessionDate, cutoffDate);

if (diff < 0 && !finalPercent.equals("") && !finalPercent.equals("0")) {
continue;
if (graduationDataStatus.getGradProgram() != null && graduationDataStatus.getGradProgram().getAssessmentReleaseDate() != null) {
String cutoffDate = EducGraduationApiUtils.formatDate(graduationDataStatus.getGradProgram().getAssessmentReleaseDate(), EducGraduationApiConstants.DEFAULT_DATE_FORMAT);
if(sc.getSessionDate() != null) {
String sessionDate = sc.getSessionDate() + "/01";
Date temp = toLastDayOfMonth(EducGraduationApiUtils.parseDate(sessionDate, EducGraduationApiConstants.SECONDARY_DATE_FORMAT));
sessionDate = EducGraduationApiUtils.formatDate(temp, EducGraduationApiConstants.DEFAULT_DATE_FORMAT);

int diff = EducGraduationApiUtils.getDifferenceInMonths(sessionDate, cutoffDate);

if (diff < 0 && !finalPercent.isEmpty() && !finalPercent.equals("0")) {
continue;
}
}
}
TranscriptResult result = new TranscriptResult();
Expand Down Expand Up @@ -570,13 +574,13 @@
List<StudentCourse> studentCourseList = graduationDataStatus.getStudentCourses().getStudentCourseList();
if (!studentCourseList.isEmpty()) {
if (program.contains("1950") || program.contains("1986")) {
List<StudentCourse> provinciallyExaminable = studentCourseList.stream().filter(sc -> sc.getProvExamCourse().compareTo("Y") == 0).collect(Collectors.toList());
List<StudentCourse> provinciallyExaminable = studentCourseList.stream().filter(sc -> sc.getProvExamCourse() != null && sc.getProvExamCourse().compareTo("Y") == 0).collect(Collectors.toList());

Check warning on line 577 in api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this usage of 'Stream.collect(Collectors.toList())' with 'Stream.toList()' and ensure that the list is unmodified. 


See more on https://sonarcloud.io/project/issues?id=bcgov_EDUC-GRAD-GRADUATION-API&issues=AZ2xtC215bcgROrytBwB&open=AZ2xtC215bcgROrytBwB&pullRequest=639
if (!provinciallyExaminable.isEmpty()) {
sortOnCourseCode(provinciallyExaminable);
createCourseListForTranscript(provinciallyExaminable, graduationDataStatus, tList, "provincially", xml);
}

List<StudentCourse> nonExaminable = studentCourseList.stream().filter(sc -> sc.getProvExamCourse().compareTo("N") == 0).collect(Collectors.toList());
List<StudentCourse> nonExaminable = studentCourseList.stream().filter(sc -> sc.getProvExamCourse() != null && sc.getProvExamCourse().compareTo("N") == 0).collect(Collectors.toList());

Check warning on line 583 in api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this usage of 'Stream.collect(Collectors.toList())' with 'Stream.toList()' and ensure that the list is unmodified. 


See more on https://sonarcloud.io/project/issues?id=bcgov_EDUC-GRAD-GRADUATION-API&issues=AZ2xtC215bcgROrytBwC&open=AZ2xtC215bcgROrytBwC&pullRequest=639
if (!nonExaminable.isEmpty()) {
sortOnCourseCode(nonExaminable);
createCourseListForTranscript(nonExaminable, graduationDataStatus, tList, "non-examinable", xml);
Expand Down
Loading
Loading