Merge pull request #4198 from nhsuk/aged-out-filter

Add filter to view children who have aged out

Author: thomasleese

app/components/app_patient_search_form_component.rb

@@ -157,6 +157,13 @@ class AppPatientSearchFormComponent < ViewComponent::Base
                                   multiple: false,
                                   link_errors: true,
                                   label: { text: "Children missing an NHS number" } %>
+
+            <%= f.govuk_check_box :aged_out_of_programmes,
+                                  1, 0,
+                                  checked: form.aged_out_of_programmes,
+                                  multiple: false,
+                                  link_errors: true,
+                                  label: { text: "Children aged out of programmes" } %>
           <% end %>
 
           <% if show_buttons_in_details? %>
@@ -223,7 +230,7 @@ def initialize(
   def open_details?
     @form.date_of_birth_year.present? || @form.date_of_birth_month.present? ||
       @form.date_of_birth_day.present? || @form.missing_nhs_number ||
-      @form.archived
+      @form.archived || @form.aged_out_of_programmes
   end
 
   def show_buttons_in_details?

app/controllers/concerns/patient_search_form_concern.rb

@@ -21,6 +21,7 @@ def set_patient_search_form
   def patient_search_form_params
     params.permit(
       :_clear,
+      :aged_out_of_programmes,
       :archived,
       :date_of_birth_day,
       :date_of_birth_month,

app/forms/patient_search_form.rb

@@ -4,6 +4,7 @@ class PatientSearchForm < SearchForm
   attr_accessor :current_user
   attr_writer :academic_year
 
+  attribute :aged_out_of_programmes, :boolean
   attribute :archived, :boolean
   attribute :consent_statuses, array: true
   attribute :date_of_birth_day, :integer
@@ -49,6 +50,7 @@ def programmes
   def apply(scope)
     scope = filter_name(scope)
     scope = filter_year_groups(scope)
+    scope = filter_aged_out_of_programmes(scope)
     scope = filter_archived(scope)
     scope = filter_date_of_birth_year(scope)
     scope = filter_nhs_number(scope)
@@ -82,6 +84,18 @@ def filter_year_groups(scope)
     end
   end
 
+  def filter_aged_out_of_programmes(scope)
+    if aged_out_of_programmes
+      scope.not_appear_in_programmes(team.programmes, academic_year:)
+    elsif @session || archived
+      scope
+    else
+      # Archived patients won't appear in programmes, so we need to
+      # skip this check if we're trying to view archived patients.
+      scope.appear_in_programmes(team.programmes, academic_year:)
+    end
+  end
+
   def filter_archived(scope)
     if archived
       scope.archived(team:)

app/models/patient.rb

@@ -152,6 +152,19 @@ class Patient < ApplicationRecord
           )
         end
 
+  scope :not_appear_in_programmes,
+        ->(programmes, academic_year:) do
+          where.not(
+            PatientSession
+              .joins(:session)
+              .where(sessions: { academic_year: })
+              .where("patient_id = patients.id")
+              .appear_in_programmes(programmes)
+              .arel
+              .exists
+          )
+        end
+
   scope :with_pending_changes, -> { where.not(pending_changes: {}) }
 
   scope :search_by_name,

spec/features/edit_vaccination_record_spec.rb

@@ -233,7 +233,7 @@ def and_an_hpv_programme_is_underway
     @replacement_batch =
       create(:batch, :not_expired, team: @team, vaccine: @vaccine)
 
-    location = create(:school)
+    location = create(:school, team: @team)
 
     @session =
       create(

spec/features/manage_children_spec.rb

@@ -17,6 +17,17 @@
     then_i_see_the_activity_log
   end
 
+  scenario "Viewing children who have aged out" do
+    given_patients_exist
+    and_todays_date_is_in_the_far_future
+
+    when_i_click_on_children
+    then_i_see_no_children
+
+    when_i_click_on_view_aged_out_children
+    then_i_see_the_children
+  end
+
   scenario "Adding an NHS number" do
     given_patients_exist
     and_sync_vaccination_records_to_nhs_feature_is_enabled
@@ -198,6 +209,10 @@ def and_the_vaccination_has_been_synced_to_nhs
     perform_enqueued_jobs(only: SyncVaccinationRecordToNHSJob)
   end
 
+  def and_todays_date_is_in_the_far_future
+    travel 13.years
+  end
+
   def when_a_deceased_patient_exists
     session = create(:session, team: @team, programmes: [@programme])
 
@@ -227,6 +242,16 @@ def then_i_see_the_children
     expect(page).to have_content(/\d+ children/)
   end
 
+  def then_i_see_no_children
+    expect(page).to have_content("No children")
+  end
+
+  def when_i_click_on_view_aged_out_children
+    find(".nhsuk-details__summary").click
+    check "Children aged out of programmes"
+    click_on "Search"
+  end
+
   def when_i_click_on_a_child
     click_on "SMITH, John"
   end

spec/features/parental_consent_manual_matching_spec.rb

@@ -35,7 +35,7 @@
     when_i_choose_a_consent_response
     then_i_am_on_the_consent_matching_page
 
-    when_i_search_for_the_child
+    when_i_search_for_the_aged_out_child
     and_i_select_the_child_record
     then_i_can_review_the_match
 
@@ -112,6 +112,13 @@ def when_i_search_for_the_child
     click_button "Search"
   end
 
+  def when_i_search_for_the_aged_out_child
+    fill_in "Search", with: @patient.given_name
+    find(".nhsuk-details__summary").click
+    check "Children aged out of programmes"
+    click_button "Search"
+  end
+
   def and_i_select_the_child_record
     click_link @patient.full_name
   end