Change 'all' filtering to only include clinics from the last 7 days

This has been changed as if we collect all clinics, this list will grow very large and will get out of control very quick. This has been changed to the last 7 days and can be more digestable

Author: cameronhargreaves1-nhs

manage_breast_screening/clinics/models.py

@@ -1,5 +1,5 @@
 import uuid
-from datetime import date
+from datetime import date, timedelta
 from enum import StrEnum
 
 from django.conf import settings
@@ -59,7 +59,7 @@ def by_filter(self, filter: str):
             case ClinicFilter.COMPLETED:
                 return self.completed()
             case ClinicFilter.ALL:
-                return self
+                return self.last_seven_days()
             case _:
                 raise ValueError(filter)
 
@@ -75,6 +75,9 @@ def upcoming(self):
         """
         return self.filter(starts_at__date__gt=date.today())
 
+    def last_seven_days(self):
+        return self.filter(starts_at__date__gte=(date.today() - timedelta(days=7)))
+
     def completed(self):
         """
         Completed clinics that started in the past
@@ -87,8 +90,12 @@ def completed(self):
             .values("state")[:1]
         )
 
+        completed_last_seven_days = self.filter(
+            starts_at__date__gte=(date.today() - timedelta(days=7))
+        )
+
         return (
-            self.filter(starts_at__date__lt=date.today())
+            completed_last_seven_days.filter(starts_at__date__lt=date.today())
             .annotate(latest_status=Subquery(latest_status))
             .filter(latest_status__in=["CLOSED", "CANCELLED"])
             .order_by("-ends_at")
@@ -160,7 +167,7 @@ def filter_counts(cls, provider_id):
         queryset = cls.objects.filter(setting__provider_id=provider_id)
 
         return {
-            ClinicFilter.ALL: queryset.count(),
+            ClinicFilter.ALL: queryset.last_seven_days().count(),
             ClinicFilter.TODAY: queryset.today().count(),
             ClinicFilter.UPCOMING: queryset.upcoming().count(),
             ClinicFilter.COMPLETED: queryset.completed().count(),

manage_breast_screening/clinics/tests/test_models.py

@@ -87,6 +87,29 @@ def test_completed_ordering_by_ends_at():
     assertQuerySetEqual(completed, [clinic1, clinic2, clinic3])
 
 
+@pytest.mark.django_db
+@time_machine.travel(datetime(2025, 1, 1, 10, tzinfo=tz.utc))
+def test_last_seven_days_all_filtering():
+    _clinic1 = ClinicFactory.create(
+        starts_at=datetime(2024, 12, 1, 9, tzinfo=tz.utc),
+        ends_at=datetime(2024, 12, 1, 17, tzinfo=tz.utc),
+        current_status=models.ClinicStatus.CLOSED,
+    )
+    _clinic2 = ClinicFactory.create(
+        starts_at=datetime(2024, 12, 2, 9, tzinfo=tz.utc),
+        ends_at=datetime(2024, 12, 2, 17, tzinfo=tz.utc),
+        current_status=models.ClinicStatus.CLOSED,
+    )
+    clinic3 = ClinicFactory.create(
+        starts_at=datetime(2024, 12, 29, 9, tzinfo=tz.utc),
+        ends_at=datetime(2024, 12, 29, 17, tzinfo=tz.utc),
+        current_status=models.ClinicStatus.CLOSED,
+    )
+
+    all = models.Clinic.objects.last_seven_days()
+    assertQuerySetEqual(all, [clinic3])
+
+
 class TestUserAssignment:
     def test_str(self):
         user = UserFactory.build(first_name="John", last_name="Doe")