archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Admin user search: Include aggregations

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-01-05 16:41:36 +01:00
parent acd7a40fe6
commit b6f7958dfe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/api/search/queries.py
View File

@ -6,8 +6,8 @@ from elasticsearch_dsl import Search, Q
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
node_agg_terms = ['node_type', 'media', 'tags', 'is_free'] NODE_AGG_TERMS = ['node_type', 'media', 'tags', 'is_free']
user_agg_terms = ['roles', ] USER_AGG_TERMS = ['roles', ]
# Will be set in setup_app() # Will be set in setup_app()
client: Elasticsearch = None client: Elasticsearch = None
@ -73,7 +73,7 @@ def do_node_search(query: str, terms: dict) -> dict:
should = [] should = []
search = nested_bool(must, should, terms) search = nested_bool(must, should, terms)
add_aggs_to_search(search, node_agg_terms) add_aggs_to_search(search, NODE_AGG_TERMS)
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
# logging removes readable indendation. # logging removes readable indendation.
@ -103,7 +103,7 @@ def do_user_search(query: str, terms: dict) -> dict:
should = [] should = []
search = nested_bool(must, should, terms) search = nested_bool(must, should, terms)
add_aggs_to_search(search, user_agg_terms) add_aggs_to_search(search, USER_AGG_TERMS)
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
log.debug(json.dumps(search.to_dict(), indent=4)) log.debug(json.dumps(search.to_dict(), indent=4))
@ -138,6 +138,7 @@ def do_user_search_admin(query: str) -> dict:
search = Search(using=client) search = Search(using=client)
search.query = Q('bool', should=should) search.query = Q('bool', should=should)
add_aggs_to_search(search, USER_AGG_TERMS)
if log.isEnabledFor(logging.DEBUG): if log.isEnabledFor(logging.DEBUG):
log.debug(json.dumps(search.to_dict(), indent=4)) log.debug(json.dumps(search.to_dict(), indent=4))