invenio-app-ils 4.1.0__py2.py3-none-any.whl → 4.2.0__py2.py3-none-any.whl

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/circulation/config.py

@@ -44,10 +44,10 @@ from invenio_app_ils.permissions import (
     PatronOwnerPermission,
     authenticated_user_permission,
     backoffice_permission,
+    loan_checkout_permission,
     loan_extend_circulation_permission,
     patron_owner_permission,
     superuser_permission,
-    loan_checkout_permission,
 )
 
 from .api import ILS_CIRCULATION_LOAN_FETCHER, ILS_CIRCULATION_LOAN_MINTER

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/documents/jsonresolvers/document_stock.py

@@ -10,8 +10,8 @@
 import jsonresolver
 from werkzeug.routing import Rule
 
-from invenio_app_ils.proxies import current_app_ils
 from invenio_app_ils.eitems.api import EItem
+from invenio_app_ils.proxies import current_app_ils
 
 # Note: there must be only one resolver per file,
 # otherwise only the last one is registered

invenio_app_ils/documents/loaders/jsonschemas/document.py

@@ -16,10 +16,10 @@ from invenio_app_ils.records.loaders.schemas.changed_by import (
     ChangedBySchema,
     set_changed_by,
 )
+from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 from invenio_app_ils.records.loaders.schemas.preserve_cover_metadata import (
     preserve_cover_metadata,
 )
-from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 
 
 class AffiliationSchema(Schema):

invenio_app_ils/eitems/loaders/jsonschemas/eitems.py

@@ -11,11 +11,11 @@ from invenio_records_rest.schemas import RecordMetadataSchemaJSONV1
 from marshmallow import EXCLUDE, Schema, fields, pre_load, validate
 
 from invenio_app_ils.eitems.api import EItem
-from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 from invenio_app_ils.records.loaders.schemas.changed_by import (
     ChangedBySchema,
     set_changed_by,
 )
+from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 
 
 class URLSchema(Schema):

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/items/loaders/jsonschemas/items.py

@@ -15,8 +15,8 @@ from invenio_app_ils.records.loaders.schemas.changed_by import (
     ChangedBySchema,
     set_changed_by,
 )
-from invenio_app_ils.records.loaders.schemas.price import PriceSchema
 from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
+from invenio_app_ils.records.loaders.schemas.price import PriceSchema
 
 
 class ISBNSchema(Schema):

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/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/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/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/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/series/loaders/jsonschemas/series.py

@@ -21,10 +21,10 @@ from invenio_app_ils.records.loaders.schemas.changed_by import (
     ChangedBySchema,
     set_changed_by,
 )
+from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 from invenio_app_ils.records.loaders.schemas.preserve_cover_metadata import (
     preserve_cover_metadata,
 )
-from invenio_app_ils.records.loaders.schemas.identifiers import IdentifierSchema
 from invenio_app_ils.series.api import Series
 
 

{invenio_app_ils-4.1.0.dist-info → invenio_app_ils-4.2.0.dist-info}/METADATA

@@ -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
@@ -101,6 +101,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.
@@ -148,7 +152,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.dist-info → invenio_app_ils-4.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_app_ils/__init__.py,sha256=PIW53N5-l4TsnmnQRYUWVI9NhFBFLNMxAuVLWTbiZe4,285
+invenio_app_ils/__init__.py,sha256=BG7JkbyAvqXyUKbb3oLeYr_yMXjp_IyeBWbEWEVKyWY,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=eXG53KxCnoC0KH9xAjHbu-U2zIsJG28GNPn9PwLTEfk,10486
@@ -7,7 +7,7 @@ invenio_app_ils/facets.py,sha256=x-ID7vL34zqbxJi7VC3EJSee13l_Jk0CfPZN3RHZrM8,420
 invenio_app_ils/fetchers.py,sha256=GY5A6BXaqMB9HKvJuTcio3JYoF15t6eqMo3yzQKTqac,520
 invenio_app_ils/indexer.py,sha256=ngXRx2liufDzgsSIoCeusk6q0Y1uskQ3QiVLeAi3KRg,2212
 invenio_app_ils/minters.py,sha256=8JW-45fL9Oy_13eZjlk8kL_12jJGZK59qbKlCeseQgA,537
-invenio_app_ils/permissions.py,sha256=Uj8QUvCNkh7imfZEgZU6VXezrwKQVZBYzipnfZbS58o,6759
+invenio_app_ils/permissions.py,sha256=fW1svDhawp1BfkG_ynvSzJxeN3ea_gPz8-NCr1ICiHc,6859
 invenio_app_ils/proxies.py,sha256=IGBwXQSOxpXHjD8PWFG1nqUm70xGAgzWT8Y0AKdCGiI,453
 invenio_app_ils/search_permissions.py,sha256=KxkzgzSz3yabcDMffrsQag4TqZac0w1TBzntb7zjmOQ,5058
 invenio_app_ils/signals.py,sha256=KaN8yQUVq-2O2IKQQvPLtMjqp1S3AU1LYPlRyw9U8Pg,395
@@ -36,7 +36,7 @@ invenio_app_ils/acquisition/schemas/__init__.py,sha256=HulLvvDz0W5owDGxVLIaastuZ
 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=so7YAlzXoO46nMwnXiKoaGgsQHr4OXwOJeUKYe88p0w,11220
-invenio_app_ils/circulation/config.py,sha256=VbRT8DDM-8Drtk333CF-7N67AA6YF9oBOEtcB8oxacE,10988
+invenio_app_ils/circulation/config.py,sha256=ZVRFTgn8ZV_ku4nA_GAlyIYc10F-6mpekKiGqF5y_Eo,10988
 invenio_app_ils/circulation/indexer.py,sha256=T24J5QqcB38LRJgirkAXL2tmFOucYToDRegxgFW96ag,3887
 invenio_app_ils/circulation/receivers.py,sha256=Ux6KTNbII3DHBvCUS0gxqbi6tNbm76_kbcaHtK0BsB4,2488
 invenio_app_ils/circulation/search.py,sha256=l9DAr9uoaF_JbfiiXVpAFKW3NLv9bgs7D-uDwtU-fv0,6105
@@ -51,7 +51,7 @@ invenio_app_ils/circulation/loaders/schemas/json/__init__.py,sha256=wsV4twVnMDNW
 invenio_app_ils/circulation/loaders/schemas/json/base.py,sha256=lkOTJT6pPbukEjwVXEDaFxA7ruslxO3WyQlNuQpiv-U,1444
 invenio_app_ils/circulation/loaders/schemas/json/bulk_extend.py,sha256=nDqWF2cwiO2GHwPVO6ivPIya6g2AHQ-pZnQoo9e9fQs,638
 invenio_app_ils/circulation/loaders/schemas/json/loan_checkout.py,sha256=ijIJ-SLgKOutuGrNtWerB9OmIfk7nVPCoFlaocBhUFg,2147
-invenio_app_ils/circulation/loaders/schemas/json/loan_request.py,sha256=jlbtdck6FoG7bK5UjLqc-LFka3kUBBURRVcM-ZRyZW4,5920
+invenio_app_ils/circulation/loaders/schemas/json/loan_request.py,sha256=iJVAnyNE1_LfVTuiO_yNtLVMOKHm0OErRbqU4uhczbU,5921
 invenio_app_ils/circulation/loaders/schemas/json/loan_update_dates.py,sha256=9NtrBJKytly3Acv4wxuqExN0gB9DGnXB8K_27izQkrs,774
 invenio_app_ils/circulation/notifications/__init__.py,sha256=fG45An4FOBrAIZcWfFtv-3RnyFC4lfHUXWdwy164y_Q,246
 invenio_app_ils/circulation/notifications/api.py,sha256=UxGle0HgDU5PA7TeS4wVThybrBurOTWGvH_QKSP5Pyg,3429
@@ -122,10 +122,10 @@ invenio_app_ils/documents/jsonresolvers/document_circulation.py,sha256=qwfP9h8R4
 invenio_app_ils/documents/jsonresolvers/document_eitem.py,sha256=bMLjQlBnsynuKqAdvUmbAe18duI76nqlt-LsGjBu90w,1827
 invenio_app_ils/documents/jsonresolvers/document_item.py,sha256=gQaXJ2ebEG9uH_sm4iz34M228_tUJEmferpU5u0clZQ,3204
 invenio_app_ils/documents/jsonresolvers/document_relations.py,sha256=D2VBBK_5hqKwefmoN7lq13oqKcjeRoHohVKQ83HhHkM,1138
-invenio_app_ils/documents/jsonresolvers/document_stock.py,sha256=aoSd1ypYt1TgUlc6H6PnTyY9kwm4A5YhqjqVYbwFDcU,1668
+invenio_app_ils/documents/jsonresolvers/document_stock.py,sha256=QQ1WNsHBqzLoxRngK2uyFcqPVCXwLqj4Ayn23dyF7YM,1668
 invenio_app_ils/documents/loaders/__init__.py,sha256=h_uilf6ka1qi9vwhfDc5SzL1rdWHH2qWCMQrI_LEnoU,414
 invenio_app_ils/documents/loaders/jsonschemas/__init__.py,sha256=3RyVNmovfMJnmze6_QKSULev8a3yRHUCuO-0y3UFy64,238
-invenio_app_ils/documents/loaders/jsonschemas/document.py,sha256=RXemA7NAQvd1qpdGwZcmYoJ3-9G35yxslsL8IRRxb5Q,7577
+invenio_app_ils/documents/loaders/jsonschemas/document.py,sha256=TmnI6QKR1tl-7MAHZGefiuTxCnt81Ikysm4roCsxDvM,7577
 invenio_app_ils/documents/mappings/__init__.py,sha256=8myTYxQP-EadjBbmAQd3vjZY1-uUGpSQCDv7Sr2cX6A,229
 invenio_app_ils/documents/mappings/os-v1/__init__.py,sha256=0TRJl_WtkxFUNK3MxyntNg2s-lZILhzB2ZdKMs7qcDI,241
 invenio_app_ils/documents/mappings/os-v1/documents/document-v1.0.0.json,sha256=o864rRsme4OKA7SwQhpc2ORO5VflH2hpF-58GssfdqA,21646
@@ -148,7 +148,7 @@ invenio_app_ils/eitems/jsonresolvers/eitem_document.py,sha256=dgs0yGqHlfOL00jIJn
 invenio_app_ils/eitems/jsonresolvers/eitem_files.py,sha256=xCAIL4HGXAGhovxbNLAWz9ra_CsWZ4UpsNzK3VaddKw,1358
 invenio_app_ils/eitems/loaders/__init__.py,sha256=F3-_mbd-3Pjr8J20gVEDxGs3VE9nMEKChp03LjLi-Uo,401
 invenio_app_ils/eitems/loaders/jsonschemas/__init__.py,sha256=6bLAkym3u9rgqYTHDHOX3gr5Hh60QNC_YHQMkzIHDgY,236
-invenio_app_ils/eitems/loaders/jsonschemas/eitems.py,sha256=nGnT-HOy4veHbg4ffrAWEw5WSKWvured_OfJQEqc2B8,2063
+invenio_app_ils/eitems/loaders/jsonschemas/eitems.py,sha256=KKUe1QvjZ7z6Swtbi2D1vxBiv_55suIXbQYM4E0tJLs,2063
 invenio_app_ils/eitems/mappings/__init__.py,sha256=PXpNWKcHerg4WIVNBjag0iCPZRQ8pyb3PyxT9zcrnvc,236
 invenio_app_ils/eitems/mappings/os-v1/__init__.py,sha256=99ifBNKeEw3npzw0AOKCUTP25mcR2Sn1M7Oy8i_Ra_A,239
 invenio_app_ils/eitems/mappings/os-v1/eitems/eitem-v1.0.0.json,sha256=MBWhA2wJl8t9q12Rc90pwRkTp0Rk8uSPfZWWWDUabDA,2756
@@ -224,7 +224,7 @@ invenio_app_ils/internal_locations/mappings/v7/internal_locations/internal_locat
 invenio_app_ils/internal_locations/schemas/__init__.py,sha256=gMsPU0b91BaEF60VR_sY6eWLR-BLkkNSldzIdlsyPBA,244
 invenio_app_ils/internal_locations/schemas/internal_locations/internal_location-v1.0.0.json,sha256=MgGTxIq64uEGryvEyN5EXSORm9lZoE4MHj4ZLaBqr18,1115
 invenio_app_ils/items/__init__.py,sha256=Jdz0wSG1rNZyyit0VynCMQVDUHo0Vv1S3A2V-PICDfU,226
-invenio_app_ils/items/api.py,sha256=xbjklZI1D605VucninFt4AA3bPsKk_md043_Toa__N4,7413
+invenio_app_ils/items/api.py,sha256=olr3T84QU9qVkmXnKgjIg7DIRQGwKRUfPfyaAjW_kwg,7838
 invenio_app_ils/items/indexer.py,sha256=vWxOnw6o_zH9gDHex4gWrDClP8H2UMyCcrJnxhxjsaU,2022
 invenio_app_ils/items/search.py,sha256=eyEsQNhMvj-DeYMQRgEsyDn4H0AxqxyMIzPMg6prbIY,2985
 invenio_app_ils/items/jsonresolvers/__init__.py,sha256=bS7v-bpbyHNrqtY9n5SkDJDcfi9jqOUZYVjjrd9qyy0,244
@@ -233,7 +233,7 @@ invenio_app_ils/items/jsonresolvers/item_internal_location.py,sha256=FKPaEfI8urk
 invenio_app_ils/items/jsonresolvers/item_loan.py,sha256=RZQP5zvM2lcuAhxQbFlhJJJyxQeNV-ZUE2tMojBApeY,1630
 invenio_app_ils/items/loaders/__init__.py,sha256=MLPgoiiMW5_7HLacJ4ny3vmmih3qOLA2-5ECPWWwZvg,424
 invenio_app_ils/items/loaders/jsonschemas/__init__.py,sha256=QjB4GpaGRO8_vUf5F2Igu-VBtCJOrxBBAcyhMYp2uLc,235
-invenio_app_ils/items/loaders/jsonschemas/items.py,sha256=Cwi9YmBrYLPMWLpvGelbAhLkfDiWjPbM2JR1QNA_8e0,2073
+invenio_app_ils/items/loaders/jsonschemas/items.py,sha256=vkktlcwZOXhKtZM0ttPUOHFpIJ3eZUIuqg7WeYiZ56k,2073
 invenio_app_ils/items/mappings/__init__.py,sha256=FHHOdSZAxfKT7lwBTyho9e9H5_MQ5iSJegK9REtcJjY,235
 invenio_app_ils/items/mappings/os-v1/__init__.py,sha256=d3ZUL6aicw4_MYvaJ3AI5a8vnoEwaSwM5YUDDOgooVg,238
 invenio_app_ils/items/mappings/os-v1/items/item-v1.0.0.json,sha256=cqSMIOFW7VsuS1FHjsQ0Hy-NuvnYEKhGyaBWM4epP6E,6352
@@ -248,7 +248,7 @@ invenio_app_ils/items/schemas/__init__.py,sha256=oH3ip8OnA1mK1eM3gp8VxEM5LLoSVSW
 invenio_app_ils/items/schemas/items/item-v1.0.0.json,sha256=kEn3c45Dk_OSJnuRtwJpThUp9WKC_FvBsTr6DcUIqTQ,3960
 invenio_app_ils/items/schemas/items/item-v2.0.0.json,sha256=kEn3c45Dk_OSJnuRtwJpThUp9WKC_FvBsTr6DcUIqTQ,3960
 invenio_app_ils/items/serializers/__init__.py,sha256=OxfwU0rGarUnBvznMmiGaJx6uMwX-062pN9RQwR2lhw,914
-invenio_app_ils/items/serializers/item.py,sha256=d9TzdYLhpRfp4VyoBdNuYTqQWkshytAk3Q8YUI1E6ms,2967
+invenio_app_ils/items/serializers/item.py,sha256=8qHJp4SFxJj_qM-Pf-Om98KYc5ytweNLJiD94ksGslQ,2967
 invenio_app_ils/literature/__init__.py,sha256=GELxzVtOq8G2O7Uvs_mLsj0wPnS5l-6ns9mLFDGMEmQ,231
 invenio_app_ils/literature/api.py,sha256=gbLMK36fN0KXUmygRLadeejPnJ_3CSU_8WFrgxwQ_j4,862
 invenio_app_ils/literature/covers_builder.py,sha256=_MzoKZik_7UZRKl8szuhcLSD-o8reRSyV8VSbcIbh8g,1285
@@ -323,7 +323,7 @@ invenio_app_ils/records/listeners.py,sha256=6_yZRDh17ujY5zz3gSCArJeId9r8vyo-yadW
 invenio_app_ils/records/metadata_extensions.py,sha256=Y7knwqFTZ6UQU6-Viuhv22cplGd9VsebXasoDB-o39o,3599
 invenio_app_ils/records/permissions.py,sha256=_0zd1GCbulcSEGLZ3ZJBaD8Q-TU1r9XLlGLByj-TqCw,3773
 invenio_app_ils/records/receivers.py,sha256=z9iEd9EMqVw5wS3_pPZTZzeKRyzOguTHqb8FgsKCoD0,493
-invenio_app_ils/records/views.py,sha256=Ds4_Fx_YvEVknNoqfpQFyOYf305k6EtkzXLGnojybyg,3410
+invenio_app_ils/records/views.py,sha256=RGdt3ZQOrfvNxuEfv31Dk-udsRG2u_8J73Sb7fiD8m8,3410
 invenio_app_ils/records/jsonresolvers/__init__.py,sha256=mhHgwyehRSGfoWcfTT9O7F5pCFoS7-yKwJkbFaYRF8Y,249
 invenio_app_ils/records/jsonresolvers/api.py,sha256=RAM7bqEjqgTn3wx6PlDRY_UEjZknrXiMSB-dMOJwvW0,1183
 invenio_app_ils/records/loaders/__init__.py,sha256=saCzmtbFLKrgmueTclBSikDwO56XVpHA07PZ_dKu4Bo,817
@@ -336,12 +336,12 @@ invenio_app_ils/records/schemas/__init__.py,sha256=K6l2nVL1zpZM9ZFfZQBgHsjeiSTsk
 invenio_app_ils/records/schemas/json.py,sha256=r7wShFjJ3FnT_pvunyqfWbgJf9z9iaUV3MhyTEtbEyw,712
 invenio_app_ils/records/serializers/__init__.py,sha256=pomP0H0b3Zku8lWWcFu86ondB-RJWzO1gDO8mDVEKgo,2230
 invenio_app_ils/records_relations/__init__.py,sha256=fLycCnrsQv6yVQPARUjHW5QAXcAH7d1dp_dDChQyzFY,238
-invenio_app_ils/records_relations/api.py,sha256=2TvOyfwBC5sDVCWX_MUnqlmll53_qXEgSlKb8EQNwKo,16763
+invenio_app_ils/records_relations/api.py,sha256=m2MlN1qS53QtrdqZI8KzRS1bO-0u11QV4z2OcmOFLzI,16764
 invenio_app_ils/records_relations/indexer.py,sha256=xlNQ6jRKTSrTXX5l0mnbx7kNkfwHeJlw70KsDSqGBeU,2279
 invenio_app_ils/records_relations/retriever.py,sha256=_PcbdG1IM_hss7xqClvK8Ti-0pB8rBgfOM5GgJvHrNM,8944
 invenio_app_ils/records_relations/views.py,sha256=-YLUhhSk2oI75RvueAgCxi5L_CafhlsgnNvbePBjobs,14889
 invenio_app_ils/relations/__init__.py,sha256=K27Ys3WJwwhJp5NnD9RZDbLMIKu_OcOXZWfSTBpcTOY,229
-invenio_app_ils/relations/api.py,sha256=2fBGdUJZ9nRnhyr7uy0YlkZJve1jD-qDQMTcJcOEUE8,14074
+invenio_app_ils/relations/api.py,sha256=IDG_6xWv8Mun40csBWuPNXkzRNdaO9wLe1otWquriig,14105
 invenio_app_ils/relations/nodes.py,sha256=PE_D6gj335EH_G1BWPGEKZOCzrIOII5UpN4a5-MpxcA,376
 invenio_app_ils/series/__init__.py,sha256=kd4lghqtrIci0-JaTmSIv0kT5DhaydNi5mBh93_x4iw,227
 invenio_app_ils/series/api.py,sha256=pbFUiOXsR86sN1Shb0eOBIb3EY6zstby4yRXofcQtdQ,3235
@@ -351,7 +351,7 @@ invenio_app_ils/series/jsonresolvers/__init__.py,sha256=KwS1i7XJkydP_YfOMjjvCXbn
 invenio_app_ils/series/jsonresolvers/series_relations.py,sha256=-QhlHVl93TddK6tsqxyYb3xvp3ISRA9dHa-qz_ZTFW4,1097
 invenio_app_ils/series/loaders/__init__.py,sha256=2tEAlF_GRq-2-eLXd8e8w4e19iBBZs98E3_nwPQiqlY,404
 invenio_app_ils/series/loaders/jsonschemas/__init__.py,sha256=h5J1d56DTizrKCfQHHO7d8OH0tno3hb_-dtaKkB63_Y,236
-invenio_app_ils/series/loaders/jsonschemas/series.py,sha256=MVOkGUTK02-6lm26sd218W6JfBRS4n939BgImNGeKuI,4110
+invenio_app_ils/series/loaders/jsonschemas/series.py,sha256=K8Z0Bl8wtSxcDCFC1lPGhGPMHdoCPmwvygEDhbaZJeA,4110
 invenio_app_ils/series/mappings/__init__.py,sha256=A7EmmTOx0yXlMkeimLxvL5xTlwBy3ogbNVRXU8E7bF8,236
 invenio_app_ils/series/mappings/os-v1/__init__.py,sha256=1Fny1TaeM8uc9Rwvw2bf94RvxEY067R5nP5Lz17UEGs,239
 invenio_app_ils/series/mappings/os-v1/series/series-v1.0.0.json,sha256=YJLsKB5xjk2IIX8V39tp-1W03r3Vq96c7Ubr_fk1AWA,6919
@@ -500,9 +500,8 @@ tests/api/ils/eitems/test_eitems_permissions.py,sha256=__AlVOpr6Q36xOIiISGTFqAJT
 tests/api/ils/eitems/test_files.py,sha256=KnzvSYo1HqnFCexXkcKZmmvr_9e4fcABc2D-dE5blK8,4625
 tests/api/ils/items/__init__.py,sha256=oc7OKnwhkZsi7f8mMAoWhwBFQTHVYeDSAWFVLBXQuEs,229
 tests/api/ils/items/test_apis.py,sha256=hLD8RCEkGYld7af_JwDFAIL69x8Rin_kElLpqjDn-KE,1366
-tests/api/ils/items/test_items_crud.py,sha256=IS1o8Lm3dNKOmt2mrp2bzkTn8KVyTK_WCWEf5ikoCIU,1794
+tests/api/ils/items/test_items_crud.py,sha256=HB3vV5PZWTA1ugumVh7ej9RobRhX1Xf6qIfVRLred7k,3221
 tests/api/ils/items/test_items_permissions.py,sha256=HE-yYAc6_fza_JXpvTzjcjA9341iAKevJKBoh99jbbw,3757
-tests/api/ils/items/test_items_update.py,sha256=_ZZTeh1Y1SZ6zN34O-rVTpEMDyUwqh2LBzbHXsgo69M,1417
 tests/api/ils/records_relations/__init__.py,sha256=VxNqRmCl2IBDm6PFgG_q_CfFMwFKojB9QtiB-LBONfo,241
 tests/api/ils/records_relations/helpers.py,sha256=lm2dQdACxYuU2ro-ymA0OtqiKYYldwax8kRmYiqxuWM,3875
 tests/api/ils/records_relations/test_records_relations_parentchild.py,sha256=vY5gr8L0nrdlvbGKM_wYSD6Vtp4L0QiZoP3YIlwxisA,17969
@@ -528,10 +527,10 @@ 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.1.0.dist-info/AUTHORS.rst,sha256=BaXCGzdHCmiMOl4qtVlh1qrfy2ROMVOQp6ylzy1m0ww,212
-invenio_app_ils-4.1.0.dist-info/LICENSE,sha256=9OdaPOAO1ZOJcRQ8BrGj7QAdaJc8SRSUgBtdom49MrI,1062
-invenio_app_ils-4.1.0.dist-info/METADATA,sha256=3KTqFuTubExWO-qq4cNMVUWTCo_sHR3duJ-FcHheYr4,15855
-invenio_app_ils-4.1.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-invenio_app_ils-4.1.0.dist-info/entry_points.txt,sha256=JbIlm87pY7dVL-gLh8Hmfav18psVHXLBmHBzA-fQqlY,7607
-invenio_app_ils-4.1.0.dist-info/top_level.txt,sha256=MQTU2NrM0if5YAyIsKmQ0k35skJ3IUyQT7eCD2IWiNQ,22
-invenio_app_ils-4.1.0.dist-info/RECORD,,
+invenio_app_ils-4.2.0.dist-info/AUTHORS.rst,sha256=BaXCGzdHCmiMOl4qtVlh1qrfy2ROMVOQp6ylzy1m0ww,212
+invenio_app_ils-4.2.0.dist-info/LICENSE,sha256=9OdaPOAO1ZOJcRQ8BrGj7QAdaJc8SRSUgBtdom49MrI,1062
+invenio_app_ils-4.2.0.dist-info/METADATA,sha256=Y_QgDlw4LmdUhMgdoFh7WwQ34zlpruRFEn1mN9JnSQo,15976
+invenio_app_ils-4.2.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+invenio_app_ils-4.2.0.dist-info/entry_points.txt,sha256=JbIlm87pY7dVL-gLh8Hmfav18psVHXLBmHBzA-fQqlY,7607
+invenio_app_ils-4.2.0.dist-info/top_level.txt,sha256=MQTU2NrM0if5YAyIsKmQ0k35skJ3IUyQT7eCD2IWiNQ,22
+invenio_app_ils-4.2.0.dist-info/RECORD,,

tests/api/ils/items/test_items_crud.py

@@ -11,11 +11,16 @@ from copy import deepcopy
 
 import pytest
 
-from invenio_app_ils.errors import DocumentNotFoundError, InternalLocationNotFoundError
-from invenio_app_ils.items.api import Item
+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_refs(app, testdata):
+def test_item_create(app, testdata):
     """Test creation of an item."""
     item = Item.create(
         dict(
@@ -23,7 +28,7 @@ def test_item_refs(app, testdata):
             document_pid="docid-1",
             internal_location_pid="ilocid-4",
             created_by=dict(type="script", value="demo"),
-            barcode="348048",
+            barcode="cm-348048",
             status="CAN_CIRCULATE",
             circulation_restriction="NO_RESTRICTION",
             medium="PAPER",
@@ -31,6 +36,7 @@ def test_item_refs(app, testdata):
     )
     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")
@@ -39,6 +45,16 @@ def test_item_refs(app, testdata):
     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"]
@@ -55,3 +71,29 @@ def test_item_validation(db, testdata):
     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()

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()