Merge pull request #6576 from NHSDigital/gillick-assessment-valid-on-day

Only consider today’s Gillick assessments as valid

Author: thomasleese

app/controllers/draft_consents_controller.rb

@@ -12,9 +12,9 @@ class DraftConsentsController < ApplicationController
 
   include WizardControllerConcern
 
-  before_action :set_triage_form, if: :includes_triage_step?
-  before_action :set_parent_options, if: -> { current_step == :who }
   before_action :set_back_link_path
+  before_action :set_new_or_existing_contact_options, if: :is_who_step?
+  before_action :set_triage_form, if: :includes_triage_step?
 
   def show
     authorize Consent, :edit?
@@ -213,6 +213,58 @@ def set_steps
     self.steps = @draft_consent.wizard_steps
   end
 
+  def set_back_link_path
+    @back_link_path =
+      if @draft_consent.editing?
+        wizard_path("confirm")
+      elsif current_step == @draft_consent.wizard_steps.first
+        session_patient_programme_path(@session, @patient, @programme)
+      else
+        previous_wizard_path
+      end
+  end
+
+  def is_who_step? = current_step == :who
+
+  NewOrExistingContactOption = Struct.new(:value, :label, :hint)
+
+  def set_new_or_existing_contact_options
+    @new_or_existing_contact_options = []
+
+    if @patient.can_self_consent_after_gillick_assessment?(
+         location: @session.location,
+         programme_type: @programme.type
+       )
+      @new_or_existing_contact_options << NewOrExistingContactOption.new(
+        value: "patient",
+        label: "Child (Gillick competent)"
+      )
+    end
+
+    parent_relationships =
+      (
+        @patient.parent_relationships.includes(:parent) +
+          @patient
+            .consents
+            .where(programme_type: @programme.type)
+            .filter_map(&:parent_relationship)
+      ).compact.uniq.sort_by(&:label)
+
+    @new_or_existing_contact_options +=
+      parent_relationships.map do |parent_relationship|
+        NewOrExistingContactOption.new(
+          value: parent_relationship.parent.id,
+          label: parent_relationship.label_with_parent,
+          hint: parent_relationship.parent.contact_label
+        )
+      end
+
+    @new_or_existing_contact_options << NewOrExistingContactOption.new(
+      value: "new",
+      label: "Add a new parental contact"
+    )
+  end
+
   def includes_triage_step?
     current_step.in?(%i[triage confirm]) && steps.include?("triage")
   end
@@ -235,28 +287,6 @@ def set_triage_form
       end
   end
 
-  def set_parent_options
-    @parent_options =
-      (
-        @patient.parent_relationships.includes(:parent) +
-          @patient
-            .consents
-            .select { it.programme_type == @programme.type }
-            .filter_map(&:parent_relationship)
-      ).compact.uniq.sort_by(&:label)
-  end
-
-  def set_back_link_path
-    @back_link_path =
-      if @draft_consent.editing?
-        wizard_path("confirm")
-      elsif current_step == @draft_consent.wizard_steps.first
-        session_patient_programme_path(@session, @patient, @programme)
-      else
-        previous_wizard_path
-      end
-  end
-
   # Returns:
   # {
   #   question_0: %i[notes response],

app/models/patient.rb

@@ -547,6 +547,14 @@ def show_year_group?(team:)
     end
   end
 
+  def can_self_consent_after_gillick_assessment?(location:, programme_type:)
+    gillick_assessments
+      .where(location:, programme_type:, date: Date.current)
+      .order(created_at: :desc)
+      &.first
+      &.gillick_competent? || false
+  end
+
   def programme_status(programme, academic_year:)
     # TODO: Update this method to accept the `programme_type` so that we can
     #  then determine the right programme variant from the `disease_types` on

app/views/draft_consents/who.html.erb

@@ -2,43 +2,19 @@
   <%= govuk_back_link(href: @back_link_path) %>
 <% end %>
 
-<% page_title = "Who are you trying to get consent from?" %>
-
-<%= h1 page_title: do %>
-  <span class="nhsuk-caption-l">
-    <%= @patient.full_name %>
-  </span>
-  <%= page_title %>
-<% end %>
-
-<% gillick_competent = @patient.gillick_assessments.order(created_at: :desc).for_session(@session).for_programme(@programme)&.first&.gillick_competent? %>
+<% legend = "Who are you trying to get consent from?" %>
+<% content_for :page_title, legend %>
 
 <%= form_with model: @draft_consent, url: wizard_path, method: :put do |f| %>
   <%= f.mavis_error_summary %>
 
-  <%= f.govuk_radio_buttons_fieldset(:new_or_existing_contact, legend: nil) do %>
-    <% if gillick_competent %>
-      <%= f.govuk_radio_button :new_or_existing_contact, "patient",
-                               label: { text: "Child (Gillick competent)" },
-                               link_errors: true %>
-    <% end %>
-
-    <% if @parent_options.present? %>
-      <% @parent_options.each.with_index do |parent_relationship, i| %>
-        <% parent = parent_relationship.parent %>
-        <%= f.govuk_radio_button :new_or_existing_contact, parent.id,
-                                 label: { text: parent_relationship.label_with_parent },
-                                 hint: { text: parent.contact_label },
-                                 link_errors: !gillick_competent && i == 0 %>
-      <% end %>
-
-      <%= f.govuk_radio_divider %>
-    <% end %>
-
-    <%= f.govuk_radio_button :new_or_existing_contact, "new",
-                             label: { text: "Add a new parental contact" },
-                             link_errors: !gillick_competent && @parent_options.empty? %>
-  <% end %>
+  <%= f.govuk_collection_radio_buttons :new_or_existing_contact,
+                                       @new_or_existing_contact_options,
+                                       :value,
+                                       :label,
+                                       :hint,
+                                       legend: { text: legend, tag: "h1", size: "l" },
+                                       caption: { text: @patient.full_name, size: "l" } %>
 
   <%= f.govuk_submit "Continue" %>
 <% end %>

spec/models/patient_spec.rb

@@ -908,6 +908,121 @@
     it { should eq("JD") }
   end
 
+  describe "#can_self_consent_after_gillick_assessment?" do
+    subject(:can_self_consent_after_gillick_assessment) do
+      patient.can_self_consent_after_gillick_assessment?(
+        location: session.location,
+        programme_type: programme.type
+      )
+    end
+
+    let(:programme) { Programme.sample }
+    let(:session) { create(:session, programmes: [programme]) }
+    let(:patient) { create(:patient) }
+
+    context "when patient has no Gillick assessments" do
+      it { should be(false) }
+    end
+
+    context "when patient has a Gillick assessment for a different programme" do
+      before do
+        create(
+          :gillick_assessment,
+          :competent,
+          patient:,
+          programme_type: "hpv",
+          session:
+        )
+      end
+
+      let(:programme) { Programme.flu }
+
+      it { should be(false) }
+    end
+
+    context "when patient has a Gillick assessment for a different session" do
+      let(:other_session) { create(:session, programmes: [programme]) }
+
+      before do
+        create(
+          :gillick_assessment,
+          :competent,
+          patient:,
+          programme_type: programme.type,
+          session: other_session
+        )
+      end
+
+      it { should be(false) }
+    end
+
+    context "when patient has a Gillick assessment on a different date" do
+      before do
+        create(
+          :gillick_assessment,
+          :competent,
+          patient:,
+          programme_type: programme.type,
+          session:,
+          date: Date.yesterday
+        )
+      end
+
+      it { should be(false) }
+    end
+
+    context "when patient has a not competent Gillick assessment" do
+      before do
+        create(
+          :gillick_assessment,
+          :not_competent,
+          patient:,
+          programme_type: programme.type,
+          session:
+        )
+      end
+
+      it { should be(false) }
+    end
+
+    context "when patient has a competent Gillick assessment" do
+      before do
+        create(
+          :gillick_assessment,
+          :competent,
+          patient:,
+          programme_type: programme.type,
+          session:
+        )
+      end
+
+      it { should be(true) }
+    end
+
+    context "when patient has multiple Gillick assessments" do
+      before do
+        create(
+          :gillick_assessment,
+          :not_competent,
+          patient:,
+          programme_type: programme.type,
+          session:
+        )
+        create(
+          :gillick_assessment,
+          :competent,
+          patient:,
+          programme_type: programme.type,
+          session:
+        )
+      end
+
+      it "returns the result of the most recent assessment" do
+        expect(can_self_consent_after_gillick_assessment).to be(true)
+      end
+    end
+  end
+
   describe "#has_patient_specific_direction?" do
     subject { patient.has_patient_specific_direction?(team:) }