facets: fix facets with range query

inveniosoftware · Feb 21, 2024 · 1c6f02d · 1c6f02d
1 parent 80b3f97
commit 1c6f02d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/invenio_app_ils/acquisition/mappings/os-v1/__init__.py b/invenio_app_ils/acquisition/mappings/os-v1/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2018 CERN.
+#
+# invenio-app-ils is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Acquisition ES mappings."""
diff --git a/invenio_app_ils/acquisition/mappings/os-v2/__init__.py b/invenio_app_ils/acquisition/mappings/os-v2/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2018 CERN.
+#
+# invenio-app-ils is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Acquisition ES mappings."""
diff --git a/invenio_app_ils/facets.py b/invenio_app_ils/facets.py
@@ -93,7 +93,7 @@ def inner(values):
 
         return dsl.query.Bool(
             [
-                dsl.RangeField(**{field: args}),
+                dsl.query.Range(**{field: args}),
                 dsl.Q(
                     "terms",
                     **{"state": current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]}
@@ -144,6 +144,6 @@ def inner(values):
             input_date = str(arrow.get(values[0]).date())
         except arrow.parser.ParserError:
             raise ValueError("Input should be a date")
-        return dsl.RangeField(**{field: {comparator: input_date}})
+        return dsl.query.Range(**{field: {comparator: input_date}})
 
     return inner
diff --git a/invenio_app_ils/records/views.py b/invenio_app_ils/records/views.py
@@ -20,7 +20,7 @@
 from invenio_app_ils.permissions import backoffice_permission
 from invenio_app_ils.records.permissions import RecordPermission
 from invenio_app_ils.series.api import SERIES_PID_TYPE
-from invenio_app_ils.signals import record_viewed, file_downloaded
+from invenio_app_ils.signals import file_downloaded, record_viewed
 
 
 def create_document_stats_blueprint(app):

diff --git a/tests/api/ils/test_facets.py b/tests/api/ils/test_facets.py
@@ -44,7 +44,7 @@ def test_current_ranged_loans_filter(app):
         overdue = rfilter(["Overdue"])
         field = {"lt": str(arrow.utcnow().date())}
         assert overdue == dsl.query.Bool(
-            [dsl.RangeField(field=field), current_loans_query]
+            [dsl.query.Range(field=field), current_loans_query]
         )
 
         upcoming = rfilter(["Upcoming return"])
@@ -53,7 +53,7 @@ def test_current_ranged_loans_filter(app):
             "lte": str((arrow.utcnow() + timedelta(days=7)).date()),
         }
         assert upcoming == dsl.query.Bool(
-            [dsl.RangeField(field=field), current_loans_query]
+            [dsl.query.Range(field=field), current_loans_query]
         )
 
 
@@ -78,10 +78,10 @@ def test_date_range_filter(app):
         to_filter = date_range_filter("field", "lte")
 
         try:
-            assert from_filter([input_date]) == dsl.RangeField(
+            assert from_filter([input_date]) == dsl.query.Range(
                 field={"gte": input_date}
             )
-            assert to_filter([input_date]) == dsl.RangeField(field={"lte": input_date})
+            assert to_filter([input_date]) == dsl.query.Range(field={"lte": input_date})
         except (ValueError, AssertionError):
             with pytest.raises(ValueError):
                 from_filter([input_date])