Skip to content

Commit 2044423

Browse files
Removes title from linked issues payload, adds date_added
1 parent 36743f9 commit 2044423

File tree

3 files changed

+12
-33
lines changed

3 files changed

+12
-33
lines changed

src/sentry/issues/services/issue/impl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from sentry.integrations.models.external_issue import ExternalIssue
88
from sentry.issues.services.issue.model import RpcGroupShareMetadata, RpcLinkedIssueSummary
9+
from sentry.issues.services.issue.serial import serialize_linked_issue_summary
910
from sentry.issues.services.issue.service import IssueService
1011
from sentry.models.group import Group
1112
from sentry.models.organization import Organization
@@ -65,6 +66,5 @@ def get_linked_issues(
6566
).order_by("date_added")
6667

6768
return [
68-
RpcLinkedIssueSummary.from_external_issue(external_issue)
69-
for external_issue in external_issues
69+
serialize_linked_issue_summary(external_issue) for external_issue in external_issues
7070
]
Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import annotations
22

3+
from datetime import datetime
4+
35
from sentry.hybridcloud.rpc import RpcModel
4-
from sentry.integrations.models.external_issue import ExternalIssue
5-
from sentry.models.grouplink import GroupLink
66

77

88
class RpcGroupShareMetadata(RpcModel):
@@ -11,20 +11,5 @@ class RpcGroupShareMetadata(RpcModel):
1111

1212

1313
class RpcLinkedIssueSummary(RpcModel):
14-
title: str
1514
issue_link: str
16-
17-
@classmethod
18-
def from_external_issue(cls, external_issue: ExternalIssue) -> RpcLinkedIssueSummary:
19-
group_link = GroupLink.objects.get(
20-
linked_id=external_issue.id,
21-
linked_type=GroupLink.LinkedType.issue,
22-
relationship=GroupLink.Relationship.references,
23-
)
24-
25-
group_url = group_link.group.get_absolute_url()
26-
27-
return RpcLinkedIssueSummary(
28-
title=external_issue.title or "",
29-
issue_link=group_url,
30-
)
15+
date_added: datetime

tests/sentry/issues/services/test_issue_service.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,11 @@ def create_linked_issue(
8585

8686
def test_get_linked_issues(self):
8787
group = self.create_group(project=self.us_region_context.project)
88-
self.create_linked_issue(
88+
linked_issue = self.create_linked_issue(
8989
key="TEST-123",
9090
region_context=self.us_region_context,
9191
group=group,
9292
integration=self.default_jira_integration,
93-
title="US Group Link",
9493
)
9594

9695
response = issue_service.get_linked_issues(
@@ -103,7 +102,7 @@ def test_get_linked_issues(self):
103102
assert response == [
104103
RpcLinkedIssueSummary(
105104
issue_link=group.get_absolute_url(),
106-
title=group.title,
105+
date_added=linked_issue.date_added,
107106
)
108107
]
109108

@@ -114,7 +113,6 @@ def test_get_linked_issues_with_multiple_organizations_in_multiple_regions(self)
114113
region_context=self.us_region_context,
115114
group=us_group,
116115
integration=self.default_jira_integration,
117-
title="US Group Link",
118116
)
119117

120118
de_group = self.create_group(project=self.de_region_context.project)
@@ -123,7 +121,6 @@ def test_get_linked_issues_with_multiple_organizations_in_multiple_regions(self)
123121
region_context=self.de_region_context,
124122
group=de_group,
125123
integration=self.default_jira_integration,
126-
title="DE Group Link",
127124
)
128125

129126
response = issue_service.get_linked_issues(
@@ -139,11 +136,11 @@ def test_get_linked_issues_with_multiple_organizations_in_multiple_regions(self)
139136
assert response == [
140137
RpcLinkedIssueSummary(
141138
issue_link=us_group.get_absolute_url(),
142-
title=us_linked_issue.title,
139+
date_added=us_linked_issue.date_added,
143140
),
144141
RpcLinkedIssueSummary(
145142
issue_link=de_group.get_absolute_url(),
146-
title=de_linked_issue.title,
143+
date_added=de_linked_issue.date_added,
147144
),
148145
]
149146

@@ -159,12 +156,11 @@ def test_get_empty_response_when_no_linked_issues(self):
159156

160157
def test_get_single_linked_issue_when_multiple_organizations_share_integration(self):
161158
us_group = self.create_group(project=self.us_region_context.project)
162-
us_linked_issue = self.create_linked_issue(
159+
linked_issue = self.create_linked_issue(
163160
key="TEST-123",
164161
region_context=self.us_region_context,
165162
group=us_group,
166163
integration=self.default_jira_integration,
167-
title="US Group Link",
168164
)
169165

170166
response = issue_service.get_linked_issues(
@@ -177,7 +173,7 @@ def test_get_single_linked_issue_when_multiple_organizations_share_integration(s
177173
assert response == [
178174
RpcLinkedIssueSummary(
179175
issue_link=us_group.get_absolute_url(),
180-
title=us_linked_issue.title,
176+
date_added=linked_issue.date_added,
181177
)
182178
]
183179

@@ -188,7 +184,6 @@ def test_filters_out_issues_from_other_organizations(self):
188184
region_context=self.us_region_context,
189185
group=us_group,
190186
integration=self.default_jira_integration,
191-
title="US Group Link",
192187
)
193188

194189
other_integration = self.create_integration(
@@ -205,7 +200,6 @@ def test_filters_out_issues_from_other_organizations(self):
205200
region_context=self.us_region_context,
206201
group=unrelated_us_group,
207202
integration=other_integration,
208-
title="Unrelated US Group Link",
209203
)
210204

211205
response = issue_service.get_linked_issues(
@@ -218,6 +212,6 @@ def test_filters_out_issues_from_other_organizations(self):
218212
assert response == [
219213
RpcLinkedIssueSummary(
220214
issue_link=us_group.get_absolute_url(),
221-
title=us_linked_issue.title,
215+
date_added=us_linked_issue.date_added,
222216
)
223217
]

0 commit comments

Comments
 (0)