diff --git a/apps/accounts/api/automations/change_secret_dashboard.py b/apps/accounts/api/automations/change_secret_dashboard.py index a395d4002..60fcb947b 100644 --- a/apps/accounts/api/automations/change_secret_dashboard.py +++ b/apps/accounts/api/automations/change_secret_dashboard.py @@ -152,7 +152,10 @@ class ChangeSecretDashboardApi(APIView): if ongoing_counts is None: execution_ids = [] inspect = app.control.inspect() - active_tasks = inspect.active() + try: + active_tasks = inspect.active() + except Exception: + active_tasks = None if active_tasks: for tasks in active_tasks.values(): for task in tasks: diff --git a/apps/accounts/filters.py b/apps/accounts/filters.py index 5345634a6..8995cb524 100644 --- a/apps/accounts/filters.py +++ b/apps/accounts/filters.py @@ -192,6 +192,16 @@ class UUIDExecutionFilterMixin: class ChangeSecretRecordFilterSet(SecretRecordMixin, UUIDExecutionFilterMixin, BaseFilterSet): execution_id = django_filters.CharFilter(method="filter_execution") + days = drf_filters.NumberFilter(method="filter_days") + + @staticmethod + def filter_days(queryset, name, value): + value = int(value) + + dt = local_zero_hour() + if value != 1: + dt = local_now() - timezone.timedelta(days=value) + return queryset.filter(date_finished__gte=dt) class Meta: model = ChangeSecretRecord