Merge pull request #358 from NHSDigital/notifications-simplify-now-with-timezone

Use `datetime.now(tz)` wherever possible

Author: steventux

manage_breast_screening/notifications/management/commands/create_appointments.py

@@ -31,9 +31,7 @@ def add_arguments(self, parser):
         parser.add_argument(
             "date_str",
             nargs="?",
-            default=datetime.today()
-            .replace(tzinfo=TZ_INFO)
-            .strftime(DIR_NAME_DATE_FORMAT),
+            default=datetime.now(tz=TZ_INFO).strftime(DIR_NAME_DATE_FORMAT),
             help="yyy-MM-dd formatted date reflecting the Azure storage directory",
         )
 

manage_breast_screening/notifications/management/commands/send_message_batch.py

@@ -43,7 +43,7 @@ def handle(self, *args, **options):
 
             message_batch = MessageBatch.objects.create(
                 routing_plan_id=routing_plan_id,
-                scheduled_at=datetime.today().replace(tzinfo=TZ_INFO),
+                scheduled_at=datetime.now(tz=TZ_INFO),
                 status=MessageBatchStatusChoices.SCHEDULED.value,
             )
 

manage_breast_screening/notifications/tests/queries/test_aggregate_query.py

@@ -37,15 +37,14 @@ def create_appointment_set(
         return appt
 
     def test_query_aggregates_appointments_and_cascade_counts(self):
+        now = datetime.now(tz=ZoneInfo("Europe/London"))
         clinic1 = ClinicFactory(code="BU001", bso_code="BSO1", name="BSU 1")
         clinic2 = ClinicFactory(code="BU002", bso_code="BSO2", name="BSU 2")
 
-        date1 = datetime.today() - timedelta(days=10)
-        date1.replace(tzinfo=ZoneInfo("Europe/London"))
+        date1 = now - timedelta(days=10)
         df1 = date1.strftime("%Y-%m-%d")
 
-        date2 = datetime.today() - timedelta(days=15)
-        date2.replace(tzinfo=ZoneInfo("Europe/London"))
+        date2 = now - timedelta(days=15)
         df2 = date2.strftime("%Y-%m-%d")
 
         nhsapp_read = {"nhsapp": "read"}