Merge pull request #6427 from NHSDigital/fix-schools-children-count

Ensure aged-out patients are not counted in schools index

Author: thomasleese

app/controllers/patients_controller.rb

@@ -96,7 +96,8 @@ def set_programme_statuses
         []
       else
         Patient::ProgrammeStatus.statuses.keys -
-          %w[not_eligible needs_consent_follow_up_requested]
+          Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
+          %w[needs_consent_follow_up_requested]
       end
   end
 

app/controllers/schools/patients_controller.rb

@@ -54,6 +54,7 @@ def index
   def set_programme_statuses
     @programme_statuses =
       Patient::ProgrammeStatus.statuses.keys -
-        %w[not_eligible needs_consent_follow_up_requested]
+        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
+        %w[needs_consent_follow_up_requested]
   end
 end

app/controllers/schools_controller.rb

@@ -17,16 +17,14 @@ def index
 
     @pagy, @locations = pagy(locations)
 
+    academic_year = AcademicYear.pending
+
     @patient_count_by_school_id =
       Patient
         .joins(:patient_locations)
-        .where(
-          patient_locations: {
-            location: @locations,
-            academic_year: AcademicYear.pending
-          }
-        )
+        .where(patient_locations: { location: @locations, academic_year: })
         .not_archived(team: current_team)
+        .appear_in_programmes(current_team.programmes, academic_year:)
         .distinct
         .group(:school_id)
         .count

app/controllers/sessions/base_controller.rb

@@ -17,6 +17,7 @@ def set_session
   def set_programme_statuses
     @programme_statuses =
       Patient::ProgrammeStatus.statuses.keys -
-        %w[not_eligible needs_consent_follow_up_requested]
+        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
+        %w[needs_consent_follow_up_requested]
   end
 end

spec/features/schools_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe "Schools" do
-  scenario "Filtering on schools and viewing sessions" do
+  scenario "filtering on schools and viewing sessions" do
     given_a_team_exists_with_a_few_schools
     and_i_am_signed_in
 
@@ -29,7 +29,7 @@
     then_i_see_the_secondary_sessions
   end
 
-  scenario "Sending clinic invitations to children in no known school" do
+  scenario "sending clinic invitations to children in no known school" do
     given_a_team_with_no_known_school_children
     and_i_am_signed_in
 
@@ -65,13 +65,16 @@ def given_a_team_exists_with_a_few_schools
     @secondary_patient =
       create(:patient, year_group: 7, session: @secondary_session)
 
-    @patient_in_both_schools = create(:patient, school: @secondary_school)
+    @patient_in_both_schools = create(:patient, session: @secondary_session)
     create(
       :patient_location,
       patient: @patient_in_both_schools,
       session: @primary_session
     )
 
+    @aged_out_patient =
+      create(:patient, year_group: 13, session: @secondary_session)
+
     @nurse = create(:nurse, team: @team)
   end