Merge pull request #452 from bcgov/feature/GRAD2-2271

GRAD2-2271: improved for a student with "X" courses and regular courses.
bcgov · Nov 3, 2023 · b1e1904 · b1e1904
2 parents 5154d7a + fb3d1e5
commit b1e1904
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/DuplicateCoursesRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/DuplicateCoursesRule.java
@@ -40,7 +40,8 @@ public RuleData fire() {
                         && studentCourseList.get(i).getCourseLevel().equals(studentCourseList.get(j).getCourseLevel())
                         && !studentCourseList.get(j).isDuplicate()) {
 
-                	logger.debug("comparing {} with {}  -> Duplicate FOUND - CourseID: {}-{}",studentCourseList.get(i).getCourseCode(),studentCourseList.get(j).getCourseCode(),studentCourseList.get(i).getCourseCode(),studentCourseList.get(i).getCourseLevel());
+                	logger.debug("comparing {} with {}  -> Duplicate FOUND - CourseID: {}-{} {}",studentCourseList.get(i).getCourseCode(),studentCourseList.get(j).getCourseCode(),
+                            studentCourseList.get(j).getCourseCode(),studentCourseList.get(j).getCourseLevel(),studentCourseList.get(j).getSessionDate());
 
                     if (studentCourseList.get(i).getCredits() > studentCourseList.get(j).getCredits()) {
                         studentCourseList.get(i).setDuplicate(false);

diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinAdultCoursesRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinAdultCoursesRule.java
@@ -159,6 +159,9 @@ public RuleData fire() {
 				}
 			}
 		}
+		if (!studentCourses.isEmpty()) {
+			ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
+		}
 		return ruleProcessorData;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,6 +159,9 @@ public RuleData fire() { @@
     				}
     			}
     		}
+    		if (!studentCourses.isEmpty()) {
+    			ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
+    		}
     		return ruleProcessorData;
     	}
@@ Expand Down @@