Merge pull request #546 from bcgov/fix/logging

Fixes for NPE

Author: mightycox

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1986Rule.java

@@ -35,7 +35,7 @@ public RuleData fire() {
         List<StudentCourse> courseList = RuleProcessorRuleUtils
                 .getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
         courseList.sort(Comparator.comparing(StudentCourse::getCourseLevel).reversed()
-                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
+                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
 
         List<ProgramRequirement> gradProgramRulesMatch = RuleEngineApiUtils.getMatchProgramRules(ruleProcessorData.getGradProgramRules());
 

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCredit1996Rule.java

@@ -46,15 +46,15 @@ public RuleData fire() {
                         && studentCourse.getFineArtsAppliedSkills().length() > 0)
                 .collect(Collectors.toList());
         fineArtsCourseList.sort(Comparator.comparing(StudentCourse::getCourseLevel)
-                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder()));
+                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
 
         List<StudentCourse> courseList = RuleProcessorRuleUtils
                 .getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected())
                 .stream().filter(studentCourse -> studentCourse.getFineArtsAppliedSkills() == null
                                 || studentCourse.getFineArtsAppliedSkills().length() == 0)
                 .collect(Collectors.toList());
         courseList.sort(Comparator.comparing(StudentCourse::getCourseLevel)
-                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder()));
+                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
 
         if (courseList.isEmpty()) {
             logger.warn("!!!Empty list sent to Match Credit 1996 Rule for processing");

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCreditsRule.java

@@ -56,7 +56,7 @@ public RuleData fire() {
             courseList.sort(
                     Comparator.comparing(StudentCourse::getCourseLevel)
                             .thenComparing(StudentCourse::getCompletedCourseLetterGrade, Comparator.nullsLast(String::compareTo))
-                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder())
+                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder()))
             );
 
             gradProgramRulesMatch = ruleProcessorData.getGradProgramRules()
@@ -155,15 +155,15 @@ public void splitSortStudentCourses(List<StudentCourse> studentCourses, LocalDat
             coursesAfterStartDate.sort(
                     Comparator.comparing(StudentCourse::getCourseLevel)
                             .thenComparing(StudentCourse::getCompletedCourseLetterGrade, Comparator.nullsLast(String::compareTo))
-                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder())
+                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder()))
             );
             studentCourses.addAll(coursesAfterStartDate);
         }
         if (!coursesOnOrBeforeStartDate.isEmpty()) {
             coursesOnOrBeforeStartDate.sort(
                     Comparator.comparing(StudentCourse::getCourseLevel)
                             .thenComparing(StudentCourse::getCompletedCourseLetterGrade, Comparator.nullsLast(String::compareTo))
-                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder())
+                            .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder()))
             );
             studentCourses.addAll(coursesOnOrBeforeStartDate);
         }

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCredit1996Rule.java

@@ -34,7 +34,7 @@ public RuleData fire() {
                 ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
         List<StudentCourse> studentCourses = tempStudentCourseList.stream().filter(sc -> !sc.isUsedInMatchRule() || (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)).collect(Collectors.toList());
         studentCourses.sort(Comparator.comparing(StudentCourse::getCourseLevel, Comparator.reverseOrder())
-                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.reverseOrder()));
+                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
         List<ProgramRequirement> gradProgramRules = ruleProcessorData.getGradProgramRules()
                 .stream()
                 .filter(gpr -> "MC".compareTo(gpr.getProgramRequirementCode().getRequirementTypeCode().getReqTypeCode()) == 0

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1986Rule.java

@@ -37,7 +37,7 @@ public RuleData fire() {
 		List<StudentCourse> studentCourses = RuleProcessorRuleUtils
 				.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
 		studentCourses.sort(Comparator.comparing(StudentCourse::getCourseLevel).reversed()
-				.thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
+				.thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
 
 		List<ProgramRequirement> gradProgramRules = ruleProcessorData
 				.getGradProgramRules().stream().filter(gpr -> "MCE".compareTo(gpr.getProgramRequirementCode().getRequirementTypeCode().getReqTypeCode()) == 0

api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java

@@ -42,7 +42,7 @@ public RuleData fire() {
 				.filter(sc -> sc.isUsedInMinCreditRule() && (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)).toList();
 		tempStudentCourseList.removeAll(minCreditGrade12Courses);
 		tempStudentCourseList.addAll(minCreditGrade12CoursesWithLeftOverCredits);
-		tempStudentCourseList.sort(Comparator.comparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
+		tempStudentCourseList.sort(Comparator.comparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Comparator.reverseOrder())));
 
 		List<ProgramRequirement> gradProgramRules = ruleProcessorData
 				.getGradProgramRules().stream().filter(gpr -> "MCE".compareTo(gpr.getProgramRequirementCode().getRequirementTypeCode().getReqTypeCode()) == 0