Merge pull request #4800 from nhsuk/appear-in-programmes-session

Allow passing session to `appear_in_programmes`

Author: thomasleese

app/components/app_session_overview_tallies_component.rb

@@ -95,7 +95,7 @@ def patients_in_programme_cohort_count(programme)
     @patients_in_programme_cohort ||= {}
     @patients_in_programme_cohort[programme.id] ||= patients_for_programme(
       programme
-    ).appear_in_programmes(programme, academic_year:).count
+    ).appear_in_programmes([programme], session:).count
   end
 
   def previously_vaccinated_count(programme)

app/forms/patient_search_form.rb

@@ -130,12 +130,7 @@ def filter_nhs_number(scope)
   def filter_programmes(scope)
     if programme_types.present?
       if session
-        birth_academic_years =
-          programmes.flat_map do |programme|
-            session.programme_birth_academic_years[programme]
-          end
-
-        scope.where(birth_academic_year: birth_academic_years)
+        scope.appear_in_programmes(programmes, session:)
       else
         scope.appear_in_programmes(programmes, academic_year:)
       end

app/models/patient.rb

@@ -139,15 +139,26 @@ class Patient < ApplicationRecord
         end
 
   scope :appear_in_programmes,
-        ->(programmes, academic_year:) do
-          patient_locations =
-            PatientLocation
-              .select("1")
-              .where("patient_locations.patient_id = patients.id")
-              .where(academic_year:)
-              .appear_in_programmes(programmes)
-
-          where(patient_locations.arel.exists)
+        ->(programmes, academic_year: nil, session: nil) do
+          if session
+            birth_academic_years =
+              programmes.flat_map do |programme|
+                session.programme_birth_academic_years[programme]
+              end
+
+            where(birth_academic_year: birth_academic_years)
+          elsif academic_year
+            patient_locations =
+              PatientLocation
+                .select("1")
+                .where("patient_locations.patient_id = patients.id")
+                .where(academic_year:)
+                .appear_in_programmes(programmes)
+
+            where(patient_locations.arel.exists)
+          else
+            raise "Pass either academic year or session."
+          end
         end
 
   scope :not_appear_in_programmes,