avniproject/avni-webapp#1390 | enhance: display count for SubjectSear…

…chRequest
avniproject · Dec 13, 2024 · cb71524 · cb71524
1 parent a6c219b
commit cb71524
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/service/IndividualSearchService.java b/avni-server-api/src/main/java/org/avni/server/service/IndividualSearchService.java
@@ -36,11 +36,12 @@ public LinkedHashMap<String, Object> search(SubjectSearchRequest subjectSearchRe
         logger.info("Searching for individuals");
         List<Map<String, Object>> searchResults = subjectSearchRepository.search(subjectSearchRequest, new SubjectSearchQueryBuilder());
         long resultsEnd = new DateTime().getMillis();
+        BigInteger totalCount = subjectSearchRequest.getIncludeDisplayCount().booleanValue() == true ? subjectSearchRepository.getTotalCount(subjectSearchRequest, new SubjectSearchQueryBuilder()) : new BigInteger("-1");
         logger.info(String.format("Subject search: Time Taken: %dms. Sorted: %s", (resultsEnd - startTime), subjectSearchRequest.getPageElement().getSortColumn()));
-        return constructIndividual(searchResults);
+        return constructIndividual(searchResults,totalCount);
     }
 
-    private LinkedHashMap<String, Object> constructIndividual(List<Map<String, Object>> individualList) {
+    private LinkedHashMap<String, Object> constructIndividual(List<Map<String, Object>> individualList,BigInteger totalCount) {
         LinkedHashMap<String, Object> recordsMap = new LinkedHashMap<String, Object>();
         List<Long> individualIds = individualList.stream()
                 .map(individualRecord -> Long.valueOf((Integer) individualRecord.get("id")))
@@ -64,6 +65,7 @@ private LinkedHashMap<String, Object> constructIndividual(List<Map<String, Objec
                             .collect(Collectors.toList()));
                     individualRecord.put("addressLevel", titleLineages.get(((BigInteger) individualRecord.get("addressId")).longValue()));
                 }).collect(Collectors.toList());
+        recordsMap.put("totalElements", totalCount);
         recordsMap.put("listOfRecords", listOfRecords);
         return recordsMap;
     }

diff --git a/...ver-api/src/main/java/org/avni/server/web/request/webapp/search/SubjectSearchRequest.java b/...ver-api/src/main/java/org/avni/server/web/request/webapp/search/SubjectSearchRequest.java
@@ -10,6 +10,7 @@ public class SubjectSearchRequest {
     private String name;
     private IntegerRange age;
     private Boolean includeVoided;
+    private Boolean includeDisplayCount;
     private List<Integer> addressIds = new ArrayList<>();
     private List<Concept> concept;
     private List<String> gender;
@@ -56,6 +57,14 @@ public void setIncludeVoided(Boolean includeVoided) {
         this.includeVoided = includeVoided;
     }
 
+    public Boolean getIncludeDisplayCount() {
+        return includeDisplayCount;
+    }
+
+    public void setIncludeDisplayCount(Boolean includeDisplayCount) {
+        this.includeDisplayCount = includeDisplayCount;
+    }
+
     public List<Integer> getAddressIds() {
         return addressIds;
     }