Simplify patient and session lookups

This simplifies the lookups for patients and sessions by removing the
duplicate scopes between patient locations and patients, instead using
the scopes on the patient only, and making sure to filter out patients
who shouldn't belong in the session before we need to query for this.

Jira-Issue: MAV-1822

Author: thomasleese

app/components/app_programme_session_table_component.rb

@@ -1,23 +1,28 @@
 # frozen_string_literal: true
 
 class AppProgrammeSessionTableComponent < ViewComponent::Base
-  def initialize(sessions, programme:)
+  def initialize(sessions, programme:, academic_year:)
     @sessions = sessions
     @programme = programme
+    @academic_year = academic_year
   end
 
   private
 
-  attr_reader :sessions, :programme
+  attr_reader :sessions, :programme, :academic_year
 
   delegate :govuk_table, to: :helpers
 
   def cohort_count(session:)
-    format_number(patient_locations(session:).count)
+    format_number(patients(session:).count)
   end
 
   def no_response_scope(session:)
-    patient_locations(session:).has_consent_status(:no_response, programme:)
+    patients(session:).has_consent_status(
+      :no_response,
+      programme:,
+      academic_year:
+    )
   end
 
   def no_response_count(session:)
@@ -27,13 +32,17 @@ def no_response_count(session:)
   def no_response_percentage(session:)
     format_percentage(
       no_response_scope(session:).count,
-      patient_locations(session:).count
+      patients(session:).count
     )
   end
 
   def triage_needed_count(session:)
     format_number(
-      patient_locations(session:).has_triage_status(:required, programme:).count
+      patients(session:).has_triage_status(
+        :required,
+        programme:,
+        academic_year:
+      ).count
     )
   end
 
@@ -48,12 +57,22 @@ def vaccinated_count(session:)
   def vaccinated_percentage(session:)
     format_percentage(
       vaccinated_scope(session:).count,
-      patient_locations(session:).count
+      patients(session:).count
+    )
+  end
+
+  def patients(session:)
+    @patients ||= {}
+    @patients[session] = session.patients.where(
+      birth_academic_year: birth_academic_years(session:)
     )
   end
 
-  def patient_locations(session:)
-    session.patient_locations.joins(:patient).appear_in_programmes([programme])
+  def birth_academic_years(session:)
+    @birth_academic_years ||= {}
+    @birth_academic_years[session] = session.programme_birth_academic_years[
+      programme
+    ]
   end
 
   def format_number(count) = count.to_s

app/components/app_session_actions_component.rb

@@ -19,9 +19,7 @@ def render? = rows.any?
   delegate :govuk_summary_list, to: :helpers
   delegate :academic_year, :programmes, to: :session
 
-  def patient_locations
-    session.patient_locations.joins(:patient).appear_in_programmes(programmes)
-  end
+  def patients = session.patients
 
   def rows
     @rows ||= [
@@ -35,7 +33,7 @@ def rows
   end
 
   def no_nhs_number_row
-    count = patient_locations.merge(Patient.without_nhs_number).count
+    count = patients.without_nhs_number.count
     href = session_patients_path(session, missing_nhs_number: true)
 
     generate_row(:children_without_nhs_number, count:, href:)
@@ -44,7 +42,11 @@ def no_nhs_number_row
   def no_consent_response_row
     status = "no_response"
     count =
-      patient_locations.has_consent_status(status, programme: programmes).count
+      patients.has_consent_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
     href = session_consent_path(session, consent_statuses: [status])
     actions = [
       {
@@ -58,7 +60,11 @@ def no_consent_response_row
   def conflicting_consent_row
     status = "conflicts"
     count =
-      patient_locations.has_consent_status(status, programme: programmes).count
+      patients.has_consent_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
     href = session_consent_path(session, consent_statuses: [status])
 
     generate_row(:children_with_conflicting_consent_response, count:, href:)
@@ -67,7 +73,11 @@ def conflicting_consent_row
   def triage_required_row
     status = "required"
     count =
-      patient_locations.has_triage_status(status, programme: programmes).count
+      patients.has_triage_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
     href = session_triage_path(session, triage_status: status)
 
     generate_row(:children_requiring_triage, count:, href:)
@@ -77,7 +87,7 @@ def register_attendance_row
     return nil unless session.requires_registration? && session.today?
 
     status = "unknown"
-    count = patient_locations.has_registration_status(status, session:).count
+    count = patients.has_registration_status(status, session:).count
     href = session_register_path(session, register_status: status)
 
     generate_row(:children_to_register, count:, href:)
@@ -88,13 +98,11 @@ def ready_for_vaccinator_row
 
     counts_by_programme =
       session.programmes.index_with do |programme|
-        patient_locations
+        patients
           .has_registration_status(%w[attending completed], session:)
-          .includes(
-            patient: %i[consent_statuses triage_statuses vaccination_statuses]
-          )
-          .count do |patient_location|
-            patient_location.patient.consent_given_and_safe_to_vaccinate?(
+          .includes(:consent_statuses, :triage_statuses, :vaccination_statuses)
+          .count do |patient|
+            patient.consent_given_and_safe_to_vaccinate?(
               programme:,
               academic_year:
             )

app/components/app_session_details_summary_component.rb

@@ -14,14 +14,12 @@ def call
   attr_reader :session
 
   delegate :govuk_summary_list, to: :helpers
-  delegate :programmes, to: :session
+  delegate :programmes, :academic_year, to: :session
 
-  def patient_locations
-    session.patient_locations.joins(:patient).appear_in_programmes(programmes)
-  end
+  def patients = session.patients
 
   def cohort_row
-    count = patient_locations.count
+    count = patients.count
 
     { key: { text: "Cohort" }, value: { text: I18n.t("children", count:) } }
   end
@@ -30,7 +28,11 @@ def consent_refused_row
     status = "refused"
 
     count =
-      patient_locations.has_consent_status(status, programme: programmes).count
+      patients.has_consent_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
 
     href = session_consent_path(session, consent_statuses: [status])
 

app/components/app_session_needs_review_warning_component.rb

@@ -32,8 +32,7 @@ def warning_href
 
   def warning_counts
     @warning_counts ||= {
-      children_without_nhs_number:
-        patient_locations.merge(Patient.without_nhs_number).count
+      children_without_nhs_number: patients.without_nhs_number.count
     }
   end
 
@@ -42,10 +41,5 @@ def make_row_from_warning(warning)
     link_to(t(warning, count: warning_counts[warning]), warning_href[warning])
   end
 
-  def patient_locations
-    @session
-      .patient_locations
-      .joins(:patient)
-      .appear_in_programmes(@session.programmes)
-  end
+  def patients = @session.patients
 end

app/controllers/programmes/base_controller.rb

@@ -22,22 +22,11 @@ def set_academic_year
 
   def patient_ids
     @patient_ids ||=
-      PatientLocation
-        .distinct
-        .joins(:patient)
-        .joins_sessions
-        .where("sessions.id IN (?)", session_ids)
-        .appear_in_programmes([@programme])
-        .not_archived(team: current_team)
-        .pluck(:patient_id)
-  end
-
-  def session_ids
-    @session_ids ||=
       current_team
-        .sessions
-        .where(academic_year: @academic_year)
-        .has_programmes([@programme])
+        .patients
+        .appear_in_programmes([@programme], academic_year: @academic_year)
+        .not_archived(team: current_team)
         .pluck(:id)
+        .uniq
   end
 end

app/controllers/sessions/consent_controller.rb

@@ -27,15 +27,16 @@ def show
 
     scope =
       @session
-        .patient_locations
-        .includes(patient: [:consent_statuses, { notes: :created_by }])
+        .patients
+        .includes(:consent_statuses, { notes: :created_by })
         .has_consent_status(
           statuses_except_not_required,
-          programme: @form.programmes
+          programme: @form.programmes,
+          academic_year: @session.academic_year
         )
 
-    patient_locations = @form.apply(scope)
-    @pagy, @patient_locations = pagy(patient_locations)
+    patients = @form.apply(scope)
+    @pagy, @patients = pagy(patients)
   end
 
   private

app/controllers/sessions/patient_specific_directions_controller.rb

@@ -9,21 +9,18 @@ class Sessions::PatientSpecificDirectionsController < ApplicationController
   before_action :set_patient_search_form
 
   def show
-    scope =
-      @session.patient_locations.includes(
-        patient: {
-          patient_specific_directions: :programme
-        }
-      )
-    @eligible_for_bulk_psd_count = patient_locations_allowed_psd.count
-    patient_locations = @form.apply(scope)
-    @pagy, @patient_locations = pagy(patient_locations)
+    scope = @session.patients.includes(patient_specific_directions: :programme)
+
+    @eligible_for_bulk_psd_count = patients_allowed_psd.count
+
+    patients = @form.apply(scope)
+    @pagy, @patients = pagy(patients)
 
     render layout: "full"
   end
 
   def new
-    @eligible_for_bulk_psd_count = patient_locations_allowed_psd.count
+    @eligible_for_bulk_psd_count = patients_allowed_psd.count
   end
 
   def create
@@ -56,12 +53,12 @@ def set_vaccine
   end
 
   def psds_to_create
-    patient_locations_allowed_psd.map do |patient_location|
+    patients_allowed_psd.map do |patient|
       PatientSpecificDirection.new(
         academic_year: @session.academic_year,
         created_by: current_user,
         delivery_site: "nose",
-        patient_id: patient_location.patient_id,
+        patient:,
         programme: @programme,
         team: current_team,
         vaccine: @vaccine,
@@ -70,18 +67,24 @@ def psds_to_create
     end
   end
 
-  def patient_locations_allowed_psd
-    @patient_locations_allowed_psd ||=
+  def patients_allowed_psd
+    @patients_allowed_psd ||=
       @session
-        .patient_locations
+        .patients
         .has_consent_status(
           "given",
           programme: @programme,
+          academic_year: @session.academic_year,
           vaccine_method: "nasal"
         )
-        .has_triage_status("not_required", programme: @programme)
+        .has_triage_status(
+          "not_required",
+          programme: @programme,
+          academic_year: @session.academic_year
+        )
         .without_patient_specific_direction(
           programme: @programme,
+          academic_year: @session.academic_year,
           team: current_team
         )
   end

app/controllers/sessions/patients_controller.rb

@@ -12,12 +12,10 @@ def show
     @statuses = Patient::VaccinationStatus.statuses.keys
 
     scope =
-      @session.patient_locations.includes(
-        patient: [:vaccination_statuses, { notes: :created_by }]
-      )
+      @session.patients.includes(:vaccination_statuses, notes: :created_by)
 
-    patient_locations = @form.apply(scope)
-    @pagy, @patient_locations = pagy(patient_locations)
+    patients = @form.apply(scope)
+    @pagy, @patients = pagy(patients)
   end
 
   private