Skip to content

Commit

Permalink
fix: support null q in build_search_query
Browse files Browse the repository at this point in the history
  • Loading branch information
raphael0202 committed Nov 29, 2023
1 parent 96445e5 commit 5ee0fdd
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 1 deletion.
7 changes: 6 additions & 1 deletion app/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,12 @@ def build_search_query(
:param sort_by: sorting key, defaults to None (=relevance-based sorting)
:return: the built Query
"""
filter_query, remaining_terms = parse_lucene_dsl_query(q, filter_query_builder)
if q is None:
filter_query = []
remaining_terms = ""
else:
filter_query, remaining_terms = parse_lucene_dsl_query(q, filter_query_builder)

logger.debug("filter query: %s", filter_query)
logger.debug("remaining terms: '%s'", remaining_terms)

Expand Down
59 changes: 59 additions & 0 deletions tests/unit/data/empty_query_with_sort_by.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"aggs": {
"brands_tags": {
"terms": {
"field": "brands_tags"
}
},
"lang": {
"terms": {
"field": "lang"
}
},
"owner": {
"terms": {
"field": "owner"
}
},
"categories_tags": {
"terms": {
"field": "categories_tags"
}
},
"labels_tags": {
"terms": {
"field": "labels_tags"
}
},
"countries_tags": {
"terms": {
"field": "countries_tags"
}
},
"states_tags": {
"terms": {
"field": "states_tags"
}
},
"nutrition_grades": {
"terms": {
"field": "nutrition_grades"
}
},
"ecoscore_grade": {
"terms": {
"field": "ecoscore_grade"
}
},
"nova_groups": {
"terms": {
"field": "nova_groups"
}
}
},
"sort": [
"unique_scans_n"
],
"size": 25,
"from": 25
}
8 changes: 8 additions & 0 deletions tests/unit/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,14 @@ def test_parse_lucene_dsl_query(
2,
None,
),
(
"empty_query_with_sort_by",
None,
{"en"},
25,
2,
"unique_scans_n",
),
],
)
def test_build_search_query(
Expand Down

0 comments on commit 5ee0fdd

Please sign in to comment.