diff --git a/apps/accounts/api/automations/gather_account.py b/apps/accounts/api/automations/gather_account.py index 9440a1559..a4dbb0931 100644 --- a/apps/accounts/api/automations/gather_account.py +++ b/apps/accounts/api/automations/gather_account.py @@ -9,7 +9,7 @@ from rest_framework.response import Response from accounts import serializers from accounts.const import AutomationTypes -from accounts.filters import GatheredAccountFilterSet +from accounts.filters import GatheredAccountFilterSet, NodeFilterBackend from accounts.models import GatherAccountsAutomation, AutomationExecution, Account from accounts.models import GatheredAccount from assets.models import Asset @@ -76,6 +76,7 @@ class GatheredAccountViewSet(OrgBulkModelViewSet): model = GatheredAccount search_fields = ("username",) filterset_class = GatheredAccountFilterSet + extra_filter_backends = [NodeFilterBackend] ordering = ("status",) serializer_classes = { "default": serializers.DiscoverAccountSerializer, diff --git a/apps/accounts/filters.py b/apps/accounts/filters.py index 90df5d375..42fc1e5e7 100644 --- a/apps/accounts/filters.py +++ b/apps/accounts/filters.py @@ -143,17 +143,12 @@ class AccountFilterSet(BaseFilterSet): class GatheredAccountFilterSet(BaseFilterSet): - node_id = drf_filters.CharFilter(method="filter_nodes") asset_id = drf_filters.CharFilter(field_name="asset_id", lookup_expr="exact") asset_name = drf_filters.CharFilter( field_name="asset__name", lookup_expr="icontains" ) status = drf_filters.CharFilter(field_name="status", lookup_expr="exact") - @staticmethod - def filter_nodes(queryset, name, value): - return AccountFilterSet.filter_nodes(queryset, name, value) - class Meta: model = GatheredAccount fields = ["id", "username"]