Merge pull request #6482 from NHSDigital/fix-follow-up-request-status

Clear follow_up_requested on changing refusal reason

Author: murugapl

app/controllers/parent_interface/consent_forms/edit_controller.rb

@@ -45,6 +45,8 @@ def update
              @consent_form.parent_phone.present?
           jump_to("contact-method", skip_to_confirm: true)
         end
+      elsif is_reason_for_refusal_step?
+        @consent_form.reset_follow_up_requested
       elsif is_injection_alternative_step?
         @consent_form.update_injection_alternative
         @consent_form.seed_health_questions
@@ -269,6 +271,8 @@ def is_without_gelatine_step? = step == "without-gelatine"
 
     def is_health_question_step? = step == "health-question"
 
+    def is_reason_for_refusal_step? = step == "reason-for-refusal"
+
     def current_health_answer
       index = step.split("-").last.to_i - 1
       @consent_form.health_answers[index]

app/models/consent_form.rb

@@ -576,6 +576,12 @@ def reason_for_refusal=(value)
       .each { it.reason_for_refusal = value }
   end
 
+  def reset_follow_up_requested
+    consent_form_programmes
+      .select(&:response_refused?)
+      .each { it.follow_up_requested = nil }
+  end
+
   def reason_for_refusal_notes
     consent_form_programmes.find(&:response_refused?)&.notes
   end

spec/features/parental_consent_refused_spec.rb

@@ -14,8 +14,13 @@
     then_i_see_the_consent_page
 
     when_i_refuse_consent
+    then_i_see_the_follow_up_question
+    when_i_request_follow_up
     then_i_can_check_my_answers
 
+    when_i_change_my_refusal_reason
+    then_the_consent_doesnt_have_follow_up_requested_stored
+
     when_i_confirm_my_answers
     and_i_refuse_to_answer_questions_on_ethnicity
     then_i_see_the_confirmation_page
@@ -91,14 +96,33 @@ def when_i_refuse_consent
     )
     fill_in "Give details", with: "They have a weakened immune system"
     click_on "Continue"
+  end
 
+  def then_i_see_the_follow_up_question
     expect(page).to have_content(
       "Would you like a member of the team to contact you to discuss alternative options?"
     )
-    choose "No"
+  end
+
+  def when_i_request_follow_up
+    choose "Yes, I would like someone to contact me"
     click_on "Continue"
   end
 
+  def when_i_change_my_refusal_reason
+    click_on "Change reason for refusal"
+    choose "Vaccine already received"
+    click_on "Continue"
+
+    fill_in "Give details",
+            with: "They will receive the vaccine at another location"
+    click_on "Continue"
+  end
+
+  def then_the_consent_doesnt_have_follow_up_requested_stored
+    expect(ConsentForm.last.follow_up_requested).to be_nil
+  end
+
   def when_i_refuse_consent_and_request_follow_up
     expect(page).to have_content("Do you agree")
     choose "No"