Merge pull request #534 from bcgov/bugfix/GRAD2-3325

mightycox · web-flow · commit 751bee94904e · 2025-03-21T11:00:10.000-07:00
GRAD2-3325 - Assessment session results after closure of 2018 program should not count towards graduation
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/StudentAssessment.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/StudentAssessment.java
@@ -29,6 +29,7 @@ public class StudentAssessment implements Serializable {
     private boolean isProjected;
     private boolean isNotCompleted;
     private String equivalentCode;
+    private boolean isCutOffAssessment;
 
     @Override
     public boolean equals(Object o) {
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/ExcludeAfterProgramCutoffRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/ExcludeAfterProgramCutoffRule.java
@@ -2,11 +2,13 @@
 
 import ca.bc.gov.educ.api.ruleengine.dto.RuleData;
 import ca.bc.gov.educ.api.ruleengine.dto.RuleProcessorData;
+import ca.bc.gov.educ.api.ruleengine.dto.StudentAssessment;
 import ca.bc.gov.educ.api.ruleengine.dto.StudentCourse;
 import ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiUtils;
 import ca.bc.gov.educ.api.ruleengine.util.RuleProcessorRuleUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +19,10 @@
 import java.util.Date;
 import java.util.List;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DEFAULT_DATE_FORMAT;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Component
 @NoArgsConstructor
@@ -28,39 +34,64 @@ public class ExcludeAfterProgramCutoffRule extends BaseRule implements Rule {
     private RuleProcessorData ruleProcessorData;
 
     public RuleData fire() {
-
+        /* Excluded Courses */
         List<StudentCourse> studentCourseList = RuleProcessorRuleUtils.getUniqueStudentCourses(
                 ruleProcessorData.getStudentCourses(), ruleProcessorData.isProjected());
-
-        if(ruleProcessorData.getGradProgram().getExpiryDate() == null) {
+        if (ruleProcessorData.getGradProgram().getExpiryDate() == null) {
             return ruleProcessorData;
         }
-        String cutoffDate = RuleEngineApiUtils.formatDate(ruleProcessorData.getGradProgram().getExpiryDate(), "yyyy-MM-dd");
-        for (StudentCourse studentCourse : studentCourseList) {
+        String cutoffDate = RuleEngineApiUtils.formatDate(ruleProcessorData.getGradProgram().getExpiryDate(), DEFAULT_DATE_FORMAT);
 
+        for (StudentCourse studentCourse : studentCourseList) {
             String sessionDate = studentCourse.getSessionDate() + "/01";
             try {
-                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, "yyyy/MM/dd"));
-                sessionDate = RuleEngineApiUtils.formatDate(temp, "yyyy-MM-dd");
+                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, DATE_FORMAT));
+                sessionDate = RuleEngineApiUtils.formatDate(temp, DEFAULT_DATE_FORMAT);
             } catch (ParseException pe) {
-                logger.error("ERROR: {}",pe.getMessage());
+                logger.error("ERROR: {}", pe.getMessage());
             }
 
-            int diff = RuleEngineApiUtils.getDifferenceInMonths(sessionDate,cutoffDate);
-
+            int diff = RuleEngineApiUtils.getDifferenceInMonths(sessionDate, cutoffDate);
             if (diff < 0) {
                 studentCourse.setCutOffCourse(true);
             }
         }
-
-        ruleProcessorData.setExcludedCourses(RuleProcessorRuleUtils.maintainExcludedCourses("ExcludeAfterProgramCutoffRule", studentCourseList,ruleProcessorData.getExcludedCourses(),ruleProcessorData.isProjected()));
+        ruleProcessorData.setExcludedCourses(RuleProcessorRuleUtils.maintainExcludedCourses("ExcludeAfterProgramCutoffRule", studentCourseList, ruleProcessorData.getExcludedCourses(), ruleProcessorData.isProjected()));
         ruleProcessorData.setStudentCourses(studentCourseList);
 
-        logger.debug("Cut-off Courses: {}",
-                (int) studentCourseList
-                        .stream()
-                        .filter(StudentCourse::isCutOffCourse)
-                        .count());
+        logger.debug("Cut-off Courses: {}", (int) studentCourseList
+                .stream()
+                .filter(StudentCourse::isCutOffCourse)
+                .count());
+
+        /* Excluded Assessments */
+        List<StudentAssessment> studentAssessmentList = RuleProcessorRuleUtils.getUniqueStudentAssessments(
+                ruleProcessorData.getStudentAssessments(), ruleProcessorData.isProjected());
+        if (ruleProcessorData.getGradProgram().getExpiryDate() == null) {
+            return ruleProcessorData;
+        }
+
+        for (StudentAssessment studentAssessment : studentAssessmentList) {
+            String sessionDate = studentAssessment.getSessionDate() + "/01";
+            try {
+                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, DATE_FORMAT));
+                sessionDate = RuleEngineApiUtils.formatDate(temp, DEFAULT_DATE_FORMAT);
+            } catch (ParseException pe) {
+                logger.error("ERROR: {}", pe.getMessage());
+            }
+
+            int diff = RuleEngineApiUtils.getDifferenceInMonths(sessionDate, cutoffDate);
+            if (diff < 0) {
+                studentAssessment.setCutOffAssessment(true);
+            }
+        }
+        ruleProcessorData.setExcludedAssessments(RuleProcessorRuleUtils.maintainExcludedAssessments(studentAssessmentList, ruleProcessorData.getExcludedAssessments(), ruleProcessorData.isProjected()));
+        ruleProcessorData.setStudentAssessments(studentAssessmentList);
+
+        logger.debug("Cut-off Assessments: {}", (int) studentAssessmentList
+                .stream()
+                .filter(StudentAssessment::isCutOffAssessment)
+                .count());
 
         return ruleProcessorData;
     }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/ExcludeValidationCoursesRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/ExcludeValidationCoursesRule.java
@@ -17,6 +17,8 @@
 import java.util.Date;
 import java.util.List;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -37,8 +39,8 @@ public RuleData fire() {
         for (StudentCourse studentCourse : studentCourseList) {
             String sessionDate = studentCourse.getSessionDate() + "/01";
             try {
-                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, "yyyy/MM/dd"));
-                sessionDate = RuleEngineApiUtils.formatDate(temp, "yyyy/MM/dd");
+                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, DATE_FORMAT));
+                sessionDate = RuleEngineApiUtils.formatDate(temp, DATE_FORMAT);
             } catch (ParseException pe) {
                 logger.error("ERROR: {}",pe.getMessage());
             }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/IncompleteCoursesRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/IncompleteCoursesRule.java
@@ -17,6 +17,9 @@
 import java.util.Date;
 import java.util.List;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DEFAULT_DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -32,12 +35,12 @@ public RuleData fire() {
         List<StudentCourse> studentCourseList = RuleProcessorRuleUtils.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(),ruleProcessorData.isProjected());
 
         for (StudentCourse studentCourse : studentCourseList) {
-            String today = RuleEngineApiUtils.formatDate(new Date(), "yyyy-MM-dd");
+            String today = RuleEngineApiUtils.formatDate(new Date(), DEFAULT_DATE_FORMAT);
             String sessionDate = studentCourse.getSessionDate() + "/01";
 
             try {
-                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, "yyyy/MM/dd"));
-                sessionDate = RuleEngineApiUtils.formatDate(temp, "yyyy-MM-dd");
+                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, DATE_FORMAT));
+                sessionDate = RuleEngineApiUtils.formatDate(temp, DEFAULT_DATE_FORMAT);
             } catch (ParseException pe) {
                 logger.error("ERROR: {}" , pe.getMessage());
             }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCreditsRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MatchCreditsRule.java
@@ -16,6 +16,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Component
@@ -140,7 +142,7 @@ public void splitSortStudentCourses(List<StudentCourse> studentCourses, LocalDat
         List<StudentCourse> coursesOnOrBeforeStartDate = new ArrayList<>();
         for (StudentCourse sc : studentCourses) {
             String courseSessionDate = sc.getSessionDate() + "/01";
-            LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, "yyyy/MM/dd");
+            LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, DATE_FORMAT);
 
             if (adultStartDate != null && temp != null && temp.isAfter(adultStartDate)) {
                 coursesAfterStartDate.add(sc);
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
@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Component
@@ -65,7 +67,7 @@ public RuleData fire() {
 
 			for (StudentCourse sc : tempStudentCourseList) {
 				String courseSessionDate = sc.getSessionDate() + "/01";
-				LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, "yyyy/MM/dd");
+				LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, DATE_FORMAT);
 
 				// Get Adult Start date from the Data Object
 				LocalDate adultStartDate = ruleProcessorData.getGradStatus().getAdultStartDate();
@@ -131,7 +133,7 @@ public RuleData fire() {
 
 		for (StudentCourse sc : tempStudentCourseList) {
 			String courseSessionDate = sc.getSessionDate() + "/01";
-			LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, "yyyy/MM/dd");
+			LocalDate temp = RuleEngineApiUtils.parseLocalDate(courseSessionDate, DATE_FORMAT);
 
 			// Get Adult Start date from the Data Object
 			LocalDate adultStartDate = ruleProcessorData.getGradStatus().getAdultStartDate();
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateAssmtRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateAssmtRule.java
@@ -17,6 +17,8 @@
 import java.text.ParseException;
 import java.util.*;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -44,8 +46,8 @@ public RuleData fire() {
                             && !studentAssessmentsList.get(i).isDuplicate()
                             && !studentAssessmentsList.get(j).isDuplicate()) {
                         try {
-                            Date sessionDate1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentAssessmentsList.get(i).getSessionDate() + "/01", "yyyy/MM/dd"));
-                            Date sessionDate2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentAssessmentsList.get(j).getSessionDate() + "/01", "yyyy/MM/dd"));
+                            Date sessionDate1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentAssessmentsList.get(i).getSessionDate() + "/01", DATE_FORMAT));
+                            Date sessionDate2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentAssessmentsList.get(j).getSessionDate() + "/01", DATE_FORMAT));
                             String sDate1 = RuleEngineApiUtils.formatDate(sessionDate1, RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
                             String sDate2 = RuleEngineApiUtils.formatDate(sessionDate2, RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
 
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsDuplicateCrseRule.java
@@ -16,6 +16,8 @@
 import java.text.ParseException;
 import java.util.*;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -51,8 +53,8 @@ public RuleData fire() {
                             continue;
                         }
                         try {
-                            Date sessionDate1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourseList.get(i).getSessionDate() + "/01", "yyyy/MM/dd"));
-                            Date sessionDate2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourseList.get(j).getSessionDate() + "/01", "yyyy/MM/dd"));
+                            Date sessionDate1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourseList.get(i).getSessionDate() + "/01", DATE_FORMAT));
+                            Date sessionDate2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourseList.get(j).getSessionDate() + "/01", DATE_FORMAT));
                             String sDate1 = RuleEngineApiUtils.formatDate(sessionDate1, RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
                             String sDate2 = RuleEngineApiUtils.formatDate(sessionDate2, RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
 
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsFailedCrseRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsFailedCrseRule.java
@@ -17,6 +17,8 @@
 import java.text.ParseException;
 import java.util.*;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -36,7 +38,7 @@ public RuleData fire() {
         boolean inProgressCourse = false;
         for (StudentCourse studentCourse : studentCourseList) {
             try {
-                Date sessionDate = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourse.getSessionDate() + "/01", "yyyy/MM/dd"));
+                Date sessionDate = toLastDayOfMonth(RuleEngineApiUtils.parseDate(studentCourse.getSessionDate() + "/01", DATE_FORMAT));
                 String sDate = RuleEngineApiUtils.formatDate(sessionDate, RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
                 String today = RuleEngineApiUtils.formatDate(cal.getTime(), RuleEngineApiConstants.DEFAULT_DATE_FORMAT);
                 int diff = RuleEngineApiUtils.getDifferenceInMonths(sDate,today);
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/RegistrationsRule.java
@@ -17,6 +17,9 @@
 import java.util.Date;
 import java.util.List;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DEFAULT_DATE_FORMAT;
+
 @Data
 @Component
 @NoArgsConstructor
@@ -33,12 +36,12 @@ public RuleData fire() {
         List<StudentCourse> studentCourseList = RuleProcessorRuleUtils.getUniqueStudentCourses(ruleProcessorData.getStudentCourses(),ruleProcessorData.isProjected());
 
         for (StudentCourse studentCourse : studentCourseList) {
-            String today = RuleEngineApiUtils.formatDate(new Date(), "yyyy-MM-dd");
+            String today = RuleEngineApiUtils.formatDate(new Date(), DEFAULT_DATE_FORMAT);
             String sessionDate = studentCourse.getSessionDate() + "/01";
 
             try {
-                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, "yyyy/MM/dd"));
-                sessionDate = RuleEngineApiUtils.formatDate(temp, "yyyy-MM-dd");
+                Date temp = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate, DATE_FORMAT));
+                sessionDate = RuleEngineApiUtils.formatDate(temp, DEFAULT_DATE_FORMAT);
             } catch (ParseException pe) {
                 logger.error("ERROR: {}",pe.getMessage());
             }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleEngineApiUtils.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleEngineApiUtils.java
@@ -19,6 +19,9 @@
 import java.util.stream.Collectors;
 import java.time.format.DateTimeFormatter;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DEFAULT_DATE_FORMAT;
+
 public class RuleEngineApiUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(RuleEngineApiUtils.class);
@@ -167,7 +170,7 @@ public static boolean checkDateForRestrictedCourses(String startDate,String endD
             Date sDate = toLastDayOfMonth(parseDate(startDate+"/01",RuleEngineApiConstants.DATE_FORMAT));
             if(endDate != null) {
                 Date eDate = toLastDayOfMonth(parseDate(endDate + "/01", RuleEngineApiConstants.DATE_FORMAT));
-                return toLastDayOfMonth(parseDate(currentSessionDate + "/01", RuleEngineApiConstants.DATE_FORMAT)).after(sDate) && toLastDayOfMonth(parseDate(currentSessionDate + "/01", "yyyy/MM/dd")).before(eDate);
+                return toLastDayOfMonth(parseDate(currentSessionDate + "/01", RuleEngineApiConstants.DATE_FORMAT)).after(sDate) && toLastDayOfMonth(parseDate(currentSessionDate + "/01", DATE_FORMAT)).before(eDate);
             }else {
                 return toLastDayOfMonth(parseDate(currentSessionDate + "/01", RuleEngineApiConstants.DATE_FORMAT)).after(sDate);
             }
@@ -178,15 +181,15 @@ public static boolean checkDateForRestrictedCourses(String startDate,String endD
     }
 
     public static boolean compareCourseSessionDates(String sessionDate1,String sessionDate2) {
-        String today = RuleEngineApiUtils.formatDate(new Date(), "yyyy-MM-dd");
+        String today = RuleEngineApiUtils.formatDate(new Date(), DEFAULT_DATE_FORMAT);
         sessionDate1 = sessionDate1 + "/01";
         sessionDate2 = sessionDate2 + "/01";
 
         try {
-            Date temp1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate1, "yyyy/MM/dd"));
-            sessionDate1 = RuleEngineApiUtils.formatDate(temp1, "yyyy-MM-dd");
-            Date temp2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate2, "yyyy/MM/dd"));
-            sessionDate2 = RuleEngineApiUtils.formatDate(temp2, "yyyy-MM-dd");
+            Date temp1 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate1, DATE_FORMAT));
+            sessionDate1 = RuleEngineApiUtils.formatDate(temp1, DEFAULT_DATE_FORMAT);
+            Date temp2 = toLastDayOfMonth(RuleEngineApiUtils.parseDate(sessionDate2, DATE_FORMAT));
+            sessionDate2 = RuleEngineApiUtils.formatDate(temp2, DEFAULT_DATE_FORMAT);
         } catch (ParseException pe) {
             logger.error("ERROR: {}",pe.getMessage());
         }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleProcessorRuleUtils.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleProcessorRuleUtils.java
@@ -16,6 +16,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DATE_FORMAT;
+
 public class RuleProcessorRuleUtils {
 
     private RuleProcessorRuleUtils() {}
@@ -123,16 +125,17 @@ public static List<StudentAssessment> getUniqueStudentAssessments(List<StudentAs
         
          List<StudentAssessment> uniqueStudentAssessmentList = studentAssessments
                 .stream()
-                .filter(sc -> !sc.isNotCompleted()
-                        && !sc.isDuplicate()
-                        && !sc.isFailed())
+                .filter(sa -> !sa.isNotCompleted()
+                        && !sa.isDuplicate()
+                        && !sa.isFailed()
+                        && !sa.isCutOffAssessment())
                 .collect(Collectors.toList());
 
         if (!projected) {
             logger.debug("Excluding Registrations!");
             uniqueStudentAssessmentList = uniqueStudentAssessmentList
                     .stream()
-                    .filter(sc -> !sc.isProjected())
+                    .filter(sa -> !sa.isProjected())
                     .collect(Collectors.toList());
         } else
             logger.debug("Including Registrations!");
@@ -143,17 +146,18 @@ public static List<StudentAssessment> getUniqueStudentAssessments(List<StudentAs
     public static List<StudentAssessment> getExcludedStudentAssessments(List<StudentAssessment> studentAssessments, boolean projected) {
         return studentAssessments
                 .stream()
-                .filter(sc -> sc.isNotCompleted()
-                        || sc.isDuplicate()
-                        || sc.isFailed()
-                        || (!projected && sc.isProjected()))
+                .filter(sa -> sa.isNotCompleted()
+                        || sa.isDuplicate()
+                        || sa.isFailed()
+                        || sa.isCutOffAssessment()
+                        || (!projected && sa.isProjected()))
                 .collect(Collectors.toList());
     }
     
     public static String getGradDate(List<StudentCourse> studentCourses) {
 
         Date gradDate = new Date();
-        DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+        DateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
 
         try {
             gradDate = dateFormat.parse("1700/01/01");
diff --git a/api/src/test/java/ca/bc/gov/educ/api/ruleengine/service/RuleEngineServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/ruleengine/service/RuleEngineServiceTest.java
diff --git a/api/src/test/resources/cutoff-rule-data.json b/api/src/test/resources/cutoff-rule-data.json
