add instant five minute celery task

Author: Johnetordoff

notifications/tasks.py

@@ -313,3 +313,29 @@ def remove_subscription_task(node_id):
         object_id=node.id,
         content_type=ContentType.objects.get_for_model(node),
     ).delete()
+
+
+@celery_app.task(bind=True, name='notifications.tasks.send_users_instant_digest_email')
+def send_users_instant_digest_email(dry_run):
+    """Send pending "instant' digest emails.
+    :return:
+    """
+    grouped_emails = get_users_emails('instantly')
+    for group in grouped_emails:
+        user_id = group['user_id']
+        notification_ids = [msg['notification_id'] for msg in group['info']]
+        if not dry_run:
+            send_user_email_task.delay(user_id, notification_ids, 'instantly')
+
+@celery_app.task(bind=True, name='notifications.tasks.send_moderators_instant_digest_email')
+def send_moderators_instant_digest_email(dry_run=False):
+    """Send pending "instant' digest emails.
+    :return:
+    """
+    grouped_emails = get_moderators_emails('instantly')
+    for group in grouped_emails:
+        user_id = group['user_id']
+        provider_id = group['provider_id']
+        notification_ids = [msg['notification_id'] for msg in group['info']]
+        if not dry_run:
+            send_moderator_email_task.delay(user_id, provider_id, notification_ids, 'instantly')

osf/models/notification_subscription.py

@@ -89,11 +89,12 @@ def emit(
             )
             if save:
                 notification.save()
-            notification.send(
-                destination_address=destination_address,
-                email_context=email_context,
-                save=save,
-            )
+            if not self._is_digest:  # instant digests are sent every 5 minutes.
+                notification.send(
+                    destination_address=destination_address,
+                    email_context=email_context,
+                    save=save,
+                )
         else:
             Notification.objects.create(
                 subscription=self,

website/settings/defaults.py

@@ -622,6 +622,16 @@ class CeleryConfig:
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m
             'kwargs': {'dry_run': False},
         },
+        '5-minute-user-emails': {
+            'task': 'notifications.tasks.send_moderators_instant_digest_email',
+            'schedule': crontab(minute='*/5'),
+            'kwargs': {'dry_run': False},
+        },
+        '5-minute-moderator-emails': {
+            'task': 'notifications.tasks.send_moderators_instant_digest_email',
+            'schedule': crontab(minute='*/5'),
+            'kwargs': {'dry_run': False},
+        },
         'send_moderators_digest_email': {
             'task': 'notifications.tasks.send_moderators_digest_email',
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m