Merge pull request #476 from NHSDigital/improve-create-appointments-logged-output

Improve logging output from Create Appointments command

Author: steventux

manage_breast_screening/notifications/management/commands/create_appointments.py

@@ -35,15 +35,15 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
         try:
-            logger.info("Create Appointments Command started")
+            logger.info("Create Appointments command started")
             container_client = BlobStorage().find_or_create_container(
                 os.getenv("BLOB_CONTAINER_NAME")
             )
             for blob in container_client.list_blobs(
                 name_starts_with=options["date_str"]
             ):
                 blob_client = container_client.get_blob_client(blob.name)
-                logger.debug(f"Processing blob {blob.name}")
+                logger.debug("Processing blob %s", blob.name)
                 blob_content = blob_client.download_blob(
                     max_concurrency=1, encoding="ASCII"
                 ).readall()
@@ -60,11 +60,13 @@ def handle(self, *args, **options):
                             row, clinic
                         )
                         logger.info(
-                            f"{appt} {'created' if appt_created else 'updated'}"
+                            "%s %s", appt, ("created" if appt_created else "updated")
                         )
 
-                self.stdout.write(f"Processed {len(data_frame)} rows from {blob.name}")
+                logger.info("Processed %s rows from %s", len(data_frame), blob.name)
+            logger.info("Create Appointments command finished successfully")
         except Exception as e:
+            logger.error(e, exc_info=True)
             raise CommandError(e)
 
     def is_not_holding_clinic(self, row):

manage_breast_screening/notifications/models.py

@@ -1,4 +1,5 @@
 import uuid
+from zoneinfo import ZoneInfo
 
 from django.db import models
 
@@ -137,8 +138,11 @@ class Meta:
 
     clinic = models.ForeignKey("notifications.Clinic", on_delete=models.PROTECT)
 
+    def localised_starts_at(self):
+        return self.starts_at.replace(tzinfo=ZoneInfo("Europe/London"))
+
     def __str__(self):
-        return f"Appointment for {self.starts_at} at {self.clinic}"
+        return f"Appointment {self.nbss_id} for {self.localised_starts_at()} at {self.clinic}"
 
 
 class Clinic(models.Model):