Remove MMRV vaccination workaround in notify templates

We were using a workaround to ensure parents only received comms for MMR even if the
patient was eligible for MMRV. This is because we hadn't built support for MMRV consent
just yet. Now that we have this support, we can get rid of the workaround and directly
use the `vaccination` variable which uses the programmes the patient is eligible for.
This requires updating some of the notify templates to no longer use `vaccination_sms`.

Author: murugapl

app/lib/govuk_notify_personalisation.rb

@@ -83,7 +83,6 @@ def to_h
       team_privacy_policy_url:,
       today_or_date_of_vaccination:,
       vaccination:,
-      vaccination_sms:,
       vaccination_and_dates:,
       vaccination_and_dates_sms:,
       vaccination_and_method:,
@@ -495,19 +494,6 @@ def vaccination
     end
   end
 
-  # TODO: Remove this method when schools start offering MMRV.
-  # When that happens:
-  # - Remove vaccination_sms method and use vaccination instead
-  # - Update email template 5462c441-81c0-4ac0-821f-713b4178f8ba to use
-  #   vaccination variable instead of hardcoded 'MMR catch-up vaccinations'
-  def vaccination_sms
-    if is_catch_up? && mmr_programme&.mmrv_variant?
-      return vaccination&.gsub("MMRV", "MMR")
-    end
-
-    vaccination
-  end
-
   def vaccination_and_dates
     if next_or_today_session_dates_or.present?
       "#{vaccination} on #{next_or_today_session_dates_or}"
@@ -519,9 +505,9 @@ def vaccination_and_dates
   # TODO: Remove this method when schools start offering MMRV.
   def vaccination_and_dates_sms
     if next_or_today_session_dates_or.present?
-      "#{vaccination_sms} on #{next_or_today_session_dates_or}"
+      "#{vaccination} on #{next_or_today_session_dates_or}"
     else
-      vaccination_sms
+      vaccination
     end
   end
 

config/initializers/govuk_notify.rb

@@ -15,7 +15,7 @@
     "3523d4b8-530b-42dd-8b9b-7fed8d1dfff1",
   consent_school_initial_reminder_flu: "7f85a5b4-5240-4ae9-94f7-43913852943c",
   consent_school_initial_reminder_hpv: "0d78bff0-9dde-4192-8cf8-10e83486b54f",
-  consent_school_initial_reminder_mmr: "5462c441-81c0-4ac0-821f-713b4178f8ba",
+  consent_school_initial_reminder_mmr: "fe47875a-a0a6-40d9-bd41-a411ebb31cff",
   consent_school_request_doubles: "9b1a015d-6caa-47c5-a223-f72377586602",
   consent_school_request_flu: "017853bc-2b35-4aff-99b1-193e514613a0",
   consent_school_request_hpv: "7b9bb010-0742-460a-ae25-1922355b6776",
@@ -57,9 +57,9 @@
   clinic_subsequent_invitation_ryg: "018f146d-e7b7-4b63-ae26-bb07ca6fe2f9",
   consent_clinic_request: "03a0d572-ca5b-417e-87c3-838872a9eabc",
   consent_confirmation_given: "8eb8d05e-b8d8-4bf9-8a38-c009ae989a4e",
-  consent_confirmation_refused: "e871e7d5-06be-48d1-81ba-38ddecae46e2",
-  consent_school_reminder: "b9c0c3fb-24f1-4647-a2a1-87389cec9942",
-  consent_school_request: "12f90b2d-33a5-429c-9ed7-0aa2823eb3ac",
+  consent_confirmation_refused: "234b7479-1968-4f57-a6bf-20e402c8da39",
+  consent_school_reminder: "26029539-60e4-416b-a3a8-40b82c2babc1",
+  consent_school_request: "2d3e2370-7faa-4798-b7ae-607692a85059",
   consent_unknown_contact_details_warning:
     "1fd4620d-1c96-4af1-b047-ed13a90b0f44",
   session_school_reminder: "cc4a7f89-d260-461c-80f0-7e6e9af75e7a",
@@ -71,6 +71,11 @@
 # Here we track email and SMS templates that we used to send but no longer
 # do. We need these to be able to display the names of the templates.
 GOVUK_NOTIFY_UNUSED_TEMPLATES = {
+  "e871e7d5-06be-48d1-81ba-38ddecae46e2" => :consent_confirmation_refused,
+  "b9c0c3fb-24f1-4647-a2a1-87389cec9942" => :consent_school_reminder,
+  "12f90b2d-33a5-429c-9ed7-0aa2823eb3ac" => :consent_school_request,
+  "5462c441-81c0-4ac0-821f-713b4178f8ba" =>
+    :consent_school_initial_reminder_mmr,
   "07516fbf-6d51-4c17-a046-305f5baa6744" => :vaccination_administered_flu,
   "3179b434-4f44-4d47-a8ba-651b58c235fd" => :consent_confirmation_given,
   "eb34f3ab-0c58-4e56-b6b1-2c179270dfc3" => :consent_confirmation_refused,

spec/lib/govuk_notify_personalisation_spec.rb

@@ -109,7 +109,6 @@
           team_privacy_notice_url: "https://example.com/privacy-notice",
           team_privacy_policy_url: "https://example.com/privacy-policy",
           vaccination: "HPV vaccination",
-          vaccination_sms: "HPV vaccination",
           vaccination_and_dates: "HPV vaccination on Thursday 1 January",
           vaccination_and_dates_sms: "HPV vaccination on Thursday 1 January",
           vaccination_and_method: "HPV vaccination",
@@ -134,8 +133,8 @@
       let(:programmes) { [Programme.mmr] }
       let(:date_of_birth) { Programme::MIN_MMRV_ELIGIBILITY_DATE + 1.month }
 
-      it { should include(vaccination_sms: "MMR vaccination") }
-      it { should include(vaccination_and_dates_sms: "MMR vaccination") }
+      it { should include(vaccination: "MMRV vaccination") }
+      it { should include(vaccination_and_dates_sms: "MMRV vaccination") }
 
       it "generates consent link with mmrv variant" do
         expect(to_h[:consent_link]).to end_with("/mmrv/start")