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

invenio_app_ils/locations/api.py

@@ -45,9 +45,7 @@ class Location(IlsRecord):
     def delete(self, **kwargs):
         """Delete Location record."""
         iloc_search = current_app_ils.internal_location_search_cls()
-        iloc_search_res = iloc_search.search_by_location_pid(
-            location_pid=self["pid"]
-        )
+        iloc_search_res = iloc_search.search_by_location_pid(location_pid=self["pid"])
         if iloc_search_res.count():
             raise RecordHasReferencesError(
                 record_type="Location",
@@ -60,7 +58,7 @@ class Location(IlsRecord):
         try:
             # invalidate cached property
             del current_app_ils.get_default_location_pid
-        except AttributeError:
+        except (AttributeError, KeyError):
             pass
 
         return rec

invenio_app_ils/locations/indexer.py

@@ -26,14 +26,10 @@ def get_internal_locations(location_pid):
     intloc_search_cls = current_app_ils.internal_location_search_cls
     intloc_record_cls = current_app_ils.internal_location_record_cls
     for iloc in (
-        intloc_search_cls()
-        .search_by_location_pid(location_pid=location_pid)
-        .scan()
+        intloc_search_cls().search_by_location_pid(location_pid=location_pid).scan()
     ):
         intloc = intloc_record_cls.get_record_by_pid(iloc["pid"])
-        referenced.append(
-            dict(pid_type=INTERNAL_LOCATION_PID_TYPE, record=intloc)
-        )
+        referenced.append(dict(pid_type=INTERNAL_LOCATION_PID_TYPE, record=intloc))
     return referenced
 
 
@@ -43,9 +39,7 @@ def get_items(location_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_location_pid(location_pid=location_pid)
-        .scan()
+        item_search_cls().search_by_location_pid(location_pid=location_pid).scan()
     ):
         item = item_record_cls.get_record_by_pid(item["pid"])
         referenced.append(dict(pid_type=ITEM_PID_TYPE, record=item))

invenio_app_ils/locations/loaders/__init__.py

@@ -7,9 +7,7 @@
 
 """ILS Locations loaders."""
 
-from invenio_app_ils.locations.loaders.jsonschemas.location import (
-    LocationSchemaV1,
-)
+from invenio_app_ils.locations.loaders.jsonschemas.location import LocationSchemaV1
 from invenio_app_ils.records.loaders import ils_marshmallow_loader
 
 location_loader = ils_marshmallow_loader(LocationSchemaV1)

invenio_app_ils/locations/loaders/jsonschemas/location.py

@@ -30,9 +30,7 @@ _WEEKDAY_NAMES = [
     "saturday",
     "sunday",
 ]
-_WEEKDAY_INDICES = {
-    weekday_name: i for i, weekday_name in enumerate(_WEEKDAY_NAMES)
-}
+_WEEKDAY_INDICES = {weekday_name: i for i, weekday_name in enumerate(_WEEKDAY_NAMES)}
 
 
 def validate_time(value):
@@ -109,9 +107,7 @@ class OpeningWeekdaySchema(Schema):
             previous = None
             for current in times:
                 if previous and previous["end_time"] >= current["start_time"]:
-                    raise ValidationError(
-                        "Time periods must not overlap.", "times"
-                    )
+                    raise ValidationError("Time periods must not overlap.", "times")
                 previous = current
         else:
             if "times" in data:
@@ -156,9 +152,7 @@ class LocationSchemaV1(RecordMetadataSchemaJSONV1):
     name = fields.Str(required=True)
     notes = fields.Str()
     opening_exceptions = fields.List(fields.Nested(OpeningExceptionSchema))
-    opening_weekdays = fields.List(
-        fields.Nested(OpeningWeekdaySchema), required=True
-    )
+    opening_weekdays = fields.List(fields.Nested(OpeningWeekdaySchema), required=True)
     phone = fields.Str()
 
     @post_load
@@ -174,8 +168,7 @@ class LocationSchemaV1(RecordMetadataSchemaJSONV1):
             index = _WEEKDAY_INDICES[name]
             if new_weekdays[index]:
                 raise ValidationError(
-                    "There are two distinct configurations for the "
-                    "same weekday.",
+                    "There are two distinct configurations for the " "same weekday.",
                     "opening_weekdays",
                 )
             new_weekdays[index] = weekday

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

invenio_app_ils/locations/mappings/os-v1/locations/location-v1.0.0.json

@@ -0,0 +1,90 @@
+{
+  "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"
+      },
+      "address": {
+        "type": "text"
+      },
+      "email": {
+        "type": "text",
+        "analyzer": "email"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "notes": {
+        "type": "text"
+      },
+      "opening_exceptions": {
+        "properties": {
+          "title": {
+            "type": "keyword"
+          },
+          "is_open": {
+            "type": "boolean"
+          },
+          "start_date": {
+            "type": "date"
+          },
+          "end_date": {
+            "type": "date"
+          }
+        },
+        "type": "object"
+      },
+      "opening_weekdays": {
+        "properties": {
+          "weekday": {
+            "type": "keyword"
+          },
+          "is_open": {
+            "type": "boolean"
+          },
+          "times": {
+            "properties": {
+              "start_time": {
+                "type": "text"
+              },
+              "end_time": {
+                "type": "text"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "phone": {
+        "type": "keyword"
+      },
+      "pid": {
+        "type": "keyword"
+      }
+    }
+  }
+}

invenio_app_ils/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 locations ES v7 mappings."""

invenio_app_ils/locations/mappings/os-v2/locations/location-v1.0.0.json

@@ -0,0 +1,90 @@
+{
+  "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"
+      },
+      "address": {
+        "type": "text"
+      },
+      "email": {
+        "type": "text",
+        "analyzer": "email"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "notes": {
+        "type": "text"
+      },
+      "opening_exceptions": {
+        "properties": {
+          "title": {
+            "type": "keyword"
+          },
+          "is_open": {
+            "type": "boolean"
+          },
+          "start_date": {
+            "type": "date"
+          },
+          "end_date": {
+            "type": "date"
+          }
+        },
+        "type": "object"
+      },
+      "opening_weekdays": {
+        "properties": {
+          "weekday": {
+            "type": "keyword"
+          },
+          "is_open": {
+            "type": "boolean"
+          },
+          "times": {
+            "properties": {
+              "start_time": {
+                "type": "text"
+              },
+              "end_time": {
+                "type": "text"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "phone": {
+        "type": "keyword"
+      },
+      "pid": {
+        "type": "keyword"
+      }
+    }
+  }
+}

invenio_app_ils/notifications/messages.py

@@ -50,8 +50,9 @@ class NotificationMsg:
         except TemplateError:
             self.body_html = self.body_plain
 
-        footer_template = current_app.config.get("ILS_NOTIFICATIONS_TEMPLATES",
-                                                 {}).get("footer")
+        footer_template = current_app.config.get("ILS_NOTIFICATIONS_TEMPLATES", {}).get(
+            "footer"
+        )
         if footer_template:
             path = os.path.join(self.TEMPLATES_BASE_DIR, footer_template)
             footer_tmpl = current_app.jinja_env.get_template(path)
@@ -81,7 +82,7 @@ class NotificationMsg:
             title=self.title,
             body_plain=self.body_plain,
             body_html=self.body_html,
-            msg_cls=self.__class__.__name__
+            msg_cls=self.__class__.__name__,
         )
 
 

invenio_app_ils/notifications/tasks.py

@@ -54,7 +54,5 @@ def log_error_notification(request, exc, traceback, data, **kwargs):
         exception=repr(exc),
         data=data,
     )
-    current_app.logger.exception(
-        json.dumps(error, sort_keys=True), exc_info=exc
-    )
+    current_app.logger.exception(json.dumps(error, sort_keys=True), exc_info=exc)
     _log_notification_to_db(data, "Error: " + repr(exc))

invenio_app_ils/notifications/views.py

@@ -38,7 +38,7 @@ def get_notifications_blueprint(_):
             "size": fields.Int(validate=[validate.Range(min=1, max=100)]),
         }
     )
-    @need_permissions("send-notification-to-patron")
+    @need_permissions("get-notifications-sent-to-patron")
     def get_notifications(
         recipient_user_id=None,
         pid_type=None,
@@ -69,7 +69,7 @@ def get_notifications_blueprint(_):
         return {"hits": notifications, "total": len(notifications)}
 
     @blueprint.route("/notifications/<int:id>")
-    @need_permissions("send-notification-to-patron")
+    @need_permissions("get-notifications-sent-to-patron")
     def get_notification(id):
         try:
             notification = NotificationsLogs.query.filter_by(id=id).one()

invenio_app_ils/patrons/anonymization.py

@@ -10,23 +10,24 @@
 
 from copy import deepcopy
 
-from elasticsearch.exceptions import NotFoundError
 from flask import current_app
-from invenio_accounts.models import SessionActivity, User, userrole
+from invenio_accounts.models import LoginInformation, SessionActivity, User, userrole
+from invenio_circulation.pidstore.pids import CIRCULATION_LOAN_PID_TYPE
 from invenio_circulation.proxies import current_circulation
 from invenio_db import db
 from invenio_oauthclient.models import RemoteAccount, RemoteToken, UserIdentity
+from invenio_search.engine import search as inv_search
 from invenio_userprofiles.models import UserProfile
 
+from invenio_app_ils.acquisition.api import ORDER_PID_TYPE
 from invenio_app_ils.acquisition.proxies import current_ils_acq
 from invenio_app_ils.circulation.search import (
     get_active_loans_by_patron_pid,
     get_loans_by_patron_pid,
 )
-from invenio_app_ils.errors import (
-    AnonymizationActiveLoansError,
-    PatronNotFoundError,
-)
+from invenio_app_ils.document_requests.api import DOCUMENT_REQUEST_PID_TYPE
+from invenio_app_ils.errors import AnonymizationActiveLoansError, PatronNotFoundError
+from invenio_app_ils.ill.api import BORROWING_REQUEST_PID_TYPE
 from invenio_app_ils.ill.proxies import current_ils_ill
 from invenio_app_ils.notifications.models import NotificationsLogs
 from invenio_app_ils.patrons.api import get_patron_or_unknown_dump
@@ -59,7 +60,6 @@ def get_patron_activity(patron_pid):
     patron_loans = dump(get_loans_by_patron_pid(patron_pid))
 
     patron_profile = UserProfile.get_by_userid(patron_pid).__dict__
-    del patron_profile["_sa_instance_state"]
 
     patron_data = {
         "patron": patron,
@@ -97,9 +97,7 @@ def anonymize_patron_data(patron_pid, force=False):
             )
         )
     OrderSearch = current_ils_acq.order_search_cls
-    n_orders = (
-        OrderSearch().get_ongoing_orders_by_patron_pid(patron_pid).count()
-    )
+    n_orders = OrderSearch().get_ongoing_orders_by_patron_pid(patron_pid).count()
     if n_orders > 0:
         raise AnonymizationActiveLoansError(
             "Cannot delete user {0}: found {1} active orders.".format(
@@ -111,9 +109,32 @@ def anonymize_patron_data(patron_pid, force=False):
     cls = current_app.config["ILS_PATRON_ANONYMOUS_CLASS"]
     anonymous_patron_fields = cls().dumps_loader()
 
+    Loan = current_circulation.loan_record_cls
+    BorrowingRequest = current_ils_ill.borrowing_request_record_cls
+    DocumentRequest = current_app_ils.document_request_record_cls
+    Order = current_ils_acq.order_record_cls
+
+    anonymized_records = {
+        CIRCULATION_LOAN_PID_TYPE: {
+            "indexer": current_circulation.loan_indexer(),
+            "records": [],
+        },
+        BORROWING_REQUEST_PID_TYPE: {
+            "indexer": current_ils_ill.borrowing_request_indexer_cls(),
+            "records": [],
+        },
+        DOCUMENT_REQUEST_PID_TYPE: {
+            "indexer": current_app_ils.document_request_indexer,
+            "records": [],
+        },
+        ORDER_PID_TYPE: {
+            "indexer": current_ils_acq.order_indexer,
+            "records": [],
+        },
+    }
+
     patron_loans = get_loans_by_patron_pid(patron_pid).scan()
 
-    Loan = current_circulation.loan_record_cls
     indices = 0
     for hit in patron_loans:
         loan = Loan.get_record_by_pid(hit.pid)
@@ -136,7 +157,7 @@ def anonymize_patron_data(patron_pid, force=False):
         loan["patron_pid"] = anonymous_patron_fields["pid"]
         loan["patron"] = anonymous_patron_fields
         loan.commit()
-        current_circulation.loan_indexer().index(loan)
+        anonymized_records[CIRCULATION_LOAN_PID_TYPE]["records"].append(loan)
         indices += 1
 
     BorrowingRequestsSearch = current_ils_ill.borrowing_request_search_cls
@@ -144,14 +165,14 @@ def anonymize_patron_data(patron_pid, force=False):
         BorrowingRequestsSearch().search_by_patron_pid(patron_pid).scan()
     )
 
-    BorrowingRequest = current_ils_ill.borrowing_request_record_cls
-    indexer = current_ils_ill.borrowing_request_indexer_cls()
     for hit in patron_borrowing_requests:
         borrowing_request = BorrowingRequest.get_record_by_pid(hit.pid)
         borrowing_request["patron"] = anonymous_patron_fields
         borrowing_request["patron_pid"] = anonymous_patron_fields["pid"]
         borrowing_request.commit()
-        indexer.index(borrowing_request)
+        anonymized_records[BORROWING_REQUEST_PID_TYPE]["records"].append(
+            borrowing_request
+        )
         indices += 1
 
     DocumentRequestSearch = current_app_ils.document_request_search_cls
@@ -159,7 +180,6 @@ def anonymize_patron_data(patron_pid, force=False):
         DocumentRequestSearch().search_by_patron_pid(patron_pid).scan()
     )
 
-    DocumentRequest = current_app_ils.document_request_record_cls
     for hit in patron_document_requests:
         document_request = DocumentRequest.get_record_by_pid(hit.pid)
         if document_request["state"] == "PENDING":
@@ -168,19 +188,18 @@ def anonymize_patron_data(patron_pid, force=False):
         document_request["patron"] = anonymous_patron_fields
         document_request["patron_pid"] = anonymous_patron_fields["pid"]
         document_request.commit()
-        current_app_ils.document_request_indexer.index(document_request)
+        anonymized_records[ORDER_PID_TYPE]["records"].append(document_request)
         indices += 1
 
     patron_acquisitions = OrderSearch().search_by_patron_pid(patron_pid).scan()
 
-    Order = current_ils_acq.order_record_cls
     for hit in patron_acquisitions:
         acquisition = Order.get_record_by_pid(hit.pid)
         for line in acquisition["order_lines"]:
-            if line["patron_pid"] == patron_pid:
+            if line.get("patron_pid") == patron_pid:
                 line["patron_pid"] = anonymous_patron_fields["pid"]
         acquisition.commit()
-        current_ils_acq.order_indexer.index(acquisition)
+        anonymized_records[Order._pid_type]["records"].append(acquisition)
         indices += 1
 
     # delete rows from db
@@ -190,11 +209,18 @@ def anonymize_patron_data(patron_pid, force=False):
     notifications = anonymize_patron_in_notification_logs(patron_pid)
 
     db.session.commit()
+
+    # index all after committing to DB, to ensure that no errors occurred.
+    for value in anonymized_records.values():
+        indexer, records = value["indexer"], value["records"]
+        for record in records:
+            indexer.index(record)
+
     if patron:
         try:
             patron_indexer = current_app_ils.patron_indexer
             patron_indexer.delete(patron)
-        except NotFoundError:
+        except inv_search.NotFoundError:
             pass
 
     return dropped, indices, notifications
@@ -205,22 +231,16 @@ def delete_user_account(patron_pid):
     dropped = 0
 
     with db.session.begin_nested():
-
         d = db.session.query(userrole).filter(userrole.c.user_id == patron_pid)
         dropped += d.delete(synchronize_session=False) or 0
 
         dropped += (
-            SessionActivity.query.filter(
-                SessionActivity.user_id == patron_pid
-            ).delete()
+            SessionActivity.query.filter(SessionActivity.user_id == patron_pid).delete()
             or 0
         )
 
         dropped += (
-            UserIdentity.query.filter(
-                UserIdentity.id_user == patron_pid
-            ).delete()
-            or 0
+            UserIdentity.query.filter(UserIdentity.id_user == patron_pid).delete() or 0
         )
 
         ra = RemoteAccount.query.filter(
@@ -236,8 +256,8 @@ def delete_user_account(patron_pid):
             dropped += ra.delete() or 0
 
         dropped += (
-            UserProfile.query.filter(
-                UserProfile.user_id == patron_pid
+            LoginInformation.query.filter(
+                LoginInformation.user_id == patron_pid
             ).delete()
             or 0
         )
@@ -253,7 +273,8 @@ def anonymize_patron_in_notification_logs(patron_pid):
 
     with db.session.begin_nested():
         notifications = NotificationsLogs.query.filter_by(
-            recipient_user_id=patron_pid).all()
+            recipient_user_id=patron_pid
+        ).all()
         for notification in notifications:
             notification.recipient_user_id = AnonymousPatron.id
             notification_anonymizations += 1

invenio_app_ils/patrons/api.py

@@ -13,7 +13,7 @@ from flask import current_app
 from invenio_accounts.models import User
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
-from invenio_userprofiles.api import UserProfile
+from invenio_userprofiles.models import UserProfile
 
 from invenio_app_ils.errors import PatronNotFoundError
 from invenio_app_ils.fetchers import pid_fetcher
@@ -29,16 +29,14 @@ PatronIdProvider = type(
     dict(pid_type=PATRON_PID_TYPE, default_status=PIDStatus.REGISTERED),
 )
 patron_pid_minter = None
-patron_pid_fetcher = partial(
-    pid_fetcher, provider_cls=PatronIdProvider, pid_field="id"
-)
+patron_pid_fetcher = partial(pid_fetcher, provider_cls=PatronIdProvider, pid_field="id")
 
 
 class Patron(dict):
     """Patron record class."""
 
     _index = "patrons-patron-v1.0.0"
-    _doc_type = "patron-v1.0.0"
+    _doc_type = None
     # Fake schema used to identify pid type from ES hit
     _schema = "patrons/patron-v1.0.0.json"
 

invenio_app_ils/patrons/cli.py

@@ -57,8 +57,7 @@ def list_activity(patron_pid):
 def anonymize(patron_pid, force):
     """Anonymize patron's data and activity."""
     if click.confirm("Are you sure you want to anonymize this patron?"):
-        dropped, indices, notifications = \
-            anonymize_patron_data(patron_pid, force)
+        dropped, indices, notifications = anonymize_patron_data(patron_pid, force)
         msg = (
             "Successfully anonymized patron's activity: {dropped} rows "
             "deleted from db, {indices} records re-indexed and "

invenio_app_ils/patrons/indexer.py

@@ -10,7 +10,6 @@
 from datetime import datetime
 
 from celery import shared_task
-from elasticsearch import VERSION as ES_VERSION
 from flask import current_app
 from invenio_accounts.models import User
 from invenio_circulation.pidstore.pids import CIRCULATION_LOAN_PID_TYPE
@@ -28,8 +27,6 @@ from invenio_app_ils.indexer import ReferencedRecordsIndexer
 from invenio_app_ils.patrons.api import PATRON_PID_TYPE
 from invenio_app_ils.proxies import current_app_ils
 
-lt_es7 = ES_VERSION[0] < 7
-
 
 def get_loans(patron_pid):
     """Get referenced loans."""
@@ -37,9 +34,7 @@ def get_loans(patron_pid):
     loan_record_cls = current_circulation.loan_record_cls
     for hit in search_by_patron_pid(patron_pid=patron_pid).scan():
         loan = loan_record_cls.get_record_by_pid(hit["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
 
 
@@ -52,9 +47,7 @@ def get_document_requests(patron_pid):
         docreq_search_cls().search_by_patron_pid(patron_pid=patron_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
 
 
@@ -78,9 +71,7 @@ def get_ill_borrowing_requests(patron_pid):
     search = brw_req_search_cls().search_by_patron_pid(patron_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
 
 
@@ -119,7 +110,7 @@ class PatronBaseIndexer(RecordIndexer):
         :param record: The record where to look for the information.
         :returns: A tuple (index, doc_type).
         """
-        doc_type = record._doc_type if lt_es7 else "_doc"
+        doc_type = None
         return record._index, doc_type
 
     def index_by_id(self, record_uuid, **kwargs):

invenio_app_ils/patrons/mappings/os-v1/__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.
+
+"""ILS Patrons ES v7 mappings."""