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

invenio_app_ils/ill/mappings/os-v2/ill_borrowing_requests/borrowing_request-v1.0.0.json

@@ -0,0 +1,254 @@
+{
+  "settings": {
+    "analysis": {
+      "analyzer": {
+        "email": {
+          "type": "custom",
+          "tokenizer": "uax_url_email"
+        }
+      }
+    }
+  },
+  "mappings": {
+    "date_detection": false,
+    "numeric_detection": false,
+    "properties": {
+      "$schema": {
+        "type": "keyword"
+      },
+      "_created": {
+        "type": "date"
+      },
+      "_updated": {
+        "type": "date"
+      },
+      "cancel_reason": {
+        "type": "text"
+      },
+      "created_by": {
+        "properties": {
+          "type": {
+            "type": "keyword"
+          },
+          "value": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "document": {
+        "properties": {
+          "authors": {
+            "type": "text"
+          },
+          "cover_metadata": {
+            "properties": {},
+            "type": "object"
+          },
+          "edition": {
+            "type": "text"
+          },
+          "pid": {
+            "type": "keyword"
+          },
+          "publication_year": {
+            "type": "keyword"
+          },
+          "title": {
+            "type": "text"
+          },
+          "alternative_titles": {
+            "properties": {
+              "language": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "value": {
+                "type": "text"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "document_pid": {
+        "type": "keyword"
+      },
+      "due_date": {
+        "type": "date"
+      },
+      "expected_delivery_date": {
+        "type": "date"
+      },
+      "legacy_id": {
+        "type": "keyword"
+      },
+      "provider": {
+        "properties": {
+          "name": {
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            },
+            "type": "text"
+          },
+          "pid": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "provider_pid": {
+        "type": "keyword"
+      },
+      "notes": {
+        "type": "text"
+      },
+      "patron": {
+        "properties": {
+          "email": {
+            "type": "text",
+            "analyzer": "email"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          },
+          "location_pid": {
+            "type": "keyword"
+          },
+          "pid": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "patron_pid": {
+        "type": "keyword"
+      },
+      "patron_loan": {
+        "properties": {
+          "extension": {
+            "properties": {
+              "notes": {
+                "type": "text"
+              },
+              "request_date": {
+                "type": "date"
+              },
+              "status": {
+                "type": "keyword"
+              }
+            },
+            "type": "object"
+          },
+          "pid": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "payment": {
+        "properties": {
+          "budget_code": {
+            "type": "keyword"
+          },
+          "debit_cost": {
+            "properties": {
+              "currency": {
+                "type": "keyword"
+              },
+              "value": {
+                "type": "float"
+              }
+            },
+            "type": "object"
+          },
+          "debit_cost_main_currency": {
+            "properties": {
+              "currency": {
+                "type": "keyword"
+              },
+              "value": {
+                "type": "float"
+              }
+            },
+            "type": "object"
+          },
+          "debit_date": {
+            "type": "date"
+          },
+          "debit_note": {
+            "type": "text"
+          },
+          "internal_purchase_requisition_id": {
+            "type": "keyword"
+          },
+          "mode": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "pid": {
+        "type": "keyword"
+      },
+      "received_date": {
+        "type": "date"
+      },
+      "request_date": {
+        "type": "date"
+      },
+      "status": {
+        "type": "keyword"
+      },
+      "total": {
+        "properties": {
+          "currency": {
+            "type": "keyword"
+          },
+          "value": {
+            "type": "float"
+          }
+        },
+        "type": "object"
+      },
+      "total_main_currency": {
+        "properties": {
+          "currency": {
+            "type": "keyword"
+          },
+          "value": {
+            "type": "float"
+          }
+        },
+        "type": "object"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "updated_by": {
+        "properties": {
+          "type": {
+            "type": "keyword"
+          },
+          "value": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      }
+    }
+  }
+}

invenio_app_ils/ill/mappings/v7/ill_borrowing_requests/borrowing_request-v1.0.0.json

@@ -56,6 +56,20 @@
           },
           "title": {
             "type": "text"
+          },
+          "alternative_titles": {
+            "properties": {
+              "language": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "value": {
+                "type": "text"
+              }
+            },
+            "type": "object"
           }
         },
         "type": "object"

invenio_app_ils/ill/notifications/api.py

@@ -11,10 +11,7 @@ from flask import current_app
 from invenio_records_rest.utils import obj_or_import_string
 
 from invenio_app_ils.ill.errors import ILLError
-from invenio_app_ils.notifications.api import (
-    build_common_msg_ctx,
-    send_notification,
-)
+from invenio_app_ils.notifications.api import build_common_msg_ctx, send_notification
 
 
 def _build_ill_msg_ctx(brw_req):

invenio_app_ils/ill/search.py

@@ -28,9 +28,7 @@ class BorrowingRequestsSearch(RecordsSearch):
         if document_pid:
             search = search.filter("term", document_pid=document_pid)
         else:
-            raise MissingRequiredParameterError(
-                description="document_pid is required"
-            )
+            raise MissingRequiredParameterError(description="document_pid is required")
         return search
 
     def search_by_patron_pid(self, patron_pid=None):
@@ -40,9 +38,7 @@ class BorrowingRequestsSearch(RecordsSearch):
         if patron_pid:
             search = search.filter("term", patron_pid=patron_pid)
         else:
-            raise MissingRequiredParameterError(
-                description="patron_pid is required"
-            )
+            raise MissingRequiredParameterError(description="patron_pid is required")
         return search
 
     def search_by_provider_pid(self, provider_pid=None):
@@ -52,8 +48,6 @@ class BorrowingRequestsSearch(RecordsSearch):
         if provider_pid:
             search = search.filter("term", provider_pid=provider_pid)
         else:
-            raise MissingRequiredParameterError(
-                description="provider_pid is required"
-            )
+            raise MissingRequiredParameterError(description="provider_pid is required")
 
         return search

invenio_app_ils/ill/serializers/__init__.py

@@ -19,8 +19,6 @@ csv_v1 = BorrowingRequestCSVSerializer(ILSRecordSchemaJSONV1)
 csv_v1_response = record_responsify_no_etag(csv_v1, "text/csv")
 csv_v1_search = search_responsify(csv_v1, "text/csv")
 
-json_v1 = BorrowingRequestJSONSerializer(
-    ILSRecordSchemaJSONV1, replace_refs=True
-)
+json_v1 = BorrowingRequestJSONSerializer(ILSRecordSchemaJSONV1, replace_refs=True)
 json_v1_response = record_responsify_no_etag(json_v1, "application/json")
 json_v1_search = search_responsify(json_v1, "application/json")

invenio_app_ils/ill/views.py

@@ -41,8 +41,7 @@ def create_ill_blueprint(app):
     default_media_type = options.get("default_media_type", "")
     rec_serializers = options.get("record_serializers", {})
     serializers = {
-        mime: obj_or_import_string(func)
-        for mime, func in rec_serializers.items()
+        mime: obj_or_import_string(func) for mime, func in rec_serializers.items()
     }
 
     def create_view(view_cls, path, loader):
@@ -123,8 +122,7 @@ class ILLPatronLoanExtensionActionResource(ILLActionResource):
         """Validate that the extension action can be performed."""
         loan = record.patron_loan.get()
         is_loan_active = (
-            loan["state"]
-            in current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]
+            loan["state"] in current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]
         )
         if not is_loan_active:
             raise ILLError("This interlibrary loan is not active.")

invenio_app_ils/internal_locations/api.py

@@ -14,10 +14,7 @@ from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
 
-from invenio_app_ils.errors import (
-    LocationNotFoundError,
-    RecordHasReferencesError,
-)
+from invenio_app_ils.errors import LocationNotFoundError, RecordHasReferencesError
 from invenio_app_ils.fetchers import pid_fetcher
 from invenio_app_ils.minters import pid_minter
 from invenio_app_ils.proxies import current_app_ils

invenio_app_ils/internal_locations/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 internal locations ES v6 mappings."""
+"""ILS internal locations ES v7 mappings."""

invenio_app_ils/internal_locations/mappings/os-v1/internal_locations/internal_location-v1.0.0.json

@@ -0,0 +1,108 @@
+{
+  "settings": {
+    "analysis": {
+      "analyzer": {
+        "email": {
+          "type": "custom",
+          "tokenizer": "uax_url_email"
+        }
+      }
+    }
+  },
+  "mappings": {
+    "date_detection": false,
+    "numeric_detection": false,
+    "properties": {
+      "$schema": {
+        "type": "keyword"
+      },
+      "_created": {
+        "type": "date"
+      },
+      "_updated": {
+        "type": "date"
+      },
+      "legacy_id": {
+        "type": "keyword"
+      },
+      "location": {
+        "properties": {
+          "pid": {
+            "type": "keyword"
+          },
+          "legacy_id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          },
+          "opening_weekdays": {
+            "properties": {
+              "weekday": {
+                "type": "keyword"
+              },
+              "is_open": {
+                "type": "boolean"
+              },
+              "times": {
+                "properties": {
+                  "start_time": {
+                    "type": "text"
+                  },
+                  "end_time": {
+                    "type": "text"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "type": "object"
+          },
+          "opening_exceptions": {
+            "properties": {
+              "title": {
+                "type": "keyword"
+              },
+              "is_open": {
+                "type": "boolean"
+              },
+              "start_date": {
+                "type": "date"
+              },
+              "end_date": {
+                "type": "date"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "location_pid": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "notes": {
+        "type": "text"
+      },
+      "physical_location": {
+        "type": "text"
+      },
+      "pid": {
+        "type": "keyword"
+      }
+    }
+  }
+}

invenio_app_ils/internal_locations/mappings/os-v2/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 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.
+
+"""ILS internal locations ES v7 mappings."""

invenio_app_ils/internal_locations/mappings/os-v2/internal_locations/internal_location-v1.0.0.json

@@ -0,0 +1,108 @@
+{
+  "settings": {
+    "analysis": {
+      "analyzer": {
+        "email": {
+          "type": "custom",
+          "tokenizer": "uax_url_email"
+        }
+      }
+    }
+  },
+  "mappings": {
+    "date_detection": false,
+    "numeric_detection": false,
+    "properties": {
+      "$schema": {
+        "type": "keyword"
+      },
+      "_created": {
+        "type": "date"
+      },
+      "_updated": {
+        "type": "date"
+      },
+      "legacy_id": {
+        "type": "keyword"
+      },
+      "location": {
+        "properties": {
+          "pid": {
+            "type": "keyword"
+          },
+          "legacy_id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          },
+          "opening_weekdays": {
+            "properties": {
+              "weekday": {
+                "type": "keyword"
+              },
+              "is_open": {
+                "type": "boolean"
+              },
+              "times": {
+                "properties": {
+                  "start_time": {
+                    "type": "text"
+                  },
+                  "end_time": {
+                    "type": "text"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "type": "object"
+          },
+          "opening_exceptions": {
+            "properties": {
+              "title": {
+                "type": "keyword"
+              },
+              "is_open": {
+                "type": "boolean"
+              },
+              "start_date": {
+                "type": "date"
+              },
+              "end_date": {
+                "type": "date"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "location_pid": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "notes": {
+        "type": "text"
+      },
+      "physical_location": {
+        "type": "text"
+      },
+      "pid": {
+        "type": "keyword"
+      }
+    }
+  }
+}

invenio_app_ils/internal_locations/search.py

@@ -30,9 +30,7 @@ class InternalLocationSearch(RecordsSearch):
         if location_pid:
             search = search.filter("term", location_pid=location_pid)
         else:
-            raise MissingRequiredParameterError(
-                description="location_pid is required"
-            )
+            raise MissingRequiredParameterError(description="location_pid is required")
 
         if filter_states:
             search = search.filter("terms", state=filter_states)

invenio_app_ils/items/api.py

@@ -11,10 +11,7 @@ from functools import partial
 
 from flask import current_app
 from invenio_circulation.search.api import search_by_pid
-from invenio_pidstore.errors import (
-    PersistentIdentifierError,
-    PIDDoesNotExistError,
-)
+from invenio_pidstore.errors import PersistentIdentifierError, PIDDoesNotExistError
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
 
@@ -82,9 +79,7 @@ class ItemValidator(RecordValidator):
             has_loans = (
                 search_by_pid(
                     item_pid=item_pid,
-                    filter_states=current_app.config[
-                        "CIRCULATION_STATES_LOAN_ACTIVE"
-                    ]
+                    filter_states=current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"]
                     + current_app.config["CIRCULATION_STATES_LOAN_COMPLETED"]
                     + current_app.config["CIRCULATION_STATES_LOAN_CANCELLED"],
                 ).count()
@@ -113,17 +108,13 @@ class Item(IlsRecord):
     """Item record class."""
 
     _pid_type = ITEM_PID_TYPE
-    _schema = "items/item-v1.0.0.json"
+    _schema = "items/item-v2.0.0.json"
     _validator = ItemValidator()
-    _loan_resolver_path = (
-        "{scheme}://{host}/api/resolver/items/{item_pid}/loan"
-    )
+    _loan_resolver_path = "{scheme}://{host}/api/resolver/items/{item_pid}/loan"
     _internal_location_resolver_path = (
         "{scheme}://{host}/api/resolver/items/{item_pid}/internal-location"
     )
-    _document_resolver_path = (
-        "{scheme}://{host}/api/resolver/items/{item_pid}/document"
-    )
+    _document_resolver_path = "{scheme}://{host}/api/resolver/items/{item_pid}/document"
     STATUSES = [
         "CAN_CIRCULATE",
         "FOR_REFERENCE_ONLY",
@@ -169,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/indexer.py

@@ -34,9 +34,7 @@ def index_referenced_records(item):
     document_pid = item["document_pid"]
     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))
 
     # fetch and index the document
     document_cls = current_app_ils.document_record_cls