Adding the query implementation changes (#75)

sunbird-cb · Feb 19, 2024 · 825049b · 825049b
1 parent c0be98f
commit 825049b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
@@ -54,10 +54,6 @@ public Future<Map<String, Object>> processSearch(SearchDTO searchDTO, boolean in
 		List<Map<String, Object>> groupByFinalList = new ArrayList<Map<String, Object>>();
 		SearchSourceBuilder query = processSearchQuery(searchDTO, groupByFinalList, true);
 
-		if (searchDTO.isSecureSettingsDisabled()) {
-			query.postFilter(getPostFilterQuery(searchDTO.getPostFilter()));
-		}
-
 		Future<SearchResponse> searchResponse = null;
 		boolean enableFuzzyWhenNoResults = Platform.config.hasPath("search.fields.enable.fuzzy.when.noresult") &&
 			Platform.config.getBoolean("search.fields.enable.fuzzy.when.noresult");
@@ -73,6 +69,11 @@ public Future<Map<String, Object>> processSearch(SearchDTO searchDTO, boolean in
 				query = processSearchQuery(searchDTO, groupByFinalList, true);
 			}
 		}
+
+		if (searchDTO.isSecureSettingsDisabled()) {
+			query.postFilter(getPostFilterQuery(searchDTO.getPostFilter()));
+		}
+
 		searchResponse = ElasticSearchUtil.search(SearchConstants.COMPOSITE_SEARCH_INDEX, query);
 
 		return searchResponse.map(new Mapper<SearchResponse, Map<String, Object>>() {