From ef5c3b7d96822c9cbede850a9f667682d13789a3 Mon Sep 17 00:00:00 2001 From: Alexander Rybakov <83988488+arybakov-cgi@users.noreply.github.com> Date: Fri, 13 Sep 2024 15:38:08 -0600 Subject: [PATCH 1/2] GRAD2-2958 (#283) * GRAD2-2958 User Distribution Run downloaded report files are empty * GRAD2-2958 User Distribution Run downloaded report files are empty --- .../grad/report/model/dto/StudentSearchRequest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/model/dto/StudentSearchRequest.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/model/dto/StudentSearchRequest.java index 2cebfa83..61c5ba80 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/grad/report/model/dto/StudentSearchRequest.java +++ b/api/src/main/java/ca/bc/gov/educ/api/grad/report/model/dto/StudentSearchRequest.java @@ -2,6 +2,7 @@ import ca.bc.gov.educ.api.grad.report.util.EducGradReportApiConstants; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -41,13 +42,13 @@ public class StudentSearchRequest implements Serializable { String activityCode; String localDownload; + @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 e3616d7e1a8599b713f0ad37f394926ce73d5219 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:23:17 -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 12af4f40..130fa28f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-graduation-report-api - 1.8.50 + 1.8.51 educ-grad-graduation-report-api Grad Graduation Report API for GRAD team