Grad release 1.10.0

bcgov · Nov 16, 2023 · 8ad6950 · 8ad6950
2 parents 85d6f90 + 6c524bb
commit 8ad6950
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-rule-engine-api</artifactId>
-	<version>1.8.50</version>
+	<version>1.8.52</version>
 	<name>educ-grad-rule-engine-api</name>
 	<description>Rule Engine API for GRAD team</description>
 

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,8 +159,9 @@ public RuleData fire() {
 				}
 			}
 		}
-
-		ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
+		if (!studentCourses.isEmpty()) {
+			ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
+		}
 		return ruleProcessorData;
 	}