From 967c533255a858545d1dd960ec00015934e4fae8 Mon Sep 17 00:00:00 2001 From: Josh Ferge Date: Sun, 9 Nov 2025 23:37:49 -0500 Subject: [PATCH] fix(types): Fix detector_id annotation collision in workflow serializer Remove unnecessary select_related("detector") and add type: ignore for detector_id annotation which collides with the existing model field name but is needed for the grouped query result. --- .../serializers/workflow_group_history_serializer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sentry/workflow_engine/endpoints/serializers/workflow_group_history_serializer.py b/src/sentry/workflow_engine/endpoints/serializers/workflow_group_history_serializer.py index 832399e70a5759..99e88214505b37 100644 --- a/src/sentry/workflow_engine/endpoints/serializers/workflow_group_history_serializer.py +++ b/src/sentry/workflow_engine/endpoints/serializers/workflow_group_history_serializer.py @@ -120,12 +120,11 @@ def fetch_workflow_groups_paginated( # subquery that retrieves row with the largest date in a group group_max_dates = filtered_history.filter(group=OuterRef("group")).order_by("-date_added")[:1] qs = ( - filtered_history.select_related("group", "detector") - .values("group") + filtered_history.values("group") .annotate(count=Count("group")) .annotate(event_id=Subquery(group_max_dates.values("event_id"))) .annotate(last_triggered=Max("date_added")) - .annotate(detector_id=Subquery(group_max_dates.values("detector_id"))) + .annotate(detector_id=Subquery(group_max_dates.values("detector_id"))) # type: ignore[no-redef] ) return cast(