link PRs to issues in weekly report

Author: amy-chen23

src/sentry/tasks/summaries/weekly_reports.py

@@ -22,9 +22,11 @@
 from sentry import analytics, features
 from sentry.analytics.events.weekly_report import WeeklyReportSent
 from sentry.models.group import Group, GroupStatus
-from sentry.models.grouphistory import GroupHistoryStatus
+from sentry.models.grouphistory import GroupHistory, GroupHistoryStatus
+from sentry.models.grouplink import GroupLink
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.organizationmember import OrganizationMember
+from sentry.models.pullrequest import PullRequest
 from sentry.notifications.services import notifications_service
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
@@ -528,6 +530,33 @@ def get_group_status_badge(group: Group) -> tuple[str, str, str]:
     return ("Ongoing", "#DAD9DE", "#DAD9DE")
 
 
+def get_group_pull_request_url(group: Group) -> str | None:
+    group_link = (
+        GroupLink.objects.filter(
+            group_id=group.id,
+            project_id=group.project_id,
+            linked_type=GroupLink.LinkedType.pull_request,
+        )
+        .order_by("-datetime")
+        .first()
+    )
+    if group_link is None:
+        return None
+
+    pull_request = PullRequest.objects.filter(id=group_link.linked_id).first()
+    if pull_request is None:
+        return None
+
+    return pull_request.get_external_url()
+
+
+def get_group_history_status(group: Group, status: int) -> tuple[str, str | None]:
+    if status == GroupHistoryStatus.SET_RESOLVED_IN_PULL_REQUEST:
+        return "Resolved in PR", get_group_pull_request_url(group)
+
+    return str(dict(GroupHistory._meta.get_field("status").choices).get(status, status)), None
+
+
 def get_group_display(group: Group) -> dict[str, str]:
     metadata = group.get_event_metadata()
     event_type = group.get_event_type()
@@ -722,6 +751,7 @@ def all_key_errors():
                         "title": display["title"],
                         "message": display["message"],
                         "status": "Unresolved",
+                        "status_url": None,
                         "status_color": (group_status_to_color[GroupHistoryStatus.NEW]),
                         "group_substatus": substatus,
                         "group_substatus_color": substatus_color,
@@ -760,22 +790,28 @@ def all_key_performance_issues():
                         substatus_color,
                         substatus_border_color,
                     ) = get_group_status_badge(group)
+                    status, status_url = (
+                        get_group_history_status(group, group_history.status)
+                        if group_history
+                        else ("Unresolved", None)
+                    )
                     yield {
                         "count": count,
                         "group": group,
                         "title": display["title"],
                         "message": display["message"],
-                        "status": (
-                            group_history.get_status_display() if group_history else "Unresolved"
-                        ),
+                        "status": status,
+                        "status_url": status_url,
                         "status_color": (
                             group_status_to_color[group_history.status]
                             if group_history
                             else group_status_to_color[GroupHistoryStatus.NEW]
                         ),
-                        "group_substatus": substatus,
-                        "group_substatus_color": substatus_color,
-                        "group_substatus_border_color": substatus_border_color,
+                        "group_substatus": None if group_history else substatus,
+                        "group_substatus_color": None if group_history else substatus_color,
+                        "group_substatus_border_color": (
+                            None if group_history else substatus_border_color
+                        ),
                     }
 
         return heapq.nlargest(3, all_key_performance_issues(), lambda d: d["count"])

src/sentry/templates/sentry/emails/reports/body.html

@@ -444,9 +444,13 @@ <h4>Issues with the most errors</h4>
         <div style="font-size: 12px; color: #80708F;">{{a.group.project.name}}</div>
       </div>
       {% if a.group_substatus and a.group_substatus_color %}
-      <span style="background-color: {{a.group_substatus_color}}; border: 1px solid {{a.group_substatus_border_color}}; border-radius: 8px; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%;">{{a.group_substatus}}</span>
+      <span style="background-color: {{a.group_substatus_color}}; border: 1px solid {{a.group_substatus_border_color}}; border-radius: 8px; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; text-align: center; width: 96px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{a.group_substatus}}</span>
       {% else %}
-      <span style="background-color: {{a.status_color}}; border-radius: 8px; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%;">{{a.status}}</span>
+        {% if a.status_url %}
+        <a href="{{a.status_url}}" style="background-color: {{a.status_color}}; border-radius: 8px; color: #2f2936; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; line-height: 1.2; text-align: center; text-decoration: none; width: 96px; white-space: normal; overflow-wrap: break-word;">{{a.status}}</a>
+        {% else %}
+        <span style="background-color: {{a.status_color}}; border-radius: 8px; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; line-height: 1.2; text-align: center; width: 96px; white-space: normal; overflow-wrap: break-word;">{{a.status}}</span>
+        {% endif %}
       {% endif %}
       </div>
     {% endfor %}
@@ -467,9 +471,13 @@ <h4>Most frequent performance issues</h4>
         <div style="font-size: 12px; color: #80708F;">{{a.group.project.name}}</div>
       </div>
       {% if a.group_substatus and a.group_substatus_color %}
-      <span style="background-color: {{a.group_substatus_color}}; border: 1px solid {{a.group_substatus_border_color}}; border-radius: 8px; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%;">{{a.group_substatus}}</span>
+      <span style="background-color: {{a.group_substatus_color}}; border: 1px solid {{a.group_substatus_border_color}}; border-radius: 8px; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; text-align: center; width: 96px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{a.group_substatus}}</span>
       {% else %}
-      <span style="background-color: {{a.status_color}}; border-radius: 8px; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%;">{{a.status}}</span>
+        {% if a.status_url %}
+        <a href="{{a.status_url}}" style="background-color: {{a.status_color}}; border-radius: 8px; color: #2f2936; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; line-height: 1.2; text-align: center; text-decoration: none; width: 96px; white-space: normal; overflow-wrap: break-word;">{{a.status}}</a>
+        {% else %}
+        <span style="background-color: {{a.status_color}}; border-radius: 8px; display: inline-block; font-size: 12px; align-self: center; padding: 2px 10px; margin-left: auto; height: 100%; line-height: 1.2; text-align: center; width: 96px; white-space: normal; overflow-wrap: break-word;">{{a.status}}</span>
+        {% endif %}
       {% endif %}
     </div>
     {% endfor %}

src/sentry/web/frontend/debug/debug_weekly_report.py

@@ -13,6 +13,7 @@
     PerformanceSlowDBQueryGroupType,
 )
 from sentry.models.group import Group, GroupStatus
+from sentry.models.grouphistory import GroupHistory, GroupHistoryStatus
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.tasks.summaries.utils import ONE_DAY, OrganizationReportContext, ProjectContext
@@ -171,22 +172,36 @@ def get_context(self, request):
                 PerformanceNPlusOneGroupType,
                 PerformanceP95EndpointRegressionGroupType,
             ]
-            project_context.key_performance_issues = [
-                (
-                    make_debug_group(
-                        group_id=20000 + (project.id * 100) + group_index,
+            performance_issue_statuses = [
+                None,
+                GroupHistoryStatus.SET_RESOLVED_IN_PULL_REQUEST,
+                GroupHistoryStatus.SET_RESOLVED_IN_COMMIT,
+            ]
+            project_context.key_performance_issues = []
+            for group_index, performance_issue_type in enumerate(performance_issue_types):
+                group = make_debug_group(
+                    group_id=20000 + (project.id * 100) + group_index,
+                    project=project,
+                    title=make_debug_issue_title(random, performance_issue_type.description),
+                    message=make_debug_issue_message(random),
+                    group_type=performance_issue_type,
+                    event_type="transaction",
+                    substatus=substatuses[group_index],
+                )
+                status = performance_issue_statuses[group_index]
+                group_history = (
+                    GroupHistory(
+                        group=group,
                         project=project,
-                        title=make_debug_issue_title(random, performance_issue_type.description),
-                        message=make_debug_issue_message(random),
-                        group_type=performance_issue_type,
-                        event_type="transaction",
-                        substatus=substatuses[group_index],
-                    ),
-                    None,
-                    random.randint(100, 1000),
+                        organization=organization,
+                        status=status,
+                    )
+                    if status is not None
+                    else None
+                )
+                project_context.key_performance_issues.append(
+                    (group, group_history, random.randint(100, 1000))
                 )
-                for group_index, performance_issue_type in enumerate(performance_issue_types)
-            ]
 
             ctx.projects_context_map[project.id] = project_context
 

tests/sentry/tasks/test_weekly_reports.py

@@ -15,6 +15,7 @@
 from sentry.issues.grouptype import PerformanceNPlusOneGroupType
 from sentry.models.group import GroupStatus
 from sentry.models.grouphistory import GroupHistoryStatus
+from sentry.models.grouplink import GroupLink
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.project import Project
@@ -1173,6 +1174,56 @@ def test_key_errors_and_performance_issues_share_substatus_badges(self) -> None:
             field: performance_issue[field] for field in substatus_fields
         }
 
+    @mock.patch("sentry.models.pullrequest.PullRequest.get_external_url")
+    def test_key_performance_issue_resolved_in_pr_status_links_pull_request(
+        self, get_external_url: mock.MagicMock
+    ) -> None:
+        get_external_url.return_value = "https://github.com/example/example/pull/1"
+        user = self.create_user()
+        self.create_member(teams=[self.team], user=user, organization=self.organization)
+        group = self.create_group(
+            project=self.project,
+            message="performance message",
+            status=GroupStatus.UNRESOLVED,
+            substatus=GroupSubStatus.ONGOING,
+            type=PerformanceNPlusOneGroupType.type_id,
+            data={
+                "type": "transaction",
+                "metadata": {"title": "N+1 Query", "value": "performance message"},
+            },
+        )
+        repo = self.create_repo(project=self.project)
+        pull_request = self.create_pull_request(
+            repository_id=repo.id,
+            organization_id=self.organization.id,
+            key="1",
+            title="Fix N+1 query",
+        )
+        GroupLink.objects.create(
+            group_id=group.id,
+            project_id=group.project_id,
+            linked_type=GroupLink.LinkedType.pull_request,
+            linked_id=pull_request.id,
+            relationship=GroupLink.Relationship.resolves,
+        )
+        group_history = self.create_group_history(
+            group=group,
+            status=GroupHistoryStatus.SET_RESOLVED_IN_PULL_REQUEST,
+        )
+        ctx = OrganizationReportContext(self.now.timestamp(), ONE_DAY * 7, self.organization)
+        project_context = ProjectContext(self.project)
+        project_context.key_performance_issues = [(group, group_history, 10)]
+        ctx.projects_context_map = {self.project.id: project_context}
+        ctx.project_ownership[user.id] = {self.project.id}
+
+        rendered_context = render_template_context(ctx, user.id)
+
+        assert rendered_context is not None
+        performance_issue = rendered_context["key_performance_issues"][0]
+        assert performance_issue["status"] == "Resolved in PR"
+        assert performance_issue["status_url"] == "https://github.com/example/example/pull/1"
+        assert performance_issue["group_substatus"] is None
+
     @mock.patch("sentry.analytics.record")
     @mock.patch("sentry.tasks.summaries.weekly_reports.MessageBuilder")
     def test_email_override_simple(