Treat cases merged into a closed case as closed in filtering.

cases/filters.py

@@ -132,12 +132,14 @@ def priority_only_filter(self, queryset, name, value):
 
     def closed_filter(self, queryset, name, value):
         if value == "none":
-            return queryset.filter(closed=False)
+            cs = [c for c in queryset if not c.is_closed_or_merged_into_closed]
         elif value == "include":
             return queryset
         elif value == "only":
-            return queryset.filter(closed=True)
-        return queryset  # pragma: no cover - should not be reachable.
+            cs = [c for c in queryset if c.is_closed_or_merged_into_closed]
+        else:
+            return queryset  # pragma: no cover - should not be reachable.
+        return queryset.filter(id__in=[c.id for c in cs])
 
     def complaints_filter(self, queryset, name, value):
         qs = Case.objects.annotate_total_complaints(queryset)

cases/models.py

@@ -738,6 +738,12 @@ def file_storage_remaining_bytes(self):
             - self.file_storage_used_bytes
         )
 
+    @property
+    def is_closed_or_merged_into_closed(self):
+        return self.closed or any(
+            [Case.objects.get(pk=m["id"]).closed for m in self.merged_into_list]
+        )
+
 
 class Complaint(AbstractModel):
     case = models.ForeignKey(Case, on_delete=models.CASCADE, related_name="complaints")

cases/tests/test_filters.py

@@ -196,21 +196,27 @@ def test_closed_cases(admin_client):
     closed_case = Case.objects.create(
         closed=True,
     )
+    merged_into_closed_case = Case.objects.create(closed=False)
+    merged_into_closed_case.merge_into(closed_case)
     response = admin_client.get("/cases")
     assertContains(response, f"/cases/{open_case.id}")
     assertNotContains(response, f"/cases/{closed_case.id}")
+    assertNotContains(response, f"/cases/{merged_into_closed_case.id}")
 
     response = admin_client.get("/cases?closed=none")
     assertContains(response, f"/cases/{open_case.id}")
     assertNotContains(response, f"/cases/{closed_case.id}")
+    assertNotContains(response, f"/cases/{merged_into_closed_case.id}")
 
     response = admin_client.get("/cases?closed=include")
     assertContains(response, f"/cases/{open_case.id}")
     assertContains(response, f"/cases/{closed_case.id}")
+    assertContains(response, f"/cases/{merged_into_closed_case.id}")
 
     response = admin_client.get("/cases?closed=only")
     assertNotContains(response, f"/cases/{open_case.id}")
     assertContains(response, f"/cases/{closed_case.id}")
+    assertContains(response, f"/cases/{merged_into_closed_case.id}")
 
 
 def test_priority_only_cases(admin_client, case_1, case_2):