Merge pull request #6021 from nhsuk/feature-flag-for-already-vaccinated-journey

Add `already_vaccinated` feature flag

Author: stevehook

app/components/app_vaccination_record_summary_component.rb

@@ -234,15 +234,18 @@ def call
         end
       end
 
-      summary_list.with_row do |row|
-        row.with_key { "Vaccinator" }
-        row.with_value { vaccinator_value }
-        if (href = @change_links[:vaccinator])
-          row.with_action(
-            text: "Change",
-            visually_hidden_text: "vaccinator",
-            href:
-          )
+      if @vaccination_record.performed_by.present? ||
+           Flipper.enabled?(:already_vaccinated)
+        summary_list.with_row do |row|
+          row.with_key { "Vaccinator" }
+          row.with_value { vaccinator_value }
+          if (href = @change_links[:vaccinator])
+            row.with_action(
+              text: "Change",
+              visually_hidden_text: "vaccinator",
+              href:
+            )
+          end
         end
       end
 
@@ -291,14 +294,16 @@ def call
         end
       end
 
-      if @vaccination_record.reported_by.present?
+      if Flipper.enabled?(:already_vaccinated) &&
+           @vaccination_record.reported_by.present?
         summary_list.with_row do |row|
           row.with_key { "Reported by" }
           row.with_value { @vaccination_record.reported_by&.full_name }
         end
       end
 
-      if @vaccination_record.reported_at.present?
+      if Flipper.enabled?(:already_vaccinated) &&
+           @vaccination_record.reported_at.present?
         summary_list.with_row do |row|
           row.with_key { "Reported on" }
           row.with_value { @vaccination_record.reported_at.to_fs(:long) }
@@ -343,7 +348,8 @@ def outcome_value
     outcome =
       VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome)
 
-    if @vaccination_record.already_had? &&
+    if Flipper.enabled?(:already_vaccinated) &&
+         @vaccination_record.already_had? &&
          @vaccination_record.reported_as_already_vaccinated?
       outcome = VaccinationRecord.human_enum_name(:outcome, "administered")
     end

app/controllers/api/reporting/totals_controller.rb

@@ -34,7 +34,7 @@ class API::Reporting::TotalsController < API::Reporting::BaseController
     consent_conflicts: "Consent Conflicts",
     consent_given: "Consent Given",
     not_vaccinated: "Not Vaccinated",
-    vaccinated: "Vaccinated",
+    vaccinated: "Vaccinated"
   }.freeze
 
   FLU_SPECIFIC_METRIC_HEADERS = {}.freeze

app/controllers/patient_sessions/programmes_controller.rb

@@ -18,24 +18,35 @@ def record_already_vaccinated
       DraftVaccinationRecord.new(request_session: session, current_user:)
 
     draft_vaccination_record.clear_attributes
+
+    first_active_wizard_step =
+      if Flipper.enabled?(:already_vaccinated)
+        eligible_for_mmr_or_mmrv? ? :mmr_or_mmrv : :date_and_time
+      else
+        :confirm
+      end
+
     draft_vaccination_record.update!(
-      dose_sequence: dose_sequence,
-      first_active_wizard_step:
-        eligible_for_mmr_or_mmrv? ? :mmr_or_mmrv : :date_and_time,
+      dose_sequence: (dose_sequence if Flipper.enabled?(:already_vaccinated)),
+      first_active_wizard_step:,
       location_id: nil,
       location_name: "Unknown",
       outcome: :already_had,
       patient: @patient,
+      performed_at: (Time.current unless Flipper.enabled?(:already_vaccinated)),
+      performed_by_user_id:
+        (current_user.id unless Flipper.enabled?(:already_vaccinated)),
       performed_ods_code: current_team.organisation.ods_code,
       programme: @programme,
-      reported_by_id: current_user.id,
-      reported_at: Time.current,
+      reported_by_id:
+        (current_user.id if Flipper.enabled?(:already_vaccinated)),
+      reported_at: (Time.current if Flipper.enabled?(:already_vaccinated)),
       session: @session,
       source: "service"
     )
 
     redirect_to draft_vaccination_record_path(
-                  eligible_for_mmr_or_mmrv? ? "mmr-or-mmrv" : "date-and-time"
+                  first_active_wizard_step.to_s.dasherize
                 )
   end
 

app/helpers/vaccination_records_helper.rb

@@ -28,7 +28,7 @@ def vaccination_record_source(vaccination_record)
   end
 
   def already_vaccinated_link_label(session:, patient:, programme:)
-    if programme.mmr?
+    if programme.mmr? && Flipper.enabled?(:already_vaccinated)
       if had_first_dose?(session:, patient:, programme:)
         "Record 2nd dose as already given"
       else

app/models/draft_vaccination_record.rb

@@ -63,7 +63,7 @@ def wizard_steps
       (:notes unless national_reporting_user_and_record?),
       (
         if programme&.mmr? && (administered? || already_had?) &&
-             patient.eligible_for_mmrv?
+             patient.eligible_for_mmrv? && Flipper.enabled?(:already_vaccinated)
           :mmr_or_mmrv
         end
       ),
@@ -191,7 +191,8 @@ def already_had?
   end
 
   def reported_as_already_vaccinated?
-    already_had? && reported_by_id.present?
+    Flipper.enabled?(:already_vaccinated) && already_had? &&
+      reported_by_id.present?
   end
 
   # So that a form error matches to a field in this model

config/feature_flags.yml

@@ -1,3 +1,7 @@
+already_vaccinated: |
+  New questions for the already vaccinated flow triggered
+  from the 'Record as already vaccinated' link on the session > children page.
+
 basic_auth: Require users to sign in with basic authentication before they
   can use the service.
 

spec/features/mmr_already_had_spec.rb

@@ -3,90 +3,113 @@
 describe "MMR/MMRV" do
   around { |example| travel_to(Date.new(2025, 7, 1)) { example.run } }
 
-  scenario "record a patient born after January 2020 as already had their 1st MMR dose outside the school session" do
-    given_an_mmr_programme_with_a_session
-    and_a_patient_is_in_the_session_born_after_january_2020
-    and_the_patient_doesnt_need_triage
-    and_the_patient_has_not_had_a_first_dose
-
-    when_i_go_the_session
-    then_i_see_one_patient_needing_consent
-    and_i_click_on_the_patient
-    then_i_see_the_patient_needs_consent
-
-    when_i_click_record_as_already_had_first_dose
-    when_i_click_back
-    then_i_see_the_patient_session_page
-
-    when_i_click_record_as_already_had_first_dose
-    then_i_see_the_did_you_have_mmr_or_mmrv_page
-
-    when_i_choose_mmr_and_continue
-    then_i_see_the_mmr_date_page
-
-    when_i_fill_in_the_date_and_continue
-    then_i_see_the_confirmation_page
-    and_the_confirmation_summary_is_not_displayed_as_a_warning
-
-    when_i_confirm_the_details
-    then_i_see_the_patient_is_already_vaccinated
-    and_i_see_that_the_vaccinator_is_unknown
-    and_i_see_that_the_location_is_unknown
-    and_i_see_that_the_reporter_is_set
-    expect(page).to have_content("LocationUnknown")
-    and_had_been_vaccinated_with_mmr
-    and_the_dose_number_is_first
-    and_the_performed_at_date_only_is_set
-    and_the_consent_requests_are_sent
-    then_the_parent_doesnt_receive_a_consent_request
-  end
-
-  scenario "record a patient born before January 2020 as already had their 1st MMR dose outside the school session" do
-    given_an_mmr_programme_with_a_session
-    and_a_patient_is_in_the_session_born_before_january_2020
-    and_the_patient_doesnt_need_triage
-    and_the_patient_has_not_had_a_first_dose
-
-    when_i_go_the_session
-    then_i_see_one_patient_needing_consent
-    and_i_click_on_the_patient
-    then_i_see_the_patient_needs_consent
-
-    when_i_click_record_as_already_had_first_dose
-    then_i_see_the_mmr_date_instead_of_the_mmr_or_mmrv_page
-  end
-
-  scenario "record a patient born after January 2020 as already had their 2nd MMRV dose outside the school session" do
-    given_an_mmr_programme_with_a_session
-    and_a_patient_is_in_the_session_born_after_january_2020
-    and_the_patient_doesnt_need_triage
-    and_the_patient_already_has_first_dose
-
-    when_i_go_the_session
-    then_i_see_one_patient_needing_consent
-    and_i_click_on_the_patient
-    then_i_see_the_patient_needs_consent
-
-    when_i_click_record_as_already_had_second_dose
-    then_i_see_the_did_you_have_mmr_or_mmrv_page
-
-    when_i_choose_mmrv_and_continue
-    then_i_see_the_mmrv_date_page
-
-    when_i_fill_in_the_date_and_time_and_continue
-    then_i_see_the_confirmation_page
-    and_the_confirmation_summary_is_not_displayed_as_a_warning
-
-    when_i_confirm_the_details
-    then_i_see_the_patient_is_already_vaccinated
-    and_i_see_that_the_vaccinator_is_unknown
-    and_i_see_that_the_location_is_unknown
-    and_i_see_that_the_reporter_is_set
-    and_had_been_vaccinated_with_mmrv
-    and_the_dose_number_is_second
-    and_the_performed_at_date_and_time_are_set
-    and_the_consent_requests_are_sent
-    then_the_parent_doesnt_receive_a_consent_request
+  context "when `already_vaccinated` feature flag is NOT enabled" do
+    scenario "record a patient born after January 2020 as already had their 1st MMR dose" do
+      given_an_mmr_programme_with_a_session
+      and_a_patient_is_in_the_session_born_after_january_2020
+      and_the_patient_doesnt_need_triage
+      and_the_patient_has_not_had_a_first_dose
+
+      when_i_go_the_session
+      then_i_see_one_patient_needing_consent
+      and_i_click_on_the_patient
+      then_i_see_the_patient_needs_consent
+
+      when_i_click_record_as_already_vaccinated
+      when_i_click_back
+      then_i_see_the_patient_session_page
+
+      when_i_click_record_as_already_vaccinated
+      then_i_see_the_confirmation_page
+    end
+  end
+
+  context "when `already_vaccinated` feature flag is enabled" do
+    before { Flipper.enable(:already_vaccinated) }
+
+    scenario "record a patient born after January 2020 as already had their 1st MMR dose outside the school session" do
+      given_an_mmr_programme_with_a_session
+      and_a_patient_is_in_the_session_born_after_january_2020
+      and_the_patient_doesnt_need_triage
+      and_the_patient_has_not_had_a_first_dose
+
+      when_i_go_the_session
+      then_i_see_one_patient_needing_consent
+      and_i_click_on_the_patient
+      then_i_see_the_patient_needs_consent
+
+      when_i_click_record_as_already_had_first_dose
+      when_i_click_back
+      then_i_see_the_patient_session_page
+
+      when_i_click_record_as_already_had_first_dose
+      then_i_see_the_did_you_have_mmr_or_mmrv_page
+
+      when_i_choose_mmr_and_continue
+      then_i_see_the_mmr_date_page
+
+      when_i_fill_in_the_date_and_time_and_continue
+      then_i_see_the_confirmation_page
+      and_the_confirmation_summary_is_not_displayed_as_a_warning
+
+      when_i_confirm_the_details
+      then_i_see_the_patient_is_already_vaccinated
+      and_i_see_that_the_vaccinator_is_unknown
+      and_i_see_that_the_location_is_unknown
+      and_i_see_that_the_reporter_is_set
+      expect(page).to have_content("LocationUnknown")
+      and_had_been_vaccinated_with_mmr
+      and_the_dose_number_is_first
+      and_the_consent_requests_are_sent
+      then_the_parent_doesnt_receive_a_consent_request
+    end
+
+    scenario "record a patient born before January 2020 as already had their 1st MMR dose outside the school session" do
+      given_an_mmr_programme_with_a_session
+      and_a_patient_is_in_the_session_born_before_january_2020
+      and_the_patient_doesnt_need_triage
+      and_the_patient_has_not_had_a_first_dose
+
+      when_i_go_the_session
+      then_i_see_one_patient_needing_consent
+      and_i_click_on_the_patient
+      then_i_see_the_patient_needs_consent
+
+      when_i_click_record_as_already_had_first_dose
+      then_i_see_the_mmr_date_instead_of_the_mmr_or_mmrv_page
+    end
+
+    scenario "record a patient born after January 2020 as already had their 2nd MMRV dose outside the school session" do
+      given_an_mmr_programme_with_a_session
+      and_a_patient_is_in_the_session_born_after_january_2020
+      and_the_patient_doesnt_need_triage
+      and_the_patient_already_has_first_dose
+
+      when_i_go_the_session
+      then_i_see_one_patient_needing_consent
+      and_i_click_on_the_patient
+      then_i_see_the_patient_needs_consent
+
+      when_i_click_record_as_already_had_second_dose
+      then_i_see_the_did_you_have_mmr_or_mmrv_page
+
+      when_i_choose_mmrv_and_continue
+      then_i_see_the_mmrv_date_page
+
+      when_i_fill_in_the_date_and_continue
+      then_i_see_the_confirmation_page
+      and_the_confirmation_summary_is_not_displayed_as_a_warning
+
+      when_i_confirm_the_details
+      then_i_see_the_patient_is_already_vaccinated
+      and_i_see_that_the_vaccinator_is_unknown
+      and_i_see_that_the_location_is_unknown
+      and_i_see_that_the_reporter_is_set
+      and_had_been_vaccinated_with_mmrv
+      and_the_dose_number_is_second
+      and_the_consent_requests_are_sent
+      then_the_parent_doesnt_receive_a_consent_request
+    end
   end
 
   def given_an_mmr_programme_with_a_session(clinic: false)
@@ -169,6 +192,10 @@ def then_i_see_the_patient_needs_consent
     expect(page).to have_content("No response")
   end
 
+  def when_i_click_record_as_already_vaccinated
+    click_on "Record as already vaccinated"
+  end
+
   def when_i_click_record_as_already_had_first_dose
     click_on "Record 1st dose as already given"
   end
@@ -294,12 +321,16 @@ def and_the_dose_number_is_second
   end
 
   def and_the_performed_at_date_and_time_are_set
-    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+    expect(page).to have_content(
+      "Date#{@vaccination_date.strftime("%-d %B %Y")}"
+    )
     expect(page).to have_content("Time12:30")
   end
 
   def and_the_performed_at_date_only_is_set
-    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+    expect(page).to have_content(
+      "Date#{@vaccination_date.strftime("%-d %B %Y")}"
+    )
   end
 
   def and_the_consent_requests_are_sent