Skip to content

fix/GRAD2-3792 #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cditcher merged 2 commits into from
May 6, 2026
Merged

fix/GRAD2-3792 #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd84ea9
First minor fix for reqt 19
cditcher May 5, 2026
030c25f
Added precedence for non-projected courses via sorting. This prioriti…
cditcher May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCreditsElective12OtherRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCreditsElective12Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinCreditsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits1996Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCredits2023Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCreditsFrench1996Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinElectiveCreditsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
Loading