diff --git a/invenio_app_ils/facets.py b/invenio_app_ils/facets.py index c2579b287..91246b907 100644 --- a/invenio_app_ils/facets.py +++ b/invenio_app_ils/facets.py @@ -90,16 +90,10 @@ def inner(values): if range_key in values: for key, value in mappings.items(): args[key] = value + range_query = dsl.query.Range(**{field: args}) + terms_query = dsl.Q("terms", **{"state": current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]}) - return dsl.query.Bool( - [ - dsl.query.Range(**{field: args}), - dsl.Q( - "terms", - **{"state": current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]} - ), - ] - ) + return dsl.query.Bool(must=[range_query, terms_query]) return inner