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

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/series/mappings/os-v1/series/series-v2.0.0.json

@@ -61,7 +61,9 @@
         "type": "date"
       },
       "abstract": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "access_urls": {
         "type": "object",
@@ -93,7 +95,9 @@
             "type": "keyword"
           },
           "value": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -103,7 +107,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "cover_metadata": {
         "properties": {},
@@ -121,13 +127,22 @@
         "type": "object"
       },
       "document_type": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "edition": {
         "type": "keyword",
         "fields": {
           "text": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -183,7 +198,9 @@
             "type": "keyword",
             "fields": {
               "text": {
-                "type": "text"
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
               }
             }
           }
@@ -218,7 +235,7 @@
       "keywords": {
         "properties": {
           "source": { "type": "text" },
-          "value": { "type": "text" }
+          "value": { "type": "text", "analyzer": "custom_analyzer", "search_analyzer": "custom_analyzer" }
         },
         "type": "object"
       },
@@ -235,7 +252,14 @@
         "type": "keyword"
       },
       "publication_year": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "publisher": {
         "fields": {
@@ -243,7 +267,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "relation_types": {
         "type": "keyword"
@@ -337,7 +363,14 @@
             "type": "text"
           },
           "value": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
+              }
+            }
           },
           "meta": {
             "type": "text"
@@ -348,7 +381,9 @@
       "physical_volumes": {
         "properties": {
           "description": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           },
           "location": {
             "type": "text"

invenio_app_ils/series/mappings/os-v2/series/series-v2.0.0.json

@@ -61,7 +61,9 @@
         "type": "date"
       },
       "abstract": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "access_urls": {
         "type": "object",
@@ -93,7 +95,9 @@
             "type": "keyword"
           },
           "value": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -103,7 +107,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "cover_metadata": {
         "properties": {},
@@ -121,13 +127,22 @@
         "type": "object"
       },
       "document_type": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "edition": {
         "type": "keyword",
         "fields": {
           "text": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -183,7 +198,9 @@
             "type": "keyword",
             "fields": {
               "text": {
-                "type": "text"
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
               }
             }
           }
@@ -218,7 +235,7 @@
       "keywords": {
         "properties": {
           "source": { "type": "text" },
-          "value": { "type": "text" }
+          "value": { "type": "text", "analyzer": "custom_analyzer", "search_analyzer": "custom_analyzer" }
         },
         "type": "object"
       },
@@ -235,7 +252,14 @@
         "type": "keyword"
       },
       "publication_year": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "publisher": {
         "fields": {
@@ -243,7 +267,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "relation_types": {
         "type": "keyword"
@@ -337,7 +363,14 @@
             "type": "text"
           },
           "value": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
+              }
+            }
           },
           "meta": {
             "type": "text"
@@ -348,7 +381,9 @@
       "physical_volumes": {
         "properties": {
           "description": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           },
           "location": {
             "type": "text"

invenio_app_ils/series/mappings/v7/series/series-v2.0.0.json

@@ -61,7 +61,9 @@
         "type": "date"
       },
       "abstract": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "access_urls": {
         "type": "object",
@@ -93,7 +95,9 @@
             "type": "keyword"
           },
           "value": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -103,7 +107,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "cover_metadata": {
         "properties": {},
@@ -121,13 +127,22 @@
         "type": "object"
       },
       "document_type": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "edition": {
         "type": "keyword",
         "fields": {
           "text": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           }
         }
       },
@@ -183,7 +198,9 @@
             "type": "keyword",
             "fields": {
               "text": {
-                "type": "text"
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
               }
             }
           }
@@ -218,7 +235,7 @@
       "keywords": {
         "properties": {
           "source": { "type": "text" },
-          "value": { "type": "text" }
+          "value": { "type": "text", "analyzer": "custom_analyzer", "search_analyzer": "custom_analyzer" }
         },
         "type": "object"
       },
@@ -235,7 +252,14 @@
         "type": "keyword"
       },
       "publication_year": {
-        "type": "keyword"
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
+          }
+        }
       },
       "publisher": {
         "fields": {
@@ -243,7 +267,9 @@
             "type": "keyword"
           }
         },
-        "type": "text"
+        "type": "text",
+        "analyzer": "custom_analyzer",
+        "search_analyzer": "custom_analyzer"
       },
       "relation_types": {
         "type": "keyword"
@@ -337,7 +363,14 @@
             "type": "text"
           },
           "value": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text",
+                "analyzer": "custom_analyzer",
+                "search_analyzer": "custom_analyzer"
+              }
+            }
           },
           "meta": {
             "type": "text"
@@ -348,7 +381,9 @@
       "physical_volumes": {
         "properties": {
           "description": {
-            "type": "text"
+            "type": "text",
+            "analyzer": "custom_analyzer",
+            "search_analyzer": "custom_analyzer"
           },
           "location": {
             "type": "text"