Merge pull request #684 from bcgov/grad-release

Grad release 1.23.1
bcgov · Sep 16, 2024 · 11cb5c4 · 11cb5c4
2 parents 56503b0 + 934a78b
commit 11cb5c4
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/StudentSearchRequest.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/StudentSearchRequest.java
@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.gradstudent.util.EducGradStudentApiConstants;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.gson.Gson;
 import lombok.Builder;
 import lombok.Data;
@@ -85,12 +86,12 @@ public String toJson() {
         return new Gson().toJson(this);
     }
 
+    @JsonIgnore
     public boolean isEmpty() {
-        return  schoolOfRecords.isEmpty() &&
-                districts.isEmpty() &&
-                schoolCategoryCodes.isEmpty() &&
-                pens.isEmpty() &&
-                studentIDs.isEmpty() &&
-                programs.isEmpty();
+        return  (schoolOfRecords == null || schoolOfRecords.isEmpty()) &&
+                (districts == null || districts.isEmpty()) &&
+                (schoolCategoryCodes == null || schoolCategoryCodes.isEmpty()) &&
+                (pens == null || pens.isEmpty()) &&
+                (studentIDs == null || studentIDs.isEmpty());
     }
 }