ref(slack): Indicate recipient in referrer (#29235)

* ref(slack): Indicate recipient in referrer

src/sentry/integrations/slack/utils/notifications.py

@@ -88,15 +88,19 @@ def send_confirmation(
         )
 
 
-def get_referrer_qstring(notification: BaseNotification) -> str:
-    return "?referrer=" + re.sub("Notification$", "Slack", notification.__class__.__name__)
+def get_referrer_qstring(notification: BaseNotification, recipient: Union["Team", "User"]) -> str:
+    return (
+        "?referrer="
+        + re.sub("Notification$", "Slack", notification.__class__.__name__)
+        + str(recipient.__class__.__name__)
+    )
 
 
-def get_settings_url(notification: BaseNotification) -> str:
+def get_settings_url(notification: BaseNotification, recipient: Union["Team", "User"]) -> str:
     url_str = "/settings/account/notifications/"
     if notification.fine_tuning_key:
         url_str += f"{notification.fine_tuning_key}/"
-    return str(urljoin(absolute_uri(url_str), get_referrer_qstring(notification)))
+    return str(urljoin(absolute_uri(url_str), get_referrer_qstring(notification, recipient)))
 
 
 def build_notification_footer(
@@ -105,9 +109,11 @@ def build_notification_footer(
     if isinstance(recipient, Team):
         team = Team.objects.get(id=recipient.id)
         url_str = f"/settings/{notification.organization.slug}/teams/{team.slug}/notifications/"
-        settings_url = str(urljoin(absolute_uri(url_str), get_referrer_qstring(notification)))
+        settings_url = str(
+            urljoin(absolute_uri(url_str), get_referrer_qstring(notification, recipient))
+        )
     else:
-        settings_url = get_settings_url(notification)
+        settings_url = get_settings_url(notification, recipient)
 
     if isinstance(notification, ReleaseActivityNotification):
         # no environment related to a deploy

tests/sentry/integrations/slack/notifications/test_assigned.py

@@ -142,5 +142,5 @@ def test_assignment(self, mock_func):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=AssignedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=AssignedActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_deploy.py

@@ -56,5 +56,5 @@ def test_deploy(self, mock_func):
         )
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/deploy/?referrer=ReleaseActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/deploy/?referrer=ReleaseActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_issue_alert.py

@@ -68,7 +68,7 @@ def test_issue_alert_user(self, mock_func):
         assert attachment["title"] == "Hello world"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -105,7 +105,7 @@ def test_issue_alert_issue_owners(self, mock_func):
         assert attachment["title"] == "Hello world"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -195,7 +195,7 @@ def test_issue_alert_team_issue_owners(self, mock_func):
         assert attachments[0]["title"] == "Hello world"
         assert (
             attachments[0]["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlackTeam|Notification Settings>"
         )
 
     @responses.activate
@@ -271,7 +271,7 @@ def test_issue_alert_team(self, mock_func):
         assert attachments[0]["title"] == "Hello world"
         assert (
             attachments[0]["footer"]
-            == f"{self.project.slug} | <http://example.com/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://example.com/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlackTeam|Notification Settings>"
         )
 
     @responses.activate
@@ -351,7 +351,7 @@ def test_issue_alert_team_new_project(self, mock_func):
         assert attachments[0]["title"] == "Hello world"
         assert (
             attachments[0]["footer"]
-            == f"{project2.slug} | <http://example.com/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{project2.slug} | <http://example.com/settings/{self.organization.slug}/teams/{self.team.slug}/notifications/?referrer=AlertRuleSlackTeam|Notification Settings>"
         )
 
     @responses.activate
@@ -453,7 +453,7 @@ def test_issue_alert_team_fallback(self, mock_func):
         assert attachments[0]["title"] == "Hello world"
         assert (
             attachments[0]["footer"]
-            == f"{self.project.slug} | <http://example.com/settings/account/notifications/alerts/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://example.com/settings/account/notifications/alerts/?referrer=AlertRuleSlackUser|Notification Settings>"
         )
 
         # check that user2 got a notification as well
@@ -465,7 +465,7 @@ def test_issue_alert_team_fallback(self, mock_func):
         assert attachments[0]["title"] == "Hello world"
         assert (
             attachments[0]["footer"]
-            == f"{self.project.slug} | <http://example.com/settings/account/notifications/alerts/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://example.com/settings/account/notifications/alerts/?referrer=AlertRuleSlackUser|Notification Settings>"
         )
 
     @responses.activate

tests/sentry/integrations/slack/notifications/test_new_processing_issues.py

@@ -62,5 +62,5 @@ def test_new_processing_issue(self, mock_func):
         )
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NewProcessingIssuesActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NewProcessingIssuesActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_note.py

@@ -38,5 +38,5 @@ def test_note(self, mock_func):
         assert attachment["text"] == notification.activity.data["text"]
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NoteActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NoteActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_regression.py

@@ -31,5 +31,5 @@ def test_regression(self, mock_func):
         assert text == "Issue marked as regression"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=RegressionActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=RegressionActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_resolved.py

@@ -34,5 +34,5 @@ def test_resolved(self, mock_func):
         )
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_resolved_in_release.py

@@ -32,5 +32,5 @@ def test_resolved_in_release(self, mock_func):
         assert text == f"Issue marked as resolved in {release_name} by {self.name}"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedInReleaseActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedInReleaseActivitySlackUser|Notification Settings>"
         )

tests/sentry/integrations/slack/notifications/test_unassigned.py

@@ -32,5 +32,5 @@ def test_unassignment(self, mock_func):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=UnassignedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=UnassignedActivitySlackUser|Notification Settings>"
         )

tests/sentry/notifications/test_notifications.py

@@ -124,7 +124,7 @@ def test_sends_note_notification(self):
         assert attachment["text"] == "blah blah"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NoteActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=NoteActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -151,7 +151,7 @@ def test_sends_assignment_notification(self):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=AssignedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=AssignedActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -180,7 +180,7 @@ def test_sends_unassignment_notification(self):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=UnassignedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=UnassignedActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -209,7 +209,7 @@ def test_sends_resolution_notification(self):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -249,7 +249,7 @@ def test_sends_deployment_notification(self):
         )
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/deploy/?referrer=ReleaseActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/deploy/?referrer=ReleaseActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -288,7 +288,7 @@ def test_sends_regression_notification(self):
         assert text == "Issue marked as regression"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=RegressionActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=RegressionActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -323,7 +323,7 @@ def test_sends_resolved_in_release_notification(self):
         assert attachment["title"] == self.group.title
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedInReleaseActivitySlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/workflow/?referrer=ResolvedInReleaseActivitySlackUser|Notification Settings>"
         )
 
     @responses.activate
@@ -383,5 +383,5 @@ def test_sends_issue_notification(self):
         assert attachment["title"] == "Hello world"
         assert (
             attachment["footer"]
-            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlack|Notification Settings>"
+            == f"{self.project.slug} | <http://testserver/settings/account/notifications/alerts/?referrer=AlertRuleSlackUser|Notification Settings>"
         )