From 30b347ff74da1168df25a8d3e86e88b8a2801f2f Mon Sep 17 00:00:00 2001
From: Javier Romero Castro <jrcastro9515@gmail.com>
Date: Tue, 27 Feb 2024 14:52:24 +0100
Subject: [PATCH] facets: fix bool query

---
 invenio_app_ils/facets.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/invenio_app_ils/facets.py b/invenio_app_ils/facets.py
index 606e7519c..6f45425c5 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.RangeField(**{field: args}),
-                dsl.Q(
-                    "terms",
-                    **{"state": current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]}
-                ),
-            ]
-        )
+        return dsl.query.Bool(must=[range_query, terms_query])
 
     return inner