Merge pull request #788 from NHSDigital/check-for-existing-extract-when-creating-appointments

Skip files which have a matching Extract record

Author: steventux

manage_breast_screening/notifications/management/commands/create_appointments.py

@@ -46,6 +46,9 @@ def handle(self, *args, **options):
             for blob in container_client.list_blobs(
                 name_starts_with=options["date_str"]
             ):
+                if Extract.objects.filter(filename=blob.name).exists():
+                    continue
+
                 blob_client = container_client.get_blob_client(blob.name)
                 logger.debug("Processing blob %s", blob.name)
                 blob_content = blob_client.download_blob(

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

@@ -355,22 +355,22 @@ def test_create_extract_and_cancel(self):
 
         assert appointment_to_update.extracts.count() == 2
 
-    @pytest.mark.django_db(transaction=True)
-    def test_errors_when_same_extract(self):
+    @pytest.mark.django_db
+    def test_skip_file_matching_extract(self):
+        """Test appointment creation where the file has been processed"""
         today_dirname = datetime.now().strftime("%Y-%m-%d")
+        filename = f"{today_dirname}/{VALID_DATA_FILE}"
 
-        with stored_blob_data(today_dirname, [VALID_DATA_FILE]):
-            Command().handle(**{"date_str": today_dirname})
-
-        assert Extract.objects.count() == 1
-        assert Appointment.objects.count() == 2
+        Extract.objects.create(
+            sequence_number=13, filename=filename, bso_code="ABC", record_count=0
+        )
 
         with stored_blob_data(today_dirname, [VALID_DATA_FILE]):
-            with pytest.raises(CommandError):
-                Command().handle(**{"date_str": today_dirname})
+            Command().handle(**{"date_str": today_dirname})
 
         assert Extract.objects.count() == 1
-        assert Appointment.objects.count() == 2
+        assert Extract.objects.first().appointments.count() == 0
+        assert Appointment.objects.count() == 0
 
     @pytest.mark.django_db(transaction=True)
     def test_errors_with_wrong_format_filename(self):