From 9e0c05d504c3325309872a1de9b9641d67e45571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilia=20M=C3=A4kel=C3=A4?= Date: Tue, 11 Jun 2024 16:09:50 +0300 Subject: [PATCH] fix: move cancelled applications to archive page (#3079) (HL-1321) --- backend/benefit/applications/api/v1/application_views.py | 6 ++++-- .../benefit/applications/api/v1/serializers/application.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/benefit/applications/api/v1/application_views.py b/backend/benefit/applications/api/v1/application_views.py index 6b7c1a5b5d..128e3cb682 100755 --- a/backend/benefit/applications/api/v1/application_views.py +++ b/backend/benefit/applications/api/v1/application_views.py @@ -105,10 +105,12 @@ def _get_archived_for_applicant(self, queryset, name, value: bool): "batch__decision_date__lte": archive_threshold.isoformat(), } + query = Q(**query) | Q(status=ApplicationStatus.CANCELLED) + if value: - return queryset.filter(**query) + return queryset.filter(query) else: - return queryset.filter(~Q(**query)) + return queryset.filter(~query) class ApplicantApplicationFilter(BaseApplicationFilter): diff --git a/backend/benefit/applications/api/v1/serializers/application.py b/backend/benefit/applications/api/v1/serializers/application.py index 6e56c6fca8..cf4c54b559 100755 --- a/backend/benefit/applications/api/v1/serializers/application.py +++ b/backend/benefit/applications/api/v1/serializers/application.py @@ -1411,6 +1411,9 @@ def get_archived_for_applicant(self, application): Make sure any changes here are reflected in the filter set as well. """ + if application.status == ApplicationStatus.CANCELLED: + return True + if application.batch is None: return False