From d1721943b0098f5a4c2d6239738c705216732440 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Mon, 3 Jul 2023 12:11:30 +0300 Subject: [PATCH] Update instance filter query to AND operation Signed-off-by: Kipchirchir Sigei --- onadata/apps/api/tasks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/onadata/apps/api/tasks.py b/onadata/apps/api/tasks.py index 1d6c0ef46d..be7cf65177 100644 --- a/onadata/apps/api/tasks.py +++ b/onadata/apps/api/tasks.py @@ -11,7 +11,6 @@ from django.core.files.uploadedfile import TemporaryUploadedFile from django.core.files.storage import default_storage from django.contrib.auth import get_user_model -from django.db.models import Q from django.utils import timezone from django.utils.datastructures import MultiValueDict @@ -123,7 +122,7 @@ def delete_inactive_submissions(): time_threshold = timezone.now() - timedelta(days=submissions_lifespan) # delete instance attachments instances = Instance.objects.filter( - Q(deleted_at__isnull=False) | Q(deleted_at__gte=time_threshold) + deleted_at__isnull=False, deleted_at__gte=time_threshold ) for instance in queryset_iterator(instances): # delete submission