fix/GRAD2-3792 (#554)

* First minor fix for reqt 19

* Added precedence for non-projected courses via sorting. This prioritizes actual passed courses before projected ones during tvr processing. Fix applied to min credits and elective (19 and 17)

Author: cditcher

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

@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -49,6 +50,8 @@ public RuleData fire() {
 			return ruleProcessorData;
 		}
 
+		studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
 		List<String> socialStudiesCourseCodeList = ruleProcessorData.getCourseRequirements().stream().filter(cr -> "502".equals(cr.getRuleCode().getCourseRequirementCode())).map(CourseRequirement::getCourseCode).collect(Collectors.toList());
 		if (socialStudiesCourseCodeList.isEmpty()) {
 			socialStudiesCourseCodeList = List.of(COURSE_CODE_SOCIAL_STUDIES);

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

@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +43,8 @@ public RuleData fire() {
 			return ruleProcessorData;
 		}
 
+		studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
 		for (ProgramRequirement gradProgramRule : gradProgramRules) {
 			requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim()); // list
 

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

@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -47,6 +48,9 @@ public RuleData fire() {
 
         RuleProcessorRuleUtils.updateCourseLevelForCLC(studentCourses, "12");
 
+        // sorting gives preference to non-projected courses GRAD2-3792
+        studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
         for (ProgramRequirement gradProgramRule : gradProgramRules) {
             requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim());
             totalCredits = studentCourses

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

@@ -37,6 +37,7 @@ public RuleData fire() {
 		int ldCourseCounter = 0;
 		List<StudentCourse> tempStudentCourseList = RuleProcessorRuleUtils
 				.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
+
 		List<StudentCourse> minCreditGrade12Courses = tempStudentCourseList.stream().filter(StudentCourse::isUsedInMinCreditRule).collect(Collectors.toList());
 		List<StudentCourse> minCreditGrade12CoursesWithLeftOverCredits = minCreditGrade12Courses.stream()
 				.filter(sc -> sc.isUsedInMinCreditRule() && (sc.getLeftOverCredits() != null && sc.getLeftOverCredits() > 0)).toList();

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

@@ -13,6 +13,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,6 +47,8 @@ public RuleData fire() {
 			return ruleProcessorData;
 		}
 
+		studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
 		for (ProgramRequirement gradProgramRule : gradProgramRules) {
 			requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim()); // list
 			for (StudentCourse sc : studentCourses) {

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

@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +40,8 @@ public RuleProcessorData fire() {
         List<StudentCourse> studentCourses = RuleProcessorRuleUtils
                 .getUniqueStudentCourses(ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
 
+        studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
         logger.debug("Unique Courses: {}",studentCourses.size());
 
         List<ProgramRequirement> gradProgramRules = ruleProcessorData

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

@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -44,6 +45,8 @@ public RuleData fire() {
 			return ruleProcessorData;
 		}
 
+		studentCourses.sort(Comparator.comparing(StudentCourse::isProjected));
+
 		for (ProgramRequirement gradProgramRule : gradProgramRules) {
 			requiredCredits = Integer.parseInt(gradProgramRule.getProgramRequirementCode().getRequiredCredits().trim()); // list
 			for (StudentCourse sc : studentCourses) {