Improve Existing email template in Moderator & Subscriber (#182)

* Update EmailTemplate.cs Fix Typo * Update SendSubscriberEmail.cs Fix Typo * Add Location in Moderator Email Template Add location in Moderator Email Template * Update Email Subject Update email subject
orcasound · Sep 17, 2024 · d4329fa · d4329fa
1 parent 6cb9573
commit d4329fa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/NotificationSystem/SendModeratorEmail.cs b/NotificationSystem/SendModeratorEmail.cs
@@ -35,13 +35,15 @@ public static async Task Run(
 
  var newDocumentCreated = false;
  DateTime? documentTimeStamp = null;
+ string location = null;
 
  foreach (var document in input)
  {
  if (!document.GetPropertyValue<bool>("reviewed"))
  {
  newDocumentCreated = true;
  documentTimeStamp = document.GetPropertyValue<DateTime>("timestamp");
+ location = document.GetPropertyValue<string>("location.name");
  break;
  }
  }
@@ -53,13 +55,14 @@ public static async Task Run(
  }
 
  // TODO: make better email
- string body = EmailTemplate.GetModeratorEmailBody(documentTimeStamp);
+ string body = EmailTemplate.GetModeratorEmailBody(documentTimeStamp, location);
 
  log.LogInformation("Retrieving email list and sending notifications");
  foreach (var emailEntity in EmailHelpers.GetEmailEntities(cloudTable, "Moderator"))
  {
+ string emailSubject = string.Format("OrcaHello Candidate at location {0}", location);
  var email = EmailHelpers.CreateEmail(Environment.GetEnvironmentVariable("SenderEmail"),
- emailEntity.Email, "Please validate new OrcaHello detection", body);
+ emailEntity.Email, emailSubject, body);
  await messageCollector.AddAsync(email);
  }
  }

diff --git a/NotificationSystem/SendSubscriberEmail.cs b/NotificationSystem/SendSubscriberEmail.cs
@@ -64,7 +64,7 @@ public static async Task<string> CreateBody(CloudQueue cloudQueue)
  await cloudQueue.DeleteMessageAsync(message);
  }
 
- return EmailTemplate.GeSubscriberEmailBody(messagesJson);
+ return EmailTemplate.GetSubscriberEmailBody(messagesJson);
  }
  }
 }
diff --git a/NotificationSystem/Template/EmailTemplate.cs b/NotificationSystem/Template/EmailTemplate.cs
@@ -8,12 +8,12 @@ namespace NotificationSystem.Template
  // TODO: we should move all html out of code and maybe use a preset email template for better design. 
  public static class EmailTemplate
  {
- public static string GetModeratorEmailBody(DateTime? timestamp)
+ public static string GetModeratorEmailBody(DateTime? timestamp, string location)
  {
- return $"<html><head><style>{GetCSS()}</style></head><body>{GetModeratorEmailHtml(timestamp)}</body></html>";
+ return $"<html><head><style>{GetCSS()}</style></head><body>{GetModeratorEmailHtml(timestamp, location)}</body></html>";
  }
 
- public static string GeSubscriberEmailBody(List<JObject> messages)
+ public static string GetSubscriberEmailBody(List<JObject> messages)
  {
  return $"<html><head><style>{GetCSS()}</style></head><body>{GetSubscriberEmailHtml(messages)}</body></html>";
  }
@@ -26,7 +26,7 @@ private static string GetSubscriberEmailHtml(List<JObject> messages)
  <body>
  <div class='card'>
  <h1>
- Southern Resident Killer Whale Spotted
+ Southern Resident Killer Whale Detected
  </h1>
  <p>
  Dear subscriber, a Southern Resident Killer Whale was most recently detected at around {timeString} PDT. 
@@ -47,7 +47,7 @@ Please be mindful of their presence when travelling in the areas below.
  </p>
  </div>
  <footer>
- In partnership with Microsoft AI 4 Earth, Orca Sound and Orca Conservancy.
+ In partnership with Microsoft AI 4 Earth, Orcasound and Orca Conservancy.
  </footer>
  </body>
  ";
@@ -101,21 +101,21 @@ private static string GetMapUri(string locationName)
  }
  }
 
- private static string GetModeratorEmailHtml(DateTime? timestamp)
+ private static string GetModeratorEmailHtml(DateTime? timestamp, string location)
  {
  string timeString = GetPDTTimestring(timestamp);
 
  return $@"
  <body>
  <div class='card'>
  <h1>
- Orca Call Identified
+ Orca Call Candidate
  </h1>
  <p>
- Dear moderator, a potential Southern Resident Killer Whale call was detected on {timeString} PDT. 
+ Dear moderator, a potential Southern Resident Killer Whale call was detected on {timeString} PDT at {location} location. 
  </p>
  <p>
- This is a request for your moderation to confirm whether the sound belongs to a Southern Resident Killer Whale on the portal below.
+ This is a request for your moderation to confirm whether the sound was produced by Southern Resident Killer Whale on the portal below.
  </p>
  <hr/>
  <h2>
@@ -131,7 +131,7 @@ Go to portal
  <footer>
  <br>
  <center>
- In partnership with Microsoft AI 4 Earth, Orca Sound and Orca Conservancy.
+ In partnership with Microsoft AI 4 Earth, Orcasound and Orca Conservancy.
  </center>
  </footer>
  </body>