Merge pull request #545 from bcgov/fix/logging

Fixes for NPE

Author: arcshiftsolutions

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

@@ -6,7 +6,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Slf4j
 @Data
 @Component
 @NoArgsConstructor
@@ -36,13 +34,8 @@ public RuleData fire() {
 
         List<StudentCourse> courseList = RuleProcessorRuleUtils
                 .getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
-
-        for(StudentCourse studentCourse : courseList) {
-            log.debug("courseCode={} :: courseLevel={}", studentCourse.getCourseCode(), studentCourse.getCourseLevel());
-        }
-
         courseList.sort(Comparator.comparing(StudentCourse::getCourseLevel).reversed()
-                .thenComparing(StudentCourse::getCompletedCoursePercentage).reversed());
+                .thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
 
         List<ProgramRequirement> gradProgramRulesMatch = RuleEngineApiUtils.getMatchProgramRules(ruleProcessorData.getGradProgramRules());
 

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

@@ -186,6 +186,7 @@ private void processCourse(StudentCourse tempCourse, List<CourseRequirement> tem
             logger.debug("tempCourse= {}", tempCourse);
             if(tempCourse.getCourseCode().startsWith("Y")
                     && tempCourse.getCourseLevel().contains("11")
+                    && tempCourse.getFineArtsAppliedSkills() != null
                     && (tempCourse.getFineArtsAppliedSkills().compareTo("B") == 0
                     || tempCourse.getFineArtsAppliedSkills().compareTo("F") == 0
                     || tempCourse.getFineArtsAppliedSkills().compareTo("A") == 0)) {

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

@@ -108,6 +108,7 @@ private void processCourse(StudentCourse tempCourse, List<CourseRequirement> tem
         } else {
             if (tempCourse.getCourseCode().startsWith("Y")
                     && tempCourse.getCourseLevel().contains("11")
+                    && tempCourse.getFineArtsAppliedSkills() != null
                     && (tempCourse.getFineArtsAppliedSkills().compareTo("B") == 0
                     || tempCourse.getFineArtsAppliedSkills().compareTo("F") == 0
                     || tempCourse.getFineArtsAppliedSkills().compareTo("A") == 0)) {

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

@@ -36,11 +36,8 @@ public RuleData fire() {
 		Integer ldCourseCounter = ruleProcessorData.getLdCounter();
 		List<StudentCourse> studentCourses = RuleProcessorRuleUtils
 				.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
-		for(StudentCourse studentCourse : studentCourses) {
-			log.debug("courseCode={} :: courseLevel={}", studentCourse.getCourseCode(), studentCourse.getCourseLevel());
-		}
 		studentCourses.sort(Comparator.comparing(StudentCourse::getCourseLevel).reversed()
-				.thenComparing(StudentCourse::getCompletedCoursePercentage).reversed());
+				.thenComparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
 
 		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).reversed());
+		tempStudentCourseList.sort(Comparator.comparing(StudentCourse::getCompletedCoursePercentage, Comparator.nullsLast(Double::compareTo)).reversed());
 
 		List<ProgramRequirement> gradProgramRules = ruleProcessorData
 				.getGradProgramRules().stream().filter(gpr -> "MCE".compareTo(gpr.getProgramRequirementCode().getRequirementTypeCode().getReqTypeCode()) == 0