Merge pull request #364 from NHSDigital/amend-appointment-selection-daterange

Amend appointment eligibility to 4 weeks

Author: steventux

manage_breast_screening/notifications/management/commands/send_message_batch.py

@@ -69,10 +69,7 @@ def handle(self, *args, **options):
         except Exception as e:
             raise CommandError(e)
 
-    # TODO: Check the appointment notification rules here.
     def schedule_date(self) -> datetime:
-        today = datetime.today()
-        today_end = today.replace(
-            hour=23, minute=59, second=59, microsecond=999999, tzinfo=TZ_INFO
-        )
-        return today_end + timedelta(weeks=4, days=4)
+        today = datetime.now(tz=TZ_INFO)
+        today_end = today.replace(hour=23, minute=59, second=59, microsecond=999999)
+        return today_end + timedelta(weeks=4)

manage_breast_screening/notifications/tests/management/commands/test_send_message_batch.py

@@ -74,8 +74,7 @@ def test_handle_with_appointments_inside_schedule_window(
         """Test that appointments with date inside the schedule period are notified"""
         mock_send_message_batch.return_value.status_code = 201
         appointment = AppointmentFactory(
-            starts_at=datetime.now().replace(tzinfo=TZ_INFO)
-            + timedelta(weeks=4, days=4)
+            starts_at=datetime.now().replace(tzinfo=TZ_INFO) + timedelta(weeks=4)
         )
 
         subject = Command()
@@ -103,7 +102,7 @@ def test_handle_with_appointments_outside_schedule_window(
         """Test that appointments with date inside the schedule period are notified"""
         AppointmentFactory(
             starts_at=datetime.now().replace(tzinfo=TZ_INFO)
-            + timedelta(weeks=4, days=5)
+            + timedelta(weeks=4, days=1)
         )
 
         subject = Command()
@@ -153,8 +152,7 @@ def test_handle_with_unrecoverable_failures(
         notify_errors = {"errors": [{"some-error": "details"}]}
         mock_send_message_batch.return_value.json.return_value = notify_errors
         appointment = AppointmentFactory(
-            starts_at=datetime.now().replace(tzinfo=TZ_INFO)
-            + timedelta(weeks=4, days=4)
+            starts_at=datetime.now().replace(tzinfo=TZ_INFO) + timedelta(weeks=4)
         )
 
         Command().handle(**{"routing_plan_id": routing_plan_id})
@@ -179,8 +177,7 @@ def test_handle_with_recoverable_failures(
         mock_send_message_batch.return_value.status_code = status_code
         mock_send_message_batch.return_value.json.return_value = notify_errors
         _appointment = AppointmentFactory(
-            starts_at=datetime.now().replace(tzinfo=TZ_INFO)
-            + timedelta(weeks=4, days=4)
+            starts_at=datetime.now().replace(tzinfo=TZ_INFO) + timedelta(weeks=4)
         )
 
         with patch(