Remove MMRV feature flag

thomasleese · thomasleese · commit 499a927e362c · 2026-01-12T13:25:17.000Z
This enables MMRV across the service and removes the ability to turn it
off.
diff --git a/app/lib/feature_flag_factory.rb b/app/lib/feature_flag_factory.rb
@@ -17,7 +17,6 @@ def self.call
   FEATURES_FOR_DEVELOPMENT = %i[
     dev_tools
     import_review_screen
-    mmrv
     reporting_api
     testing_api
   ].freeze
diff --git a/app/models/programme.rb b/app/models/programme.rb
@@ -38,7 +38,7 @@ class InvalidType < StandardError
     "flu" => %w[Flu],
     "hpv" => %w[HPV],
     "menacwy" => %w[ACWYX4 MenACWY],
-    "mmr" => %w[MMR],
+    "mmr" => %w[MMR MMRV],
     "td_ipv" => %w[3-in-1 Td/IPV]
   }.freeze
 
@@ -124,17 +124,19 @@ def <=>(other) = type <=> other.type
 
   def variant_type = nil
 
-  def translation_key
-    mmr? && Flipper.enabled?(:mmrv) ? "mmr_and_mmrv" : type
-  end
+  def translation_key = mmr? ? "mmr_and_mmrv" : type
 
   TYPES.each do |programme_type|
     define_method("#{programme_type}?") { type == programme_type }
   end
 
-  def name = I18n.t(translation_key, scope: :programme_types)
+  def name
+    @name ||= I18n.t(translation_key, scope: :programme_types)
+  end
 
-  def name_in_sentence = flu? ? name.downcase : name
+  def name_in_sentence
+    @name_in_sentence = flu? ? name.downcase : name
+  end
 
   def variant_for(disease_types: nil, patient: nil)
     return self unless mmr?
@@ -152,12 +154,7 @@ def variant_for(disease_types: nil, patient: nil)
 
     return self if eligible_for_mmrv.nil?
 
-    variant_type =
-      if eligible_for_mmrv && Flipper.enabled?(:mmrv)
-        "mmrv"
-      else
-        "mmr"
-      end
+    variant_type = eligible_for_mmrv ? "mmrv" : "mmr"
 
     Programme::Variant.new(self, variant_type:)
   end
@@ -212,15 +209,7 @@ def default_dose_sequence = hpv? || flu? ? 1 : nil
 
   def maximum_dose_sequence = MAXIMUM_DOSE_SEQUENCES.fetch(type)
 
-  # TODO: add MMRV to IMPORT_NAMES once the MMRV flag is removed
-  def import_names
-    names = IMPORT_NAMES.fetch(type)
-    if Flipper.enabled?(:mmrv) && type == "mmr"
-      names + %w[MMRV]
-    else
-      names
-    end
-  end
+  def import_names = IMPORT_NAMES.fetch(type)
 
   def snomed_target_disease_codes = SNOMED_TARGET_DISEASE_CODES.fetch(type)
 
diff --git a/app/models/programme/variant.rb b/app/models/programme/variant.rb
@@ -33,7 +33,9 @@ def mmrv_variant? = variant_type == "mmrv"
 
   def translation_key = variant_type
 
-  def name = I18n.t(translation_key, scope: :programme_types)
+  def name
+    @name ||= I18n.t(translation_key, scope: :programme_types)
+  end
 
   def name_in_sentence = name
 
diff --git a/config/feature_flags.yml b/config/feature_flags.yml
@@ -44,5 +44,3 @@ reporting_api: Enables the Commissioner reporting component to authenticate to M
   statistics from /api/reporting/
 
 testing_api: Basic API useful for automated testing.
-
-mmrv: Adds support for MMRV vaccinations
diff --git a/spec/components/app_activity_log_component_spec.rb b/spec/components/app_activity_log_component_spec.rb
@@ -535,7 +535,6 @@
   describe "vaccination records" do
     context "for the MMRV variant" do
       let(:programme) do
-        Flipper.enable(:mmrv)
         Programme.mmr.variant_for(
           disease_types: Programme::Variant::DISEASE_TYPES.fetch("mmrv")
         )
diff --git a/spec/components/app_patient_search_result_card_component_spec.rb b/spec/components/app_patient_search_result_card_component_spec.rb
@@ -84,8 +84,6 @@
     let(:programme) { Programme.mmr }
     let(:programmes) { [programme] }
 
-    before { Flipper.enable(:mmrv) }
-
     context "with a patient not eligible for MMRV" do
       let(:patient) { create(:patient, date_of_birth: Date.new(2019, 1, 1)) }
 
diff --git a/spec/components/app_session_summary_component_spec.rb b/spec/components/app_session_summary_component_spec.rb
@@ -39,8 +39,6 @@
     it { should have_link("Download the HPV consent form (PDF)") }
 
     context "for MMR(V) programme" do
-      before { Flipper.enable(:mmrv) }
-
       let(:programmes) { [Programme.mmr] }
 
       it { should have_link("Download the MMR consent form (PDF)") }
@@ -58,8 +56,6 @@
       end
 
       context "for MMR(V) programme" do
-        before { Flipper.enable(:mmrv) }
-
         let(:programmes) { [Programme.mmr] }
 
         it { should have_link("View the MMR online consent form") }
diff --git a/spec/components/app_vaccine_criteria_label_component_spec.rb b/spec/components/app_vaccine_criteria_label_component_spec.rb
@@ -19,14 +19,14 @@
     let(:vaccine_methods) { %w[injection] }
     let(:without_gelatine) { false }
 
-    it { should have_content("Record MMR vaccination") }
+    it { should have_content("Record MMR(V) vaccination") }
 
     context "with gelatine-free injection" do
       let(:without_gelatine) { true }
 
       it do
         expect(rendered).to have_content(
-          "Record MMR vaccination with gelatine-free injection"
+          "Record MMR(V) vaccination with gelatine-free injection"
         )
       end
     end
diff --git a/spec/factories/patient_consent_statuses.rb b/spec/factories/patient_consent_statuses.rb
@@ -27,6 +27,7 @@
   factory :patient_consent_status, class: "Patient::ConsentStatus" do
     patient
     programme { Programme.sample }
+    disease_types { programme.disease_types }
     academic_year { AcademicYear.current }
 
     traits_for_enum :status
diff --git a/spec/factories/patient_programme_statuses.rb b/spec/factories/patient_programme_statuses.rb
@@ -29,8 +29,8 @@
 FactoryBot.define do
   factory :patient_programme_status, class: "Patient::ProgrammeStatus" do
     patient
-    academic_year { AcademicYear.current }
     programme { Programme.sample }
+    academic_year { AcademicYear.current }
 
     traits_for_enum :status
 
diff --git a/spec/features/edit_session_programmes_spec.rb b/spec/features/edit_session_programmes_spec.rb
@@ -165,7 +165,7 @@ def then_i_see_the_warning_panel_about_unvaccinated_patients_for_hpv
 
   def then_i_see_the_warning_panel_about_unvaccinated_patients_for_mmr
     expect(page).to have_content(
-      "Have you imported historical vaccination records for MMR?"
+      "Have you imported historical vaccination records for MMR(V)?"
     )
     expect(page).to have_content(
       "0% of children in Years 8 to 11 in this session have vaccination " \
@@ -180,7 +180,7 @@ def then_i_see_the_warning_panel_about_unvaccinated_patients_for_mmr
 
   def then_i_see_the_warning_panel_about_unvaccinated_patients_for_hpv_and_mmr
     expect(page).to have_content(
-      "Have you imported historical vaccination records for HPV and MMR?"
+      "Have you imported historical vaccination records for HPV and MMR(V)?"
     )
     expect(page).to have_content(
       "0% of children in Years 8 to 11 in this session have vaccination " \
diff --git a/spec/features/mmr_vaccination_administered_spec.rb b/spec/features/mmr_vaccination_administered_spec.rb
@@ -291,7 +291,7 @@ def then_i_see_the_right_programme_on_the_entries
     expect(page).to have_content("Vaccinated with Priorix\nMMR")
     expect(page).to have_content(
       "Triaged decision: Delay vaccination to a later date\n" \
-        "Next dose 29 October 2024 at 9:00am\nMMR"
+        "Next dose 29 October 2024 at 9:00am\nMMR(V)"
     )
   end
 
diff --git a/spec/features/mmrv_triage_spec.rb b/spec/features/mmrv_triage_spec.rb
@@ -6,8 +6,7 @@
   end
 
   scenario "triage without gelatine only" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_with_mmr_programme
+    given_i_am_signed_in_with_mmr_programme
     and_there_is_a_session_today_with_patients_with_consent
 
     when_i_go_to_the_without_gelatine_only_patient
@@ -21,8 +20,7 @@
   end
 
   scenario "triage without gelatine" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_with_mmr_programme
+    given_i_am_signed_in_with_mmr_programme
     and_there_is_a_session_today_with_patients_with_consent
 
     when_i_go_to_the_without_gelatine_patient
@@ -36,8 +34,7 @@
   end
 
   scenario "triage with gelatine" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_with_mmr_programme
+    given_i_am_signed_in_with_mmr_programme
     and_there_is_a_session_today_with_patients_with_consent
 
     when_i_go_to_the_with_gelatine_patient
@@ -50,11 +47,7 @@
     then_i_see_the_right_programme_on_the_entries
   end
 
-  def given_mmrv_vaccinations_are_enabled
-    Flipper.enable(:mmrv)
-  end
-
-  def and_i_am_signed_in_with_mmr_programme
+  def given_i_am_signed_in_with_mmr_programme
     @programme = Programme.mmr
     @team = create(:team, :with_one_nurse, programmes: [@programme])
     @location = create(:school, team: @team)
diff --git a/spec/features/mmrv_vaccination_administered_spec.rb b/spec/features/mmrv_vaccination_administered_spec.rb
@@ -4,8 +4,7 @@
   around { |example| travel_to(Time.zone.local(2024, 10, 1)) { example.run } }
 
   scenario "administered at community clinic" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_as_a_nurse
+    given_i_am_signed_in_as_a_nurse
     and_a_patient_has_consented_for_mmrv
 
     when_i_go_to_the_patients_tab
@@ -34,8 +33,7 @@
   end
 
   scenario "there is no more MMRV stock available" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_as_a_nurse
+    given_i_am_signed_in_as_a_nurse
     and_a_patient_exists
 
     when_i_visit_the_patient_mmrv_tab
@@ -52,8 +50,7 @@
   end
 
   scenario "patient has MMRV consent, then consents for MMR" do
-    given_mmrv_vaccinations_are_enabled
-    and_i_am_signed_in_as_a_nurse
+    given_i_am_signed_in_as_a_nurse
     and_a_patient_has_consented_for_mmrv
 
     when_i_visit_the_patient_mmrv_tab
@@ -65,11 +62,7 @@
     then_i_see_a_message_that_the_consent_is_conflicting
   end
 
-  def given_mmrv_vaccinations_are_enabled
-    Flipper.enable(:mmrv)
-  end
-
-  def and_i_am_signed_in_as_a_nurse
+  def given_i_am_signed_in_as_a_nurse
     @programme = Programme.mmr
     @team = create(:team, :with_one_nurse, programmes: [@programme])
 
diff --git a/spec/features/triage_without_gelatine_spec.rb b/spec/features/triage_without_gelatine_spec.rb
@@ -46,8 +46,6 @@
   end
 
   def given_an_mmr_programme_is_underway
-    Flipper.enable(:mmrv)
-
     programmes = [Programme.mmr]
     @programme_variant =
       Programme.mmr.variant_for(
@@ -87,7 +85,7 @@ def when_i_go_to_the_patients_tab
 
   def then_i_see_the_patient
     expect(page).to have_content(@patient.full_name)
-    expect(page).to have_content("MMRNeeds triage")
+    expect(page).to have_content("MMRVNeeds triage")
   end
 
   def when_i_click_on_the_patient
@@ -118,12 +116,12 @@ def when_i_record_the_triage_outcome(without_gelatine:)
   end
 
   def then_i_see_the_triage_status_with_gelatine
-    expect(page).to have_content("MMR: Safe to vaccinate")
+    expect(page).to have_content("MMRV: Safe to vaccinate")
   end
 
   def then_i_see_the_triage_status_without_gelatine
     expect(page).to have_content(
-      "MMR: Safe to vaccinate with gelatine-free injection"
+      "MMRV: Safe to vaccinate with gelatine-free injection"
     )
   end
 end
diff --git a/spec/lib/govuk_notify_personalisation_spec.rb b/spec/lib/govuk_notify_personalisation_spec.rb
@@ -134,8 +134,6 @@
       let(:programmes) { [Programme.mmr] }
       let(:date_of_birth) { Programme::MIN_MMRV_ELIGIBILITY_DATE + 1.month }
 
-      before { Flipper.enable(:mmrv) }
-
       it { should include(vaccination_sms: "MMR vaccination") }
       it { should include(vaccination_and_dates_sms: "MMR vaccination") }
     end
diff --git a/spec/lib/patient_status_resolver_spec.rb b/spec/lib/patient_status_resolver_spec.rb
@@ -14,8 +14,6 @@
   let(:academic_year) { AcademicYear.current }
   let(:context_location_id) { nil }
 
-  before { Flipper.enable(:mmrv) }
-
   describe "#consent" do
     subject { patient_status_resolver.consent }
 
diff --git a/spec/lib/reports/careplus_exporter_spec.rb b/spec/lib/reports/careplus_exporter_spec.rb
@@ -363,8 +363,6 @@
     end
 
     context "and an MMRV vaccine" do
-      before { Flipper.enable(:mmrv) }
-
       let(:vaccine) { Vaccine.find_by!(brand: "ProQuad") }
       let(:expected_vaccine_code) { "MMRV" }
 
diff --git a/spec/lib/reports/offline_session_exporter_spec.rb b/spec/lib/reports/offline_session_exporter_spec.rb
diff --git a/spec/lib/reports/programme_vaccinations_exporter_spec.rb b/spec/lib/reports/programme_vaccinations_exporter_spec.rb
diff --git a/spec/models/immunisation_import_row_spec.rb b/spec/models/immunisation_import_row_spec.rb
diff --git a/spec/models/programme_spec.rb b/spec/models/programme_spec.rb
diff --git a/spec/models/vaccination_record_spec.rb b/spec/models/vaccination_record_spec.rb
diff --git a/spec/models/vaccine_spec.rb b/spec/models/vaccine_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,6 @@`
`535`	`535`	`describe "vaccination records" do`
`536`	`536`	`context "for the MMRV variant" do`
`537`	`537`	`let(:programme) do`
`538`		`- Flipper.enable(:mmrv)`
`539`	`538`	`Programme.mmr.variant_for(`
`540`	`539`	`disease_types: Programme::Variant::DISEASE_TYPES.fetch("mmrv")`
`541`	`540`	`)`