Skip to content

Feature/ved 1106#1280

Merged
FimranNHS merged 5 commits intomasterfrom
feature/VED-1106
Mar 10, 2026
Merged

Feature/ved 1106#1280
FimranNHS merged 5 commits intomasterfrom
feature/VED-1106

Conversation

@FimranNHS
Copy link
Contributor

Summary

  • Routine Change
  • ❗ Breaking Change
  • 🤖 Operational or Infrastructure Change
  • ✨ New Feature
  • ⚠️ Potential issues that might be caused by this change

Add any other relevant notes or explanations here. Remove this line if you have nothing to add.

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.

@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-1106

@sonarqubecloud
Copy link

Copy link
Collaborator

@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.

Noice. Some optional comments.

}
print(f"\n Search Post request (mixed valid/invalid target-disease) - \n {context.request}")
context.response = http_requests_session.post(context.url, headers=context.headers, data=context.request)
trigger_search_request_by_httpMethod(context, httpMethod=httpMethod)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Technically in python and per coding standards we're looking for Pep 8 ideally variables and method names would be lower case with underscores separating the words.

i.e http_method. Not major, as it would be something to rework in the automation tests anyway. So can leave as optional to do later if you'd prefer.


def validate_inf_ack_file(context, success: bool = True) -> bool:
content = context.fileContent
content = content.replace("\r\n", "\n")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this issue just being seen on certain Windows laptops?

elapsed = 0

if folderName == "forwardedFile":
expected_extensions = {".csv", ".json"}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could link this line to VED-1071. E.g. put a # VED-1071 TODO comment about restricting to JSON only once DPS has done the required development work.

More widely it does beg the question why the INF Acks are still CSV. That is a design question for the architect. Ultimately does not matter too much if no one is using them yet, but if we want clients other than DPS to use it in future, it does seem weird that one is CSV and one is JSON!


if expected_extensions == {".csv"}:
return {"csv": found_files[".csv"]}
if expected_extensions.issubset(found_files.keys()):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Subset could mean that even more keys were found. This check is fine, but it could be tightened up with:

len(expected_extensions.difference(found_files.keys())) == 0. There might be a neater more Pythonic way to do it, but that will be more precise at least.

@FimranNHS FimranNHS merged commit fff3f66 into master Mar 10, 2026
17 checks passed
@FimranNHS FimranNHS deleted the feature/VED-1106 branch March 10, 2026 20:38
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.

2 participants