facets: fix bool query

inveniosoftware · Feb 27, 2024 · 594199c · 594199c
1 parent 129c4cd
commit 594199c
Showing 1 changed file with 3 additions and 9 deletions.
diff --git 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