Merge pull request #6581 from NHSDigital/MAV-6069-fix-mmrv-triage-email

Fix the "<Patient> needs another dose of MMR/MMRV" email so it doesn't always say MMR

Author: benilovj

app/helpers/patients_helper.rb

@@ -88,4 +88,14 @@ def patient_next_dose_label(patient, programme, academic_year)
       .dose_sequence
       &.ordinalize
   end
+
+  def patient_previous_dose_label(patient, programme, academic_year)
+    dose = patient.programme_status(programme, academic_year:).dose_sequence
+    (dose - 1).ordinalize if dose && dose > 1
+  end
+
+  def patient_short_name_possessive(patient)
+    name = patient.short_name
+    name.ends_with?("s") ? "#{name}’" : "#{name}’s"
+  end
 end

app/helpers/sessions_helper.rb

@@ -73,4 +73,8 @@ def session_title(session)
   def session_consent_style(session)
     session.outbreak ? "Outbreak request" : "Standard request"
   end
+
+  def session_future_dates(session)
+    session.future_dates.map { it.to_fs(:short_day_of_week) }.to_sentence
+  end
 end

app/lib/govuk_notify_personalisation.rb

@@ -6,6 +6,7 @@ class GovukNotifyPersonalisation
   include PatientsHelper
   include PhoneHelper
   include ProgrammesHelper
+  include SessionsHelper
   include TeamsHelper
   include VaccinationRecordsHelper
   include VaccinesHelper

app/views/notify_templates/email/triage_vaccination_will_happen_mmr_second_dose.text.erb

@@ -1,10 +1,13 @@
 ---
 template_id: "6fd910fd-120c-4e58-9ef3-15ffc5bd6edc"
 template_name: triage_vaccination_will_happen_mmr_second_dose
-subject: "<%= short_patient_name %> needs another dose of the MMR vaccination"
+subject: "<%= patient.short_name %> needs another dose of the <%= programme_name_for_parents(mmr_programme.variant_for(patient:)) %> vaccination"
 ---
-We recently gave <%= short_patient_name %> their 1st dose of the MMR vaccination. To be fully vaccinated, they need 2 doses.
+<% variant = mmr_programme.variant_for(patient:) -%>
+<% previous_dose = patient_previous_dose_label(patient, mmr_programme, academic_year) -%>
+<% next_dose = patient_next_dose_label(patient, mmr_programme, academic_year) -%>
+We recently gave <%= patient.short_name %> their <%= previous_dose %> dose of the <%= programme_name_for_parents(variant) %> vaccination. To be fully vaccinated, they need <%= mmr_programme.maximum_dose_sequence %> doses.
 
-We’re coming to <%= location_name %> on <%= next_session_dates %> and plan to give <%= short_patient_name %> their 2nd dose then. Please let them know about this.
+We’re coming to <%= session.location.name %> on <%= session_future_dates(session) %> and plan to give <%= patient.short_name %> their <%= next_dose %> dose then. Please let them know about this.
 
-If <%= short_patient_name_apos %> health changes, or you arrange for them to get their 2nd dose somewhere else, contact us. You can email <%= subteam_email %> or phone <%= subteam_phone %>.
+If <%= patient_short_name_possessive(patient) %> health changes, or you arrange for them to get their <%= next_dose %> dose somewhere else, contact us. You can email <%= team_contact_email(session) %> or phone <%= team_contact_phone(session) %>.

spec/features/triage_required_spec.rb

@@ -481,16 +481,27 @@ def given_an_mmr_programme_with_a_running_session
 
   def and_a_partially_vaccinated_patient_who_needs_triage_exists
     @patient_triage_needed =
-      create(:patient, :partially_vaccinated_triage_needed, session: @session)
+      create(
+        :patient,
+        :partially_vaccinated_triage_needed,
+        date_of_birth: Date.new(2019, 6, 1), # before MMRV eligibility cutoff
+        session: @session
+      )
   end
 
   def then_the_mmr_second_dose_will_happen_email_is_sent
+    patient_name = @patient_triage_needed.short_name
+
     @patient_triage_needed.parents.each do |parent|
       expect(email_deliveries).to include(
         matching_notify_email(
           to: parent.email,
-          template: :triage_vaccination_will_happen_mmr_second_dose
-        ).with_content_including("We recently gave", "2nd dose")
+          template: :triage_vaccination_will_happen_mmr_second_dose,
+          subject: "#{patient_name} needs another dose of the MMR vaccination"
+        ).with_content_including(
+          "We recently gave #{patient_name} their 1st dose of the MMR vaccination",
+          "plan to give #{patient_name} their 2nd dose then"
+        )
       )
     end
   end

spec/helpers/patients_helper_spec.rb

@@ -177,4 +177,64 @@
       it { should eq("2nd") }
     end
   end
+
+  describe "#patient_previous_dose_label" do
+    subject(:previous_dose_label) do
+      helper.patient_previous_dose_label(
+        patient,
+        programme,
+        session.academic_year
+      )
+    end
+
+    let(:programme) { Programme.mmr }
+    let(:team) { create(:team, programmes: [programme]) }
+    let(:session) do
+      create(
+        :session,
+        team:,
+        programmes: [programme],
+        date: Date.new(2024, 10, 1)
+      )
+    end
+    let(:patient) { create(:patient, session:, year_group: 9) }
+
+    context "with no vaccinations" do
+      before { PatientStatusUpdater.call(patient:) }
+
+      it { should be_nil }
+    end
+
+    context "with one vaccination" do
+      before do
+        create(
+          :vaccination_record,
+          :administered,
+          programme:,
+          patient:,
+          session:,
+          performed_at: Date.new(2024, 10, 1)
+        )
+        PatientStatusUpdater.call(patient:)
+      end
+
+      it { should eq("1st") }
+    end
+  end
+
+  describe "#patient_short_name_possessive" do
+    subject { helper.patient_short_name_possessive(patient) }
+
+    context "when the name does not end in s" do
+      let(:patient) { build(:patient, given_name: "Filip") }
+
+      it { should eq("Filip’s") }
+    end
+
+    context "when the name ends in s" do
+      let(:patient) { build(:patient, given_name: "James") }
+
+      it { should eq("James’") }
+    end
+  end
 end

spec/helpers/sessions_helper_spec.rb

@@ -107,6 +107,32 @@
     end
   end
 
+  describe "#session_future_dates" do
+    subject { travel_to(today) { helper.session_future_dates(session) } }
+
+    let(:today) { Date.new(2025, 6, 1) }
+
+    context "with no future dates" do
+      let(:session) { create(:session, dates: [Date.new(2025, 5, 30)]) }
+
+      it { should eq("") }
+    end
+
+    context "with one future date" do
+      let(:session) { create(:session, dates: [Date.new(2025, 6, 10)]) }
+
+      it { should eq("Tuesday 10 June") }
+    end
+
+    context "with multiple future dates" do
+      let(:session) do
+        create(:session, dates: [Date.new(2025, 6, 10), Date.new(2025, 6, 17)])
+      end
+
+      it { should eq("Tuesday 10 June and Tuesday 17 June") }
+    end
+  end
+
   describe "#session_title" do
     subject(:session_title) { helper.session_title(session) }
 

spec/views/notify_templates/email/triage_vaccination_will_happen_mmr_second_dose_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+describe "Notify email templates: triage_vaccination_will_happen_mmr_second_dose",
+         type: :view do
+  subject(:rendered) { render_template }
+
+  let(:programme) { Programme.mmr }
+  let(:team) { create(:team, :with_one_nurse, programmes: [programme]) }
+  let(:session) do
+    create(
+      :session,
+      team:,
+      programmes: [programme],
+      date: Date.new(2025, 6, 10)
+    )
+  end
+  let(:patient) do
+    create(
+      :patient,
+      :partially_vaccinated_triage_needed,
+      given_name: "Filip",
+      date_of_birth: Date.new(2015, 6, 1),
+      session:
+    )
+  end
+  let(:consent) { patient.consents.first }
+
+  def render_template
+    PatientStatusUpdater.call(patient:)
+    patient.programme_statuses.reload
+    personalisation = GovukNotifyPersonalisation.new(consent:, session:)
+    NotifyTemplate.find(
+      :triage_vaccination_will_happen_mmr_second_dose,
+      channel: :email
+    ).render(personalisation)
+  end
+
+  context "with an MMR programme" do
+    it "includes the programme name in the subject" do
+      expect(rendered[:subject]).to include("MMR vaccination")
+    end
+
+    it "describes the first dose given" do
+      expect(rendered[:body]).to include(
+        "We recently gave Filip their 1st dose of the MMR vaccination"
+      )
+    end
+
+    it "describes the next dose" do
+      expect(rendered[:body]).to include(
+        "plan to give Filip their 2nd dose then"
+      )
+    end
+  end
+
+  context "with an MMRV programme" do
+    let(:patient) do
+      create(
+        :patient,
+        :partially_vaccinated_triage_needed,
+        given_name: "Filip",
+        date_of_birth: Date.new(2020, 6, 1),
+        session:
+      )
+    end
+
+    it "includes the programme name in the subject" do
+      expect(rendered[:subject]).to include("MMRV vaccination")
+    end
+
+    it "describes the first dose given" do
+      expect(rendered[:body]).to include(
+        "We recently gave Filip their 1st dose of the MMRV vaccination"
+      )
+    end
+
+    it "describes the next dose" do
+      expect(rendered[:body]).to include(
+        "plan to give Filip their 2nd dose then"
+      )
+    end
+  end
+end