fix: move cancelled applications to archive page (#3079) (HL-1321)

City-of-Helsinki · Jun 11, 2024 · 9e0c05d · 9e0c05d
1 parent 1f1c84a
commit 9e0c05d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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