invenio-app-ils 4.1.0__tar.gz → 4.3.0__tar.gz

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/CHANGES.rst

@@ -8,6 +8,19 @@
 Changes
 =======
 
+Version 4.3.0 (released 2024-11-19)
+
+- self-checkout: use dedicated endpoints for the entire workflow for better
+                 permissions check and error handling.
+                 Add a new loan transition and delivery method for self-checkout.
+- anonymization: ensure that re-indexing is happening after the commit to the db,
+                 to avoid premature re-indexing (and therefore index conflict version)
+                 when db rollback happens.
+
+Version 4.2.0 (released 2024-11-04)
+
+- self-checkout: barcode is now always uppercased to make searches case-insensitive
+
 Version 4.1.0 (released 2024-10-21)
 
 - search: apply the same search analyzers to the fields that needs to be searchable.
@@ -55,7 +68,7 @@ Version 2.0.0rc9 (released 2024-04-25)
 Version 2.0.0rc8 (released 2024-04-04)
 
 - records_relation: Simplify sorting
-- records_relations: Use sort_by paramemter from configs instead
+- records_relations: Use sort_by parameter from configs instead
 - relations: Add functionality to sort json refs by relation_type
 - tests: circulation: Add new location for testing closures
 - circulation: loan_request: Fix dates comparison in get_offset_duration

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-app-ils
-Version: 4.1.0
+Version: 4.3.0
 Summary: Invenio Integrated Library System.
 Home-page: https://github.com/inveniosoftware/invenio-app-ils
 Author: CERN
@@ -10,12 +10,62 @@ Keywords: invenio-app-ils Invenio
 Platform: any
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.8
+License-File: LICENSE
+License-File: AUTHORS.rst
+Requires-Dist: invenio-app<1.4.0,>=1.3.4
+Requires-Dist: invenio-db[mysql,postgresql]<2.0.0,>=1.0.14
+Requires-Dist: invenio-base<1.3.0,>=1.2.11
+Requires-Dist: invenio-cache<2.0.0,>=1.1.1
+Requires-Dist: invenio-celery<2.0.0,>=1.2.4
+Requires-Dist: invenio-config<1.1.0,>=1.0.3
+Requires-Dist: invenio-i18n<3.0.0,>=2.0.0
+Requires-Dist: invenio-admin<1.5.0,>=1.4.0
+Requires-Dist: invenio-assets<4.0.0,>=3.0.0
+Requires-Dist: invenio-formatter<3.0.0,>=2.0.0
+Requires-Dist: invenio-logging[sentry_sdk]<3.0.0,>=2.0.0
+Requires-Dist: invenio-mail<3.0.0,>=2.0.0
+Requires-Dist: invenio-rest<1.4.0,>=1.3.0
+Requires-Dist: invenio-theme<3.0.0,>=2.0.0
+Requires-Dist: invenio-access<3.0.0,>=2.0.0
+Requires-Dist: invenio-accounts<4.0.0,>=3.0.0
+Requires-Dist: invenio-oauth2server<3.0.0,>=2.0.0
+Requires-Dist: invenio-oauthclient<4.0.0,>=3.0.0
+Requires-Dist: invenio-userprofiles<1.3.0,>=1.2.4
+Requires-Dist: invenio-indexer<3.0.0,>=2.2.0
+Requires-Dist: invenio-jsonschemas<1.2.0,>=1.1.4
+Requires-Dist: invenio-oaiserver<2.3.0,>=2.2.0
+Requires-Dist: invenio-pidstore<1.4.0,>=1.3.0
+Requires-Dist: invenio-records-rest<3.0.0,>=2.2.0
+Requires-Dist: invenio-records<3.0.0,>=2.2.1
+Requires-Dist: invenio-files-rest<3.0.0,>=2.0.0
+Requires-Dist: invenio-banners<1.1.0,>=1.0.0a1
+Requires-Dist: invenio-pages<1.1.0,>=1.0.0a5
+Requires-Dist: invenio-circulation<4.0.0,>=3.0.0a1
+Requires-Dist: invenio-opendefinition<3.0.0,>=2.0.0a1
+Requires-Dist: invenio-pidrelations<1.1.0,>=0.2.0
+Requires-Dist: invenio-stats<5.0.0,>=4.0.0
+Requires-Dist: Flask-Debugtoolbar<1.0.0,>=0.10.1
+Requires-Dist: pycountry<23.0.0,>=20.0.0
+Requires-Dist: simplejson<4.0.0,>=3.8.1
+Requires-Dist: pluggy<1.0.0,>=0.13.1
+Requires-Dist: jsonschema<5.0.0,>=4.3.0
+Requires-Dist: itsdangerous<2.1,>=1.1
+Requires-Dist: SQLAlchemy<2.0.0,>=1.3.0
+Requires-Dist: Flask<2.3.0,>=2.2.0
+Requires-Dist: Werkzeug<2.3.0,>=2.2.0
 Provides-Extra: tests
+Requires-Dist: pytest-black>=0.3.0; extra == "tests"
+Requires-Dist: mock>=2.0.0; extra == "tests"
+Requires-Dist: pytest-invenio<3.0.0,>=2.0.0; extra == "tests"
+Requires-Dist: docker-services-cli>=0.6.0; extra == "tests"
+Requires-Dist: pydocstyle==6.1.1; extra == "tests"
+Requires-Dist: pytest-mock>=1.6.0; extra == "tests"
+Requires-Dist: sphinx>=5; extra == "tests"
 Provides-Extra: lorem
+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
-License-File: LICENSE
-License-File: AUTHORS.rst
 
 ..
     Copyright (C) 2018-2020 CERN.
@@ -51,6 +101,19 @@ https://invenioils.docs.cern.ch
 Changes
 =======
 
+Version 4.3.0 (released 2024-11-19)
+
+- self-checkout: use dedicated endpoints for the entire workflow for better
+                 permissions check and error handling.
+                 Add a new loan transition and delivery method for self-checkout.
+- anonymization: ensure that re-indexing is happening after the commit to the db,
+                 to avoid premature re-indexing (and therefore index conflict version)
+                 when db rollback happens.
+
+Version 4.2.0 (released 2024-11-04)
+
+- self-checkout: barcode is now always uppercased to make searches case-insensitive
+
 Version 4.1.0 (released 2024-10-21)
 
 - search: apply the same search analyzers to the fields that needs to be searchable.
@@ -98,7 +161,7 @@ Version 2.0.0rc9 (released 2024-04-25)
 Version 2.0.0rc8 (released 2024-04-04)
 
 - records_relation: Simplify sorting
-- records_relations: Use sort_by paramemter from configs instead
+- records_relations: Use sort_by parameter from configs instead
 - relations: Add functionality to sort json refs by relation_type
 - tests: circulation: Add new location for testing closures
 - circulation: loan_request: Fix dates comparison in get_offset_duration
@@ -513,5 +576,3 @@ Version 1.0.0a4 (released 2020-06-19)
 Version 1.0.0a0 (released 2020-06-05)
 
 - Initial public release.
-
-

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/__init__.py

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

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/api.py

@@ -30,10 +30,15 @@ from invenio_app_ils.circulation.search import (
     get_all_expiring_or_overdue_loans_by_patron_pid,
 )
 from invenio_app_ils.errors import (
+    DocumentOverbookedError,
     IlsException,
     InvalidLoanExtendError,
     InvalidParameterError,
+    ItemCannotCirculateError,
+    ItemHasActiveLoanError,
+    ItemNotFoundError,
     MissingRequiredParameterError,
+    MultipleItemsBarcodeFoundError,
     PatronHasLoanOnDocumentError,
     PatronHasLoanOnItemError,
     PatronHasRequestOnDocumentError,
@@ -119,7 +124,7 @@ def request_loan(
     patron_pid,
     transaction_location_pid,
     transaction_user_pid=None,
-    **kwargs
+    **kwargs,
 ):
     """Create a new loan and trigger the first transition to PENDING."""
     loan_cls = current_circulation.loan_record_cls
@@ -170,13 +175,54 @@ def patron_has_active_loan_on_item(patron_pid, item_pid):
     return search_result.hits.total.value > 0
 
 
+def _checkout_loan(
+    item_pid,
+    patron_pid,
+    transaction_location_pid,
+    trigger="checkout",
+    transaction_user_pid=None,
+    delivery=None,
+    **kwargs,
+):
+    """Checkout a loan."""
+    transaction_user_pid = transaction_user_pid or str(current_user.id)
+    loan_cls = current_circulation.loan_record_cls
+    # create a new loan
+    record_uuid = uuid.uuid4()
+    new_loan = dict(
+        patron_pid=patron_pid,
+        transaction_location_pid=transaction_location_pid,
+        transaction_user_pid=transaction_user_pid,
+    )
+
+    if delivery:
+        new_loan["delivery"] = delivery
+    # check if there is an existing request
+    loan = patron_has_request_on_document(patron_pid, kwargs.get("document_pid"))
+    if loan:
+        loan = loan_cls.get_record_by_pid(loan.pid)
+        pid = IlsCirculationLoanIdProvider.get(loan["pid"]).pid
+        loan.update(new_loan)
+    else:
+        pid = ils_circulation_loan_pid_minter(record_uuid, data=new_loan)
+        loan = loan_cls.create(data=new_loan, id_=record_uuid)
+
+    params = deepcopy(loan)
+    params.update(item_pid=item_pid, **kwargs)
+
+    loan = current_circulation.circulation.trigger(
+        loan, **dict(params, trigger=trigger)
+    )
+    return pid, loan
+
+
 def checkout_loan(
     item_pid,
     patron_pid,
     transaction_location_pid,
     transaction_user_pid=None,
     force=False,
-    **kwargs
+    **kwargs,
 ):
     """Create a new loan and trigger the first transition to ITEM_ON_LOAN.
 
@@ -191,7 +237,7 @@ def checkout_loan(
         the checkout. If False, the checkout will fail when the item cannot
         circulate.
     """
-    loan_cls = current_circulation.loan_record_cls
+
     if patron_has_active_loan_on_item(patron_pid=patron_pid, item_pid=item_pid):
         raise PatronHasLoanOnItemError(patron_pid, item_pid)
     optional_delivery = kwargs.get("delivery")
@@ -201,35 +247,86 @@ def checkout_loan(
     if force:
         _set_item_to_can_circulate(item_pid)
 
-    transaction_user_pid = transaction_user_pid or str(current_user.id)
-
-    # create a new loan
-    record_uuid = uuid.uuid4()
-    new_loan = dict(
-        patron_pid=patron_pid,
-        transaction_location_pid=transaction_location_pid,
+    return _checkout_loan(
+        item_pid,
+        patron_pid,
+        transaction_location_pid,
         transaction_user_pid=transaction_user_pid,
+        **kwargs,
     )
 
-    # check if there is an existing request
-    loan = patron_has_request_on_document(patron_pid, kwargs.get("document_pid"))
-    if loan:
-        loan = loan_cls.get_record_by_pid(loan.pid)
-        pid = IlsCirculationLoanIdProvider.get(loan["pid"]).pid
-        loan.update(new_loan)
-    else:
-        pid = ils_circulation_loan_pid_minter(record_uuid, data=new_loan)
-        loan = loan_cls.create(data=new_loan, id_=record_uuid)
 
-    params = deepcopy(loan)
-    params.update(item_pid=item_pid, **kwargs)
+def _ensure_item_loanable_via_self_checkout(item_pid):
+    """Self-checkout: return loanable item or raise when not loanable.
 
-    # trigger the transition to request
-    loan = current_circulation.circulation.trigger(
-        loan, **dict(params, trigger="checkout")
+    Implements the self-checkout rules to loan an item.
+    """
+    item = current_app_ils.item_record_cls.get_record_by_pid(item_pid)
+    item_dict = item.replace_refs()
+
+    if item_dict["status"] != "CAN_CIRCULATE":
+        raise ItemCannotCirculateError()
+
+    circulation_state = item_dict["circulation"].get("state")
+    has_active_loan = (
+        circulation_state and circulation_state in CIRCULATION_STATES_LOAN_ACTIVE
     )
+    if has_active_loan:
+        raise ItemHasActiveLoanError(loan_pid=item_dict["circulation"]["loan_pid"])
 
-    return pid, loan
+    document = current_app_ils.document_record_cls.get_record_by_pid(
+        item_dict["document_pid"]
+    )
+    document_dict = document.replace_refs()
+    if document_dict["circulation"].get("overbooked", False):
+        raise DocumentOverbookedError(
+            f"Cannot self-checkout the overbooked document {item_dict['document_pid']}"
+        )
+
+    return item
+
+
+def self_checkout_get_item_by_barcode(barcode):
+    """Search for an item by barcode.
+
+    :param barcode: the barcode of the item to search for
+    :return item: the item that was found, or raise in case of errors
+    """
+    item_search = current_app_ils.item_search_cls()
+    items = item_search.search_by_barcode(barcode).execute()
+    if items.hits.total.value == 0:
+        raise ItemNotFoundError(barcode=barcode)
+    if items.hits.total.value > 1:
+        raise MultipleItemsBarcodeFoundError(barcode)
+
+    item_pid = items.hits[0].pid
+    item = _ensure_item_loanable_via_self_checkout(item_pid)
+    return item_pid, item
+
+
+def self_checkout(
+    item_pid, patron_pid, transaction_location_pid, transaction_user_pid=None, **kwargs
+):
+    """Perform self-checkout.
+
+    :param item_pid: a dict containing `value` and `type` fields to
+        uniquely identify the item.
+    :param patron_pid: the PID value of the patron
+    :param transaction_location_pid: the PID value of the location where the
+        checkout is performed
+    :param transaction_user_pid: the PID value of the user that performed the
+        checkout
+    """
+    _ensure_item_loanable_via_self_checkout(item_pid["value"])
+    return _checkout_loan(
+        item_pid,
+        patron_pid,
+        transaction_location_pid,
+        transaction_user_pid=transaction_user_pid,
+        trigger="self_checkout",
+        delivery=dict(method="SELF-CHECKOUT"),
+        **kwargs,
+    )
 
 
 def bulk_extend_loans(patron_pid, **kwargs):
@@ -253,7 +350,7 @@ def bulk_extend_loans(patron_pid, **kwargs):
                     params,
                     trigger="extend",
                     transition_kwargs=dict(send_notification=False),
-                )
+                ),
             )
             extended_loans.append(extended_loan)
         except (CirculationException, InvalidLoanExtendError):

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/config.py

@@ -47,7 +47,6 @@ from invenio_app_ils.permissions import (
     loan_extend_circulation_permission,
     patron_owner_permission,
     superuser_permission,
-    loan_checkout_permission,
 )
 
 from .api import ILS_CIRCULATION_LOAN_FETCHER, ILS_CIRCULATION_LOAN_MINTER
@@ -84,6 +83,7 @@ ILS_CIRCULATION_LOAN_WILL_EXPIRE_DAYS = 7
 ILS_CIRCULATION_DELIVERY_METHODS = {
     "PICKUP": "Pick it up at the library desk",
     "DELIVERY": "Have it delivered to my office",
+    "SELF-CHECKOUT": "Self-checkout",
 }
 
 # Notification message creator for loan notifications
@@ -162,7 +162,13 @@ CIRCULATION_LOAN_TRANSITIONS = {
             dest="ITEM_ON_LOAN",
             trigger="checkout",
             transition=ILSToItemOnLoan,
-            permission_factory=loan_checkout_permission,
+            permission_factory=backoffice_permission,
+        ),
+        dict(
+            dest="ITEM_ON_LOAN",
+            trigger="self_checkout",
+            transition=ILSToItemOnLoan,
+            permission_factory=authenticated_user_permission,
         ),
     ],
     "PENDING": [
@@ -172,6 +178,12 @@ CIRCULATION_LOAN_TRANSITIONS = {
             transition=ILSToItemOnLoan,
             permission_factory=backoffice_permission,
         ),
+        dict(
+            dest="ITEM_ON_LOAN",
+            trigger="self_checkout",
+            transition=ILSToItemOnLoan,
+            permission_factory=authenticated_user_permission,
+        ),
         dict(
             dest="CANCELLED",
             trigger="cancel",

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/loaders/__init__.py

@@ -12,9 +12,11 @@ from invenio_app_ils.records.loaders import ils_marshmallow_loader
 from .schemas.json.bulk_extend import BulkExtendLoansSchemaV1
 from .schemas.json.loan_checkout import LoanCheckoutSchemaV1
 from .schemas.json.loan_request import LoanRequestSchemaV1
+from .schemas.json.loan_self_checkout import LoanSelfCheckoutSchemaV1
 from .schemas.json.loan_update_dates import LoanUpdateDatesSchemaV1
 
 loan_request_loader = ils_marshmallow_loader(LoanRequestSchemaV1)
 loan_checkout_loader = ils_marshmallow_loader(LoanCheckoutSchemaV1)
+loan_self_checkout_loader = ils_marshmallow_loader(LoanSelfCheckoutSchemaV1)
 loan_update_dates_loader = ils_marshmallow_loader(LoanUpdateDatesSchemaV1)
 loans_bulk_update_loader = ils_marshmallow_loader(BulkExtendLoansSchemaV1)

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/loaders/schemas/json/loan_request.py

@@ -12,7 +12,6 @@ from datetime import timedelta
 import arrow
 from flask import current_app
 from invenio_circulation.records.loaders.schemas.json import DateString
-from invenio_app_ils.proxies import current_app_ils
 from marshmallow import (
     Schema,
     ValidationError,
@@ -22,6 +21,8 @@ from marshmallow import (
     validates_schema,
 )
 
+from invenio_app_ils.proxies import current_app_ils
+
 from .base import LoanBaseSchemaV1
 
 

invenio_app_ils-4.3.0/invenio_app_ils/circulation/loaders/schemas/json/loan_self_checkout.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2019 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.
+
+"""Invenio App ILS circulation Loan Checkout loader JSON schema."""
+
+from invenio_circulation.records.loaders.schemas.json import LoanItemPIDSchemaV1
+from marshmallow import fields
+
+from .base import LoanBaseSchemaV1
+
+
+class LoanSelfCheckoutSchemaV1(LoanBaseSchemaV1):
+    """Loan self-checkout schema."""
+
+    item_pid = fields.Nested(LoanItemPIDSchemaV1, required=True)

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/notifications/messages.py

@@ -25,6 +25,7 @@ class NotificationLoanMsg(NotificationMsg):
         request="request.html",
         request_no_items="request_no_items.html",
         checkout="checkout.html",
+        self_checkout="self_checkout.html",
         checkin="checkin.html",
         extend="extend.html",
         cancel="cancel.html",

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/serializers/__init__.py

@@ -6,6 +6,7 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Loan serializers."""
+
 from invenio_records_rest.serializers.response import search_responsify
 
 from invenio_app_ils.records.schemas.json import ILSRecordSchemaJSONV1

{invenio-app-ils-4.1.0 → invenio_app_ils-4.3.0}/invenio_app_ils/circulation/serializers/response.py

@@ -6,6 +6,7 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Response serializers for circulation module."""
+
 import json
 
 from flask import current_app

invenio_app_ils-4.3.0/invenio_app_ils/circulation/templates/invenio_app_ils_circulation/notifications/self_checkout.html

@@ -0,0 +1,19 @@
+{% block title %}
+InvenioILS: loan started for "{{ document.title|safe }}"
+{% endblock %}
+
+{% block body_plain %}
+Dear {{ patron.name }},
+
+your self-checkout loan for "{{ document.full_title }}" <{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=document.pid) }}> has started.
+
+The due date is {{ loan.end_date }}.
+{% endblock %}
+
+{% block body_html %}
+Dear {{ patron.name }}, <br/><br/>
+
+your self-checkout loan for <a href="{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=document.pid) }}">"{{ document.full_title }}"</a> has <b>started</b>. <br/><br/>
+
+<b>The due date is {{ loan.end_date }}</b>.<br/>
+{% endblock %}