Skip to content

Conversation

thomasleese
Copy link
Contributor

@thomasleese thomasleese commented Jun 6, 2025

This adds a new column on consent forms (per programme) allowing parents to express a preference regarding the vaccine method. In most cases this is irrelevant as injection is the only option, but for Flu there's the option of a nasal spray which is the preferred choice.

To support this I've removed the old contact_injection column and related code as this is going to be rebuilt in the future as the designs have changed quite significantly since this was first added.

Jira Issue

@thomasleese thomasleese added this to the v2.2.6 milestone Jun 6, 2025
@thomasleese thomasleese requested a review from a team as a code owner June 6, 2025 06:55
@thomasleese thomasleese added the refactor Improving maintainability label Jun 6, 2025
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 06:57 Inactive
@thomasleese thomasleese modified the milestones: v2.2.6, v2.3.0 Jun 6, 2025
@thomasleese thomasleese marked this pull request as draft June 6, 2025 07:07
@thomasleese thomasleese force-pushed the consent-form-programme-response branch from c91ce92 to 662d944 Compare June 6, 2025 07:24
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 1791745 to eb714aa Compare June 6, 2025 07:26
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 07:26 Inactive
@thomasleese thomasleese force-pushed the consent-form-programme-response branch 2 times, most recently from efa5f59 to c290f1c Compare June 6, 2025 07:42
@thomasleese thomasleese force-pushed the consent-preferred-method branch from eb714aa to 96aa95a Compare June 6, 2025 07:42
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 07:42 Inactive
@thomasleese thomasleese force-pushed the consent-form-programme-response branch from c290f1c to 1750686 Compare June 6, 2025 07:47
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 96aa95a to b7505dc Compare June 6, 2025 07:47
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 07:47 Inactive
@thomasleese thomasleese force-pushed the consent-preferred-method branch from b7505dc to 606e36a Compare June 6, 2025 07:49
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 07:50 Inactive
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 606e36a to de37e1f Compare June 6, 2025 08:14
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 08:14 Inactive
@thomasleese thomasleese force-pushed the consent-preferred-method branch from de37e1f to 47c77a6 Compare June 6, 2025 11:40
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 6, 2025 11:41 Inactive
@thomasleese thomasleese marked this pull request as ready for review June 6, 2025 11:41
@thomasleese thomasleese force-pushed the consent-form-programme-response branch from 1750686 to 0f773b2 Compare June 7, 2025 06:29
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 47c77a6 to 84d0692 Compare June 7, 2025 06:29
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 7, 2025 06:29 Inactive
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 7, 2025 16:54 Inactive
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 0caec24 to f12e0ad Compare June 7, 2025 17:02
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 867d46f to 75310c8 Compare June 11, 2025 14:00
@thomasleese thomasleese changed the title Store vaccine method on consent forms Store vaccine methods on consent forms Jun 11, 2025
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 75310c8 to 02e914a Compare June 11, 2025 14:47
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 02e914a to ca0e12b Compare June 11, 2025 15:11
@thomasleese thomasleese force-pushed the consent-preferred-method branch from ca0e12b to 368e49d Compare June 11, 2025 15:12
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 368e49d to c6653c3 Compare June 11, 2025 15:18
@thomasleese thomasleese force-pushed the consent-form-programme-response branch 2 times, most recently from 8770c64 to bf19acc Compare June 12, 2025 14:21
Base automatically changed from consent-form-programme-response to next June 12, 2025 14:33
@thomasleese thomasleese force-pushed the consent-preferred-method branch from c6653c3 to 4dd588b Compare June 12, 2025 14:52
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 4dd588b to 498f3b2 Compare June 15, 2025 16:46
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 498f3b2 to 67c958a Compare June 16, 2025 13:27
This refactors the method to avoid duplication when generating the two
types of consent (given and refused).
This will be used to store an array of validate vaccine methods on a
consent, an enum backed by an array.
This adds a new column on consent forms (per programme) allowing parents
to express a preference regarding the vaccine method. In most cases this
is irrelevant as injection is the only option, but for Flu there's the
option of a nasal spray which is the preferred choice.

Jira-Issue: MAV-1230
This adds some validation on the `vaccine_method` column of the
`Consent` model to ensure that it's always set when the parent has given
consent. This value will be used as part of generating the overall
consent status so it's important that it's always present.

We can't validate that the `vaccine_method` is not set when refused
consent because it's possible for a parent to give consent and then
withdrawn it, in which case we would want to see what the method was
when consent was given.

Jira-Issue: MAV-1230
@thomasleese thomasleese force-pushed the consent-preferred-method branch from 67c958a to a2d5ed8 Compare June 16, 2025 17:51
@thomasleese thomasleese enabled auto-merge June 16, 2025 17:52
@tvararu tvararu temporarily deployed to mavis-pr-3673 June 16, 2025 17:52 Inactive
Copy link

@thomasleese thomasleese merged commit 69da9c6 into next Jun 16, 2025
13 checks passed
@thomasleese thomasleese deleted the consent-preferred-method branch June 16, 2025 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Improving maintainability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants