Commit 8d8f6dd2 authored by shishir suman's avatar shishir suman
Browse files

superadmin search related fixes

Showing with 15 additions and 1 deletion
+15 -1
......@@ -518,7 +518,11 @@ public class SearchServiceImpl implements SearchService {
getPriority(String.valueOf(searchRequest.getPriority()), finalQuery);
}
if(searchRequest.getFilter().get("cc") != null) {
getCCRangeQuery(String.valueOf(searchRequest.getFilter().get("cc")), finalQuery);
if(String.valueOf(searchRequest.getFilter().get("cc")).equals("0")) {
getCCRangeQueryNot(String.valueOf(-1), finalQuery);
} else {
getCCRangeQuery(String.valueOf(searchRequest.getFilter().get("cc")), finalQuery);
}
}
getDateRangeQuery(searchRequest, finalQuery);
if(searchRequest.getFilter().get("status") != null) {
......@@ -549,6 +553,16 @@ public class SearchServiceImpl implements SearchService {
return finalQuery;
}
private BoolQueryBuilder getCCRangeQueryNot(String cc, BoolQueryBuilder finalQuery) {
if (cc != null) {
MatchQueryBuilder ccMatchQuery = QueryBuilders.matchQuery("assigned_to_id", cc);
BoolQueryBuilder ccSearchQuery = QueryBuilders.boolQuery();
ccSearchQuery.mustNot(ccMatchQuery);
finalQuery.must(ccSearchQuery);
}
return finalQuery;
}
private BoolQueryBuilder getJunkQuery(Boolean isJunk, BoolQueryBuilder finalQuery) {
if (isJunk != null) {
MatchQueryBuilder junkMatchQuery = QueryBuilders.matchQuery("is_junk", isJunk);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment