Skip to content

Multi filter search Fix #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nivetha-M wants to merge 1 commit into
base: release-4.8.0_cb
Choose a base branch
from
Open

Multi filter search Fix #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions search-api/search-actors/src/main/java/org/sunbird/actors/SearchActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ private SearchDTO getSearchDTO(Request request) throws Exception {
// Changing fields to null so that search all fields but returns
// only the fields specified
properties.addAll(getSearchQueryProperties(queryString, null));
properties.addAll(getSearchFilterProperties(filters, wordChainsRequest, request));
properties.addAll(getSearchFilterProperties(filters, wordChainsRequest, request, true));
searchObj.setSortBy(sortBy);
searchObj.setFacets(facets);
searchObj.setProperties(properties);
if (multiFilters != null) {
List<Map> multiFilterProperties = new ArrayList<Map>();
multiFilterProperties.addAll(getSearchFilterProperties(multiFilters, wordChainsRequest, request));
multiFilterProperties.addAll(getSearchFilterProperties(multiFilters, wordChainsRequest, request, false));
searchObj.setMultiFilterProperties(multiFilterProperties);
}
// Added Implicit Filter Properties To Support Collection content tagging to reuse by tenants.
Expand Down Expand Up @@ -372,7 +372,7 @@ private List<Map<String, Object>> getSearchQueryProperties(String queryString, L
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private List<Map<String, Object>> getSearchFilterProperties(Map<String, Object> filters, Boolean traversal, Request request)
private List<Map<String, Object>> getSearchFilterProperties(Map<String, Object> filters, Boolean traversal, Request request, Boolean defaultProperty)
throws Exception {
List<Map<String, Object>> properties = new ArrayList<Map<String, Object>>();
if (null == filters) filters = new HashMap<String, Object>();
Expand Down Expand Up @@ -516,7 +516,7 @@ private List<Map<String, Object>> getSearchFilterProperties(Map<String, Object>
}
}

if (!filters.containsKey("status") && !traversal) {
if (defaultProperty && !filters.containsKey("status") && !traversal) {
Map<String, Object> property = getFilterProperty("status", SearchConstants.SEARCH_OPERATION_EQUAL, Arrays.asList(new String[] { "Live" }));
properties.add(property);
}
Expand Down Expand Up @@ -773,7 +773,7 @@ private void setImplicitFilters(Map<String, Object> filters, SearchDTO searchObj
}
}
List<Map> implicitFilterProps = new ArrayList<Map>();
implicitFilterProps.addAll(getSearchFilterProperties(implicitFilter, false, null));
implicitFilterProps.addAll(getSearchFilterProperties(implicitFilter, false, null, true));
searchObj.setImplicitFilterProperties(implicitFilterProps);
}
}
Expand Down
4 changes: 3 additions & 1 deletion search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ private QueryBuilder prepareSearchQuery(SearchDTO searchDTO) {
List<Map> properties = searchDTO.getProperties();
formQuery(properties, queryBuilder, boolQuery, totalOperation);
if(searchDTO.getMultiFilterProperties() != null) {
formQuery(searchDTO.getMultiFilterProperties(), queryBuilder, boolQuery, SearchConstants.SEARCH_OPERATION_OR);
BoolQueryBuilder multiFilterBoolQuery = new BoolQueryBuilder();
formQuery(searchDTO.getMultiFilterProperties(), queryBuilder, multiFilterBoolQuery, SearchConstants.SEARCH_OPERATION_OR);
boolQuery.must(multiFilterBoolQuery);
}

Map<String, Object> softConstraints = searchDTO.getSoftConstraints();
Expand Down