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

invenio_app_ils/document_requests/api.py

@@ -31,9 +31,7 @@ DOCUMENT_REQUEST_PID_FETCHER = "dreqid"
 DocumentRequestIdProvider = type(
     "DocumentRequestIdProvider",
     (RecordIdProviderV2,),
-    dict(
-        pid_type=DOCUMENT_REQUEST_PID_TYPE, default_status=PIDStatus.REGISTERED
-    ),
+    dict(pid_type=DOCUMENT_REQUEST_PID_TYPE, default_status=PIDStatus.REGISTERED),
 )
 document_request_pid_minter = partial(
     pid_minter, provider_cls=DocumentRequestIdProvider
@@ -59,15 +57,12 @@ class DocumentRequestValidator(RecordValidator):
                 Document.get_record_by_pid(document_pid)
             except PIDDoesNotExistError:
                 raise DocumentRequestError(
-                    "The document with PID {} doesn't exist".format(
-                        document_pid
-                    )
+                    "The document with PID {} doesn't exist".format(document_pid)
                 )
 
     def validate_physical_item_provider(self, physical_item_provider):
         """Validate physical_item_provider existence."""
         if physical_item_provider:
-
             pid = physical_item_provider.get("pid", None)
             pid_type = physical_item_provider.get("pid_type", None)
             if not pid or not pid_type:
@@ -81,17 +76,13 @@ class DocumentRequestValidator(RecordValidator):
             elif pid_type == BORROWING_REQUEST_PID_TYPE:
                 Provider = current_ils_ill.borrowing_request_record_cls
             else:
-                raise DocumentRequestError(
-                    "Unknown pid_type {}".format(pid_type)
-                )
+                raise DocumentRequestError("Unknown pid_type {}".format(pid_type))
 
             try:
                 Provider.get_record_by_pid(pid)
             except PIDDoesNotExistError:
                 raise DocumentRequestError(
-                    "Record with PID {0}:{1} doesn't exist".format(
-                        pid_type, pid
-                    )
+                    "Record with PID {0}:{1} doesn't exist".format(pid_type, pid)
                 )
 
     def validate_decline(self, document_pid, state, decline_reason):
@@ -101,11 +92,7 @@ class DocumentRequestValidator(RecordValidator):
                 "You have to provide a reason when declining a request"
             )
 
-        if (
-            state == "DECLINING"
-            and decline_reason == "IN_CATALOG"
-            and not document_pid
-        ):
+        if state == "DECLINING" and decline_reason == "IN_CATALOG" and not document_pid:
             raise DocumentRequestError(
                 "Document Request cannot be declined with reason IN_CATALOG "
                 "without providing a document_pid."
@@ -113,9 +100,7 @@ class DocumentRequestValidator(RecordValidator):
 
     def validate_accept(self, document_pid, physical_item_provider, state):
         """Validate accept is correct."""
-        if state == "ACCEPTED" and (
-            not document_pid or not physical_item_provider
-        ):
+        if state == "ACCEPTED" and (not document_pid or not physical_item_provider):
             raise DocumentRequestError(
                 "Need to provide a document_pid and a physical_item_provider "
                 "when accepting a request"

invenio_app_ils/document_requests/loaders/__init__.py

@@ -10,15 +10,9 @@
 from invenio_app_ils.records.loaders import ils_marshmallow_loader
 
 from .jsonschemas.document_request import DocumentRequestSchemaV1
-from .jsonschemas.document_request_decline import (
-    DocumentRequestDeclineSchemaV1,
-)
-from .jsonschemas.document_request_document import (
-    DocumentRequestDocumentSchemaV1,
-)
-from .jsonschemas.document_request_provider import (
-    DocumentRequestProviderSchemaV1,
-)
+from .jsonschemas.document_request_decline import DocumentRequestDeclineSchemaV1
+from .jsonschemas.document_request_document import DocumentRequestDocumentSchemaV1
+from .jsonschemas.document_request_provider import DocumentRequestProviderSchemaV1
 
 document_request_loader = ils_marshmallow_loader(DocumentRequestSchemaV1)
 document_request_document_loader = ils_marshmallow_loader(
@@ -27,6 +21,4 @@ document_request_document_loader = ils_marshmallow_loader(
 document_request_provider_loader = ils_marshmallow_loader(
     DocumentRequestProviderSchemaV1
 )
-document_request_decline_loader = ils_marshmallow_loader(
-    DocumentRequestDeclineSchemaV1
-)
+document_request_decline_loader = ils_marshmallow_loader(DocumentRequestDeclineSchemaV1)

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

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2018 CERN.
+# Copyright (C) 2019 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.
 
-"""Invenio App ILS Document Requests ES v6 mappings."""
+"""Invenio App ILS Document Requests ES v7 mappings."""

invenio_app_ils/document_requests/mappings/os-v1/document_requests/document_request-v1.0.0.json

@@ -0,0 +1,196 @@
+{
+  "mappings": {
+    "date_detection": false,
+    "numeric_detection": false,
+    "properties": {
+      "$schema": {
+        "type": "keyword"
+      },
+      "_created": {
+        "type": "date"
+      },
+      "_updated": {
+        "type": "date"
+      },
+      "authors": {
+        "type": "text"
+      },
+      "document": {
+        "properties": {
+          "authors": {
+            "properties": {
+              "affiliations": {
+                "properties": {
+                  "identifiers": {
+                    "properties": {
+                      "scheme": {
+                        "type": "keyword"
+                      },
+                      "value": {
+                        "type": "keyword"
+                      }
+                    },
+                    "type": "object"
+                  },
+                  "name": {
+                    "type": "text",
+                    "fields": {
+                      "keyword": {
+                        "type": "keyword"
+                      }
+                    }
+                  }
+                },
+                "type": "object"
+              },
+              "alternative_names": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword"
+                  }
+                }
+              },
+              "full_name": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword"
+                  }
+                }
+              },
+              "identifiers": {
+                "properties": {
+                  "material": {
+                    "type": "keyword"
+                  },
+                  "scheme": {
+                    "type": "keyword"
+                  },
+                  "value": {
+                    "type": "keyword"
+                  }
+                },
+                "type": "object"
+              },
+              "roles": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              }
+            },
+            "type": "object"
+          },
+          "cover_metadata": {
+            "properties": {},
+            "type": "object"
+          },
+          "edition": {
+            "type": "text"
+          },
+          "pid": {
+            "type": "keyword"
+          },
+          "publication_year": {
+            "type": "keyword"
+          },
+          "title": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          }
+        },
+        "type": "object"
+      },
+      "document_pid": {
+        "type": "keyword"
+      },
+      "edition": {
+        "type": "keyword"
+      },
+      "internal_note": {
+          "type": "text"
+        },
+      "isbn": {
+        "type": "keyword"
+      },
+      "issn": {
+        "type": "keyword"
+      },
+      "issue": {
+        "type": "keyword"
+      },
+      "journal_title": {
+        "type": "text"
+      },
+      "legacy_id": {
+        "type": "keyword"
+      },
+      "medium": {
+        "type": "keyword"
+      },
+      "note": {
+        "type": "text"
+      },
+      "page": {
+        "type": "keyword"
+      },
+      "patron_pid": {
+        "type": "keyword"
+      },
+      "payment_info": {
+        "type": "keyword"
+      },
+      "payment_method": {
+        "type": "keyword"
+      },
+      "physical_item_provider": {
+        "properties": {
+          "pid": {
+            "type": "keyword"
+          },
+          "pid_type": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "pid": {
+        "type": "keyword"
+      },
+      "publication_year": {
+        "type": "keyword"
+      },
+      "decline_reason": {
+        "type": "keyword"
+      },
+      "request_type": {
+        "type": "keyword"
+      },
+      "standard_number": {
+        "type": "keyword"
+      },
+      "state": {
+        "type": "keyword"
+      },
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "volume": {
+        "type": "text"
+      },
+      "publisher": {
+        "type": "text"
+      }
+    }
+  }
+}

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

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

invenio_app_ils/document_requests/mappings/os-v2/document_requests/document_request-v1.0.0.json

@@ -0,0 +1,196 @@
+{
+  "mappings": {
+    "date_detection": false,
+    "numeric_detection": false,
+    "properties": {
+      "$schema": {
+        "type": "keyword"
+      },
+      "_created": {
+        "type": "date"
+      },
+      "_updated": {
+        "type": "date"
+      },
+      "authors": {
+        "type": "text"
+      },
+      "document": {
+        "properties": {
+          "authors": {
+            "properties": {
+              "affiliations": {
+                "properties": {
+                  "identifiers": {
+                    "properties": {
+                      "scheme": {
+                        "type": "keyword"
+                      },
+                      "value": {
+                        "type": "keyword"
+                      }
+                    },
+                    "type": "object"
+                  },
+                  "name": {
+                    "type": "text",
+                    "fields": {
+                      "keyword": {
+                        "type": "keyword"
+                      }
+                    }
+                  }
+                },
+                "type": "object"
+              },
+              "alternative_names": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword"
+                  }
+                }
+              },
+              "full_name": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword"
+                  }
+                }
+              },
+              "identifiers": {
+                "properties": {
+                  "material": {
+                    "type": "keyword"
+                  },
+                  "scheme": {
+                    "type": "keyword"
+                  },
+                  "value": {
+                    "type": "keyword"
+                  }
+                },
+                "type": "object"
+              },
+              "roles": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              }
+            },
+            "type": "object"
+          },
+          "cover_metadata": {
+            "properties": {},
+            "type": "object"
+          },
+          "edition": {
+            "type": "text"
+          },
+          "pid": {
+            "type": "keyword"
+          },
+          "publication_year": {
+            "type": "keyword"
+          },
+          "title": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          }
+        },
+        "type": "object"
+      },
+      "document_pid": {
+        "type": "keyword"
+      },
+      "edition": {
+        "type": "keyword"
+      },
+      "internal_note": {
+          "type": "text"
+        },
+      "isbn": {
+        "type": "keyword"
+      },
+      "issn": {
+        "type": "keyword"
+      },
+      "issue": {
+        "type": "keyword"
+      },
+      "journal_title": {
+        "type": "text"
+      },
+      "legacy_id": {
+        "type": "keyword"
+      },
+      "medium": {
+        "type": "keyword"
+      },
+      "note": {
+        "type": "text"
+      },
+      "page": {
+        "type": "keyword"
+      },
+      "patron_pid": {
+        "type": "keyword"
+      },
+      "payment_info": {
+        "type": "keyword"
+      },
+      "payment_method": {
+        "type": "keyword"
+      },
+      "physical_item_provider": {
+        "properties": {
+          "pid": {
+            "type": "keyword"
+          },
+          "pid_type": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
+      "pid": {
+        "type": "keyword"
+      },
+      "publication_year": {
+        "type": "keyword"
+      },
+      "decline_reason": {
+        "type": "keyword"
+      },
+      "request_type": {
+        "type": "keyword"
+      },
+      "standard_number": {
+        "type": "keyword"
+      },
+      "state": {
+        "type": "keyword"
+      },
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "volume": {
+        "type": "text"
+      },
+      "publisher": {
+        "type": "text"
+      }
+    }
+  }
+}

invenio_app_ils/document_requests/notifications/api.py

@@ -10,10 +10,7 @@
 from flask import current_app
 from invenio_records_rest.utils import obj_or_import_string
 
-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 send_document_request_notification(
@@ -27,9 +24,7 @@ def send_document_request_notification(
     msg_ctx = msg_extra_ctx or {}
     msg_ctx.update(build_common_msg_ctx(document_request))
 
-    func_or_path = current_app.config[
-        "ILS_NOTIFICATIONS_MSG_BUILDER_DOCUMENT_REQUEST"
-    ]
+    func_or_path = current_app.config["ILS_NOTIFICATIONS_MSG_BUILDER_DOCUMENT_REQUEST"]
     builder = obj_or_import_string(func_or_path)
     msg = builder(document_request, action, msg_ctx, **kwargs)
 

invenio_app_ils/document_requests/notifications/messages.py

@@ -35,9 +35,7 @@ class NotificationDocumentRequestMsg(NotificationMsg):
 
         templates = dict(
             self.DEFAULT_TEMPLATES,
-            **current_app.config[
-                "ILS_NOTIFICATIONS_TEMPLATES_DOCUMENT_REQUEST"
-            ],
+            **current_app.config["ILS_NOTIFICATIONS_TEMPLATES_DOCUMENT_REQUEST"],
         )
 
         if not action:
@@ -72,8 +70,6 @@ class NotificationDocumentRequestMsg(NotificationMsg):
         return d
 
 
-def notification_document_request_msg_builder(record, action, msq_extra_ctx,
-                                              **kwargs):
+def notification_document_request_msg_builder(record, action, msq_extra_ctx, **kwargs):
     """Factory builder to create a notification msg."""
-    return NotificationDocumentRequestMsg(record, action, msq_extra_ctx,
-                                          **kwargs)
+    return NotificationDocumentRequestMsg(record, action, msq_extra_ctx, **kwargs)

invenio_app_ils/document_requests/search.py

@@ -30,9 +30,7 @@ class DocumentRequestSearch(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")
 
         if filter_states:
             search = search.filter("terms", state=filter_states)
@@ -48,7 +46,5 @@ class DocumentRequestSearch(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

invenio_app_ils/document_requests/views.py

@@ -35,8 +35,7 @@ def create_document_request_action_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()
         }
 
         blueprint.add_url_rule(
@@ -58,9 +57,7 @@ def create_document_request_action_blueprint(app):
     )
 
     _add_view(blueprint, DocumentRequestAcceptResource, "accept", None)
-    _add_view(
-        blueprint, DocumentRequestDeclineResource, "decline", dr_decline_loader
-    )
+    _add_view(blueprint, DocumentRequestDeclineResource, "decline", dr_decline_loader)
     _add_view(
         blueprint,
         DocumentRequestDocumentResource,
@@ -194,8 +191,7 @@ class DocumentRequestAcceptResource(DocumentRequestActionResource):
 
         if "document_pid" not in record:
             raise DocumentRequestError(
-                "document_pid is required for the Document Request to be "
-                "accepted."
+                "document_pid is required for the Document Request to be " "accepted."
             )
 
         if "physical_item_provider" not in record:
@@ -251,9 +247,7 @@ class DocumentRequestDeclineResource(DocumentRequestActionResource):
 
         if decline_reason == "IN_CATALOG" and not document_pid:
             raise DocumentRequestError(
-                "Document PID required for decline reason {}".format(
-                    decline_reason
-                ),
+                "Document PID required for decline reason {}".format(decline_reason),
                 errors=[
                     FieldError(
                         field="document_pid",