fix upsert

Author: JamesW1-NHS

lambdas/filenameprocessor/src/audit_table.py

@@ -15,7 +15,7 @@ def upsert_audit_table(
     queue_name: str,
     file_status: str,
     error_details: Optional[str] = None,
-    condition_expression: str = "",
+    condition_expression: Optional[str] = None,
 ) -> None:
     """
     Updates the audit table with the file details
@@ -34,11 +34,17 @@ def upsert_audit_table(
 
     try:
         # Add to the audit table (regardless of whether it is a duplicate)
-        dynamodb_client.put_item(
-            TableName=AUDIT_TABLE_NAME,
-            Item=audit_item,
-            ConditionExpression=condition_expression,
-        )
+        if not condition_expression:
+            dynamodb_client.put_item(
+                TableName=AUDIT_TABLE_NAME,
+                Item=audit_item,
+            )
+        else:
+            dynamodb_client.put_item(
+                TableName=AUDIT_TABLE_NAME,
+                Item=audit_item,
+                ConditionExpression=condition_expression,
+            )
         logger.info(
             "%s file, with message id %s, successfully added to audit table",
             file_key,

lambdas/filenameprocessor/src/file_name_processor.py

@@ -304,8 +304,10 @@ def handle_extended_attributes_file(
         logger.error("Error processing file '%s': %s", file_key, str(error))
 
         file_status = get_file_status_for_error(error)
-        extended_attribute_identifier = validate_extended_attributes_file_key(file_key)
-        queue_name = extended_attribute_identifier
+
+        # NB if we got InvalidFileKeyError we won't have a valid queue name
+        if not queue_name:
+            queue_name = "unknown"
 
         # Move file to archive
         move_file(bucket_name, file_key, f"archive/{file_key}")