Merge pull request #321 from NHSDigital/DTOSS-10670-save-file-data-to-appointment

[DTOSS-10670] save file data to appointment

Author: Harriethw

manage_breast_screening/notifications/management/commands/create_appointments.py

@@ -52,7 +52,7 @@ def handle(self, *args, **options):
                             self.stdout.write(f"{clinic} created")
 
                         appt, appt_created = self.update_or_create_appointment(
-                            row, clinic
+                            row, clinic, blob.name
                         )
                         if appt_created:
                             self.stdout.write(f"{appt} created")
@@ -93,10 +93,11 @@ def find_or_create_clinic(self, row: pandas.Series) -> tuple[Clinic, bool]:
         )
 
     def update_or_create_appointment(
-        self, row: pandas.Series, clinic: Clinic
+        self, row: pandas.Series, clinic: Clinic, blob_name: str
     ) -> tuple[Appointment, bool]:
         defaults = {
             "batch_id": row["BatchID"],
+            "blob_name": blob_name,
             "number": row["Sequence"],
             "status": row["Status"],
             "episode_type": row["Episode Type"],

manage_breast_screening/notifications/migrations/0013_add_blob_name_to_appointments.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.3 on 2025-08-21 14:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0012_alter_message_batch_notify_errors'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='appointment',
+            name='blob_name',
+            field=models.TextField(default='/'),
+            preserve_default=False,
+        ),
+    ]

manage_breast_screening/notifications/models.py

@@ -126,6 +126,7 @@ class Appointment(models.Model):
     starts_at = models.DateTimeField(null=False)
     created_at = models.DateTimeField(null=False, auto_now_add=True)
     updated_at = models.DateTimeField(null=True, auto_now=True)
+    blob_name = models.TextField(null=False)
 
     clinic = models.ForeignKey("notifications.Clinic", on_delete=models.PROTECT)
 

manage_breast_screening/notifications/tests/integration/test_create_appointments_from_azure_storage.py

@@ -27,13 +27,11 @@ def helpers(self):
     @pytest.mark.django_db
     def test_appointments_created_from_file_stored_in_azure(self, helpers):
         today_dirname = datetime.today().strftime("%Y-%m-%d")
+        test_file_path = "ABC_20241202091221_APPT_106.dat"
+        blob_name = f"{today_dirname}/{test_file_path}"
 
-        with open(
-            helpers.get_test_file_path("ABC_20241202091221_APPT_106.dat")
-        ) as test_file:
-            BlobStorage().add(
-                f"{today_dirname}/ABC_20241202091221_APPT_106.dat", test_file.read()
-            )
+        with open(helpers.get_test_file_path(test_file_path)) as test_file:
+            BlobStorage().add(blob_name, test_file.read())
 
         Command().handle(**{"date_str": today_dirname})
 
@@ -80,3 +78,7 @@ def test_appointments_created_from_file_stored_in_azure(self, helpers):
         assert appointments[0].clinic == clinics[0]
         assert appointments[1].clinic == clinics[1]
         assert appointments[2].clinic == clinics[1]
+
+        assert appointments[0].blob_name == blob_name
+        assert appointments[1].blob_name == blob_name
+        assert appointments[2].blob_name == blob_name

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

@@ -95,6 +95,10 @@ def test_handle_creates_records(self):
         assert appointments[1].clinic == clinics[1]
         assert appointments[2].clinic == clinics[1]
 
+        assert appointments[0].blob_name == mock_blob.name.return_value
+        assert appointments[1].blob_name == mock_blob.name.return_value
+        assert appointments[2].blob_name == mock_blob.name.return_value
+
     @pytest.mark.django_db
     def test_handles_holding_clinics(self):
         """Test does not create appointments for valid NBSS data marked as a Holding Clinic"""