Allow recording injection for nasal patients

thomasleese · thomasleese · commit b9550013f57a · 2025-07-15T16:35:57.000+01:00
This adds the ability for nurses to record an injection for a patient if
they've got consent for both the nasal spray and the injection.

Jira-Issue: MAV-1338
diff --git a/app/components/app_vaccinate_form_component.html.erb b/app/components/app_vaccinate_form_component.html.erb
@@ -66,22 +66,40 @@
       <% hint = "Pre-screening checks must be completed for vaccination to go ahead" %>
 
       <%= f.govuk_radio_buttons_fieldset :vaccine_method, legend: nil do %>
-        <% if common_delivery_sites_options.length > 1 %>
-          <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: "Yes" }, hint: { text: hint }, link_errors: true do %>
-            <%= f.govuk_collection_radio_buttons :delivery_site,
-                                                 common_delivery_sites_options,
-                                                 :value,
-                                                 :label,
-                                                 legend: {
-                                                   text: "Where will the injection be given?",
-                                                   size: "s",
-                                                 } %>
+        <% vaccine_methods.each_with_index do |vaccine_method, index| %>
+          <% if index == 1 %>
+            <%= f.govuk_radio_divider %>
+          <% end %>
+
+          <% label = if index.zero?
+                 "Yes"
+               else
+                 "No — but they can have the #{Vaccine.human_enum_name(:method_prefix, vaccine_method)} #{programme.name_in_sentence} instead"
+               end %>
+
+          <% options = common_delivery_site_options(vaccine_method) %>
+
+          <% if options.length > 1 %>
+            <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: label }, hint: { text: hint }, link_errors: index.zero? do %>
+              <%= f.govuk_collection_radio_buttons :delivery_site,
+                                                   options,
+                                                   :value,
+                                                   :label,
+                                                   legend: {
+                                                     text: "Where will the #{Vaccine.human_enum_name(:method, vaccine_method).downcase} be given?",
+                                                     size: "s",
+                                                   } %>
+            <% end %>
+          <% else %>
+            <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: label }, hint: { text: hint }, link_errors: index.zero? do %>
+              <%= f.hidden_field :delivery_site, value: options.first.value %>
+            <% end %>
+          <% end %>
+
+          <% if index.zero? %>
+            <%= f.govuk_radio_button :vaccine_method, "none", label: { text: "No" } %>
           <% end %>
-        <% else %>
-          <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: "Yes" }, hint: { text: hint }, link_errors: true %>
-          <%= f.hidden_field :delivery_site, value: common_delivery_sites_options.first.value %>
         <% end %>
-        <%= f.govuk_radio_button :vaccine_method, "none", label: { text: "No" } %>
       <% end %>
 
       <%= f.hidden_field :dose_sequence, value: dose_sequence %>
diff --git a/app/components/app_vaccinate_form_component.rb b/app/components/app_vaccinate_form_component.rb
@@ -18,8 +18,8 @@ def url
     session_patient_programme_vaccinations_path(session, patient, programme)
   end
 
-  def vaccine_method
-    patient.approved_vaccine_methods(programme:).first
+  def vaccine_methods
+    patient.approved_vaccine_methods(programme:)
   end
 
   def dose_sequence
@@ -33,29 +33,26 @@ def dose_sequence
 
   CommonDeliverySite = Struct.new(:value, :label)
 
-  def common_delivery_sites_options
-    @common_delivery_sites_options ||=
-      begin
-        options =
-          COMMON_DELIVERY_SITES
-            .fetch(vaccine_method)
-            .map do |value|
-              label = VaccinationRecord.human_enum_name(:delivery_site, value)
-              CommonDeliverySite.new(value:, label:)
-            end
-
-        if vaccine_method == "injection"
-          options << CommonDeliverySite.new(value: "other", label: "Other")
+  def common_delivery_site_options(vaccine_method)
+    options =
+      COMMON_DELIVERY_SITES
+        .fetch(vaccine_method)
+        .map do |value|
+          label = VaccinationRecord.human_enum_name(:delivery_site, value)
+          CommonDeliverySite.new(value:, label:)
         end
 
-        options
-      end
+    if vaccine_method == "injection"
+      options << CommonDeliverySite.new(value: "other", label: "Other")
+    end
+
+    options
   end
 
   def vaccination_name
     vaccination =
       if programme.has_multiple_vaccine_methods?
-        Vaccine.human_enum_name(:method, vaccine_method).downcase
+        Vaccine.human_enum_name(:method, vaccine_methods.first).downcase
       else
         "vaccination"
       end
@@ -67,5 +64,5 @@ def ask_not_taking_medication? = programme.doubles? || programme.flu?
 
   def ask_not_pregnant? = programme.td_ipv?
 
-  def ask_asthma_flare_up? = vaccine_method == "nasal"
+  def ask_asthma_flare_up? = vaccine_methods.include?("nasal")
 end
diff --git a/spec/features/flu_vaccination_administered_spec.rb b/spec/features/flu_vaccination_administered_spec.rb
@@ -5,7 +5,7 @@
 
   scenario "Administered with nasal spray" do
     given_i_am_signed_in_with_flu_programme
-    and_there_is_a_flu_session_today_with_two_patients_ready_to_vaccinate
+    and_there_is_a_flu_session_today_with_patients_ready_to_vaccinate
     and_there_are_nasal_and_injection_batches
     and_sync_vaccination_records_to_nhs_on_create_feature_is_enabled
 
@@ -24,7 +24,7 @@
 
   scenario "Administered with injection" do
     given_i_am_signed_in_with_flu_programme
-    and_there_is_a_flu_session_today_with_two_patients_ready_to_vaccinate
+    and_there_is_a_flu_session_today_with_patients_ready_to_vaccinate
     and_there_are_nasal_and_injection_batches
 
     when_i_go_to_the_injection_only_patient
@@ -39,9 +39,27 @@
     and_a_text_is_sent_to_the_parent_confirming_the_vaccination
   end
 
+  scenario "Administered with injection instead of nasal" do
+    given_i_am_signed_in_with_flu_programme
+    and_there_is_a_flu_session_today_with_patients_ready_to_vaccinate
+    and_there_are_nasal_and_injection_batches
+
+    when_i_go_to_the_nasal_or_injection_patient
+    then_i_see_the_vaccination_form_for_nasal_spray
+    and_i_see_the_option_to_administer_injection
+
+    when_i_record_that_the_patient_has_been_vaccinated_with_injection_instead
+    then_i_see_the_check_and_confirm_page_for_injection
+    and_i_get_confirmation_after_recording
+
+    when_vaccination_confirmations_are_sent
+    then_an_email_is_sent_to_the_parent_confirming_the_vaccination
+    and_a_text_is_sent_to_the_parent_confirming_the_vaccination
+  end
+
   scenario "Switching between nasal and injection" do
     given_i_am_signed_in_with_flu_programme
-    and_there_is_a_flu_session_today_with_two_patients_ready_to_vaccinate
+    and_there_is_a_flu_session_today_with_patients_ready_to_vaccinate
     and_there_are_nasal_and_injection_batches
 
     when_i_go_to_the_nasal_only_patient
@@ -71,14 +89,21 @@ def given_i_am_signed_in_with_flu_programme
     sign_in @organisation.users.first
   end
 
-  def and_there_is_a_flu_session_today_with_two_patients_ready_to_vaccinate
-    @nasal_patient =
+  def and_there_is_a_flu_session_today_with_patients_ready_to_vaccinate
+    @nasal_only_patient =
       create(
         :patient,
         :consent_given_nasal_only_triage_not_needed,
         :in_attendance,
         session: @session
       )
+    @nasal_or_injection_patient =
+      create(
+        :patient,
+        :consent_given_nasal_or_injection_triage_not_needed,
+        :in_attendance,
+        session: @session
+      )
     @injection_patient =
       create(
         :patient,
@@ -120,7 +145,13 @@ def and_sync_vaccination_records_to_nhs_on_create_feature_is_enabled
 
   def when_i_go_to_the_nasal_only_patient
     visit session_record_path(@session)
-    @patient = @nasal_patient
+    @patient = @nasal_only_patient
+    click_link @patient.full_name
+  end
+
+  def when_i_go_to_the_nasal_or_injection_patient
+    visit session_record_path(@session)
+    @patient = @nasal_or_injection_patient
     click_link @patient.full_name
   end
 
@@ -144,6 +175,12 @@ def then_i_see_the_vaccination_form_for_injection
     )
   end
 
+  def and_i_see_the_option_to_administer_injection
+    expect(page).to have_content(
+      "No — but they can have the injected flu instead"
+    )
+  end
+
   def when_i_record_that_the_patient_has_been_vaccinated_with_nasal_spray
     within all("section")[0] do
       check "I have checked that the above statements are true"
@@ -175,6 +212,21 @@ def when_i_record_that_the_patient_has_been_vaccinated_with_injection
     click_button "Continue"
   end
 
+  def when_i_record_that_the_patient_has_been_vaccinated_with_injection_instead
+    within all("section")[0] do
+      check "I have checked that the above statements are true"
+    end
+
+    within all("section")[1] do
+      choose "No — but they can have the injected flu instead"
+      choose "Left arm (upper position)"
+      click_button "Continue"
+    end
+
+    choose @injection_batch.name
+    click_button "Continue"
+  end
+
   def then_i_see_the_check_and_confirm_page_for_nasal_spray
     expect(page).to have_content("Check and confirm")
     expect(page).to have_content(@patient.full_name)
