diff --git a/api/pom.xml b/api/pom.xml
index 0da706a..da96dbf 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -10,7 +10,7 @@
ca.bc.gov.educ
educ-grad-rule-engine-api
- 1.8.50
+ 1.8.52
educ-grad-rule-engine-api
Rule Engine API for GRAD team
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
index 085d2fb..370b7e8 100644
--- 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
index 6fe0b38..5a940d7 100644
--- 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;
}