Merge pull request #594 from NHSDigital/test-nbss-dat-file-processing-order

Add an integration test to verify blob file ordering

Author: steventux

manage_breast_screening/notifications/tests/fixtures/ABC_20241202091321_APPT_107.dat

@@ -1,4 +1,4 @@
 "NBSSAPPT_HDR"|"00000013"|"20250128"|"170922"|"000003"
 "NBSSAPPT_FLDS"|"Sequence"|"BSO"|"Action"|"Clinic Code"|"Holding Clinic"|"Status"|"Attended Not Scr"|"Appointment ID"|"NHS Num"|"Episode Type"|"Episode Start"|"Batch ID"|"Screen or Asses"|"Screen Appt num"|"Booked By"|"Cancelled By"|"Appt Date"|"Appt Time"|"Location"|"Clinic Name"|"Clinic Name (Let)"|"Clinic Address 1"|"Clinic Address 2"|"Clinic Address 3"|"Clinic Address 4"|"Clinic Address 5"|"Postcode"|"Action Timestamp"
-"NBSSAPPT_DATA"|"000001"|"KMK"|"C"|"BU011"|"N"|"C"|"N"|"BU011-67278-RA1-DN-Y1111-1"|"9449305552"|"F"|"20250128"|"KMK001326"|"S"|"1"|"H"|"C"|"20250314"|"1345"|"MKGH"|"BREAST CARE UNIT"|"BREAST CARE UNIT"|"BREAST CARE UNIT"|"MILTON KEYNES HOSPITAL"|"STANDING WAY"|"MILTON KEYNES"|"MK6 5LD"|"MK6 5LD"|"20250128-154003"
+"NBSSAPPT_DATA"|"000001"|"KMK"|"C"|"BU011"|"N"|"C"|"N"|"BU011-67278-RA1-DN-Y1111-1"|"9449305552"|"F"|"20250128"|"KMK001326"|"S"|"1"|"H"|"C"|"20250314"|"1345"|"MKGH"|"BREAST CARE UNIT"|"BREAST CARE UNIT"|"BREAST CARE UNIT"|"MILTON KEYNES HOSPITAL"|"STANDING WAY"|"MILTON KEYNES"|"MK6 5LD"|"MK6 5LD"|"20250128-175555"
 "NBSSAPPT_END"|"00000013"|"20250128"|"17:09:22"|"000003"

manage_breast_screening/notifications/tests/integration/test_create_appointments_from_azure_storage.py

@@ -27,10 +27,10 @@ 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}"
+        test_file_name = "ABC_20241202091221_APPT_106.dat"
+        blob_name = f"{today_dirname}/{test_file_name}"
 
-        with open(helpers.get_test_file_path(test_file_path)) as test_file:
+        with open(helpers.get_test_file_path(test_file_name)) as test_file:
             BlobStorage().add(blob_name, test_file.read())
 
         Command().handle(**{"date_str": today_dirname})
@@ -75,3 +75,27 @@ def test_appointments_created_from_file_stored_in_azure(self, helpers):
 
         assert appointments[0].clinic == clinics[1]
         assert appointments[1].clinic == clinics[1]
+
+    @pytest.mark.django_db
+    def test_files_are_processed_in_correct_order(self, helpers):
+        today_dirname = datetime.today().strftime("%Y-%m-%d")
+        test_file_names = [
+            "ABC_20241202091221_APPT_106.dat",
+            "ABC_20241202091321_APPT_107.dat",
+        ]
+        for test_file_name in test_file_names:
+            blob_name = f"{today_dirname}/{test_file_name}"
+
+            with open(helpers.get_test_file_path(test_file_name)) as test_file:
+                BlobStorage().add(blob_name, test_file.read())
+
+        Command().handle(**{"date_str": today_dirname})
+
+        assessment = Appointment.objects.filter(nhs_number="9449306621").first()
+        booked_then_cancelled = Appointment.objects.filter(
+            nhs_number="9449305552"
+        ).first()
+        assert booked_then_cancelled.updated_at is not None
+        assert booked_then_cancelled.cancelled_at is not None
+        assert assessment.created_at < booked_then_cancelled.updated_at
+        assert booked_then_cancelled.booked_at < booked_then_cancelled.cancelled_at

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

@@ -185,7 +185,7 @@ def test_handle_updates_records(self):
         assert appointments[0].status == "C"
         assert appointments[0].cancelled_by == "C"
         assert appointments[0].cancelled_at == datetime.strptime(
-            "20250128-154003", "%Y%m%d-%H%M%S"
+            "20250128-175555", "%Y%m%d-%H%M%S"
         ).replace(tzinfo=TZ_INFO)
 
     def test_only_updates_cancelled_appointments(self):