Merge branch 'master' into bugfix/search-combobox-event-emit

Netflix · Oct 16, 2023 · abdefcb · abdefcb
2 parents 918db50 + 2ed3927
commit abdefcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/dispatch/case/messaging.py b/src/dispatch/case/messaging.py
@@ -13,6 +13,7 @@
     CASE_TRIAGE_REMINDER,
     MessageType,
 )
+from dispatch.config import DISPATCH_UI_URL
 from dispatch.plugin import service as plugin_service
 
 
@@ -36,7 +37,7 @@ def send_case_close_reminder(case: Case, db_session: SessionLocal):
     items = [
         {
             "name": case.name,
-            "ticket_weblink": case.ticket.weblink,
+            "dispatch_ui_case_url": f"{DISPATCH_UI_URL}/{case.project.organization.name}/cases/{case.name}",  # noqa
             "title": case.title,
             "status": case.status,
         }
@@ -70,9 +71,9 @@ def send_case_triage_reminder(case: Case, db_session: SessionLocal):
     items = [
         {
             "name": case.name,
-            "ticket_weblink": case.ticket.weblink,
             "title": case.title,
             "status": case.status,
+            "dispatch_ui_case_url": f"{DISPATCH_UI_URL}/{case.project.organization.name}/cases/{case.name}",  # noqa
         }
     ]
 

diff --git a/src/dispatch/messaging/strings.py b/src/dispatch/messaging/strings.py
@@ -627,7 +627,7 @@ class MessageType(DispatchEnum):
 CASE_CLOSE_REMINDER = [
     {
         "title": "{{name}} Case - Close Reminder",
-        "title_link": "{{ticket_weblink}}",
+        "title_link": "{{dispatch_ui_case_url}}",
         "text": CASE_CLOSE_REMINDER_DESCRIPTION,
     },
     CASE_TITLE,
@@ -637,7 +637,7 @@ class MessageType(DispatchEnum):
 CASE_TRIAGE_REMINDER = [
     {
         "title": "{{name}} Case - Triage Reminder",
-        "title_link": "{{ticket_weblink}}",
+        "title_link": "{{dispatch_ui_case_url}}",
         "text": CASE_TRIAGE_REMINDER_DESCRIPTION,
     },
     CASE_TITLE,