Skip to content

Back merge main into development - #592

Merged
HasanCPS merged 5 commits into
developmentfrom
main
Sep 23, 2026
Merged

HasanCPS merged 5 commits into
developmentfrom
main

Conversation

@HasanCPS

Copy link
Copy Markdown
Collaborator

PR checklist

Tick what applies before you raise. Delete anything that doesn't.

Correctness

  • Does what the ticket asks for
  • Handles the edge cases (empty, null, zero, large inputs), not just the happy path
  • Errors are handled, not swallowed
  • New logic has tests, including the failure cases
  • Tests assert something real, not just run the code

Keeping it simple

  • Doesn't rebuild something that already exists in the codebase
  • No more complex or slower than it needs to be
  • No leftover debug logging or commented-out code

Code Quality

  • Pre-commit hooks were run for all commits in this PR

Easy to miss (a green pipeline won't flag these)

  • One logical change, not a pile of unrelated stuff

If you touched the backend

  • Schema changes have a migration, and the Down() doesn't drop anything it shouldn't
  • New app settings are wired into the fa-config templates
  • Secrets use Key Vault references, not plain text
  • New outbound HTTP clients go through the shared resilience handler (AddResiliencePolicyHandler), rather than hand-rolling retries
  • New calls to an external service (DDEI, Egress, NetApp) have client tests against a WireMock stub (for the serialisation, auth and error handling) and are covered by the integration tests that run against the real dev services

If you touched the UI

  • Ran the e2e/ suite locally (the PR build only runs the mocked tests; the full suite runs post-merge and gates the deploy)
  • API changes are reflected in the MSW handlers in src/mocks and the matching zod schema, so the mocked tests aren't passing against a contract that's gone
  • New config or feature flags are wired into the VITE build variables, not just added in code
  • Data fetches handle the loading, empty and error states, not just success, and match how the rest of the app already does it
  • Ran prettier (npm run prettier:format), since CI lints but doesn't check formatting
  • Checked accessibility (keyboard nav, screen reader, sensible labels), since the Lighthouse run is manual and won't flag it for you

@lilachdavis lilachdavis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@HasanCPS
HasanCPS merged commit f86801e into development Sep 23, 2026
30 of 37 checks passed
@sonarqubecloud

sonarqubecloud Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

lilachdavis added a commit that referenced this pull request Sep 28, 2026
* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants