diff --git a/CHANGES.rst b/CHANGES.rst index 646552fe9..8383f03b4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,18 @@ Changes ======= +Version 2.0.0rc7 (released 2024-03-04) + +- circulation: Made loan request start date to be configurable and validated at the backend + +Version 2.0.0rc6 (released 2024-02-27) + +- facets: fix boolean query + +Version 2.0.0rc5 (released 2024-02-21) + +- facets: fix range query + Version 2.0.0rc4 (released 2024-02-19) - stats: emit custom signal for file download diff --git a/invenio_app_ils/__init__.py b/invenio_app_ils/__init__.py index a66eb66d3..825f46f3f 100644 --- a/invenio_app_ils/__init__.py +++ b/invenio_app_ils/__init__.py @@ -7,6 +7,6 @@ """invenio-app-ils.""" -__version__ = "2.0.0rc4" +__version__ = "2.0.0rc7" __all__ = ("__version__",) diff --git a/invenio_app_ils/facets.py b/invenio_app_ils/facets.py index 6f45425c5..c91201f3f 100644 --- a/invenio_app_ils/facets.py +++ b/invenio_app_ils/facets.py @@ -91,7 +91,9 @@ def inner(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"]}) + terms_query = dsl.Q( + "terms", **{"state": current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]} + ) return dsl.query.Bool(must=[range_query, terms_query]) diff --git a/tests/api/ils/test_facets.py b/tests/api/ils/test_facets.py index af97ffb92..acf5c4989 100644 --- a/tests/api/ils/test_facets.py +++ b/tests/api/ils/test_facets.py @@ -44,8 +44,8 @@ def test_current_ranged_loans_filter(app): overdue = rfilter(["Overdue"]) field = {"lt": str(arrow.utcnow().date())} assert overdue == dsl.query.Bool( - must=[dsl.query.Range(field=field), - current_loans_query]) + must=[dsl.query.Range(field=field), current_loans_query] + ) upcoming = rfilter(["Upcoming return"]) field = { @@ -53,8 +53,8 @@ def test_current_ranged_loans_filter(app): "lte": str((arrow.utcnow() + timedelta(days=7)).date()), } assert upcoming == dsl.query.Bool( - must=[dsl.query.Range(field=field), - current_loans_query]) + must=[dsl.query.Range(field=field), current_loans_query] + ) def test_default_value_when_missing_filter(app):