fix: email module should not assume that eap alert class is required

rodekruis · Jul 1, 2024 · 0415d96 · 0415d96
1 parent 07ff5ed
commit 0415d96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/services/API-service/src/api/event/event.service.ts b/services/API-service/src/api/event/event.service.ts
@@ -158,7 +158,10 @@ export class EventService {
             event.eventName,
           );
       }
-      if (disasterSettings.eapAlertClasses) {
+      if (disasterType === DisasterType.Floods) {
+        // REFACTOR: either make eapAlertClass a requirement across all hazard
+        // types or reimplement such that eapAlertClass is not needed in the
+        // backend (it is a VIEW of the DATA in the dashboard and email)
         event.disasterSpecificProperties = await this.getEventEapAlertClass(
           disasterSettings,
           event.triggerValue,

diff --git a/services/API-service/src/api/notification/email/email-template.service.ts b/services/API-service/src/api/notification/email/email-template.service.ts
@@ -340,7 +340,10 @@ export class EmailTemplateService {
             CountryTimeZoneMapping[emailContent.country.countryCodeISO3],
           triangleIcon: this.getTriangleIcon(event.eapAlertClass?.key),
           leadTime: event.firstLeadTime.replace('-', ' '),
-          disasterIssuedLabel: event.eapAlertClass.label,
+          disasterIssuedLabel:
+            event.eapAlertClass?.label ?? event.triggerStatusLabel,
+          // REFACTOR: avoid the logic fork in disasterIssuedLabel
+          // use the same label variable across all hazard types
           color: this.ibfColorToHex(event.eapAlertClass?.color),
           advisory: this.getAdvisoryHtml(
             event.triggerStatusLabel,

diff --git a/...ces/API-service/src/api/notification/notification-content/notification-content.service.ts b/...ces/API-service/src/api/notification/notification-content/notification-content.service.ts
@@ -192,7 +192,7 @@ export class NotificationContentService {
       disasterType,
       event.eventName || 'no-name',
     );
-    data.eapAlertClass = event.disasterSpecificProperties.eapAlertClass;
+    data.eapAlertClass = event.disasterSpecificProperties?.eapAlertClass;
     return data;
   }