VED-1010: refactor audit table functions #1137

edhall-nhs · 2026-01-15T12:34:55Z

Summary

Routine Change
⚠️ Potential issues that might be caused by this change

Consolidate audit table related functions for the batch flow into the shared code directory.

⚠️ This also changed and consolidated the log messages for all updated items. So e2e tests that verify log messages will need to be updated when in testing if there are any.

Reviews Required

Dev
Test
Tech Author
Product Owner

Review Checklist

ℹ️ This section is to be filled in by the reviewer.

I have reviewed the changes in this PR and they fill all of the acceptance criteria of the ticket.
If there were infrastructure, operational, or build changes, I have made sure there is sufficient evidence that the changes will work.
If there were changes that are outside of the regular release processes e.g. account infrastructure to setup, manual setup for external API integrations, secrets to set, then I have checked that the developer has flagged this to the Tech Lead as release steps.
I have checked that no Personal Identifiable Data (PID) is logged as part of the changes.

edhall-nhs · 2026-01-15T12:38:19Z

lambdas/batch_processor_filter/src/batch_audit_repository.py

-            ConditionExpression="attribute_exists(message_id)",
+    @staticmethod
+    def update_status(file_key: str, message_id: str, updated_status: str) -> None:
+        update_audit_table_item(


I imported the shared function here as the rest of this lambda is class/oop based so didn't think it was worth refactoring. Can do if needed.

edhall-nhs · 2026-01-15T12:45:34Z

lambdas/shared/src/common/batch/audit_table.py

+        raise UnhandledAuditTableError(error) from error
+
+
+def _build_update_expression_attribute_names_and_values(


Not sure about the name of this function. Happy to take suggestions or if it makes sense to others, leave as is.

Also not overly fond of reassigning and mutating the variables but hopefully I've made it clear that this func should be private and only used here. In which case I guess it's okay? Again, happy to take suggestions

It's an ugly name but a fully descriptive one :)

Maybe there's no need to pass the empty dicts in at all - just create them as locals and return a tuple.

…t_time in recordprocessor to use common update_audit_table_item

Also moved other audit table functions to shared file

sonarqubecloud · 2026-01-15T17:14:26Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
94.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

JamesW1-NHS · 2026-01-15T18:00:33Z

lambdas/recordprocessor/tests/test_recordprocessor_main.py

-            "file_level_validation.set_audit_table_ingestion_start_time"
-        )
+
+        self.update_audit_table_item_pather = patch("file_level_validation.update_audit_table_item")


Typo - should be 'patcher'

JamesW1-NHS · 2026-01-15T18:02:52Z

lambdas/shared/src/common/batch/audit_table.py

+def update_audit_table_item(
+    file_key: str,
+    message_id: str,
+    optional_params: dict[AuditTableKeys, any],


As Dan said, they're not really optional parameters. If we pass { }, then we end up calling update_item() with an unchanged item. If we pass None, then optional_parameters.items() will raise an AttributeError.

edhall-nhs commented Jan 15, 2026

View reviewed changes

edhall-nhs force-pushed the feature/VED-1010-refactor-audit-table-functions branch from e77f040 to 0a71a35 Compare January 15, 2026 15:27

edhall-nhs temporarily deployed to dev January 15, 2026 15:28 — with GitHub Actions Inactive

edhall-nhs had a problem deploying to internal-dev-sandbox January 15, 2026 15:34 — with GitHub Actions Failure

edhall-nhs temporarily deployed to internal-dev January 15, 2026 15:34 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev January 15, 2026 15:39 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to dev January 15, 2026 16:54 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to dev January 15, 2026 16:55 — with GitHub Actions Inactive

edhall-nhs had a problem deploying to internal-dev-sandbox January 15, 2026 16:59 — with GitHub Actions Failure

edhall-nhs had a problem deploying to internal-dev January 15, 2026 16:59 — with GitHub Actions Error

edhall-nhs temporarily deployed to dev January 15, 2026 17:05 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to dev January 15, 2026 17:06 — with GitHub Actions Inactive

edhall-nhs added 12 commits January 15, 2026 17:07

Refactor upsert_audit_table to create_audit_table_item

bcd014d

Refactor update_audit_table_status and set_audit_table_ingestion_star…

449a6d8

…t_time in recordprocessor to use common update_audit_table_item

Refactor ack_backend to use shared update

825f4fe

Also moved other audit table functions to shared file

Use shared function in batch_processor_filter

c616bc1

Refactor update_audit_table_item

a31d4bc

Consolidate unit tests

ea80d34

Tidy up create_audit_table_item and unit tests

86f4d2f

Delete consolidated unit test files

c50237a

Self review

809453d

Tidy up after rebase

ee1f84b

Self review 2

99af12c

Fix linting issue

4ce8e4d

edhall-nhs temporarily deployed to internal-dev-sandbox January 15, 2026 17:08 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev January 15, 2026 17:08 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev January 15, 2026 17:10 — with GitHub Actions Inactive

edhall-nhs force-pushed the feature/VED-1010-refactor-audit-table-functions branch from 88c6404 to 4ce8e4d Compare January 15, 2026 17:10

edhall-nhs temporarily deployed to dev January 15, 2026 17:10 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to dev January 15, 2026 17:11 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev January 15, 2026 17:13 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev-sandbox January 15, 2026 17:13 — with GitHub Actions Inactive

edhall-nhs temporarily deployed to internal-dev January 15, 2026 17:14 — with GitHub Actions Inactive

edhall-nhs deployed to internal-dev-sandbox January 15, 2026 17:17 — with GitHub Actions Active

edhall-nhs deployed to internal-dev January 15, 2026 17:19 — with GitHub Actions Active

edhall-nhs marked this pull request as ready for review January 15, 2026 17:21

JamesW1-NHS reviewed Jan 15, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

VED-1010: refactor audit table functions #1137

VED-1010: refactor audit table functions #1137

Uh oh!

edhall-nhs commented Jan 15, 2026

Uh oh!

edhall-nhs Jan 15, 2026

Uh oh!

edhall-nhs Jan 15, 2026

Uh oh!

JamesW1-NHS Jan 15, 2026 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Jan 15, 2026

Uh oh!

JamesW1-NHS Jan 15, 2026

Uh oh!

JamesW1-NHS Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		raise UnhandledAuditTableError(error) from error


		def _build_update_expression_attribute_names_and_values(

VED-1010: refactor audit table functions #1137

Are you sure you want to change the base?

VED-1010: refactor audit table functions #1137

Uh oh!

Conversation

edhall-nhs commented Jan 15, 2026

Summary

Reviews Required

Review Checklist

Uh oh!

edhall-nhs Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

edhall-nhs Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

JamesW1-NHS Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jan 15, 2026

Quality Gate passed

Uh oh!

JamesW1-NHS Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

JamesW1-NHS Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

JamesW1-NHS Jan 15, 2026 •

edited

Loading