feat(eap): Add partners contact emails and attachment in email notification

Author: sudip-khanal

assets

@@ -11,7 +11,11 @@
 from api.playwright import render_pdf_from_url
 from api.utils import generate_eap_export_url
 from eap.models import EAPRegistration, EAPType, FullEAP, SimplifiedEAP
-from eap.utils import get_coordinator_emails_by_region, get_eap_email_context
+from eap.utils import (
+    get_coordinator_emails_by_region,
+    get_eap_email_context,
+    get_eap_registration_email_context,
+)
 from main.utils import logger_context
 from notifications.notification import send_notification
 
@@ -113,7 +117,6 @@ def generate_export_eap_pdf(eap_registration_id, version):
     eap_registration = EAPRegistration.objects.get(id=eap_registration_id)
     user = User.objects.get(id=eap_registration.created_by_id)
     token = Token.objects.filter(user=user).last()
-
     url = generate_eap_export_url(
         registration_id=eap_registration_id,
         version=version,
@@ -181,7 +184,7 @@ def send_new_eap_registration_email(eap_registration_id: int):
             ]
         )
     )
-    email_context = get_eap_email_context(instance)
+    email_context = get_eap_registration_email_context(instance)
     email_subject = (
         f"[{instance.get_eap_type_display() if instance.get_eap_type_display() else 'EAP'} IN DEVELOPMENT] "
         f"{instance.country} {instance.disaster_type}"
@@ -206,12 +209,17 @@ def send_new_eap_submission_email(eap_registration_id: int):
     if not instance:
         return None
 
-    partner_contacts = (
-        instance.latest_simplified_eap.partner_contacts
-        if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP
-        else instance.latest_full_eap.partner_contacts
-    )
+    if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
+        latest_eap = instance.latest_simplified_eap
+    else:
+        latest_eap = instance.latest_full_eap
 
+    if not latest_eap.export_file:
+        generate_export_eap_pdf(
+            eap_registration_id=instance.id,
+            version=latest_eap.version,
+        )
+    partner_contacts = latest_eap.partner_contacts
     partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)
@@ -258,7 +266,9 @@ def send_feedback_email(eap_registration_id: int):
         latest_eap = instance.latest_simplified_eap
     else:
         latest_eap = instance.latest_full_eap
+
     ifrc_delegation_focal_point_email = latest_eap.ifrc_delegation_focal_point_email
+
     partner_contacts = latest_eap.partner_contacts
     partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
 
@@ -303,13 +313,19 @@ def send_eap_resubmission_email(eap_registration_id: int):
     instance = EAPRegistration.objects.filter(id=eap_registration_id).first()
     if not instance:
         return None
-
     if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
         latest_eap = instance.latest_simplified_eap
     else:
         latest_eap = instance.latest_full_eap
 
     latest_version = latest_eap.version
+
+    if not latest_eap.diff_file:
+        generate_export_diff_pdf(
+            eap_registration_id=instance.id,
+            version=latest_eap.version,
+        )
+
     partner_contacts = latest_eap.partner_contacts
     partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
 
@@ -464,12 +480,17 @@ def send_pending_pfa_email(eap_registration_id: int):
     if not instance:
         return None
 
-    partner_contacts = (
-        instance.latest_simplified_eap.partner_contacts
-        if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP
-        else instance.latest_full_eap.partner_contacts
-    )
+    if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
+        latest_eap = instance.latest_simplified_eap
+    else:
+        latest_eap = instance.latest_full_eap
+
+        if not latest_eap.summary_file:
+            generate_eap_summary_pdf(
+                eap_registration_id=instance.id,
+            )
 
+    partner_contacts = latest_eap.partner_contacts
     partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)

eap/tasks.py

@@ -1746,9 +1746,6 @@ def test_status_transitions_trigger_email(
 
         self.assert_200(response)
         eap_registration.refresh_from_db()
-        self.assertIsNotNone(
-            self.eap_registration.review_checklist_file,
-        )
         self.assertEqual(response.data["status"], EAPStatus.NS_ADDRESSING_COMMENTS)
         send_feedback_email.delay.assert_called_once_with(eap_registration.id)
         send_feedback_email.delay.reset_mock()
@@ -1807,9 +1804,6 @@ def test_status_transitions_trigger_email(
 
         self.assert_200(response)
         eap_registration.refresh_from_db()
-        self.assertIsNotNone(
-            self.eap_registration.review_checklist_file,
-        )
         self.assertEqual(response.data["status"], EAPStatus.NS_ADDRESSING_COMMENTS)
         send_feedback_email_for_resubmitted_eap.delay.assert_called_once_with(eap_registration.id)
         send_feedback_email_for_resubmitted_eap.delay.reset_mock()
@@ -1877,9 +1871,6 @@ def test_status_transitions_trigger_email(
 
         self.assert_200(response)
         eap_registration.refresh_from_db()
-        self.assertIsNotNone(
-            self.eap_registration.review_checklist_file,
-        )
         self.assertEqual(response.data["status"], EAPStatus.NS_ADDRESSING_COMMENTS)
         send_feedback_email_for_resubmitted_eap.delay.assert_called_once_with(eap_registration.id)
         send_feedback_email_for_resubmitted_eap.delay.reset_mock()

eap/test_views.py

@@ -47,6 +47,25 @@ def get_file_url(file_obj):
         return file_obj.file.url
 
 
+def get_eap_registration_email_context(instance):
+    from eap.serializers import EAPRegistrationSerializer
+
+    eap_registration_data = EAPRegistrationSerializer(instance).data
+    email_context = {
+        "registration_id": eap_registration_data["id"],
+        "eap_type_display": eap_registration_data["eap_type_display"],
+        "country_name": eap_registration_data["country_details"]["name"],
+        "national_society": eap_registration_data["national_society_details"]["society_name"],
+        "supporting_partners": eap_registration_data["partners_details"],
+        "disaster_type": eap_registration_data["disaster_type_details"]["name"],
+        "ns_contact_name": eap_registration_data["national_society_contact_name"],
+        "ns_contact_email": eap_registration_data["national_society_contact_email"],
+        "ns_contact_phone": eap_registration_data["national_society_contact_phone_number"],
+        "frontend_url": settings.GO_WEB_URL,
+    }
+    return email_context
+
+
 def get_eap_email_context(instance):
     from eap.serializers import EAPRegistrationSerializer
 

eap/utils.py

@@ -31,7 +31,11 @@
                         </a>
                     </li>
                 {% endif %}
-                    <li>Auto-generated Summary PDF</li>
+                <li>
+                    <a href="{{ summary_file }}">
+                       Auto-generated Summary PDF
+                    </a>
+                </li>
             </ul>
             <p style="margin-top:16px;">
                 Congratulations again and warm wishes,<br>

notifications/templates/email/eap/pending_pfa.html

@@ -83,14 +83,14 @@
 
             <p>Attachments:</p>
             <ul>
-            <li>Revised EAP PDF with modifications in tracked changes</li>
-            {% if budget_file %}
+            <li> <a href="{{ diff_file }}">
+                        Revised EAP PDF
+                    </a></li>
                 <li>
                     <a href="{{ budget_file }}">
                         Revised EAP budget
                     </a>
                 </li>
-            {% endif %}
             {% if updated_checklist_file %}
                 <li>
                     <a href="{{ updated_checklist_file }}">

notifications/templates/email/eap/re-submission.html

@@ -58,21 +58,16 @@
             </p>
             <strong>Attached documents:</strong><br>
             <ul>
-                {% if export_file %}
-                    <li>
-                        <a href="{{ export_file }}">
+                <li>
+                    <a href="{{ export_file }}">
                             Export PDF
                         </a>
                     </li>
-                {% endif %}
-
-                {% if budget_file %}
                     <li>
                         <a href="{{ budget_file }}">
                             Budget file
                         </a>
                     </li>
-                {% endif %}
             </ul>
             <!-- Signature -->
             <p style="margin-top:16px;">