Merge pull request #3961 from nhsuk/verbal-consent-follow-up-questions

Don't ask follow up root questions in verbal consent

Author: thomasleese

app/controllers/draft_consents_controller.rb

@@ -42,6 +42,8 @@ def update
       @draft_consent.assign_attributes(update_params)
     end
 
+    @draft_consent.seed_health_questions if current_step == :agree
+
     jump_to("confirm") if @draft_consent.editing? && current_step != :confirm
 
     set_steps
@@ -85,9 +87,13 @@ def handle_confirm
   end
 
   def handle_questions
-    questions_attrs = update_params.except(:wizard_step).values
-    @draft_consent.health_answers.each_with_index do |ha, index|
-      ha.assign_attributes(questions_attrs[index])
+    questions_attrs = update_params.except(:wizard_step)
+
+    @draft_consent.health_answers.each_with_index do |health_answer, index|
+      attributes = questions_attrs["question_#{index}"]
+      if health_answer.requires_notes?
+        health_answer.assign_attributes(attributes)
+      end
     end
 
     @draft_consent.assign_attributes(wizard_step: current_step)

app/models/draft_consent.rb

@@ -355,6 +355,40 @@ def vaccine_method_injection? = vaccine_methods.include?("injection")
 
   def vaccine_method_nasal? = vaccine_methods.include?("nasal")
 
+  def seed_health_questions
+    return unless response_given?
+
+    # If the health answers change due to the chosen vaccines changing, we
+    # want to try and keep as much as what the parents already wrote intact.
+    # We do this be saving the answers to the question title (as the IDs
+    # and ordering can change).
+
+    existing_health_answers =
+      health_answers.each_with_object({}) do |health_answer, memo|
+        memo[health_answer.question] = {
+          response: health_answer.response,
+          notes: health_answer.notes
+        }
+      end
+
+    vaccines = programme.vaccines.where(method: vaccine_methods)
+
+    self.health_answers =
+      HealthAnswersDeduplicator
+        .call(vaccines:)
+        .map do |health_answer|
+          if (
+               existing_health_answer =
+                 existing_health_answers[health_answer.question]
+             )
+            health_answer.response = existing_health_answer[:response]
+            health_answer.notes = existing_health_answer[:notes]
+          end
+
+          health_answer
+        end
+  end
+
   private
 
   def readable_attribute_names
@@ -393,6 +427,8 @@ def health_answers_are_valid
     return if health_answers.map(&:valid?).all?
 
     health_answers.each_with_index do |health_answer, index|
+      next unless health_answer.requires_notes?
+
       health_answer.errors.messages.each do |field, messages|
         messages.each do |message|
           errors.add("question-#{index}-#{field}", message)
@@ -408,10 +444,7 @@ def reset_unused_fields
     self.notes = "" unless notes_required?
 
     if response_given?
-      if health_answers.empty?
-        vaccine = programme.vaccines.first # assumes all vaccines in the programme have the same questions
-        self.health_answers = vaccine.health_questions.to_health_answers
-      end
+      seed_health_questions if health_answers.empty?
     else
       self.health_answers = []
     end

app/views/draft_consents/questions.html.erb

@@ -15,18 +15,19 @@
   <% content_for(:before_content) { f.govuk_error_summary } %>
 
   <% @draft_consent.health_answers.each_with_index do |health_answer, index| %>
-    <%= f.fields_for "question_#{index}", health_answer do |ff| %>
-      <%= ff.govuk_radio_buttons_fieldset(:question,
-                                          legend: { size: "s", text: health_answer.question },
-                                          hint: { text: health_answer.hint }) do %>
-        <%= ff.govuk_radio_button :response, "yes",
-                                  label: { text: "Yes" },
-                                  link_errors: true do %>
-          <%= ff.govuk_text_area :notes,
-                                 label: { text: "Give details" } %>
+    <% if health_answer.requires_notes? %>
+      <%= f.fields_for "question_#{index}", health_answer do |ff| %>
+        <%= ff.govuk_radio_buttons_fieldset :question,
+                                            legend: { size: "s", text: health_answer.question },
+                                            hint: { text: health_answer.hint } do %>
+          <%= ff.govuk_radio_button :response, "yes",
+                                    label: { text: "Yes" },
+                                    link_errors: true do %>
+            <%= ff.govuk_text_area :notes, label: { text: "Give details" } %>
+          <% end %>
+
+          <%= ff.govuk_radio_button :response, "no", label: { text: "No" } %>
         <% end %>
-        <%= ff.govuk_radio_button :response, "no",
-                                  label: { text: "No" } %>
       <% end %>
     <% end %>
   <% end %>

spec/features/self_consent_spec.rb

@@ -237,6 +237,7 @@ def and_the_nurse_records_consent_for_the_child
 
   def and_the_child_can_give_their_own_consent_that_the_nurse_records
     click_on "Change method"
+
     choose "Child (Gillick competent)"
     5.times { click_on "Continue" }
 

spec/features/verbal_consent_given_spec.rb

@@ -1,23 +1,32 @@
 # frozen_string_literal: true
 
 describe "Verbal consent" do
-  scenario "Given" do
+  scenario "Given HPV" do
     given_an_hpv_programme_is_underway
     and_i_am_signed_in
+
     when_i_record_that_verbal_consent_was_given
     then_an_email_is_sent_to_the_parent_confirming_their_consent
     and_a_text_is_sent_to_the_parent_confirming_their_consent
     and_the_patients_status_is_safe_to_vaccinate
     and_i_can_see_the_consent_response_details
   end
 
-  scenario "Given flu nasal consent" do
+  scenario "Given flu nasal spray" do
     given_an_flu_programme_is_underway
     and_i_am_signed_in
+
     when_i_record_that_verbal_nasal_consent_was_given
     and_the_patients_status_is_safe_to_vaccinate_with_nasal_spray
   end
 
+  scenario "Given flu nasal spray and injection" do
+    given_an_flu_programme_is_underway
+    and_i_am_signed_in
+
+    when_i_record_that_verbal_nasal_and_injection_consent_was_given
+  end
+
   def given_an_hpv_programme_is_underway
     create_programme(:hpv)
   end
@@ -41,19 +50,32 @@ def create_programme(programme_type)
   end
 
   def when_i_record_that_verbal_consent_was_given
-    record_that_verbal_consent_was_given(consent_option: "Yes, they agree")
+    record_that_verbal_consent_was_given(
+      consent_option: "Yes, they agree",
+      number_of_health_questions: 4
+    )
   end
 
   def when_i_record_that_verbal_nasal_consent_was_given
     record_that_verbal_consent_was_given(
       consent_option: "Yes, for the nasal spray",
+      number_of_health_questions: 9,
+      triage_option: "Yes, it’s safe to vaccinate with nasal spray"
+    )
+  end
+
+  def when_i_record_that_verbal_nasal_and_injection_consent_was_given
+    record_that_verbal_consent_was_given(
+      consent_option: "Yes, for the nasal spray",
+      number_of_health_questions: 10,
       triage_option: "Yes, it’s safe to vaccinate with nasal spray",
       injective_alternative: true
     )
   end
 
   def record_that_verbal_consent_was_given(
     consent_option:,
+    number_of_health_questions:,
     triage_option: "Yes, it’s safe to vaccinate",
     injective_alternative: false
   )
@@ -86,11 +108,9 @@ def record_that_verbal_consent_was_given(
     if consent_option.include?("nasal")
       choose injective_alternative ? "Yes" : "No"
     end
-
     click_button "Continue"
 
-    # assumes all vaccines in the programme have the same questions
-    @programme.vaccines.first.health_questions.size.times do |index|
+    number_of_health_questions.times do |index|
       find_all(".nhsuk-fieldset")[index].choose "No"
     end