wip

Author: thomasleese

app/components/app_patient_programmes_table_component.rb

@@ -258,7 +258,7 @@ def vaccination_records_for(programme:, academic_year: nil)
   end
 
   def eligible_year_groups_for(programme:)
-    location_ids = patient.patient_sessions.joins(:session).select(:location_id)
+    location_ids = patient.patient_sessions.select(:location_id)
 
     LocationProgrammeYearGroup
       .where(location_id: location_ids)

app/components/app_session_actions_component.rb

@@ -20,10 +20,7 @@ def render? = rows.any?
   delegate :academic_year, :programmes, to: :session
 
   def patient_sessions
-    session
-      .patient_sessions
-      .joins(:patient, :session)
-      .appear_in_programmes(programmes)
+    session.patient_sessions.joins(:patient).appear_in_programmes(programmes)
   end
 
   def rows

app/components/app_session_details_summary_component.rb

@@ -17,10 +17,7 @@ def call
   delegate :programmes, to: :session
 
   def patient_sessions
-    session
-      .patient_sessions
-      .joins(:patient, :session)
-      .appear_in_programmes(programmes)
+    session.patient_sessions.joins(:patient).appear_in_programmes(programmes)
   end
 
   def cohort_row

app/components/app_session_needs_review_warning_component.rb

@@ -45,7 +45,7 @@ def make_row_from_warning(warning)
   def patient_sessions
     @session
       .patient_sessions
-      .joins(:patient, :session)
+      .joins(:patient)
       .appear_in_programmes(@session.programmes)
   end
 end

app/controllers/patient_sessions/base_controller.rb

@@ -36,7 +36,7 @@ def set_patient
 
   def set_patient_session
     @patient_session =
-      PatientSession.find_by!(patient: @patient, session: @session)
+      PatientSession.find_by!(patient: @patient, location: @session.location, academic_year: @session.academic_year)
   end
 
   def set_programme

app/controllers/patients_controller.rb

@@ -46,15 +46,12 @@ def set_patient
         :school,
         consents: %i[parent patient],
         parent_relationships: :parent,
-        sessions: :location,
         vaccination_records: :programme
       ).find(params[:id])
   end
 
   def set_in_generic_clinic
-    generic_clinic_session =
-      current_team.generic_clinic_session(academic_year: AcademicYear.pending)
-    @in_generic_clinic = @patient.sessions.include?(generic_clinic_session)
+    @in_generic_clinic = @patient.patient_sessions.exists?(location: current_team.generic_clinic, academic_year: AcademicYear.pending)
   end
 
   def record_access_log_entry

app/controllers/programmes/base_controller.rb

@@ -24,8 +24,9 @@ def patient_ids
     @patient_ids ||=
       PatientSession
         .distinct
-        .joins(:patient, :session)
-        .where(session_id: session_ids)
+        .joins(:patient)
+        .joins_sessions
+        .where("sessions.id IN (?)", session_ids)
         .appear_in_programmes([@programme])
         .not_archived(team: current_team)
         .pluck(:patient_id)

app/controllers/sessions/consent_controller.rb

@@ -14,7 +14,6 @@ def show
     scope =
       @session
         .patient_sessions
-        .includes_programmes
         .includes(patient: [:consent_statuses, { notes: :created_by }])
         .has_consent_status(@statuses, programme: @form.programmes)
 

app/controllers/sessions_controller.rb

@@ -18,10 +18,11 @@ def index
 
     @patient_count_by_session_id =
       PatientSession
-        .where(session_id: sessions.map(&:id))
-        .joins(:patient, :session)
+        .joins_sessions
+        .where("sessions.id IN (?)", sessions.pluck(:id))
+        .joins(:patient)
         .appear_in_programmes(@programmes)
-        .group(:session_id)
+        .group("sessions.id")
         .count
 
     @pagy, @sessions = pagy_array(sessions)

app/forms/patient_search_form.rb

@@ -129,7 +129,7 @@ def filter_nhs_number(scope)
   def filter_programmes(scope)
     if programmes.present?
       if @session
-        scope.joins(:patient, :session).appear_in_programmes(programmes)
+        scope.joins(:patient).appear_in_programmes(programmes)
       else
         scope.appear_in_programmes(programmes, academic_year:)
       end