VED-1058 Minor improvement to record forwarder lambda logs (#1183)

Author: dlzhry2nhs

lambdas/recordforwarder/src/repository/fhir_batch_repository.py

@@ -189,7 +189,7 @@ def delete_immunization(
         except botocore.exceptions.ClientError as error:
             # Either resource didn't exist or it has already been deleted. See ConditionExpression in the request
             if error.response["Error"]["Code"] == "ConditionalCheckFailedException":
-                raise ResourceNotFoundError(resource_type="Immunization", resource_id=imms_id)
+                raise ResourceNotFoundError(resource_type="Immunization", resource_id=identifier)
             else:
                 raise UnhandledResponseError(
                     message=f"Unhandled error from dynamodb: {error.response['Error']['Code']}",

lambdas/recordforwarder/tests/test_forwarding_batch_lambda.py

@@ -385,7 +385,7 @@ def test_forward_lambda_handler_multiple_scenarios(self):
                     "diagnostics": create_diagnostics_dictionary(
                         ResourceNotFoundError(
                             resource_type="Immunization",
-                            resource_id="Immunization#4d2ac1eb-080f-4e54-9598-f2d53334681c",
+                            resource_id="https://www.ravs.england.nhs.uk/#RSV_002",
                         )
                     ),
                 },
@@ -415,7 +415,7 @@ def test_forward_lambda_handler_multiple_scenarios(self):
                     "diagnostics": create_diagnostics_dictionary(
                         ResourceNotFoundError(
                             resource_type="Immunization",
-                            resource_id="Immunization#4d2ac1eb-080f-4e54-9598-f2d53334681c",
+                            resource_id="https://www.ravs.england.nhs.uk/#RSV_002",
                         )
                     ),
                 },
@@ -700,7 +700,7 @@ def test_forward_lambda_handler_update_scenarios(self):
                     "diagnostics": create_diagnostics_dictionary(
                         ResourceNotFoundError(
                             resource_type="Immunization",
-                            resource_id="Immunization#4d2ac1eb-080f-4e54-9598-f2d53334687r",
+                            resource_id="https://www.ravs.england.nhs.uk/#UPDATE_TEST",
                         )
                     ),
                 },