Merge pull request #1540 from IFRCGo/feature/dref-emails-1538

Add notification sending to DREF creation/update

Author: szabozoltan69

deployments/snapshots/snap_tests.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.15 on 2022-09-29 07:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0038_auto_20220915_1520'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dref',
+            name='field_report',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='field_report_dref', to='api.fieldreport', verbose_name='field report'),
+        ),
+        migrations.RenameField(
+            model_name='drefoperationalupdate',
+            old_name='has_forcasted_event_materialize',
+            new_name='has_forecasted_event_materialize',
+        ),
+        migrations.AlterField(
+            model_name='drefoperationalupdate',
+            name='has_forecasted_event_materialize',
+            field=models.BooleanField(blank=True, null=True, verbose_name='Has Forecasted Event Materialize'),
+        ),
+    ]

dref/migrations/0039_alter_dref_field_report.py

@@ -198,7 +198,6 @@ def get_image_map(title, request):
             PlannedIntervention.Title.MULTI_PURPOSE_CASH: 'cash.png',
             PlannedIntervention.Title.ENVIRONMENTAL_SUSTAINABILITY: 'environment.png',
             PlannedIntervention.Title.COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY: 'participation_team.png',
-            PlannedIntervention.Title.MULTI_PURPOSE_CASH: 'cash.png'
         }
         return request.build_absolute_uri(static(os.path.join('images/dref', title_static_map[title])))
 
@@ -243,7 +242,7 @@ class Status(models.IntegerChoices):
     )
     field_report = models.ForeignKey(
         FieldReport, verbose_name=_('field report'),
-        on_delete=models.SET_NULL, null=True,
+        on_delete=models.SET_NULL, null=True, blank=True,
         related_name='field_report_dref'
     )
     title = models.CharField(verbose_name=_('title'), max_length=255)
@@ -1076,8 +1075,8 @@ class DrefOperationalUpdate(models.Model):
         blank=True, null=True,
         verbose_name=_('Risk Security Concern')
     )
-    has_forcasted_event_materialize = models.BooleanField(
-        verbose_name=_('Has Forcasted Event Materialize'),
+    has_forecasted_event_materialize = models.BooleanField(
+        verbose_name=_('Has Forecasted Event Materialize'),
         null=True, blank=True
     )
     anticipatory_to_response = models.TextField(

dref/models.py

@@ -2,7 +2,7 @@
 import datetime
 
 from django.utils.translation import gettext
-from django.db import models
+from django.db import models, transaction
 
 from rest_framework import serializers
 
@@ -34,6 +34,8 @@
 from dref.imminent_utils import extract_imminent_file
 from dref.assessment_utils import extract_assessment_file
 
+from .tasks import send_dref_email
+
 
 class RiskSecuritySerializer(ModelSerializer):
     class Meta:
@@ -160,7 +162,7 @@ def create(self, validated_data):
             created_by = self.context['request'].user
             dref = extract_assessment_file(file, created_by)
             if not dref:
-                raise serializers.ValidationError(ugettext('Can\'t dref from supplied data'))
+                raise serializers.ValidationError(gettext('Can\'t dref from supplied data'))
             validated_data['dref'] = dref
         return super().create(validated_data)
 
@@ -422,7 +424,11 @@ def create(self, validated_data):
             dref_assessment_report = super().create(validated_data)
             dref_assessment_report.needs_identified.clear()
             return dref_assessment_report
-        return super().create(validated_data)
+        dref = super().create(validated_data)
+        transaction.on_commit(
+            lambda: send_dref_email.delay(dref.id)
+        )
+        return dref
 
     def update(self, instance, validated_data):
         validated_data['modified_by'] = self.context['request'].user
@@ -452,7 +458,11 @@ def update(self, instance, validated_data):
             dref_assessment_report = super().update(instance, validated_data)
             dref_assessment_report.needs_identified.clear()
             return dref_assessment_report
-        return super().update(instance, validated_data)
+        dref = super().update(instance, validated_data)
+        transaction.on_commit(
+            lambda: send_dref_email.delay(dref.id)
+        )
+        return dref
 
 
 class DrefOperationalUpdateSerializer(

dref/serializers.py

@@ -0,0 +1,20 @@
+from celery import shared_task
+from django.template.loader import render_to_string
+from notifications.notification import send_notification
+from .models import Dref
+from .utils import get_email_context
+
+
+@shared_task
+def send_dref_email(dref_id):
+    instance = Dref.objects.get(id=dref_id)
+    email_context = get_email_context(instance)
+    users_emails = [t.email for t in instance.users.iterator()]
+    if users_emails:
+        send_notification(
+            f'Flash Update: {instance.title}',
+            users_emails,
+            render_to_string('email/dref/dref.html', email_context),
+            'New DREF'
+        )
+    return email_context

dref/tasks.py

@@ -509,3 +509,13 @@ def f(r, c, i=0, as_list=False):
     dref.national_society_actions.add(*national_societies)
     dref.risk_security.add(*risk_security_list)
     return dref
+
+
+def get_email_context(instance):
+    from dref.serializers import DrefSerializer
+
+    dref_data = DrefSerializer(instance).data
+    email_context = {
+        'title': dref_data['title'],
+    }
+    return email_context

dref/utils.py

@@ -0,0 +1,11 @@
+{% include "email/dref/head.html" %}
+
+   <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#ffffff">
+     <tr>
+       <td align="center" class="pb-30" style="padding-bottom:30px;">
+         You have been added to a DREF Application "DREF Tittle" (with an hyperlink to the application, http://localhost:3000/dref-application/X/edit/
+       </td>
+     </tr>
+   </table>
+
+{% include "design/foot1.html" %}