Cleanup error messages

Author: robertnovac1

azure/templates/post-deploy.yml

@@ -206,7 +206,7 @@ steps:
 
     displayName: Run full batch test suite
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/e2e_batch"
-    enabled: false
+    condition: eq(1, 2) # Disable task but make this step visible in the pipeline
 
   - task: PublishTestResults@2
     displayName: 'Publish test results'

e2e/utils/base_test.py

@@ -103,11 +103,17 @@ def tearDownClass(cls):
     # It’s used to clean up resources that were initialized specifically for a single test,
     # such as temporary files or mock objects.
     def tearDown(cls):
-        for api in cls.imms_apis:
-            if api.generated_test_records:
-                imms_deleted = delete_imms_records(api.generated_test_records)
-                print(imms_deleted)
-                api.generated_test_records.clear()
+        for api_client in cls.imms_apis:
+            if api_client.generated_test_records:
+                result = delete_imms_records(api_client.generated_test_records)
+
+                if result.get("failure_count", 0) > 0:
+                    print(
+                        f"[teardown warning] Deleted {result.get('success_count', 0)} records out of "
+                        f"{len(api_client.generated_test_records)}, failed to delete {result['failure_count']}"
+                    )
+
+                api_client.generated_test_records.clear()
 
     @staticmethod
     def create_immunization_resource(imms_api: ImmunisationApi, resource: dict = None) -> str:

e2e/utils/resource.py

@@ -8,7 +8,6 @@
 from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource, Table
 from botocore.config import Config
 from .mappings import vaccine_type_mappings, VaccineTypes
-from functools import lru_cache
 from .constants import valid_nhs_number1
 
 current_directory = os.path.dirname(os.path.realpath(__file__))
@@ -138,31 +137,32 @@ def get_full_row_from_identifier(identifier: str) -> dict:
     return table.get_item(Key={"PK": f"Immunization#{identifier}"}).get("Item")
 
 
-@lru_cache()
 def get_dynamodb_table() -> Table:
     config = Config(connect_timeout=2, read_timeout=2, retries={"max_attempts": 1})
     db: DynamoDBServiceResource = boto3.resource("dynamodb", region_name="eu-west-2", config=config)
     return db.Table(os.getenv("DYNAMODB_TABLE_NAME"))
 
 
 def delete_imms_records(identifiers: list[str]) -> dict:
-    """Batch delete immunization records from the DynamoDB table."""
+    """Batch delete immunization records from the DynamoDB table.
+    Returns counts of successful and failed deletions.
+    """
     table = get_dynamodb_table()
-    deleted = []
-    errors = []
+    success_count = 0
+    failure_count = 0
 
     try:
         with table.batch_writer(overwrite_by_pkeys=["PK"]) as batch:
             for identifier in identifiers:
                 key = {"PK": f"Immunization#{identifier}"}
                 try:
                     batch.delete_item(Key=key)
-                    deleted.append(identifier)
+                    success_count += 1
                 except Exception as e:
                     print(f"Failed to delete record with key {key}: {e}")
-                    errors.append({"identifier": identifier, "error": str(e)})
+                    failure_count += 1
     except Exception as e:
         print(f"Batch writer failed: {e}")
-        return {"Error": str(e), "Deleted": deleted, "Failures": errors}
+        return {"success_count": success_count, "failure_count": len(identifiers)}
 
-    return {"Deleted": deleted, "Failures": errors}
+    return {"success_count": success_count, "failure_count": failure_count}