Fixed notification template (#6721)

* Fixed notification template * Made if-clause equal to append Like Slack and email notification * Add custom_body attribute to discord test * Add missing attribute
getredash · Jan 30, 2024 · d245ff7 · d245ff7
1 parent 97db492
commit d245ff7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/redash/destinations/discord.py b/redash/destinations/discord.py
@@ -42,8 +42,8 @@ def notify(self, alert, query, user, new_state, app, host, metadata, options):
                 "inline": True,
             },
         ]
-        if alert.options.get("custom_body"):
-            fields.append({"name": "Description", "value": alert.options["custom_body"]})
+        if alert.custom_body:
+            fields.append({"name": "Description", "value": alert.custom_body})
         if new_state == Alert.TRIGGERED_STATE:
             if alert.options.get("custom_subject"):
                 text = alert.options["custom_subject"]

diff --git a/tests/handlers/test_destinations.py b/tests/handlers/test_destinations.py
@@ -97,13 +97,14 @@ def test_post(self):
 
 
 def test_discord_notify_calls_requests_post():
-    alert = mock.Mock(spec_set=["id", "name", "options", "render_template"])
+    alert = mock.Mock(spec_set=["id", "name", "options", "custom_body", "render_template"])
     alert.id = 1
     alert.name = "Test Alert"
     alert.options = {
         "custom_subject": "Test custom subject",
         "custom_body": "Test custom body",
     }
+    alert.custom_body = alert.options["custom_body"]
     alert.render_template = mock.Mock(return_value={"Rendered": "template"})
     query = mock.Mock()
     query.id = 1