invenio-app-ils 4.4.0__py2.py3-none-any.whl → 4.5.0__py2.py3-none-any.whl

invenio_app_ils/__init__.py

@@ -7,6 +7,6 @@
 
 """invenio-app-ils."""
 
-__version__ = "4.4.0"
+__version__ = "4.5.0"
 
 __all__ = ("__version__",)

invenio_app_ils/circulation/api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2018-2020 CERN.
+# Copyright (C) 2018-2025 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.
@@ -78,9 +78,9 @@ def _validate_delivery(delivery):
             )
 
 
-def _set_item_to_can_circulate(item_pid):
+def _set_item_to_can_circulate(item_pid_value):
     """Change the item status to CAN_CIRCULATE."""
-    item = Item.get_record_by_pid(item_pid["value"])
+    item = Item.get_record_by_pid(item_pid_value)
     if item["status"] != "CAN_CIRCULATE":
         item["status"] = "CAN_CIRCULATE"
         item.commit()
@@ -245,7 +245,7 @@ def checkout_loan(
         _validate_delivery(optional_delivery)
 
     if force:
-        _set_item_to_can_circulate(item_pid)
+        _set_item_to_can_circulate(item_pid["value"])
 
     return _checkout_loan(
         item_pid,
@@ -256,14 +256,19 @@ def checkout_loan(
     )
 
 
-def _ensure_item_loanable_via_self_checkout(item_pid):
+def _ensure_item_loanable_via_self_checkout(item_pid_value):
     """Self-checkout: return loanable item or raise when not loanable.
 
     Implements the self-checkout rules to loan an item.
     """
-    item = current_app_ils.item_record_cls.get_record_by_pid(item_pid)
+    item = current_app_ils.item_record_cls.get_record_by_pid(item_pid_value)
     item_dict = item.replace_refs()
 
+    if item_dict["status"] == "MISSING":
+        _set_item_to_can_circulate(item_pid_value)
+        item = current_app_ils.item_record_cls.get_record_by_pid(item_pid_value)
+        item_dict = item.replace_refs()
+
     if item_dict["status"] != "CAN_CIRCULATE":
         raise ItemCannotCirculateError()
 

invenio_app_ils/closures/api.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 CERN.
+# Copyright (C) 2020-2025 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.
 
 """ILS location closures API."""
 
-from datetime import timedelta
+from datetime import date, timedelta
+from calendar import day_name
 
 import arrow
 
@@ -64,3 +65,70 @@ def find_next_open_date(location_pid, date):
         "location %s is open after the given date %s."
         "Please check opening/closures dates." % (location_pid, date.isoformat())
     )
+
+
+def get_closure_periods(location, start, end):
+    """
+    Return date ranges within a specified period when the location is closed.
+    """
+    if (
+        not location
+        or not isinstance(start, date)
+        or not isinstance(end, date)
+        or start > end
+    ):
+        raise ValueError("Invalid input parameters")
+
+    one_day_delta = timedelta(days=1)
+
+    weekday_name_to_index = {name.lower(): i for i, name in enumerate(day_name)}
+    closed_weekdays = set()
+    for weekday_rule in location.get("opening_weekdays", []):
+        if weekday_rule.get("is_open") is False:
+            weekday_str = weekday_rule.get("weekday", "").lower()
+            closed_weekdays.add(weekday_name_to_index[weekday_str])
+
+    exception_overrides = {}
+    for exception in location.get("opening_exceptions", []):
+        is_closed_override = not exception.get("is_open")
+
+        ex_start = date.fromisoformat(exception["start_date"])
+        ex_end = date.fromisoformat(exception["end_date"])
+
+        current_ex_date = ex_start
+        while current_ex_date <= ex_end:
+            exception_overrides[current_ex_date] = is_closed_override
+            current_ex_date += one_day_delta
+
+    closure_periods = []
+    closure_streak_start = None
+    current_date = start
+
+    while current_date <= end:
+        is_date_closed = False
+
+        override_status = exception_overrides.get(current_date)
+
+        if override_status is not None:
+            is_date_closed = override_status
+        else:
+            if current_date.weekday() in closed_weekdays:
+                is_date_closed = True
+
+        if is_date_closed:
+            if closure_streak_start is None:
+                closure_streak_start = current_date
+        else:
+            if closure_streak_start is not None:
+                closure_periods.append(
+                    {"start": closure_streak_start, "end": current_date - one_day_delta}
+                )
+                closure_streak_start = None
+
+        current_date += one_day_delta
+
+    # Handle trailing closed period
+    if closure_streak_start is not None:
+        closure_periods.append({"start": closure_streak_start, "end": end})
+
+    return closure_periods

invenio_app_ils/closures/serializers/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2025-2025 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+
+from invenio_app_ils.closures.serializers.response import closure_periods_responsify
+from invenio_app_ils.closures.serializers.schema import ClosurePeriodsV1
+
+
+closure_periods_response = closure_periods_responsify(
+    ClosurePeriodsV1, "application/json"
+)

invenio_app_ils/closures/serializers/response.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2025-2025 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Invenio App ILS Closures response serializers."""
+
+import json
+from flask import current_app
+
+
+def closure_periods_responsify(schema_class, mimetype):
+    """Closure periods response serializer.
+
+    :param schema_class: Schema instance.
+    :param mimetype: MIME type of response.
+    """
+
+    def view(data, code=200, headers=None):
+        """Generate the response object."""
+        response_data = schema_class().dump(data)
+
+        response = current_app.response_class(
+            json.dumps(response_data), mimetype=mimetype
+        )
+        response.status_code = code
+
+        if headers is not None:
+            response.headers.extend(headers)
+        return response
+
+    return view

invenio_app_ils/closures/serializers/schema.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2025-2025 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Invenio App ILS Closures response schemas."""
+
+from marshmallow import Schema, fields
+
+
+class DateRangeSchema(Schema):
+    """Schema for a single closure period."""
+
+    start = fields.Date(required=True, description="Start date of the closure period.")
+    end = fields.Date(required=True, description="End date of the closure period.")
+
+
+class ClosurePeriodsV1(Schema):
+    """Schema for a list of closure periods."""
+
+    closure_periods = fields.List(
+        fields.Nested(DateRangeSchema),
+        required=True,
+        description="List of closure date periods.",
+    )

invenio_app_ils/closures/views.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2025-2025 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Invenio App ILS Closure views."""
+
+from flask import Blueprint, abort
+from flask_login import current_user
+from datetime import date
+from invenio_records_rest.views import pass_record
+from invenio_rest import ContentNegotiatedMethodView
+from invenio_app_ils.locations.api import LOCATION_PID_TYPE
+from invenio_app_ils.closures.serializers import closure_periods_response
+from invenio_app_ils.closures.api import get_closure_periods
+from invenio_app_ils.permissions import backoffice_permission
+from invenio_app_ils.records.permissions import RecordPermission
+
+
+def create_closures_blueprint(app):
+    """Create location closed periods blueprint."""
+    blueprint = Blueprint("invenio_app_ils_closures", __name__, url_prefix="")
+    endpoints = app.config["RECORDS_REST_ENDPOINTS"]
+
+    options = endpoints[LOCATION_PID_TYPE]
+    default_media_type = options.get("default_media_type", "")
+    closure_periods_serializers = {"application/json": closure_periods_response}
+
+    closure_periods_view = LocationClosurePeriodsResource.as_view(
+        LocationClosurePeriodsResource.view_name,
+        serializers=closure_periods_serializers,
+        default_media_type=default_media_type,
+    )
+    blueprint.add_url_rule(
+        "{0}/closure_periods/<int:year>".format(options["item_route"]),
+        view_func=closure_periods_view,
+        methods=["GET"],
+    )
+
+    return blueprint
+
+
+class LocationClosurePeriodsResource(ContentNegotiatedMethodView):
+    """Returns the closure periods of a Location"""
+
+    view_name = "location_closure_periods"
+
+    @pass_record
+    def get(self, pid, record, year, **kwargs):
+        """Get the date ranges for which a location is closure based in the specified year"""
+
+        factory = RecordPermission(record, "read")
+        if not factory.is_public() and not backoffice_permission().can():
+            if not current_user.is_authenticated:
+                abort(401)
+            abort(403)
+
+        start_date = date(year, 1, 1)
+        end_date = date(year, 12, 31)
+
+        closure_periods = get_closure_periods(record, start_date, end_date)
+
+        return self.make_response({"closure_periods": closure_periods}, 200)

{invenio_app_ils-4.4.0.dist-info → invenio_app_ils-4.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: invenio-app-ils
-Version: 4.4.0
+Version: 4.5.0
 Summary: Invenio Integrated Library System.
 Home-page: https://github.com/inveniosoftware/invenio-app-ils
 Author: CERN
@@ -66,6 +66,7 @@ Requires-Dist: lorem>=0.1.1; extra == "lorem"
 Provides-Extra: opensearch2
 Requires-Dist: invenio-search[opensearch2]<3.0.0,>=2.0.0; extra == "opensearch2"
 Provides-Extra: docs
+Dynamic: license-file
 
 ..
     Copyright (C) 2018-2020 CERN.
@@ -101,6 +102,11 @@ https://invenioils.docs.cern.ch
 Changes
 =======
 
+Version 4.5.0 (released 2025-06-04)
+
+- closures: added endpoint for closure periods in a year
+- circulation: self-checkout of MISSING items marks them as CAN_CIRCULATE
+- tests: Fix comment on running tests by bumping Postgres & adding param
 
 Version 4.4.0 (released 2025-02-21)
 

{invenio_app_ils-4.4.0.dist-info → invenio_app_ils-4.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_app_ils/__init__.py,sha256=meAZ9qX5aymnutmLfBi3C_OoS3FUGNa1s4NHG2QrM4I,285
+invenio_app_ils/__init__.py,sha256=5FxyNegCXBoMVkuZG-tPYBUFB9w78RX2ImxZl6S7QRY,285
 invenio_app_ils/cli.py,sha256=wD-SSrkbEhsndI7N9E39p-T1MXj8LR8pvsWFH-JHHVA,57478
 invenio_app_ils/config.py,sha256=b-3nNceV4s93eS-AS3WEj9eMopROa2hEZ7BI5jDnlAg,40857
 invenio_app_ils/errors.py,sha256=HB_iWj-aYxzTzzO6hWb66mUPZdqpWYHgmr2H2t3j3wU,13293
@@ -35,7 +35,7 @@ invenio_app_ils/acquisition/mappings/v7/acq_orders/order-v1.0.0.json,sha256=KMaS
 invenio_app_ils/acquisition/schemas/__init__.py,sha256=HulLvvDz0W5owDGxVLIaastuZ4o6T5-MYGw0RPuY90g,233
 invenio_app_ils/acquisition/schemas/acq_orders/order-v1.0.0.json,sha256=_Kd3oX_7gJJQSqSc2TxQulXletYu0wEeTdQKkXr7kLs,5688
 invenio_app_ils/circulation/__init__.py,sha256=Gd0KAsGdhPdz0ACEQ9k8xSeOIxZr3xRK_FiE8U3RQWs,248
-invenio_app_ils/circulation/api.py,sha256=wUiRoPF7-tdUg-XsIhNfTSJ4-nF3sOxRTdxVF0JuDdo,14257
+invenio_app_ils/circulation/api.py,sha256=ac-WrxQYZainV3QkOLyVzF4MVwfdcpRVXg-gd9Vi0tc,14495
 invenio_app_ils/circulation/config.py,sha256=aVl7kLA2fobQuQy2XR9J_fQMV-ZaVxE2niMSTirDQM0,11387
 invenio_app_ils/circulation/indexer.py,sha256=T24J5QqcB38LRJgirkAXL2tmFOucYToDRegxgFW96ag,3887
 invenio_app_ils/circulation/receivers.py,sha256=Ux6KTNbII3DHBvCUS0gxqbi6tNbm76_kbcaHtK0BsB4,2488
@@ -79,8 +79,12 @@ invenio_app_ils/circulation/templates/invenio_app_ils_circulation/notifications/
 invenio_app_ils/circulation/transitions/__init__.py,sha256=XaEYQVWOWhZ_0JPxTg0Lx53BmyWJXOfM3_nm2KipYhY,237
 invenio_app_ils/circulation/transitions/transitions.py,sha256=9W5h4RHm72wMQuY3hKgFHLKwnxN68gkN98RwBlCjsro,1361
 invenio_app_ils/closures/__init__.py,sha256=zJ2fI8Y34Vm-1uL9qLNeOQoqGKlhgfmiH8YcvvgnQP4,242
-invenio_app_ils/closures/api.py,sha256=phuH8_veqchQhgGpK8McsKA9qloX3w9E_Mkh_X-Yu00,2203
+invenio_app_ils/closures/api.py,sha256=5i9C1_gDR0-HLeCtU4-aGcvosc9cSR3YVK6gpXJObdo,4441
 invenio_app_ils/closures/tasks.py,sha256=Uy8W1OPyuByLW4OFdSHVtH9sXmT2tP_uB57FxkV_Vag,4343
+invenio_app_ils/closures/views.py,sha256=cWgCV58D7Pnsg56WLEcWBFQ97jEUgnNb-yvLvWRuvYk,2403
+invenio_app_ils/closures/serializers/__init__.py,sha256=PT1NBZEFk3X7u-7JUQ0U6Pbv12wpD7gPCVIpsZAPdp4,494
+invenio_app_ils/closures/serializers/response.py,sha256=kMSpqllro-UgUOquIRUWywqm77GNdJeeaaaYzpKVMnU,937
+invenio_app_ils/closures/serializers/schema.py,sha256=yFQYCPgd-m3tZAk019FR8TDV0BXovYcKW39o7MLGeAc,816
 invenio_app_ils/demo_data/documents.json,sha256=n0urrP68azieRMjgwGvKWoJSNXyTwpVxqzS4RInN3Ig,6342
 invenio_app_ils/demo_data/items.json,sha256=J0IGbnIsFefgvGbgMWVCcvDIW5RJa48WoDPNBImUWKQ,1799
 invenio_app_ils/document_requests/__init__.py,sha256=yPDfvJcGPy0dJ0f_hsJ5OQ5EcQ-WJODFPLjuWmSXSdU,237
@@ -438,6 +442,8 @@ invenio_app_ils/vocabularies/sources/__init__.py,sha256=EMLoLQGiq9_qoZ4lKqO_J0u2
 invenio_app_ils/vocabularies/sources/base.py,sha256=kmNg85cjrxqc8VErFP2SUtlyo1PnmzOBQgfoSpfTPh4,1418
 invenio_app_ils/vocabularies/sources/json.py,sha256=KGLTJ4AX8zEDdkpi3v92oHGs-h2dUzHbNPSg99-j8o0,1021
 invenio_app_ils/vocabularies/sources/opendefinition.py,sha256=9zbRXuTr0i5lVLt596oUhsLQPiJVf9jiM9-C7T6zbXA,2151
+invenio_app_ils-4.5.0.dist-info/licenses/AUTHORS.rst,sha256=BaXCGzdHCmiMOl4qtVlh1qrfy2ROMVOQp6ylzy1m0ww,212
+invenio_app_ils-4.5.0.dist-info/licenses/LICENSE,sha256=9OdaPOAO1ZOJcRQ8BrGj7QAdaJc8SRSUgBtdom49MrI,1062
 tests/__init__.py,sha256=eweSnIIeVVFHlmAFG9zkUQ8EXJMYfx8S6DIbsMVzinM,236
 tests/conftest.py,sha256=vL0D8_Vj34eA1aHD5bzLITQ2_oNugnPoUzv1lIVAUbI,7154
 tests/helpers.py,sha256=_x3SB-P6YusPHJ-jnKSf5GtuevHcNaNQBVqKh9eZnJ0,3227
@@ -452,7 +458,7 @@ tests/api/acquisition/test_acq_providers_permissions.py,sha256=aVshFVUuKwUfjRZgD
 tests/api/circulation/__init__.py,sha256=AWnR9VZzm4IiO97eKJNn1LLtQJ1sRgjgrxChJ1Wxsuw,235
 tests/api/circulation/test_expired_loans.py,sha256=nVGu1H7G8KlPGatx_YG2NCEYpeniZnGkwL4gsg_uyp8,2798
 tests/api/circulation/test_loan_bulk_extend.py,sha256=jDYYyPXn5p6yn55pUVp4ivVSh9GcCvU5C-P8OlubMto,5606
-tests/api/circulation/test_loan_checkout.py,sha256=ndIi5eto0QwlkojF8O4ny98mCsIKNNEUcY1PFz_ETUc,16308
+tests/api/circulation/test_loan_checkout.py,sha256=OFJI57lJZPzheJGuIiCukTzzkZePO2lrlphGlXKJT38,17512
 tests/api/circulation/test_loan_default_durations.py,sha256=SWQmAJwe5GSoji1Hibx6DjGorJQZ2tYfiHPkuPZKTJo,1681
 tests/api/circulation/test_loan_document_resolver.py,sha256=ZNu-otdQ8398ksTV2XdgpK3WcbeR8-X-qaRnlPM2_6w,556
 tests/api/circulation/test_loan_extend.py,sha256=vkpyss5XkzeHVuGUXU8eOlF9J4esSjrVr5oNx-nXqEU,4158
@@ -476,7 +482,7 @@ tests/api/ill/test_ill_providers_permissions.py,sha256=q07t8RQEQ_68H4n01r3lWoNyu
 tests/api/ils/__init__.py,sha256=9wpf3d3iO-AJ7rNFlnBciyU8QHD7RUp6ShxjZ8s4Gks,227
 tests/api/ils/test_anonymization.py,sha256=dnWioSC-598zH9-jeH3IxyWOJLVw3M6L7SnICJM3mMU,6650
 tests/api/ils/test_apis.py,sha256=2fqYcl6X8V5C8YpNqoVAwpHQH3SrerGZNcgwbanHmH4,2680
-tests/api/ils/test_closures.py,sha256=xQbpYHQLB5o0JUabdteMU0qTn44QRs3mNnIGFSGPedQ,10041
+tests/api/ils/test_closures.py,sha256=o5WtrC9R88XAJYbvq76-3mhfL_SZhZ7yk7HObsX4XCc,11250
 tests/api/ils/test_errors.py,sha256=8_cVOU5K2jneUrYRGz4-6IyZUNIPoh92hNqA1er-ync,4313
 tests/api/ils/test_facets.py,sha256=ffig7FH6mnjaRoL1yELL2X06Q9yp3elmpkvtK6oLdo0,2766
 tests/api/ils/test_internal_locations.py,sha256=MdSEjloixYIUWdIvc-1vcLbPXClWrzVunpqCqJ81LLY,3517
@@ -519,7 +525,7 @@ tests/data/eitems.json,sha256=2qwmHZkTf718Jizmk7YAO1v_8gs4yOm4dytzmvD-asQ,2122
 tests/data/ill_borrowing_requests.json,sha256=XG3xQnBizpeXrgUsNHphqLA7wQKEYEdLbkYwTZdqOIM,1603
 tests/data/ill_providers.json,sha256=M1NPVcjyP3_3r4Ynrltf5ZJ8QReBVHzV2fYSVUmj5Nc,169
 tests/data/internal_locations.json,sha256=CMXYQ98d9Hhu7YnaQoxrUGAoyIe43kTikE3CIhXPq9E,396
-tests/data/items.json,sha256=CUH1RooPv3aI3xKTJ7yN_GKZ19Ap8Cv0dsT8ZcV6igY,8528
+tests/data/items.json,sha256=JMz2ojY79t0_x_55Mjt4BEL2LP1KOj82jXx6o-vCvm4,8849
 tests/data/loans.json,sha256=xVTnEc9IuJdu0Fspd0HDNHM8ZO26lir3EEkwaAvTGIM,3668
 tests/data/loans_most_loaned.json,sha256=ut1bOCFHCShPv_HotAjVV59gfwNfjpxEahyPCOZmQgY,3039
 tests/data/locations.json,sha256=2-xvSY4x8MJsDzlK-aleXaJw6mPMaQe7rJqwX1YqxfM,1637
@@ -529,10 +535,8 @@ tests/templates/notifications/title_body.html,sha256=W-pa6eSm7glK9JEcTVo4G7yC3Q1
 tests/templates/notifications/title_body_html.html,sha256=wPDP-DpQ0c2AX3oIfLvJLRp7J_rMoesIc9nLx3apkDc,146
 tests/templates/notifications/title_body_html_ctx.html,sha256=qqfTZ9zKVXFqyXIcqt5BLHEJptRlUDPBPtLxPfTmNzQ,193
 tests/templates/notifications/title_only.html,sha256=aoZ0veSleRYdKPXWgN6fdXLaz3r-KAPzdfHSuHPR2Uo,45
-invenio_app_ils-4.4.0.dist-info/AUTHORS.rst,sha256=BaXCGzdHCmiMOl4qtVlh1qrfy2ROMVOQp6ylzy1m0ww,212
-invenio_app_ils-4.4.0.dist-info/LICENSE,sha256=9OdaPOAO1ZOJcRQ8BrGj7QAdaJc8SRSUgBtdom49MrI,1062
-invenio_app_ils-4.4.0.dist-info/METADATA,sha256=kFPwEemRyg_ePUbr0UCeGaq6b8BL37z_qj6wA_OXdGo,16508
-invenio_app_ils-4.4.0.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-invenio_app_ils-4.4.0.dist-info/entry_points.txt,sha256=dLh4XxQPtPYRl_VNqzNpRK4l_sv_RQEyAm57tBBL7Ic,7606
-invenio_app_ils-4.4.0.dist-info/top_level.txt,sha256=MQTU2NrM0if5YAyIsKmQ0k35skJ3IUyQT7eCD2IWiNQ,22
-invenio_app_ils-4.4.0.dist-info/RECORD,,
+invenio_app_ils-4.5.0.dist-info/METADATA,sha256=GiTij7n__fnC2H4vz4pUnuwvUh3lIiEblB88lR8DZv4,16771
+invenio_app_ils-4.5.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+invenio_app_ils-4.5.0.dist-info/entry_points.txt,sha256=iBVLFVqDZl-jiWvOfKldxDq9xsrbmI8GZhWhqsj8Ba0,7678
+invenio_app_ils-4.5.0.dist-info/top_level.txt,sha256=MQTU2NrM0if5YAyIsKmQ0k35skJ3IUyQT7eCD2IWiNQ,22
+invenio_app_ils-4.5.0.dist-info/RECORD,,

{invenio_app_ils-4.4.0.dist-info → invenio_app_ils-4.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

{invenio_app_ils-4.4.0.dist-info → invenio_app_ils-4.5.0.dist-info}/entry_points.txt

@@ -24,6 +24,7 @@ ils_rest = invenio_app_ils.ext:InvenioAppIlsREST
 [invenio_base.api_blueprints]
 ils_circulation = invenio_app_ils.circulation.views:create_circulation_blueprint
 ils_circulation_stats = invenio_app_ils.circulation.stats.views:create_circulation_stats_blueprint
+ils_closures = invenio_app_ils.closures.views:create_closures_blueprint
 ils_document_request = invenio_app_ils.document_requests.views:create_document_request_action_blueprint
 ils_document_stats = invenio_app_ils.records.views:create_document_stats_blueprint
 ils_files = invenio_app_ils.files.views:create_files_blueprint

tests/api/circulation/test_loan_checkout.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2018-2020 CERN.
+# Copyright (C) 2018-2025 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.
@@ -249,15 +249,29 @@ def test_self_checkout_search(app, client, json_headers, users, testdata):
     assert res.status_code == 400
 
     # test that an error is returned when the item cannot circulate
-    missing_item_barcode = "123456789-1"
+    in_binding_item_barcode = "123456789-74"
     url = url_for("invenio_app_ils_circulation.loan_self_checkout")
-    res = client.get(f"{url}?barcode={missing_item_barcode}", headers=json_headers)
+    res = client.get(f"{url}?barcode={in_binding_item_barcode}", headers=json_headers)
     assert res.status_code == 400
     # assert that the payload will contain the key error with a msg
     response = res.get_json()
     assert LoanSelfCheckoutItemInvalidStatus.description in response["message"]
     assert LoanSelfCheckoutItemInvalidStatus.supportCode in response["supportCode"]
 
+    # test that no error is returned when the item is marked as missing
+    missing_item_barcode = "123456789-1"
+    missing_item_pid = "itemid-1"
+    url = url_for("invenio_app_ils_circulation.loan_self_checkout")
+    res = client.get(f"{url}?barcode={missing_item_barcode}", headers=json_headers)
+    assert res.status_code == 200
+
+    # assert item is no longer marked as missing
+    response = res.get_json()
+    item_pid = response["metadata"]["pid"]
+    assert item_pid == missing_item_pid
+    item = Item.get_record_by_pid(item_pid)
+    assert item["status"] == "CAN_CIRCULATE"
+
     # create a loan on the same patron, and another one on another patron
     user_login(client, "librarian", users)
     url = url_for("invenio_app_ils_circulation.loan_checkout")
@@ -326,6 +340,7 @@ def test_self_checkout(app, client, json_headers, users, testdata):
         current_search.flush_and_refresh(index="*")
 
     def _self_checkout(patron, item_pid, document_pid):
+        url = url_for("invenio_app_ils_circulation.loan_self_checkout")
         params = deepcopy(NEW_LOAN)
         params["document_pid"] = document_pid
         params["item_pid"] = dict(type="pitmid", value=item_pid)
@@ -394,3 +409,14 @@ def test_self_checkout(app, client, json_headers, users, testdata):
     assert res.status_code == 202
     response = res.get_json()
     assert response["metadata"]["delivery"]["method"] == "SELF-CHECKOUT"
+
+    # test self-checkout with item marked as missing raises no error and marks the item as CAN_CIRCULATE
+    missing_item_pid = "itemid-1"
+    app.config["ILS_SELF_CHECKOUT_ENABLED"] = True
+    patron2 = user_login(client, "patron2", users)
+    res = _self_checkout(patron2, missing_item_pid, "docid-1")
+    assert res.status_code == 202
+    response = res.get_json()
+    assert response["metadata"]["delivery"]["method"] == "SELF-CHECKOUT"
+    item = Item.get_record_by_pid(missing_item_pid)
+    assert item["status"] == "CAN_CIRCULATE"

tests/api/ils/test_closures.py

@@ -10,6 +10,7 @@
 import json
 
 import arrow
+import pytest
 from flask import url_for
 
 from invenio_app_ils.closures.api import find_next_open_date
@@ -21,6 +22,7 @@ _LOCATION_PID = "locid-1"
 _LOCATION_NAME = "Location name"
 _ITEM_ENDPOINT = "invenio_records_rest.locid_item"
 _LIST_ENDPOINT = "invenio_records_rest.locid_list"
+_CLOSURE_PERIODS_ENDPOINT = "invenio_app_ils_closures.location_closure_periods"
 _WEEKDAYS = [
     "monday",
     "tuesday",
@@ -261,7 +263,8 @@ def test_location_validation(client, json_headers, users, testdata):
     )
 
 
-def test_find_next_open_date(app, db, testdata):
+@pytest.fixture
+def location_closures_testdata(db, testdata):
     def _update_location_closures_data(closed_weekdays, exceptions):
         Location = current_app_ils.location_record_cls
         record = Location.get_record_by_pid(_LOCATION_PID)
@@ -273,13 +276,6 @@ def test_find_next_open_date(app, db, testdata):
 
         return record
 
-    def _test(start_date, expected_next_open_date):
-        next_open = find_next_open_date(_LOCATION_PID, _date_from_string(start_date))
-        if expected_next_open_date:
-            assert next_open == _date_from_string(expected_next_open_date)
-        else:
-            assert next_open is None
-
     """
     Mon. Tue. Wed. Thu. Fri. Sat. Sun.
      27   28   29   30   31  -01  -02
@@ -300,6 +296,15 @@ def test_find_next_open_date(app, db, testdata):
     ]
     _update_location_closures_data(closed_weekdays, exceptions)
 
+
+def test_find_next_open_date(app, location_closures_testdata):
+    def _test(start_date, expected_next_open_date):
+        next_open = find_next_open_date(_LOCATION_PID, _date_from_string(start_date))
+        if expected_next_open_date:
+            assert next_open == _date_from_string(expected_next_open_date)
+        else:
+            assert next_open is None
+
     _test("2000-01-01", "2000-01-06")
     _test("2000-01-04", "2000-01-06")
     _test("2000-01-06", "2000-01-06")
@@ -313,3 +318,36 @@ def test_find_next_open_date(app, db, testdata):
     _test("2000-01-30", "2000-01-30")
 
     _test("2000-02-05", "2000-02-07")
+
+
+def test_get_closure_periods(client, location_closures_testdata, json_headers):
+    """Test get closure periods."""
+    url = url_for(
+        _CLOSURE_PERIODS_ENDPOINT,
+        pid_value=_LOCATION_PID,
+        year=2000,
+    )
+    res = client.get(url, headers=json_headers)
+    assert res.status_code in _HTTP_OK
+
+    hits = json.loads(res.data.decode("utf-8"))["closure_periods"]
+    hits = [
+        (_date_from_string(hit["start"]), _date_from_string(hit["end"])) for hit in hits
+    ]
+
+    def _is_in_interval(date, interval):
+        return interval[0] <= date <= interval[1]
+
+    def _test(date, closed):
+        date = _date_from_string(date)
+        assert (
+            any(_is_in_interval(date, hit) for hit in hits) == closed
+        ), f"Date {date} is wrongfully marked as {'Open' if closed else 'Closed'}"
+
+    _test("2000-01-01", True)
+    _test("2000-01-06", False)
+    _test("2000-01-22", True)
+    _test("2000-01-23", True)
+    _test("2000-01-30", False)
+    _test("2000-02-01", False)
+    _test("2000-02-05", True)

tests/data/items.json

@@ -289,5 +289,16 @@
     "medium": "NOT_SPECIFIED",
     "status": "CAN_CIRCULATE",
     "document": {}
+  },
+  {
+    "pid": "itemid-74",
+    "created_by": { "type": "script", "value": "demo" },
+    "barcode": "123456789-74",
+    "document_pid": "docid-17",
+    "internal_location_pid": "ilocid-1",
+    "circulation_restriction": "NO_RESTRICTION",
+    "medium": "NOT_SPECIFIED",
+    "status": "IN_BINDING",
+    "document": {}
   }
 ]