[chore] New changes

Author: Dhanus3133

openwisp_notifications/handlers.py

@@ -162,6 +162,36 @@ def notify_handler(**kwargs):
     return notification_list
 
 
+def send_single_email(instance):
+    try:
+        subject = instance.email_subject
+    except NotificationRenderException:
+        # Do not send email if notification is malformed.
+        return
+    url = instance.data.get('url', '') if instance.data else None
+    description = instance.message
+    if url:
+        target_url = url
+    elif instance.target:
+        target_url = instance.redirect_view_url
+    else:
+        target_url = None
+    if target_url:
+        description += _('\n\nFor more information see %(target_url)s.') % {
+            'target_url': target_url
+        }
+    send_email(
+        subject,
+        description,
+        instance.message,
+        recipients=[instance.recipient.email],
+        extra_context={
+            'call_to_action_url': target_url,
+            'call_to_action_text': _('Find out more'),
+        },
+    )
+
+
 @receiver(post_save, sender=Notification, dispatch_uid='send_email_notification')
 def send_email_notification(sender, instance, created, **kwargs):
     # Abort if a new notification is not created
@@ -190,23 +220,7 @@ def send_email_notification(sender, instance, created, **kwargs):
     if not (email_preference and instance.recipient.email and email_verified):
         return
 
-    try:
-        subject = instance.email_subject
-    except NotificationRenderException:
-        # Do not send email if notification is malformed.
-        return
-    url = instance.data.get('url', '') if instance.data else None
-    description = instance.message
-    if url:
-        target_url = url
-    elif instance.target:
-        target_url = instance.redirect_view_url
-    else:
-        target_url = None
-    if target_url:
-        description += _('\n\nFor more information see %(target_url)s.') % {
-            'target_url': target_url
-        }
+    send_single_email(instance)
 
     recipient_id = instance.recipient.id
     cache_key = f'email_batch_{recipient_id}'
@@ -232,16 +246,9 @@ def send_email_notification(sender, instance, created, **kwargs):
 
     cache_data['last_email_sent_time'] = timezone.now()
     cache.set(cache_key, cache_data, timeout=EMAIL_BATCH_INTERVAL)
-    send_email(
-        subject,
-        description,
-        instance.message,
-        recipients=[instance.recipient.email],
-        extra_context={
-            'call_to_action_url': target_url,
-            'call_to_action_text': _('Find out more'),
-        },
-    )
+
+    send_single_email(instance)
+
     # flag as emailed
     instance.emailed = True
     # bulk_update is used to prevent emitting post_save signal

openwisp_notifications/tasks.py

@@ -3,13 +3,15 @@
 from celery import shared_task
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
+from django.contrib.sites.models import Site
 from django.core.cache import cache
 from django.db.models import Q
 from django.db.utils import OperationalError
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.html import strip_tags
 
+from openwisp_notifications import handlers
 from openwisp_notifications import settings as app_settings
 from openwisp_notifications import types
 from openwisp_notifications.swapper import load_model, swapper_load_model
@@ -222,36 +224,56 @@ def batch_email_notification(email_id):
         return
 
     unsent_notifications = Notification.objects.filter(id__in=ids)
-    alerts = []
-
-    for notification in unsent_notifications:
-        url = notification.data.get('url', '') if notification.data else None
-        if url:
-            target_url = url
-        elif notification.target:
-            target_url = notification.redirect_view_url
-        else:
-            target_url = None
-        alerts.append(
-            {
-                'level': notification.level,
-                'message': notification.message,
-                'description': notification.message,
-                'timestamp': notification.timestamp,
-                'url': target_url,
+    notifications_count = unsent_notifications.count()
+    current_site = Site.objects.get_current()
+
+    if notifications_count == 1:
+        instance = unsent_notifications.first()
+        handlers.send_single_email(instance)
+    else:
+        alerts = []
+        for notification in unsent_notifications:
+            url = notification.data.get('url', '') if notification.data else None
+            if url:
+                target_url = url
+            elif notification.target:
+                target_url = notification.redirect_view_url
+            else:
+                target_url = None
+
+            description = notification.message if notifications_count <= 5 else None
+            alerts.append(
+                {
+                    'level': notification.level,
+                    'message': notification.message,
+                    'description': description,
+                    'timestamp': notification.timestamp,
+                    'url': target_url,
+                }
+            )
+
+        context = {
+            'alerts': alerts,
+            'notifications_count': notifications_count,
+            'site_name': current_site.name,
+            'site_domain': current_site.domain,
+        }
+        html_content = render_to_string('emails/batch_email.html', context)
+        plain_text_content = strip_tags(html_content)
+
+        extra_context = {}
+        if notifications_count > 5:
+            extra_context = {
+                'call_to_action_url': f"https://{current_site.domain}/admin",
+                'call_to_action_text': 'View all Notifications',
             }
-        )
 
-    context = {
-        'alerts': alerts,
-    }
-    html_content = render_to_string('emails/batch_email.html', context)
-    plain_text_content = strip_tags(html_content)
-    send_email(
-        subject='Summary of Notifications',
-        body_text=plain_text_content,
-        body_html=html_content,
-        recipients=[email_id],
-    )
+        send_email(
+            subject=f'Summary of {notifications_count} Notifications',
+            body_text=plain_text_content,
+            body_html=html_content,
+            recipients=[email_id],
+            extra_context=extra_context,
+        )
     unsent_notifications.update(emailed=True)
     Notification.objects.bulk_update(unsent_notifications, ['emailed'])