Skip to content

Version 6.14.0#5864

Merged
thomasleese merged 92 commits intomainfrom
next
Jan 22, 2026
Merged

Version 6.14.0#5864
thomasleese merged 92 commits intomainfrom
next

Conversation

@thomasleese
Copy link
Copy Markdown
Contributor

No description provided.

murugapl and others added 30 commits January 15, 2026 16:34
Add sections for Contact details, Clinics, Schools and Session defaults.
Ability to manage schools and clinics will eventually be added to this tab.
This is so that the user never gets any import issues.

Instead of creating import issues on close matches, we will now simply
create a new record, unless it's an exact match with what was
previously uploaded (ie if the same spreadsheet were uploaded twice)

Jira-Issue: MAV-3078
Only if the `sync_national_reporting_to_imms_api` feature flag is
enabled.

Jira-Issue: MAV-3085
This is the commit that adds the new SQL file with no changes.
These columns will be used for grouping CSV exports by school, allowing
teams to see vaccination metrics broken down by individual schools.
Allows using ?group=school to group CSV exports by school URN and name.
This extends the totals endpoint to return an array of grouped records
when the group parameter is passed, reusing the existing grouping logic
from the CSV export.
Amend names of input arguments to better reflect what is needed. This is also reflected in the help docs.
Add better test coverage and feedback when command fails.
Adds feedback statements when the school doesn't belong tho the team specified.
Adds tests to cover all failure scenarios.
Amend add-to-team to use TEAM_WORKGROUP instead of ODS_CODE.
Add documentation for remove-from-team command.
This removes the `UpdatesPatientTeam` concern from `ArchiveReason` and
instead replaces it with an explicit call to `PatientTeamUpdater`.

Jira-Issue: MAV-2840
This removes the `UpdatesPatientTeam` concern from `PatientLocation` and
instead replaces it with an explicit call to `PatientTeamUpdater`.

Jira-Issue: MAV-2840
This removes the `UpdatesPatientTeam` concern from `TeamLocation` and
instead replaces it with an explicit call to `PatientTeamUpdater`.

Jira-Issue: MAV-2840
This removes the `UpdatesPatientTeam` concern from `SchoolMove` and
instead replaces it with an explicit call to `PatientTeamUpdater`.

Jira-Issue: MAV-2840
This removes the `UpdatesPatientTeam` concern from `VaccinationRecord`
and instead replaces it with an explicit call to `PatientTeamUpdater`.

Jira-Issue: MAV-2840
This is no longer being used so it can be safely removed.

Jira-Issue: MAV-2840
This renames the exception to `UnsupportedProgrammeType` to allow it to
be used more easily in a context where we don't have a programme
instance but instead only know the type.

Jira-Issue: MAV-2660
This refactors the status generators to accept only the
`programme_type` as an argument and instead return the approriate
`programme`.

This has no change on functionality (although might offer a slight
performance improvement), but it makes it clear that the status
generator is what we use to determine the specific programme variant of
a programme type. At the moment you could pass in separate programme
variants of the same type which doesn't feel right as the fact that it's
a variant would be ignored.

Jira-Issue: MAV-2660
This removes the logic related to resolving a consent status and moves
it in to the `AppPatientSessionConsentComponent` component which was the
only place where this was being used.

Jira-Issue: MAV-2660
This removes the logic related to resolving a triage status and moves
it in to the `AppPatientSessionTriageComponent` component which was the
only place where this was being used.

Jira-Issue: MAV-2660
This class is now only responsible for resolving the programme status of
a patient, so it's been renamed as such and the interface has been
simplified.

Jira-Issue: MAV-2660
…cination

Remove `consent` and `triage` from `PatientStatusResolver`
Avoid using callbacks to update patient-teams
…sync-status

Show `Synced with NHSE?` on national reporting vaccinations
This refactors the `eligible_for_programme` and
`eligible_for_any_programmes_of` scopes to use
`Patient::ProgrammeStatus` instead of the `Patient::VaccinationStatus`.

The functionality should be the same before and after.

Jira-Issue: MAV-2660
This replaces all usage of the `Patient::VaccinationStatus` with the
`Patient::ProgrammeStatus` which in most cases can be a drop-in
replacement, although there are a few areas where some specific changes
need to be made.

We're doing this so we can eventually remove the
`Patient::VaccinationStatus` and be fully replaced by
`Patient::ProgrammeStatus`.

Jira-Issue: MAV-2660
We're no longer using this model anywhere so we can safely stop updating
it.

Jira-Issue: MAV-2660
We're no longer using this model anywhere so we can safely remove it.

This will be followed up by a migration which removes the table.

Jira-Issue: MAV-2660
Adds a new `rdocs:generate` Rake task to generate RDoc documentation for
the project, including README, documentation files, and Ruby source files.
mikejamesthompson and others added 21 commits January 21, 2026 17:59
…and-report

Allow CarePlus staff type and staff code fields to be set per team
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.591.0 to 1.592.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-version: 1.592.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [prettier](https://github.com/prettier/prettier) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.8.0...3.8.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.8.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [dry-cli](https://github.com/dry-rb/dry-cli) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/dry-rb/dry-cli/releases)
- [Changelog](https://github.com/dry-rb/dry-cli/blob/main/CHANGELOG.md)
- [Commits](dry-rb/dry-cli@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: dry-cli
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [with_advisory_lock](https://github.com/ClosureTree/with_advisory_lock) from 7.0.2 to 7.5.0.
- [Release notes](https://github.com/ClosureTree/with_advisory_lock/releases)
- [Changelog](https://github.com/ClosureTree/with_advisory_lock/blob/master/CHANGELOG.md)
- [Commits](ClosureTree/with_advisory_lock@with_advisory_lock/v7.0.2...with_advisory_lock/v7.5.0)

---
updated-dependencies:
- dependency-name: with_advisory_lock
  dependency-version: 7.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [puma](https://github.com/puma/puma) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/main/History.md)
- [Commits](puma/puma@v7.1.0...v7.2.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…c2-1.592.0

Bump aws-sdk-ec2 from 1.591.0 to 1.592.0
…tier-3.8.1

Bump prettier from 3.8.0 to 3.8.1
…sory_lock-7.5.0

Bump with_advisory_lock from 7.0.2 to 7.5.0
Bumps the npm_and_yarn group with 1 update in the / directory: [lodash](https://github.com/lodash/lodash).


Updates `lodash` from 4.17.21 to 4.17.23
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…arn-f3562b46b9

Bump lodash from 4.17.21 to 4.17.23 in the npm_and_yarn group across 1 directory
This is just the view file with no changes.
This makes them consistent with the rest of Mavis.
Update `school.name` in reporting API totals view
- Use production-level resource distribution
- Allow workflows to run for pentest environment
@thomasleese thomasleese requested review from a team as code owners January 22, 2026 17:20
@sonarqubecloud
Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
2 Security Hotspots
12.6% Duplication on New Code (required ≤ 3%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@thomasleese thomasleese enabled auto-merge January 22, 2026 17:22
@thomasleese thomasleese merged commit eb8cfea into main Jan 22, 2026
80 of 81 checks passed
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.

8 participants