Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize duplicate queries occurring in AlertGroupFilter #1809

Merged
merged 5 commits into from
Apr 26, 2023
Merged

Optimize duplicate queries occurring in AlertGroupFilter #1809

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4964f9
WIP: optimize duplicate queries occuring in
joeyorlando Apr 21, 2023
3bd2759
WIP
joeyorlando Apr 24, 2023
5c8e286
Update engine/apps/api/views/alert_group.py
iskhakov Apr 26, 2023
16dde39
Merge branch 'dev' into jorlando/improve-alert-group-filterset-queries
iskhakov Apr 26, 2023
4434ada
Update CHANGELOG.md
iskhakov Apr 26, 2023
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
42 changes: 34 additions & 8 deletions engine/apps/api/views/alert_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,32 @@ def get_user_queryset(request):
return User.objects.filter(organization=request.user.organization).distinct()


class AlertGroupFilterBackend(filters.DjangoFilterBackend):
"""
See here for more context on how this works

https://github.com/carltongibson/django-filter/discussions/1572
https://youtu.be/e52S1SjuUeM?t=841
"""

def get_filterset(self, request, queryset, view):
filterset = super().get_filterset(request, queryset, view)

filterset.form.fields["integration"].queryset = get_integration_queryset(request)
filterset.form.fields["escalation_chain"].queryset = get_escalation_chain_queryset(request)

user_queryset = get_user_queryset(request)

filterset.form.fields["silenced_by"].queryset = user_queryset
filterset.form.fields["acknowledged_by"].queryset = user_queryset
filterset.form.fields["resolved_by_user"].queryset = user_queryset
filterset.form.fields["acknowledged_by_user"].queryset = user_queryset
filterset.form.fields["invitees_are"].queryset = user_queryset
filterset.form.fields["involved_users_are"].queryset = user_queryset

return filterset


class AlertGroupFilter(DateRangeFilterMixin, ByTeamModelFieldFilterMixin, ModelFieldFilterMixin, filters.FilterSet):
"""
Examples of possible date formats here https://docs.djangoproject.com/en/1.9/ref/settings/#datetime-input-formats
Expand All @@ -69,19 +95,19 @@ class AlertGroupFilter(DateRangeFilterMixin, ByTeamModelFieldFilterMixin, ModelF
silenced_at = filters.CharFilter(field_name="silenced_at", method=DateRangeFilterMixin.filter_date_range.__name__)
silenced_by = filters.ModelMultipleChoiceFilter(
field_name="silenced_by_user",
queryset=get_user_queryset,
queryset=None,
to_field_name="public_primary_key",
method=ModelFieldFilterMixin.filter_model_field.__name__,
)
integration = filters.ModelMultipleChoiceFilter(
field_name="channel_filter__alert_receive_channel",
queryset=get_integration_queryset,
queryset=None,
to_field_name="public_primary_key",
method=ModelFieldFilterMixin.filter_model_field.__name__,
)
escalation_chain = filters.ModelMultipleChoiceFilter(
field_name="channel_filter__escalation_chain",
queryset=get_escalation_chain_queryset,
queryset=None,
to_field_name="public_primary_key",
method=ModelFieldFilterMixin.filter_model_field.__name__,
)
Expand All @@ -90,21 +116,21 @@ class AlertGroupFilter(DateRangeFilterMixin, ByTeamModelFieldFilterMixin, ModelF
)
resolved_by = filters.ModelMultipleChoiceFilter(
field_name="resolved_by_user",
queryset=get_user_queryset,
queryset=None,
to_field_name="public_primary_key",
method=ModelFieldFilterMixin.filter_model_field.__name__,
)
acknowledged_by = filters.ModelMultipleChoiceFilter(
field_name="acknowledged_by_user",
queryset=get_user_queryset,
queryset=None,
to_field_name="public_primary_key",
method=ModelFieldFilterMixin.filter_model_field.__name__,
)
invitees_are = filters.ModelMultipleChoiceFilter(
queryset=get_user_queryset, to_field_name="public_primary_key", method="filter_invitees_are"
queryset=None, to_field_name="public_primary_key", method="filter_invitees_are"
)
involved_users_are = filters.ModelMultipleChoiceFilter(
queryset=get_user_queryset, to_field_name="public_primary_key", method="filter_by_involved_users"
queryset=None, to_field_name="public_primary_key", method="filter_by_involved_users"
)
with_resolution_note = filters.BooleanFilter(method="filter_with_resolution_note")
mine = filters.BooleanFilter(method="filter_mine")
Expand Down Expand Up @@ -270,7 +296,7 @@ class AlertGroupView(

pagination_class = TwentyFiveCursorPaginator

filter_backends = [SearchFilter, filters.DjangoFilterBackend]
filter_backends = [SearchFilter, AlertGroupFilterBackend]
search_fields = ["public_primary_key", "inside_organization_number", "web_title_cache"]

filterset_class = AlertGroupFilter
Expand Down