From f5fb5d34dc333a4c0d59863fc71ef8a15fdb3de8 Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Tue, 7 Mar 2023 08:38:50 -0300 Subject: [PATCH] Rework alert group mine filter query (#1466) Rework query to make it more efficient. --- engine/apps/api/views/alert_group.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/apps/api/views/alert_group.py b/engine/apps/api/views/alert_group.py index f94ed479..be97359e 100644 --- a/engine/apps/api/views/alert_group.py +++ b/engine/apps/api/views/alert_group.py @@ -147,9 +147,14 @@ class AlertGroupFilter(DateRangeFilterMixin, ModelFieldFilterMixin, filters.Filt return queryset queryset = queryset.filter( - Q(personal_log_records__author__in=users) | Q(log_records__author__in=users) + # user was notified + Q(personal_log_records__author__in=users) + | + # or interacted with the alert group + Q(acknowledged_by_user__pk__in=users) + | Q(resolved_by_user__pk__in=users) + | Q(silenced_by_user__pk__in=users) ).distinct() - return queryset def filter_mine(self, queryset, name, value):