From cb33ed278767d676224ed0fa45b86f112733dba1 Mon Sep 17 00:00:00 2001
From: Alexander Rybakov <83988488+arybakov-cgi@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:38:39 -0600
Subject: [PATCH 1/2] GRAD2-2958 (#683)

* GRAD2-2958
User Distribution Run downloaded report files are empty

* GRAD2-2958
User Distribution Run downloaded report files are empty
---
 .../gradstudent/model/dto/StudentSearchRequest.java | 13 +++++++------
 1 file changed, 7 insertions(+), 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
index b983211b..879568a1 100644
--- 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());
     }
 }

From 934a78b2901c62ee95a895da2f2e1ce88eea00c8 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:20:42 -0700
Subject: [PATCH 2/2] Update pom.xml

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index 8b32e1af..23d9ba05 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-student-api</artifactId>
-	<version>1.8.63</version>
+	<version>1.8.64</version>
 	<name>educ-grad-student-api</name>
 	<description>Student Demographics API for GRAD team</description>