From e656e3feb643ba380f1e760822e4697d566a1f0a Mon Sep 17 00:00:00 2001
From: Carina Antunes <carina.oliveira.antunes@cern.ch>
Date: Tue, 8 Jun 2021 16:24:56 +0000
Subject: [PATCH] emails: fix priority icon

---
 .../email/templates/notification_body.html    |  2 +-
 .../templates/daily_notification.html         |  2 +-
 scripts/docker-send-email.py                  | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/notifications_consumer/processors/email/templates/notification_body.html b/notifications_consumer/processors/email/templates/notification_body.html
index 443154e..4369574 100644
--- a/notifications_consumer/processors/email/templates/notification_body.html
+++ b/notifications_consumer/processors/email/templates/notification_body.html
@@ -3,7 +3,7 @@
     <p>
       <a style="text-decoration:none" href="{{ link }}">
         <b>
-          {% if priority == notification_priority.IMPORTANT %}
+          {% if priority and priority.upper() == notification_priority.IMPORTANT %}
             <span style="color: #FF5144; font-size: 1.5em; vertical-align: middle;">
               &#9888;
             </span>
diff --git a/notifications_consumer/processors/email_daily/templates/daily_notification.html b/notifications_consumer/processors/email_daily/templates/daily_notification.html
index 1470cff..a007e0e 100644
--- a/notifications_consumer/processors/email_daily/templates/daily_notification.html
+++ b/notifications_consumer/processors/email_daily/templates/daily_notification.html
@@ -24,7 +24,7 @@
                 {% for notification in notifications[:3] %}
                 <tr>
                     <td style="padding:10px">
-                        <p style="line-height: 145%;"><b>{% if notification.priority ==
+                        <p style="line-height: 145%;"><b>{% if notification.priority and notification.priority.upper() ==
                                 notification_priority.IMPORTANT %} <span
                                     style="color: #FF5144; font-size: 1.5em; vertical-align: middle;">
                                     &#9888;</span> {% endif %}
diff --git a/scripts/docker-send-email.py b/scripts/docker-send-email.py
index 2e8c557..9690668 100644
--- a/scripts/docker-send-email.py
+++ b/scripts/docker-send-email.py
@@ -6,14 +6,15 @@ import stomp
 conn = stomp.Connection([("activemq", 61613)])
 conn.connect("admin", "admin", wait=True)
 message_body = r"""{
-"channel_name":"My Channel",
-"channel_id":"123",
-"message_body":"<p>Dear subscribers,</p>\n\n<p>This week news follows.&nbsp;</p>\n\n<p>&nbsp;</p>\n\n<p><strong>Topic 1</strong></p>\n\n<ul>\n\t<li>bla&nbsp;</li>\n\t<li>bla</li>\n\t<li>bla</li>\n</ul>\n\n<p>&nbsp;</p>\n\n<p><strong>Topic 2</strong></p>\n\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n\n<p>&nbsp;</p>\n\n<p>See you next week,</p>\n\n<p>Myself.</p>\n",
-"summary":"This week news!",
-"email":"user@cern.ch",
-"created_at":"2021-02-26T13:59:40.754Z",
-"notification_id":"BD19EEA4-9DCA-48D9-A577-5DE9D2BF374A",
-"link":"http://toto.cern.ch"
-}"""
+"channel_name": "My Channel",
+"channel_id": "123",
+"message_body": "<p>Dear subscribers,</p>\n\n<p>This week news follows.&nbsp;</p>\n\n<p>&nbsp;</p>\n\n<p><strong>Topic 1</strong></p>\n\n<ul>\n\t<li>bla&nbsp;</li>\n\t<li>bla</li>\n\t<li>bla</li>\n</ul>\n\n<p>&nbsp;</p>\n\n<p><strong>Topic 2</strong></p>\n\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n\n<p>&nbsp;</p>\n\n<p>See you next week,</p>\n\n<p>Myself.</p>\n",
+"summary": "This week news!",
+"email": "user@cern.ch",
+"created_at": "2021-02-26T13:59:40.754Z",
+"notification_id": "BD19EEA4-9DCA-48D9-A577-5DE9D2BF374A",
+"link": "http://toto.cern.ch",
+"priority": "important"
+} """
 conn.send(body=message_body, destination="/queue/np.email", headers={"persistent": "true"})
 conn.disconnect()
-- 
GitLab