Fix username for student history

bcgov · Aug 21, 2024 · 4c238fe · 4c238fe
1 parent 1a38c30
commit 4c238fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 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
@@ -29,12 +29,14 @@ public class StudentSearchRequest implements Serializable {
     String schoolOfRecord;
     String gradProgram;
 
-    private List<String> schoolOfRecords;
-    private List<String> districts;
-    private List<String> schoolCategoryCodes;
-    private List<String> pens;
-    private List<String> programs;
-    private List<UUID> studentIDs;
+    private List<String> schoolOfRecords = new ArrayList<>();
+    private List<String> districts = new ArrayList<>();
+    private List<String> schoolCategoryCodes = new ArrayList<>();
+    private List<String> pens = new ArrayList<>();
+    private List<String> programs = new ArrayList<>();
+    private List<UUID> studentIDs = new ArrayList<>();
+    private List<String> statuses = new ArrayList<>();
+    private List<String> reportTypes = new ArrayList();
 
     @JsonFormat(pattern= EducGradStudentApiConstants.DEFAULT_DATE_FORMAT)
     LocalDate gradDateFrom;
@@ -82,4 +84,13 @@ public List<String> getPrograms() {
     public String toJson() {
         return new Gson().toJson(this);
     }
+
+    public boolean isEmpty() {
+        return  schoolOfRecords.isEmpty() &&
+                districts.isEmpty() &&
+                schoolCategoryCodes.isEmpty() &&
+                pens.isEmpty() &&
+                studentIDs.isEmpty() &&
+                programs.isEmpty();
+    }
 }
diff --git a/...ain/java/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordRepository.java b/...ain/java/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordRepository.java
@@ -56,7 +56,7 @@ public interface GraduationStudentRecordRepository extends JpaRepository<Graduat
 	@Query("select c.studentID from GraduationStudentRecordEntity c where c.studentStatus=:studentStatus")
 	List<UUID> findByStudentStatus(String studentStatus);
 
-	@Query("select c.studentID from GraduationStudentRecordEntity c")
+	@Query("select distinct c.studentID from GraduationStudentRecordEntity c")
 	List<UUID> findAllStudentGuids();
 
 	List<GraduationStudentRecordView> findBySchoolOfRecordAndStudentStatusAndStudentGradeIn(String schoolOfRecord, String studentStatus, List<String> studentGrade);