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

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

@@ -8,6 +8,10 @@
 Changes
 =======
 
+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 +59,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.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-app-ils
-Version: 4.1.0
+Version: 4.2.0
 Summary: Invenio Integrated Library System.
 Home-page: https://github.com/inveniosoftware/invenio-app-ils
 Author: CERN
@@ -51,6 +51,10 @@ https://invenioils.docs.cern.ch
 Changes
 =======
 
+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 +102,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.2.0}/invenio_app_ils/__init__.py

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

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.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.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/items/api.py

@@ -160,15 +160,27 @@ class Item(IlsRecord):
             )
         }
 
+    @classmethod
+    def enforce_constraints(cls, data, **kwargs):
+        """Enforce constraints.
+
+        :param data (dict): dict that can be mutated to enforce constraints.
+        """
+        # barcode is a required field and it should be always uppercase
+        data["barcode"] = data["barcode"].upper()
+
     @classmethod
     def create(cls, data, id_=None, **kwargs):
         """Create Item record."""
         cls.build_resolver_fields(data)
-        return super().create(data, id_=id_, **kwargs)
+        cls.enforce_constraints(data, **kwargs)
+        created = super().create(data, id_=id_, **kwargs)
+        return created
 
     def update(self, *args, **kwargs):
         """Update Item record."""
         super().update(*args, **kwargs)
+        self.enforce_constraints(self)
         self.build_resolver_fields(self)
 
     def delete(self, **kwargs):

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/items/serializers/item.py

@@ -49,7 +49,7 @@ class ItemCSVSerializer(CSVSerializer):
             pid, record, links_factory=links_factory, **kwargs
         )
         filter_circulation(item)
-        field_cover_metadata(item.get('metadata', {}).get("document", {}))
+        field_cover_metadata(item.get("metadata", {}).get("document", {}))
         return item
 
     def transform_search_hit(self, pid, record_hit, links_factory=None, **kwargs):
@@ -58,7 +58,7 @@ class ItemCSVSerializer(CSVSerializer):
             pid, record_hit, links_factory=links_factory, **kwargs
         )
         filter_circulation(hit)
-        field_cover_metadata(hit.get('metadata', {}).get("document", {}))
+        field_cover_metadata(hit.get("metadata", {}).get("document", {}))
         return hit
 
 
@@ -71,7 +71,7 @@ class ItemJSONSerializer(JSONSerializer):
             pid, record, links_factory=links_factory, **kwargs
         )
         filter_circulation(item)
-        field_cover_metadata(item.get('metadata', {}).get("document", {}))
+        field_cover_metadata(item.get("metadata", {}).get("document", {}))
         return item
 
     def transform_search_hit(self, pid, record_hit, links_factory=None, **kwargs):
@@ -80,5 +80,5 @@ class ItemJSONSerializer(JSONSerializer):
             pid, record_hit, links_factory=links_factory, **kwargs
         )
         filter_circulation(hit)
-        field_cover_metadata(hit.get('metadata', {}).get("document", {}))
+        field_cover_metadata(hit.get("metadata", {}).get("document", {}))
         return hit

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/permissions.py

@@ -134,25 +134,27 @@ def patron_owner_permission(record):
 def loan_checkout_permission(*args, **kwargs):
     """Return permission to allow admins and librarians to checkout and patrons to self-checkout if enabled."""
     if not has_request_context():
-        # If from CLI, don't allow self-checkout
+        # CLI or Celery task
         return backoffice_permission()
+
     if current_user.is_anonymous:
         abort(401)
 
     is_admin_or_librarian = backoffice_permission().allows(g.identity)
     if is_admin_or_librarian:
         return backoffice_permission()
+
+    # ensure that only the loan's patron can do operations on this loan
     if len(args):
         loan = args[0]
     else:
-        loan = kwargs.get("record", {})
-    is_patron_current_user = current_user.id == int(loan.get("patron_pid"))
-    if (
-        current_app.config.get("ILS_SELF_CHECKOUT_ENABLED", False)
-        and is_patron_current_user
-    ):
+        loan = kwargs["record"]
+    is_patron_current_user = current_user.id == int(loan["patron_pid"])
+
+    if current_app.config["ILS_SELF_CHECKOUT_ENABLED"] and is_patron_current_user:
         return authenticated_user_permission()
-    raise LoanCheckoutByPatronForbidden(int(loan.get("patron_pid")), current_user.id)
+
+    raise LoanCheckoutByPatronForbidden(int(loan["patron_pid"]), current_user.id)
 
 
 class PatronOwnerPermission(Permission):
@@ -163,36 +165,42 @@ class PatronOwnerPermission(Permission):
         super().__init__(UserNeed(int(record["patron_pid"])), backoffice_access_action)
 
 
+_is_authenticated_user = [
+    "circulation-loan-request",
+    "patron-loans",
+    "bulk-loan-extension",
+]
+_is_backoffice_permission = [
+    "circulation-loan-force-checkout",
+    "circulation-overdue-loan-notification",
+    "circulation-loan-update-dates",
+    "relations-create",
+    "relations-delete",
+    "stats-most-loaned",
+    "document-request-actions",
+    "bucket-create",
+    "ill-brwreq-patron-loan-create",
+    "ill-brwreq-patron-loan-extension-accept",
+    "ill-brwreq-patron-loan-extension-decline",
+    "send-notification-to-patron",
+]
+_is_patron_owner_permission = [
+    "document-request-decline",
+    "ill-brwreq-patron-loan-extension-request",
+]
+
+
 def views_permissions_factory(action):
     """Return ILS views permissions factory."""
-    is_authenticated_user = [
-        "circulation-loan-request",
-        "patron-loans",
-        "bulk-loan-extension",
-    ]
-    is_backoffice_permission = [
-        "circulation-loan-checkout",
-        "circulation-loan-force-checkout",
-        "circulation-overdue-loan-notification",
-        "circulation-loan-update-dates",
-        "relations-create",
-        "relations-delete",
-        "stats-most-loaned",
-        "document-request-actions",
-        "bucket-create",
-        "ill-brwreq-patron-loan-create",
-        "ill-brwreq-patron-loan-extension-accept",
-        "ill-brwreq-patron-loan-extension-decline",
-        "send-notification-to-patron",
-    ]
-    is_patron_owner_permission = [
-        "document-request-decline",
-        "ill-brwreq-patron-loan-extension-request",
-    ]
-    if action in is_authenticated_user:
+    if action in _is_authenticated_user:
         return authenticated_user_permission()
-    elif action in is_backoffice_permission:
+    elif action in _is_backoffice_permission:
         return backoffice_permission()
-    elif action in is_patron_owner_permission:
+    elif action in _is_patron_owner_permission:
         return PatronOwnerPermission
+    elif action == "circulation-loan-checkout":
+        if current_app.config["ILS_SELF_CHECKOUT_ENABLED"]:
+            return authenticated_user_permission()
+        else:
+            return backoffice_permission()
     return deny_all()

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/records/views.py

@@ -20,7 +20,7 @@ from invenio_app_ils.errors import StatsError
 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):

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/records_relations/api.py

@@ -425,6 +425,7 @@ class IlsRecordWithRelations(IlsRecord):
     def relations(self):
         """Get record relations."""
         from .retriever import get_relations
+
         return get_relations(self)
 
     def clear(self):

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils/relations/api.py

@@ -17,7 +17,12 @@ from sqlalchemy import and_, or_
 from invenio_app_ils.errors import RecordRelationsError
 
 ILS_RELATION_TYPE = namedtuple(
-    "IlsRelationType", RelationType._fields + ("relation_class", "sort_by",)
+    "IlsRelationType",
+    RelationType._fields
+    + (
+        "relation_class",
+        "sort_by",
+    ),
 )
 
 LANGUAGE_RELATION = ILS_RELATION_TYPE(

{invenio-app-ils-4.1.0 → invenio-app-ils-4.2.0}/invenio_app_ils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-app-ils
-Version: 4.1.0
+Version: 4.2.0
 Summary: Invenio Integrated Library System.
 Home-page: https://github.com/inveniosoftware/invenio-app-ils
 Author: CERN
@@ -51,6 +51,10 @@ https://invenioils.docs.cern.ch
 Changes
 =======
 
+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 +102,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.2.0}/invenio_app_ils.egg-info/SOURCES.txt

@@ -553,7 +553,6 @@ tests/api/ils/items/__init__.py
 tests/api/ils/items/test_apis.py
 tests/api/ils/items/test_items_crud.py
 tests/api/ils/items/test_items_permissions.py
-tests/api/ils/items/test_items_update.py
 tests/api/ils/records_relations/__init__.py
 tests/api/ils/records_relations/helpers.py
 tests/api/ils/records_relations/test_records_relations_parentchild.py

invenio-app-ils-4.2.0/tests/api/ils/items/test_items_crud.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2021 CERN.
+#
+# Invenio-Circulation is free software; you can redistribute it and/or modify
+# it under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests items CRUD."""
+
+from copy import deepcopy
+
+import pytest
+
+from invenio_app_ils.circulation.search import get_active_loan_by_item_pid
+from invenio_app_ils.errors import (
+    DocumentNotFoundError,
+    InternalLocationNotFoundError,
+    ItemHasPastLoansError,
+)
+from invenio_app_ils.items.api import ITEM_PID_TYPE, Item
+
+
+def test_item_create(app, testdata):
+    """Test creation of an item."""
+    item = Item.create(
+        dict(
+            pid="itemid-99",
+            document_pid="docid-1",
+            internal_location_pid="ilocid-4",
+            created_by=dict(type="script", value="demo"),
+            barcode="cm-348048",
+            status="CAN_CIRCULATE",
+            circulation_restriction="NO_RESTRICTION",
+            medium="PAPER",
+        )
+    )
+    assert "$schema" in item
+    assert "document" in item and "$ref" in item["document"]
+    assert item["barcode"] == "CM-348048"
+    assert "internal_location" in item and "$ref" in item["internal_location"]
+
+    item = Item.get_record_by_pid("itemid-1")
+    item = item.replace_refs()
+    assert "document" in item and item["document"]["title"]
+    assert "internal_location" in item and item["internal_location"]["name"]
+
+
+def test_item_update(app, db, testdata):
+    """Test update of an item."""
+    item = Item.get_record_by_pid("itemid-1")
+    item.update(dict(barcode="cm-348048"))
+    item.commit()
+    db.session.commit()
+
+    assert Item.get_record_by_pid("itemid-1")["barcode"] == "CM-348048"
+
+
+def test_item_validation(db, testdata):
+    """Test validation when updating an item."""
+    item_pid = testdata["items"][0]["pid"]
+    orginal_item = Item.get_record_by_pid(item_pid)
+
+    # change document pid
+    item = deepcopy(orginal_item)
+    item["document_pid"] = "not_found_doc"
+    with pytest.raises(DocumentNotFoundError):
+        item.commit()
+
+    # change internal location pid
+    item = deepcopy(orginal_item)
+    item["internal_location_pid"] = "not_found_pid"
+    with pytest.raises(InternalLocationNotFoundError):
+        item.commit()
+
+
+def test_item_references(db, testdata):
+    """Test references when updating an item."""
+
+    def get_active_loan_pid_and_item_pid():
+        for t in testdata["items"]:
+            if t["status"] == "CAN_CIRCULATE":
+                item_pid = dict(type=ITEM_PID_TYPE, value=t["pid"])
+                active_loan = get_active_loan_by_item_pid(item_pid).execute().hits
+                total = active_loan.total.value
+                if total > 0:
+                    return t["pid"], active_loan[0]["pid"]
+
+    # change document pid while is on loan
+    item_pid, loan_pid = get_active_loan_pid_and_item_pid()
+    item = Item.get_record_by_pid(item_pid)
+    item["document_pid"] = "docid-1"
+    with pytest.raises(ItemHasPastLoansError):
+        item.commit()
+
+    # change document to one that does not exist
+    item = Item.get_record_by_pid("itemid-1")
+    item["document_pid"] = "not_found_doc"
+    with pytest.raises(DocumentNotFoundError):
+        item.commit()

invenio-app-ils-4.1.0/tests/api/ils/items/test_items_crud.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2021 CERN.
-#
-# Invenio-Circulation is free software; you can redistribute it and/or modify
-# it under the terms of the MIT License; see LICENSE file for more details.
-
-"""Tests items CRUD."""
-
-from copy import deepcopy
-
-import pytest
-
-from invenio_app_ils.errors import DocumentNotFoundError, InternalLocationNotFoundError
-from invenio_app_ils.items.api import Item
-
-
-def test_item_refs(app, testdata):
-    """Test creation of an item."""
-    item = Item.create(
-        dict(
-            pid="itemid-99",
-            document_pid="docid-1",
-            internal_location_pid="ilocid-4",
-            created_by=dict(type="script", value="demo"),
-            barcode="348048",
-            status="CAN_CIRCULATE",
-            circulation_restriction="NO_RESTRICTION",
-            medium="PAPER",
-        )
-    )
-    assert "$schema" in item
-    assert "document" in item and "$ref" in item["document"]
-    assert "internal_location" in item and "$ref" in item["internal_location"]
-
-    item = Item.get_record_by_pid("itemid-1")
-    item = item.replace_refs()
-    assert "document" in item and item["document"]["title"]
-    assert "internal_location" in item and item["internal_location"]["name"]
-
-
-def test_item_validation(db, testdata):
-    """Test validation when updating an item."""
-    item_pid = testdata["items"][0]["pid"]
-    orginal_item = Item.get_record_by_pid(item_pid)
-
-    # change document pid
-    item = deepcopy(orginal_item)
-    item["document_pid"] = "not_found_doc"
-    with pytest.raises(DocumentNotFoundError):
-        item.commit()
-
-    # change internal location pid
-    item = deepcopy(orginal_item)
-    item["internal_location_pid"] = "not_found_pid"
-    with pytest.raises(InternalLocationNotFoundError):
-        item.commit()

invenio-app-ils-4.1.0/tests/api/ils/items/test_items_update.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2018-2020 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.
-
-"""Test record delete."""
-
-import pytest
-
-from invenio_app_ils.circulation.search import get_active_loan_by_item_pid
-from invenio_app_ils.errors import DocumentNotFoundError, ItemHasPastLoansError
-from invenio_app_ils.items.api import ITEM_PID_TYPE, Item
-
-
-def test_update_item(db, testdata):
-    """Test update item status."""
-
-    def get_active_loan_pid_and_item_pid():
-        for t in testdata["items"]:
-            if t["status"] == "CAN_CIRCULATE":
-                item_pid = dict(type=ITEM_PID_TYPE, value=t["pid"])
-                active_loan = get_active_loan_by_item_pid(item_pid).execute().hits
-                total = active_loan.total.value
-                if total > 0:
-                    return t["pid"], active_loan[0]["pid"]
-
-    # change document pid while is on loan
-    item_pid, loan_pid = get_active_loan_pid_and_item_pid()
-    item = Item.get_record_by_pid(item_pid)
-    item["document_pid"] = "docid-1"
-    with pytest.raises(ItemHasPastLoansError):
-        item.commit()
-
-    # change document to one that does not exist
-    item = Item.get_record_by_pid("itemid-1")
-    item["document_pid"] = "not_found_doc"
-    with pytest.raises(DocumentNotFoundError):
-        item.commit()