chore(slack): suspect commit small refactor (#70914)

Author: cathteng

src/sentry/integrations/slack/message_builder/issues.py

@@ -324,16 +324,16 @@ def get_suspect_commit_text(group: Group) -> str | None:
         return None
 
     suspect_commit_text = "Suspect Commit: "
-    pull_request = PullRequest.objects.filter(
-        merge_commit_sha=commit.key, organization_id=group.project.organization_id
-    ).first()
 
     author = commit.author
     commit_id = commit.key
     if not (author and commit_id):  # we need both the author and commit id to continue
         return None
 
     author_display = author.name if author.name else author.email
+    pull_request = PullRequest.objects.filter(
+        merge_commit_sha=commit.key, organization_id=group.project.organization_id
+    ).first()
     if pull_request:
         repo = Repository.objects.get(id=pull_request.repository_id)
         repo_base = repo.url

src/sentry/models/group.py

@@ -807,13 +807,20 @@ def get_recommended_event_for_environments(
     def get_suspect_commit(self) -> Commit | None:
         from sentry.models.groupowner import GroupOwner, GroupOwnerType
 
-        suspect_commit_owner = GroupOwner.objects.filter(
-            group_id=self.id, project_id=self.project_id, type=GroupOwnerType.SUSPECT_COMMIT.value
+        suspect_commit_owner = (
+            GroupOwner.objects.filter(
+                group_id=self.id,
+                project_id=self.project_id,
+                type=GroupOwnerType.SUSPECT_COMMIT.value,
+                context__isnull=False,
+            )
+            .order_by("-date_added")
+            .first()
         )
-        if not suspect_commit_owner.exists():
+
+        if not suspect_commit_owner:
             return None
 
-        suspect_commit_owner = suspect_commit_owner.first()
         commit_id = suspect_commit_owner.context.get("commitId")
         if not commit_id:
             return None