GRAD2-2580

(GRAD) Fix User Request Distribution Run options - Part 2 - CUR and Null Distribution Dates
bcgov · May 13, 2024 · 66e701f · 66e701f
1 parent d463309
commit 66e701f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordSearchSpecification.java b/...ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordSearchSpecification.java
@@ -38,7 +38,7 @@ public Predicate toPredicate(Root<GraduationStudentRecordSearchEntity> root, Cri
         } else {
             curStatusOptional = criteriaBuilder.equal(root.get(STUDENT_STATUS), "CUR");
         }
-        Predicate datesRangePredicate = null;
+        Predicate datesRangePredicate = criteriaBuilder.and();
         if(searchCriteria.getGradDateFrom() != null && searchCriteria.getGradDateTo() != null) {
             datesRangePredicate = criteriaBuilder.and(
                     criteriaBuilder.greaterThanOrEqualTo(root.get(PROGRAM_COMPLETION_DATE).as(LocalDate.class), searchCriteria.getGradDateFrom())
@@ -47,17 +47,17 @@ public Predicate toPredicate(Root<GraduationStudentRecordSearchEntity> root, Cri
         }
         if (searchCriteria.getStudentIds() != null && !searchCriteria.getStudentIds().isEmpty()) {
             return criteriaBuilder.and(root.get("studentID").as(UUID.class).in(searchCriteria.getStudentUUIDs()),
-                    curStatusOptional, datesRangePredicate == null ? criteriaBuilder.and() : datesRangePredicate
+                    curStatusOptional, datesRangePredicate
             );
         }
         if (searchCriteria.getSchoolOfRecords() != null && !searchCriteria.getSchoolOfRecords().isEmpty()) {
             return criteriaBuilder.and(root.get("schoolOfRecord").in(searchCriteria.getSchoolOfRecords()),
-                    curStatusOptional, datesRangePredicate == null ? criteriaBuilder.and() : datesRangePredicate
+                    curStatusOptional, datesRangePredicate
             );
         }
         if (searchCriteria.getPrograms() != null && !searchCriteria.getPrograms().isEmpty()) {
             return criteriaBuilder.and(root.get("program").in(searchCriteria.getPrograms()),
-                    curStatusOptional, datesRangePredicate == null ? criteriaBuilder.and() : datesRangePredicate
+                    curStatusOptional, datesRangePredicate
             );
         }
         return criteriaBuilder.and(curStatusOptional);