Skip to content

Conversation

@nhsdevws
Copy link
Contributor

@nhsdevws nhsdevws commented Sep 24, 2025

Summary

  • Routine Change
  • ❗ Breaking Change
  • 🤖 Operational or Infrastructure Change
  • ✨ New Feature
  • ⚠️ Potential issues that might be caused by this change
  • Tests described by json
  • Tests use different ods/Vax combination for FIFO parallel processing
  • Uploaded in together before poll
  • Revised validations
    = Complete cleanup of source/dest s3, audit/events table, SQS FIFOs (only purged for dev PRs)

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 or part of the acceptance criteria of the ticket, and the code is in a mergeable state.
  • If there were infrastructure, operational, or build changes, I have made sure there is sufficient evidence that the changes will work.
  • I have ensured the changelog has been updated by the submitter, if necessary.

@github-actions
Copy link
Contributor

This branch is working on a ticket in the NHS England VED JIRA Project. Here's a handy link to the ticket:

VED-770

@nhsdevws nhsdevws force-pushed the VED-770-e2e-batch-rewrite branch from 51dca76 to 3411691 Compare September 24, 2025 21:14
Copy link
Contributor

@dlzhry2nhs dlzhry2nhs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work - looks like it's running quickly in the pipeline and it'll be great to get this back in as a CI check.

Couple of comments added mostly around readability and expressing intent.

We can also have tickets down the line to add further test cases of critical functionality e.g. invalid files, duplicates, and richer assertions on the persisted data. Happy for that to be later rather than now - this PR gets us to a better position.

Only reservation relates to the readability - while it is now performing, not convinced this is much more readable or extensible than what we had before. We can see when we attempt to add the additional required cases. If necessary could spike moving to pytest parallel - it has always been my preference regardless of whether it is integration or unit tests, for test readability i.e. clear setup, act and assert steps to be used. (Details of what we are doing in the steps can be abstracted into code but in this suite it seems like everything is tucked away into the new test classes away from the original e2e_batch test file.

@nhsdevws nhsdevws force-pushed the VED-770-e2e-batch-rewrite branch from 65eee14 to 436c1b9 Compare September 25, 2025 12:03
@nhsdevws nhsdevws force-pushed the VED-770-e2e-batch-rewrite branch from 6013e42 to d4b1183 Compare September 25, 2025 15:22
@nhsdevws nhsdevws force-pushed the VED-770-e2e-batch-rewrite branch from ec52c23 to 73357d3 Compare September 25, 2025 18:06
@nhsdevws nhsdevws force-pushed the VED-770-e2e-batch-rewrite branch from 44fae14 to e66ad1b Compare September 26, 2025 08:06
@dlzhry2nhs dlzhry2nhs self-requested a review September 26, 2025 08:08
@sonarqubecloud
Copy link

print(".", end="")
time.sleep(5)
if (time.time() - start_time) > max_timeout:
return False
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a minor point: if we do timeout, should we not log something? (e.g. the fact we timed out, and/or some information on the unprocessed files)

@nhsdevws nhsdevws merged commit 95dcfbc into master Sep 26, 2025
7 checks passed
@nhsdevws nhsdevws deleted the VED-770-e2e-batch-rewrite branch September 26, 2025 09:16
mfjarvis pushed a commit that referenced this pull request Oct 22, 2025
* Purge SQS in development PR branch only

* comments env & create_with_cp1252_encoded_character

* poetry lock

* remove VaxSupplierPerms. 600 s timeout. readme
mfjarvis pushed a commit that referenced this pull request Oct 27, 2025
* Purge SQS in development PR branch only

* comments env & create_with_cp1252_encoded_character

* poetry lock

* remove VaxSupplierPerms. 600 s timeout. readme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants