invenio-app-ils 1.0.0a54__py2.py3-none-any.whl → 6.1.0__py2.py3-none-any.whl

invenio_app_ils/documents/api.py

@@ -49,10 +49,11 @@ class Document(IlsRecordWithRelations):
         "STANDARD",
         "SERIAL_ISSUE",
         "ARTICLE",
+        "MULTIMEDIA",
     ]
 
     _pid_type = DOCUMENT_PID_TYPE
-    _schema = "documents/document-v1.0.0.json"
+    _schema = "documents/document-v2.0.0.json"
     _circulation_resolver_path = (
         "{scheme}://{host}/api/resolver/documents/{document_pid}/circulation"
     )
@@ -135,7 +136,7 @@ class Document(IlsRecordWithRelations):
         """Search for referencing loans."""
         loan_search_res = search_by_pid(
             document_pid=self["pid"],
-            filter_states=current_app.config['CIRCULATION_STATES_LOAN_REQUEST']
+            filter_states=current_app.config["CIRCULATION_STATES_LOAN_REQUEST"]
             + current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"],
         )
         return loan_search_res
@@ -143,23 +144,17 @@ class Document(IlsRecordWithRelations):
     def search_item_references(self):
         """Search for referencing items."""
         item_search = current_app_ils.item_search_cls()
-        return item_search.search_by_document_pid(
-            document_pid=self["pid"]
-        )
+        return item_search.search_by_document_pid(document_pid=self["pid"])
 
     def search_eitem_references(self):
         """Search for referencing eitems."""
         eitem_search = current_app_ils.eitem_search_cls()
-        return eitem_search.search_by_document_pid(
-            document_pid=self["pid"]
-        )
+        return eitem_search.search_by_document_pid(document_pid=self["pid"])
 
     def search_doc_req_references(self):
         """Search for referencing document requests."""
         req_search = current_app_ils.document_request_search_cls()
-        return req_search.search_by_document_pid(
-            document_pid=self["pid"]
-        )
+        return req_search.search_by_document_pid(document_pid=self["pid"])
 
     def search_order_references(self):
         """Search for referencing orders."""
@@ -177,14 +172,16 @@ class Document(IlsRecordWithRelations):
 
     def has_references(self):
         """Check if record has references."""
-        return any([
-            self.search_loan_references().count(),
-            self.search_item_references().count(),
-            self.search_eitem_references().count(),
-            self.search_doc_req_references().count(),
-            self.search_order_references().count(),
-            self.search_brw_req_references().count()
-        ])
+        return any(
+            [
+                self.search_loan_references().count(),
+                self.search_item_references().count(),
+                self.search_eitem_references().count(),
+                self.search_doc_req_references().count(),
+                self.search_order_references().count(),
+                self.search_brw_req_references().count(),
+            ]
+        )
 
     def delete(self, **kwargs):
         """Delete Document record."""
@@ -216,8 +213,7 @@ class Document(IlsRecordWithRelations):
                 record_type="Document",
                 record_id=self["pid"],
                 ref_type="EItem",
-                ref_ids=sorted([res["pid"] for res
-                                in eitem_search_res.scan()]),
+                ref_ids=sorted([res["pid"] for res in eitem_search_res.scan()]),
             )
 
         if req_search_res.count():
@@ -233,8 +229,7 @@ class Document(IlsRecordWithRelations):
                 record_type="Document",
                 record_id=self["pid"],
                 ref_type="AcquisitionOrder",
-                ref_ids=sorted([res["pid"] for
-                                res in orders_refs_search.scan()]),
+                ref_ids=sorted([res["pid"] for res in orders_refs_search.scan()]),
             )
 
         if brw_req_refs_search.count():
@@ -242,8 +237,7 @@ class Document(IlsRecordWithRelations):
                 record_type="Document",
                 record_id=self["pid"],
                 ref_type="BorrowingRequest",
-                ref_ids=sorted([res["pid"] for
-                                res in brw_req_refs_search.scan()]),
+                ref_ids=sorted([res["pid"] for res in brw_req_refs_search.scan()]),
             )
         return super().delete(**kwargs)
 

invenio_app_ils/documents/indexer.py

@@ -15,6 +15,7 @@ from invenio_circulation.pidstore.pids import CIRCULATION_LOAN_PID_TYPE
 from invenio_circulation.proxies import current_circulation
 from invenio_circulation.search.api import search_by_pid as search_loans_by_pid
 from invenio_indexer.api import RecordIndexer
+from invenio_pidstore.errors import PIDDeletedError
 
 from invenio_app_ils.acquisition.api import ORDER_PID_TYPE
 from invenio_app_ils.acquisition.proxies import current_ils_acq
@@ -35,9 +36,7 @@ def get_items(document_pid):
     item_search_cls = current_app_ils.item_search_cls
     item_record_cls = current_app_ils.item_record_cls
     for item in (
-        item_search_cls()
-        .search_by_document_pid(document_pid=document_pid)
-        .scan()
+        item_search_cls().search_by_document_pid(document_pid=document_pid).scan()
     ):
         item = item_record_cls.get_record_by_pid(item["pid"])
         referenced.append(dict(pid_type=ITEM_PID_TYPE, record=item))
@@ -50,9 +49,7 @@ def get_eitems(document_pid):
     eitem_search_cls = current_app_ils.eitem_search_cls
     eitem_record_cls = current_app_ils.eitem_record_cls
     for eitem in (
-        eitem_search_cls()
-        .search_by_document_pid(document_pid=document_pid)
-        .scan()
+        eitem_search_cls().search_by_document_pid(document_pid=document_pid).scan()
     ):
         eitem = eitem_record_cls.get_record_by_pid(eitem["pid"])
         referenced.append(dict(pid_type=EITEM_PID_TYPE, record=eitem))
@@ -63,9 +60,13 @@ def get_related_records(document_pid):
     """Get referenced records via relations."""
     referenced = []
     doc_record_cls = current_app_ils.document_record_cls
-    record = doc_record_cls.get_record_by_pid(document_pid)
+    try:
+        record = doc_record_cls.get_record_by_pid(document_pid)
+    except PIDDeletedError:
+        # Document might have been deleted while reindexing asynchronously.
+        return referenced
     relations = record.relations
-    for relation_type, related_records in relations.items():
+    for _, related_records in relations.items():
         for obj in related_records:
             rec = IlsRecord.get_record_by_pid(
                 obj["pid_value"], pid_type=obj["pid_type"]
@@ -80,14 +81,10 @@ def get_document_requests(document_pid):
     docreq_search_cls = current_app_ils.document_request_search_cls
     docreq_record_cls = current_app_ils.document_request_record_cls
     for request in (
-        docreq_search_cls()
-        .search_by_document_pid(document_pid=document_pid)
-        .scan()
+        docreq_search_cls().search_by_document_pid(document_pid=document_pid).scan()
     ):
         docreq = docreq_record_cls.get_record_by_pid(request["pid"])
-        referenced.append(
-            dict(pid_type=DOCUMENT_REQUEST_PID_TYPE, record=docreq)
-        )
+        referenced.append(dict(pid_type=DOCUMENT_REQUEST_PID_TYPE, record=docreq))
     return referenced
 
 
@@ -97,9 +94,7 @@ def get_loans(document_pid):
     loan_record_cls = current_circulation.loan_record_cls
     for loan in search_loans_by_pid(document_pid=document_pid).scan():
         loan = loan_record_cls.get_record_by_pid(loan["pid"])
-        referenced.append(
-            dict(pid_type=CIRCULATION_LOAN_PID_TYPE, record=loan)
-        )
+        referenced.append(dict(pid_type=CIRCULATION_LOAN_PID_TYPE, record=loan))
     return referenced
 
 
@@ -123,9 +118,7 @@ def get_ill_borrowing_requests(document_pid):
     search = brw_req_search_cls().search_by_document_pid(document_pid)
     for hit in search.scan():
         brw_req = brw_req_record_cls.get_record_by_pid(hit["pid"])
-        referenced.append(
-            dict(pid_type=BORROWING_REQUEST_PID_TYPE, record=brw_req)
-        )
+        referenced.append(dict(pid_type=BORROWING_REQUEST_PID_TYPE, record=brw_req))
     return referenced
 
 

invenio_app_ils/documents/jsonresolvers/document_circulation.py

@@ -8,7 +8,6 @@
 """Resolve the circulation status referenced in the Document."""
 
 import jsonresolver
-from elasticsearch import VERSION as ES_VERSION
 from werkzeug.routing import Rule
 
 from invenio_app_ils.circulation.search import (
@@ -19,9 +18,6 @@ from invenio_app_ils.circulation.search import (
 from invenio_app_ils.ill.api import BORROWING_REQUEST_PID_TYPE
 from invenio_app_ils.items.search import get_items_aggregated_by_statuses
 
-lt_es7 = ES_VERSION[0] < 7
-
-
 # Note: there must be only one resolver per file,
 # otherwise only the last one is registered
 
@@ -43,41 +39,26 @@ def jsonresolver_loader(url_map):
         past_loans_count = 0
         active_loans_count = 0
         pending_loans_count = 0
-        loans_search = get_loans_aggregated_by_states(
-            document_pid, loan_states
-        )
+        loans_search = get_loans_aggregated_by_states(document_pid, loan_states)
 
         loans_result = loans_search.execute()
 
         for bucket in loans_result.aggregations.states.buckets:
-            if (
-                bucket["key"]
-                in current_app.config["CIRCULATION_STATES_LOAN_COMPLETED"]
-            ):
+            if bucket["key"] in current_app.config["CIRCULATION_STATES_LOAN_COMPLETED"]:
                 past_loans_count += bucket["doc_count"]
-            elif (
-                bucket["key"]
-                in current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]
-            ):
+            elif bucket["key"] in current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]:
                 active_loans_count += bucket["doc_count"]
-            elif (
-                bucket["key"]
-                in current_app.config["CIRCULATION_STATES_LOAN_REQUEST"]
-            ):
+            elif bucket["key"] in current_app.config["CIRCULATION_STATES_LOAN_REQUEST"]:
                 pending_loans_count += bucket["doc_count"]
 
-        overdue_loans_count = get_overdue_loans_by_doc_pid(
-            document_pid
-        ).count()
+        overdue_loans_count = get_overdue_loans_by_doc_pid(document_pid).count()
 
         # items
         unavailable_items_count = 0
         items_for_reference_count = 0
         item_statuses = get_items_aggregated_by_statuses(document_pid)
         item_result = item_statuses.execute()
-        items_count = (
-            item_result.hits.total if lt_es7 else item_result.hits.total.value
-        )
+        items_count = item_result.hits.total.value
         for bucket in item_result.aggregations.statuses.buckets:
             if bucket["key"] not in "CAN_CIRCULATE":
                 unavailable_items_count += bucket["doc_count"]
@@ -90,9 +71,10 @@ def jsonresolver_loader(url_map):
             loan = hit.to_dict()
             loan_item_type = loan.get("item_pid", {}).get("type")
             is_brw_req = loan_item_type == BORROWING_REQUEST_PID_TYPE
-            if loan["state"] in \
-                current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"] \
-                    and is_brw_req:
+            if (
+                loan["state"] in current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]
+                and is_brw_req
+            ):
                 active_ill_loans_count += 1
 
         active_ils_loans_count = active_loans_count - active_ill_loans_count
@@ -120,11 +102,7 @@ def jsonresolver_loader(url_map):
             next_available_loans = (
                 get_loan_next_available_date(document_pid).execute().hits
             )
-            total = (
-                next_available_loans.total
-                if lt_es7
-                else next_available_loans.total.value
-            )
+            total = next_available_loans.total.value
             if total > 0:
                 next_date = next_available_loans[0].end_date
                 circulation["next_available_date"] = next_date

invenio_app_ils/documents/jsonresolvers/document_eitem.py

@@ -31,6 +31,7 @@ def jsonresolver_loader(url_map):
             eitems.append(
                 {
                     "pid": eitem.get("pid"),
+                    "eitem_type": eitem.get("eitem_type"),
                     "description": eitem.get("description"),
                     "identifiers": eitem.get("identifiers", []),
                     "internal_notes": eitem.get("internal_notes"),

invenio_app_ils/documents/jsonresolvers/document_item.py

@@ -37,12 +37,15 @@ def jsonresolver_loader(url_map):
                 "status": item.get("status"),
                 "description": item.get("description"),
                 "shelf": item.get("shelf"),
+                "identifiers": item.get("identifiers"),
                 "internal_location": {
                     "name": item.get("internal_location", {}).get("name", ""),
                     "location": {
-                        "name": item.get("internal_location", {})
-                        .get("location", {})
-                        .get("name", "")
+                        "name": (
+                            item.get("internal_location", {})
+                            .get("location", {})
+                            .get("name", "")
+                        )
                     },
                 },
             }
@@ -55,13 +58,9 @@ def jsonresolver_loader(url_map):
 
             # grouping by location (can circulate and not on loan)
             location_name = (
-                item.get("internal_location", {})
-                .get("location", {})
-                .get("name", "")
-            )
-            internal_location_name = item.get("internal_location", {}).get(
-                "name", ""
+                item.get("internal_location", {}).get("location", {}).get("name", "")
             )
+            internal_location_name = item.get("internal_location", {}).get("name", "")
             if location_name not in by_location:
                 by_location[location_name] = {
                     internal_location_name: [],

invenio_app_ils/documents/jsonresolvers/document_stock.py

@@ -10,6 +10,7 @@
 import jsonresolver
 from werkzeug.routing import Rule
 
+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,
@@ -30,14 +31,13 @@ def jsonresolver_loader(url_map):
         search.aggs.bucket("mediums", "terms", field="medium")
         search_response = search.execute()
         mediums = [
-            bucket.key
-            for bucket in search_response.aggregations.mediums.buckets
+            bucket.key for bucket in search_response.aggregations.mediums.buckets
         ]
-        eitems_count = eitem_search.search_by_document_pid(
-            document_pid
-        ).count()
-        if eitems_count > 0:
-            mediums.append("E-BOOK")
+        eitems = eitem_search.search_by_document_pid(document_pid)
+        for type in EItem.EITEM_TYPES:
+            type_count = eitems.filter("term", eitem_type=type).count()
+            if type_count > 0:
+                mediums.append(type)
         return {
             "mediums": mediums,
         }

invenio_app_ils/documents/loaders/jsonschemas/document.py

@@ -16,24 +16,12 @@ 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,
 )
 
 
-class IdentifierSchema(Schema):
-    """Identifier schema."""
-
-    class Meta:
-        """Meta attributes for the schema."""
-
-        unknown = EXCLUDE
-
-    material = fields.Str()
-    scheme = fields.Str(required=True)
-    value = fields.Str(required=True)
-
-
 class AffiliationSchema(Schema):
     """Affiliation schema."""
 
@@ -241,6 +229,7 @@ class DocumentSchemaV1(RecordMetadataSchemaJSONV1):
     internal_notes = fields.List(fields.Nested(InternalNoteSchema))
     keywords = fields.List(fields.Nested(KeywordSchema))
     languages = fields.List(fields.Str())
+    legacy_recid = fields.Int()
     licenses = fields.List(fields.Nested(LicenseSchema))
     note = fields.Str()
     number_of_pages = fields.Str()
@@ -248,7 +237,7 @@ class DocumentSchemaV1(RecordMetadataSchemaJSONV1):
     physical_description = fields.Str()
     publication_info = fields.List(fields.Nested(PublicationInfoSchema))
     publication_year = fields.Str(required=True)
-    restricted = fields.Bool(missing=False)
+    restricted = fields.Bool(load_default=False)
     source = fields.Str()
     subjects = fields.List(fields.Nested(SubjectSchema))
     table_of_content = fields.List(fields.Str())

invenio_app_ils/documents/mappings/{v6 → os-v1}/__init__.py

@@ -5,4 +5,4 @@
 # 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 ES v6 document mappings."""
+"""ILS ES v7 document mappings."""