Merge pull request #547 from bcgov/fix/logging

New data uses full word for course language 'French'. TRAX used just …

Author: alexmcdermid

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

@@ -46,13 +46,13 @@ public RuleData fire() {
                     if (studentCourseList.get(i).getCredits() > studentCourseList.get(j).getCredits()) {
                         studentCourseList.get(i).setDuplicate(false);
                         studentCourseList.get(j).setDuplicate(true);
-                    } else if (studentCourseList.get(i).getCompletedCoursePercentage() > studentCourseList.get(j).getCompletedCoursePercentage()) {
+                    } else if (computeCompletedCoursePercentage(studentCourseList.get(i).getCompletedCoursePercentage()) > computeCompletedCoursePercentage(studentCourseList.get(j).getCompletedCoursePercentage())) {
                         studentCourseList.get(i).setDuplicate(false);
                         studentCourseList.get(j).setDuplicate(true);
-                    } else if (studentCourseList.get(i).getCompletedCoursePercentage() < studentCourseList.get(j).getCompletedCoursePercentage()) {
+                    } else if (computeCompletedCoursePercentage(studentCourseList.get(i).getCompletedCoursePercentage()) < computeCompletedCoursePercentage(studentCourseList.get(j).getCompletedCoursePercentage())) {
                         studentCourseList.get(i).setDuplicate(true);
                         studentCourseList.get(j).setDuplicate(false);
-                    } else if (studentCourseList.get(i).getCompletedCoursePercentage().equals(studentCourseList.get(j).getCompletedCoursePercentage())) {
+                    } else if (computeCompletedCoursePercentage(studentCourseList.get(i).getCompletedCoursePercentage()).equals(computeCompletedCoursePercentage(studentCourseList.get(j).getCompletedCoursePercentage()))) {
                     	compareSessionDates(studentCourseList,i,j);                        
                     }
                 }  //Do Nothing
@@ -75,6 +75,10 @@ private void compareSessionDates(List<StudentCourse> studentCourseList, int i, i
             studentCourseList.get(j).setDuplicate(false);
         }
     }
+
+    private Double computeCompletedCoursePercentage(Double completedCoursePercentage) {
+        return completedCoursePercentage != null ? completedCoursePercentage : Double.valueOf("0");
+    }
 
     @Override
     public void setInputData(RuleData inputData) {

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

@@ -54,7 +54,7 @@ public RuleProcessorData fire() {
         while (studentCourseIterator2.hasNext()) {            
         	StudentCourse sc = studentCourseIterator2.next();
             for(OptionalProgramRequirement pR:gradOptionalProgramMinCreditElectiveRulesMatch) {
-                if(!sc.getCourseCode().startsWith("X") && sc.getLanguage() != null && sc.getLanguage().equalsIgnoreCase("F")){
+                if(!sc.getCourseCode().startsWith("X") && sc.getLanguage() != null && sc.getLanguage().toUpperCase().startsWith("F")){
                     requiredCreditsGrad11or12 = Integer.parseInt(pR.getOptionalProgramRequirementCode().getRequiredCredits());
                     totalCreditsGrade11or12 = processCredits(pR,totalCreditsGrade11or12,sc,requirementsMet);
                 }

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

@@ -54,7 +54,7 @@ public RuleProcessorData fire() {
         while (studentCourseIterator2.hasNext()) {            
         	StudentCourse sc = studentCourseIterator2.next();
             for(OptionalProgramRequirement pR:gradOptionalProgramMinCreditElectiveRulesMatch) {
-                if(pR.getOptionalProgramRequirementCode().getRequiredLevel() != null && pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("11 or 12") == 0 && sc.getLanguage() != null && sc.getLanguage().equalsIgnoreCase("F") && (sc.getCourseLevel().trim().contains("11") || sc.getCourseLevel().trim().contains("12"))) {
+                if(pR.getOptionalProgramRequirementCode().getRequiredLevel() != null && pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("11 or 12") == 0 && sc.getLanguage() != null && sc.getLanguage().toUpperCase().startsWith("F") && (sc.getCourseLevel().trim().contains("11") || sc.getCourseLevel().trim().contains("12"))) {
                     requiredCreditsGrad11or12 = Integer.parseInt(pR.getOptionalProgramRequirementCode().getRequiredCredits());
                     totalCreditsGrade11or12 = processCredits(pR,totalCreditsGrade11or12,sc,requirementsMet);
                 }

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

@@ -65,7 +65,7 @@ public RuleProcessorData fire() {
         	StudentCourse sc = studentCourseIterator.next();
         	if(!requirementAchieved) {
 	        	for(OptionalProgramRequirement pR:gradOptionalProgramMinCreditElectiveRulesMatch) {            	
-	        		if((pR.getOptionalProgramRequirementCode().getRequiredLevel() == null || pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("") == 0) && sc.getLanguage() != null && sc.getLanguage().equalsIgnoreCase("F")) {
+	        		if((pR.getOptionalProgramRequirementCode().getRequiredLevel() == null || pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("") == 0) && sc.getLanguage() != null && sc.getLanguage().toUpperCase().startsWith("F")) {
 	        			requiredCredits = Integer.parseInt(pR.getOptionalProgramRequirementCode().getRequiredCredits());
 	        			totalCredits = processCredits(pR,totalCredits,sc,requirementsMet);
 	        		}
@@ -97,7 +97,7 @@ public RuleProcessorData fire() {
         			if(pR.getOptionalProgramRequirementCode().getRequiredLevel() != null
                             && pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("11 or 12") == 0
                             && sc.getLanguage() != null
-                            && sc.getLanguage().equalsIgnoreCase("F")
+                            && sc.getLanguage().toUpperCase().startsWith("F")
                             && (sc.getCourseLevel().trim().contains("11") || sc.getCourseLevel().trim().contains("12")
                                             || sc.getCourseCode().contains("CLC"))
                     ) {

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

@@ -55,7 +55,7 @@ public RuleProcessorData fire() {
                            .filter(sc -> !sc.isUsedInMatchRule()
                                    && (sc.getCourseLevel().contains("11")
                                    || sc.getCourseLevel().contains("12"))
-                                   && sc.getLanguage() != null && sc.getLanguage().trim().compareTo("F")==0)
+                                   && sc.getLanguage() != null && sc.getLanguage().trim().toUpperCase().startsWith("F"))
                            .collect(Collectors.toList());
 
 

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

@@ -106,13 +106,17 @@ private boolean is1950AndSameLevel(String programCode, String courseLevel, Strin
 
     private void compareCredits(StudentCourse sCourse, StudentCourse tempCourseRestriction, List<StudentCourse> studentCourses, int i) {
         if (sCourse.getCredits().equals(tempCourseRestriction.getCredits())) {
-            if (sCourse.getCompletedCoursePercentage().equals(tempCourseRestriction.getCompletedCoursePercentage())) {
+            if (computeCompletedCoursePercentage(sCourse.getCompletedCoursePercentage()).equals(computeCompletedCoursePercentage(tempCourseRestriction.getCompletedCoursePercentage()))) {
                 compareSessionDates(sCourse, tempCourseRestriction, studentCourses, i);
             } else
-                studentCourses.get(i).setRestricted(sCourse.getCompletedCoursePercentage() <= tempCourseRestriction.getCompletedCoursePercentage());
+                studentCourses.get(i).setRestricted(computeCompletedCoursePercentage(sCourse.getCompletedCoursePercentage()) <= computeCompletedCoursePercentage(tempCourseRestriction.getCompletedCoursePercentage()));
         } else studentCourses.get(i).setRestricted(sCourse.getCredits() <= tempCourseRestriction.getCredits());
     }
 
+    private Double computeCompletedCoursePercentage(Double completedCoursePercentage) {
+        return completedCoursePercentage != null ? completedCoursePercentage : Double.valueOf("0");
+    }
+
     private void compareSessionDates(StudentCourse sCourse, StudentCourse tempCourseRestriction, List<StudentCourse> studentCourses, int i) {
         if (RuleEngineApiUtils.parsingTraxDate(sCourse.getSessionDate())
                 .compareTo(RuleEngineApiUtils.parsingTraxDate(tempCourseRestriction.getSessionDate())) < 0) {