notifications: enhance notifications

* Adds aggregated notification dispatch. * Adds time stamp monitoring cli. * closes rero#1236. Co-Authored-by: Peter Weber <peter.weber@rero.ch>
rerowep · Apr 29, 2021 · a73cafa · a73cafa
1 parent ebfdee3
commit a73cafa
Show file tree

Hide file tree

Showing 41 changed files with 682 additions and 368 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,6 +79,7 @@ cryptography = ">3.3.1"
 freezegun = "^1.1.0"
 lazyreader = ">1.0.0"
 jinja2 = ">2.11.2"
+num2words = "^0.5.10"
 
 [tool.poetry.dev-dependencies]
 ## Python packages development dependencies (order matters)

diff --git a/rero_ils/config.py b/rero_ils/config.py
@@ -307,6 +307,38 @@ def _(x):
         'enabled': False,
         # TODO: in production set this up once a day
     },
+    'notification-dispatch-due_soon': {
+        'task': 'rero_ils.modules.notifications.tasks.process_notifications',
+        'schedule': crontab(minute="*/15"),
+        'kwargs': {
+            'notification_type': Notification.DUE_SOON_NOTIFICATION_TYPE
+        },
+        'enabled': False,
+    },
+    'notification-dispatch-overdue': {
+        'task': 'rero_ils.modules.notifications.tasks.process_notifications',
+        'schedule': timedelta(minutes=15),
+        'kwargs': {
+            'notification_type': Notification.OVERDUE_NOTIFICATION_TYPE
+        },
+        'enabled': False,
+    },
+    'notification-dispatch-availability': {
+        'task': 'rero_ils.modules.notifications.tasks.process_notifications',
+        'schedule': timedelta(minutes=15),
+        'kwargs': {
+            'notification_type': Notification.AVAILABILITY_NOTIFICATION_TYPE
+        },
+        'enabled': False,
+    },
+    'notification-dispatch-recall': {
+        'task': 'rero_ils.modules.notifications.tasks.process_notifications',
+        'schedule': timedelta(minutes=15),
+        'kwargs': {
+            'notification_type': Notification.RECALL_NOTIFICATION_TYPE
+        },
+        'enabled': False,
+    },
     'claims-creation': {
         'task': ('rero_ils.modules.items.tasks'
                  '.process_late_claimed_issues'),

diff --git a/rero_ils/modules/libraries/api.py b/rero_ils/modules/libraries/api.py
@@ -333,17 +333,6 @@ def get_timezone(self):
         default = pytz.timezone('Europe/Zurich')
         return default
 
-    def email_notification_type(self, notification_type):
-        """Get the email corresponding to the given notification type.
-
-        :param notification_type: the notification type.
-        :return: the email corresponding to the notification type.
-        :rtype: string
-        """
-        for setting in self['notification_settings']:
-            if setting['type'] == notification_type:
-                return setting['email']
-
 
 class LibrariesIndexer(IlsRecordsIndexer):
     """Holdings indexing class."""
@@ -356,3 +345,15 @@ def bulk_index(self, record_id_iterator):
         :param record_id_iterator: Iterator yielding record UUIDs.
         """
         super().bulk_index(record_id_iterator, doc_type='lib')
+
+
+def email_notification_type(libray, notification_type):
+    """Get the email corresponding to the given notification type.
+
+    :param notification_type: the notification type.
+    :return: the email corresponding to the notification type.
+    :rtype: string
+    """
+    for setting in libray['notification_settings']:
+        if setting['type'] == notification_type:
+            return setting['email']
diff --git a/rero_ils/modules/loans/api.py b/rero_ils/modules/loans/api.py
@@ -191,7 +191,7 @@ def check_required_params(self, action, **kwargs):
         required_params = self.action_required_params(action=action)
         missing_params = set(required_params) - set(kwargs)
         if missing_params:
-            message = 'Parameters {} are required'.format(missing_params)
+            message = f'Parameters {missing_params} are required'
             raise MissingRequiredParameterError(description=message)
 
     def update_pickup_location(self, pickup_location_pid):
@@ -574,12 +574,7 @@ def create_notification(self, notification_type=None, counter=0):
             }
             notification = Notification.create(
                 data=record, dbcommit=True, reindex=True)
-            enqueue = notification_type not in [
-                Notification.RECALL_NOTIFICATION_TYPE,
-                Notification.AVAILABILITY_NOTIFICATION_TYPE
-            ]
-            # put into the queue only for batch notifications i.e. overdue
-            return notification.dispatch(enqueue=enqueue)
+            return notification
 
     @classmethod
     def concluded(cls, loan):