Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions src/sentry/issues/endpoints/group_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,29 @@ class GroupDetailsEndpoint(GroupEndpoint):
}
)

def _get_seen_by(self, request: Request, group: Group) -> list[dict[str, Any]]:
def _get_seen_by_and_participants(
self, request: Request, group: Group
) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
seen_by = list(GroupSeen.objects.filter(group=group).order_by("-last_seen"))
return [seen for seen in serialize(seen_by, request.user) if seen is not None]
participant_ids = set(GroupSubscriptionManager.get_participating_user_ids(group))
user_ids = {seen.user_id for seen in seen_by} | participant_ids
users = (
user_service.serialize_many(
filter={"user_ids": sorted(user_ids)},
as_user=serialize_generic_user(request.user),
)
if user_ids
else []
)
users_by_id = {int(user["id"]): user for user in users}
return (
[
{**users_by_id[seen.user_id], "lastSeen": seen.last_seen}
for seen in seen_by
if seen.user_id in users_by_id
],
[{**user, "type": "user"} for user in users if int(user["id"]) in participant_ids],
)

def _report_status_inconsistency(self, group: Group) -> None:
if options.get("issues.derived_data.read_path_checks.killswitch"):
Expand Down Expand Up @@ -244,7 +264,7 @@ def get(self, request: Request, group: Group) -> Response[GroupDetailsResponse]:
)

# TODO: these probably should be another endpoint
seen_by = self._get_seen_by(request, group)
seen_by, participants = self._get_seen_by_and_participants(request, group)

if "release" not in collapse:
first_release, last_release = get_first_last_release(request, group)
Expand Down Expand Up @@ -355,6 +375,7 @@ def get(self, request: Request, group: Group) -> Response[GroupDetailsResponse]:
{
"activity": activity_items,
"seenBy": seen_by,
"participants": participants,
"userReportCount": user_reports.count(),
"count": get_group_global_count(group),
}
Expand All @@ -364,16 +385,6 @@ def get(self, request: Request, group: Group) -> Response[GroupDetailsResponse]:
hourly_stats, daily_stats = self.__group_hourly_daily_stats(group, environment_ids)
data["stats"] = {"24h": hourly_stats, "30d": daily_stats}

participants = user_service.serialize_many(
filter={"user_ids": GroupSubscriptionManager.get_participating_user_ids(group)},
as_user=serialize_generic_user(request.user),
)

for participant in participants:
participant["type"] = "user"

data.update({"participants": participants})

publish_action(
ViewAction(),
source=resolve_action_source(request),
Expand Down
10 changes: 10 additions & 0 deletions tests/sentry/issues/endpoints/test_group_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -1133,12 +1133,22 @@ def test_subscription(self) -> None:
user_id=self.user.id, group=group, is_active=True
).exists()

resp = self.client.get(url)
assert resp.status_code == 200, resp.content
assert [(user["id"], user["type"]) for user in resp.data["participants"]] == [
(str(self.user.id), "user")
]

resp = self.client.put(url, data={"isSubscribed": "false"})
assert resp.status_code == 200, resp.content
assert GroupSubscription.objects.filter(
user_id=self.user.id, group=group, is_active=False
).exists()

resp = self.client.get(url)
assert resp.status_code == 200, resp.content
assert resp.data["participants"] == []

def test_discard(self) -> None:
self.login_as(user=self.user)
group = self.create_group()
Expand Down
Loading