Amend Gillick assessments rather than replacing

This changes how Gillick assessments are editing by always creating a
new record based on the previous one rather than updating the record.
This allows us to keep a history of Gillick assessments per patient, and
show them all in the activity log.

Author: thomasleese

app/controllers/gillick_assessments_controller.rb

@@ -10,10 +10,7 @@ def new
   end
 
   def create
-    if @gillick_assessment.update(
-         performed_by: current_user,
-         **gillick_assessment_params
-       )
+    if @gillick_assessment.update(gillick_assessment_params)
       redirect_to session_patient_path(id: @patient.id)
     else
       render :new, status: :unprocessable_entity
@@ -24,7 +21,9 @@ def edit
   end
 
   def update
-    if @gillick_assessment.update(gillick_assessment_params)
+    @gillick_assessment.assign_attributes(gillick_assessment_params)
+
+    if !@gillick_assessment.changed? || @gillick_assessment.save
       redirect_to session_patient_path(id: @patient.id)
     else
       render :edit, status: :unprocessable_entity
@@ -48,18 +47,21 @@ def set_patient_session
 
   def set_gillick_assessment
     @gillick_assessment =
-      authorize @patient_session.latest_gillick_assessment ||
+      authorize @patient_session.latest_gillick_assessment&.dup ||
                   @patient_session.gillick_assessments.build
   end
 
   def gillick_assessment_params
-    params.require(:gillick_assessment).permit(
-      :knows_consequences,
-      :knows_delivery,
-      :knows_disease,
-      :knows_side_effects,
-      :knows_vaccination,
-      :notes
-    )
+    params
+      .require(:gillick_assessment)
+      .permit(
+        :knows_consequences,
+        :knows_delivery,
+        :knows_disease,
+        :knows_side_effects,
+        :knows_vaccination,
+        :notes
+      )
+      .merge(performed_by: current_user)
   end
 end

spec/features/self_consent_spec.rb

@@ -4,31 +4,27 @@
   before { Flipper.enable(:release_1b) }
   after { Flipper.disable(:release_1b) }
 
-  scenario "No consent from parent, the child is Gillick competent so can self-consent" do
+  scenario "From Gillick assessment" do
     given_an_hpv_programme_is_underway
     and_there_is_a_child_without_parental_consent
 
     when_the_nurse_assesses_the_child_as_not_being_gillick_competent
-    and_the_details_of_the_gillick_non_competence_assessment_are_visible
-    then_the_nurse_assesses_the_child_as_gillick_competent
-    then_the_child_can_give_their_own_consent_that_the_nurse_records
+    then_the_details_of_the_gillick_non_competence_assessment_are_visible
+    and_the_child_cannot_give_their_own_consent
+    and_the_child_status_reflects_that_there_is_no_consent
+    and_the_activity_log_shows_the_gillick_non_competence
+
+    when_the_nurse_edits_the_assessment_the_child_as_gillick_competent
+    then_the_details_of_the_gillick_competence_assessment_are_visible
+    and_the_activity_log_shows_the_gillick_non_competence
+    and_the_activity_log_shows_the_gillick_competence
+    and_the_child_can_give_their_own_consent_that_the_nurse_records
 
     when_the_nurse_views_the_childs_record
     then_they_see_that_the_child_has_consent
     and_the_child_should_be_safe_to_vaccinate
   end
 
-  scenario "No consent from parent, the child is not Gillick competent" do
-    given_an_hpv_programme_is_underway
-    and_there_is_a_child_without_parental_consent
-
-    when_the_nurse_assesses_the_child_as_gillick_competent
-    and_the_details_of_the_gillick_competence_assessment_are_visible
-    then_the_nurse_assesses_the_child_as_not_being_gillick_competent
-    then_the_child_cannot_give_their_own_consent
-    and_the_childs_status_reflects_that_there_is_no_consent
-  end
-
   def given_an_hpv_programme_is_underway
     programme = create(:programme, :hpv)
     @organisation =
@@ -65,93 +61,121 @@ def and_there_is_a_child_without_parental_consent
     expect(page).to have_content(@patient.full_name)
   end
 
-  def when_the_nurse_assesses_the_child_as_gillick_competent
+  def when_the_nurse_assesses_the_child_as_not_being_gillick_competent
     click_on @patient.full_name
     click_on "Assess Gillick competence"
-    fill_in_as_competent
-    click_on "Complete your assessment"
-  end
-
-  def then_the_nurse_assesses_the_child_as_gillick_competent
-    click_on "Edit Gillick competence"
-    fill_in_as_competent
-    click_on "Update your assessment"
-  end
 
-  def fill_in_as_competent
     within(
       "fieldset",
       text: "The child knows which vaccination they will have"
-    ) { choose "Yes" }
+    ) { choose "No" }
 
     within(
       "fieldset",
       text: "The child knows which disease the vaccination protects against"
-    ) { choose "Yes" }
+    ) { choose "No" }
 
     within(
       "fieldset",
       text: "The child knows what could happen if they got the disease"
-    ) { choose "Yes" }
+    ) { choose "No" }
 
     within(
       "fieldset",
       text: "The child knows how the injection will be given"
-    ) { choose "Yes" }
+    ) { choose "No" }
 
     within(
       "fieldset",
       text: "The child knows which side effects they might experience"
-    ) { choose "Yes" }
+    ) { choose "No" }
 
     fill_in "Assessment notes (optional)",
-            with: "They understand the benefits and risks of the vaccine"
-  end
+            with: "They didn't understand the benefits and risks of the vaccine"
 
-  def when_the_nurse_assesses_the_child_as_not_being_gillick_competent
-    click_on @patient.full_name
-    click_on "Assess Gillick competence"
-    fill_in_as_non_competent
     click_on "Complete your assessment"
   end
 
-  def then_the_nurse_assesses_the_child_as_not_being_gillick_competent
-    click_on "Edit Gillick competence"
-    fill_in_as_non_competent
-    click_on "Update your assessment"
+  def then_the_details_of_the_gillick_non_competence_assessment_are_visible
+    expect(page).to have_content("Child assessed as not Gillick competent")
+    expect(page).to have_content(
+      "They didn't understand the benefits and risks of the vaccine"
+    )
   end
 
-  def fill_in_as_non_competent
+  def and_the_child_cannot_give_their_own_consent
+    click_on "Get consent"
+    expect(page).not_to have_content("Child (Gillick competent)")
+    click_on "Back"
+  end
+
+  def and_the_child_status_reflects_that_there_is_no_consent
+    expect(page).to have_content("No response")
+  end
+
+  def and_the_activity_log_shows_the_gillick_non_competence
+    click_on "Activity log"
+    expect(page).to have_content(
+      "Completed Gillick assessment as not Gillick competent"
+    )
+    click_on "Child record"
+  end
+
+  def when_the_nurse_edits_the_assessment_the_child_as_gillick_competent
+    click_on "Edit Gillick competence"
+
+    # notes from previous assessment
+    expect(page).to have_content(
+      "They didn't understand the benefits and risks of the vaccine"
+    )
+
     within(
       "fieldset",
       text: "The child knows which vaccination they will have"
-    ) { choose "No" }
+    ) { choose "Yes" }
 
     within(
       "fieldset",
       text: "The child knows which disease the vaccination protects against"
-    ) { choose "No" }
+    ) { choose "Yes" }
 
     within(
       "fieldset",
       text: "The child knows what could happen if they got the disease"
-    ) { choose "No" }
+    ) { choose "Yes" }
 
     within(
       "fieldset",
       text: "The child knows how the injection will be given"
-    ) { choose "No" }
+    ) { choose "Yes" }
 
     within(
       "fieldset",
       text: "The child knows which side effects they might experience"
-    ) { choose "No" }
+    ) { choose "Yes" }
 
     fill_in "Assessment notes (optional)",
-            with: "They didn't understand the benefits and risks of the vaccine"
+            with: "They understand the benefits and risks of the vaccine"
+
+    click_on "Update your assessment"
+  end
+
+  def then_the_details_of_the_gillick_competence_assessment_are_visible
+    expect(page).to have_content("Child assessed as Gillick competent")
+    expect(page).to have_content(
+      "They understand the benefits and risks of the vaccine"
+    )
   end
 
-  def then_the_child_can_give_their_own_consent_that_the_nurse_records
+  def and_the_activity_log_shows_the_gillick_competence
+    click_on "Activity log"
+    expect(page).to have_content(
+      "Updated Gillick assessment as Gillick competent"
+    )
+    click_on "Child record"
+  end
+
+  def and_the_child_can_give_their_own_consent_that_the_nurse_records
     click_on "Get consent"
 
     # who
@@ -191,33 +215,7 @@ def then_they_see_that_the_child_has_consent
     expect(page).to have_content("Consent given")
   end
 
-  def and_the_details_of_the_gillick_competence_assessment_are_visible
-    expect(page).to have_content("Child assessed as Gillick competent")
-    expect(page).to have_content(
-      "They understand the benefits and risks of the vaccine"
-    )
-  end
-
-  def and_the_details_of_the_gillick_non_competence_assessment_are_visible
-    expect(page).to have_content("Child assessed as not Gillick competent")
-    expect(page).to have_content(
-      "They didn't understand the benefits and risks of the vaccine"
-    )
-  end
-
   def and_the_child_should_be_safe_to_vaccinate
     expect(page).to have_content("Safe to vaccinate")
   end
-
-  def then_the_child_cannot_give_their_own_consent
-    click_on "Get consent"
-
-    expect(page).not_to have_content("Child (Gillick competent)")
-
-    click_on "Back"
-  end
-
-  def and_the_childs_status_reflects_that_there_is_no_consent
-    expect(page).to have_content("No response")
-  end
 end