GRAD2-2220 - CLCF to be coded as meeting the requirements of the Fren…

…ch Immersion Dual Dogwood
bcgov · Jul 18, 2023 · 35efafe · 35efafe
1 parent fa0c0df
commit 35efafe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...c/main/java/ca/bc/gov/educ/api/ruleengine/rule/FrenchImmersionMinElectiveCreditsRule.java b/...c/main/java/ca/bc/gov/educ/api/ruleengine/rule/FrenchImmersionMinElectiveCreditsRule.java
@@ -93,7 +93,13 @@ public RuleProcessorData fire() {
         	StudentCourse sc = studentCourseIterator2.next();
         	if(!requirementAchieved && sc.isUsed()) {
         		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().equalsIgnoreCase("F")
+                            && (sc.getCourseLevel().trim().contains("11") || sc.getCourseLevel().trim().contains("12")
+                                            || sc.getCourseCode().contains("CLC"))
+                    ) {
         				requiredCreditsGrad11or12 = Integer.parseInt(pR.getOptionalProgramRequirementCode().getRequiredCredits());
         				totalCreditsGrade11or12 = processCredits(pR,totalCreditsGrade11or12,sc,requirementsMet);
         			}         		

diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCreditsRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCreditsRule.java
@@ -46,6 +46,12 @@ public RuleData fire() {
             return ruleProcessorData;
         }
 
+        studentCourses.forEach(sc -> {
+            if (sc.getCourseCode().contains("CLC")) {
+                sc.setCourseLevel("12");
+            }
+        });
+
         for (ProgramRequirement gradProgramRule : gradProgramRules) {
             requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim());
             totalCredits = studentCourses
@@ -92,6 +98,13 @@ public RuleData fire() {
 
             logger.debug("Min Credits -> Required:{} Has : {}",requiredCredits,totalCredits);
         }
+
+        ruleProcessorData.getStudentCourses().forEach(sc -> {
+            if (sc.getCourseCode().contains("CLC")) {
+                sc.setCourseLevel("");
+            }
+        });
+
         ruleProcessorData.setStudentCourses(studentCourses);
         return ruleProcessorData;
     }