wip

Author: thomasleese

app/components/app_activity_log_component.rb

@@ -66,9 +66,10 @@ def initialize(team:, patient:, session: nil)
     @patient_locations =
       @patient
         .patient_locations
-        .includes_programmes
-        .includes(session: :location)
-        .then { |scope| session ? scope.where(session:) : scope }
+        .includes(:location)
+        .then do |scope|
+          session ? scope.where(location: session.location) : scope
+        end
 
     @patient_specific_directions =
       @patient
@@ -347,14 +348,10 @@ def pre_screening_events
 
   def session_events
     patient_locations.map do |patient_location|
-      patient = patient_location.patient
-      session = patient_location.session
-
       [
         {
-          title: "Added to the session at #{session.location.name}",
-          at: patient_location.created_at,
-          programmes: session.programmes_for(patient:)
+          title: "Added to the session at #{patient_location.location.name}",
+          at: patient_location.created_at
         }
       ]
     end

app/components/app_patient_programmes_table_component.rb

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

app/components/app_programme_session_table_component.rb

@@ -53,10 +53,7 @@ def vaccinated_percentage(session:)
   end
 
   def patient_locations(session:)
-    session
-      .patient_locations
-      .joins(:patient, :session)
-      .appear_in_programmes([programme])
+    session.patient_locations.joins(:patient).appear_in_programmes([programme])
   end
 
   def format_number(count) = count.to_s

app/components/app_session_actions_component.rb

@@ -20,10 +20,7 @@ def render? = rows.any?
   delegate :academic_year, :programmes, to: :session
 
   def patient_locations
-    session
-      .patient_locations
-      .joins(:patient, :session)
-      .appear_in_programmes(programmes)
+    session.patient_locations.joins(:patient).appear_in_programmes(programmes)
   end
 
   def rows
@@ -80,7 +77,7 @@ def register_attendance_row
     return nil unless session.requires_registration? && session.today?
 
     status = "unknown"
-    count = patient_locations.has_registration_status(status).count
+    count = patient_locations.has_registration_status(status, session:).count
     href = session_register_path(session, register_status: status)
 
     generate_row(:children_to_register, count:, href:)
@@ -92,7 +89,7 @@ def ready_for_vaccinator_row
     counts_by_programme =
       session.programmes.index_with do |programme|
         patient_locations
-          .has_registration_status(%w[attending completed])
+          .has_registration_status(%w[attending completed], session:)
           .includes(
             patient: %i[consent_statuses triage_statuses vaccination_statuses]
           )

app/components/app_session_details_summary_component.rb

@@ -17,10 +17,7 @@ def call
   delegate :programmes, to: :session
 
   def patient_locations
-    session
-      .patient_locations
-      .joins(:patient, :session)
-      .appear_in_programmes(programmes)
+    session.patient_locations.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_locations
     @session
       .patient_locations
-      .joins(:patient, :session)
+      .joins(:patient)
       .appear_in_programmes(@session.programmes)
   end
 end

app/controllers/consent_forms_controller.rb

@@ -136,7 +136,6 @@ def set_patient
     @patient =
       policy_scope(Patient).includes(
         parent_relationships: :parent,
-        pending_sessions: :programmes,
         vaccination_records: :programme
       ).find(params[:patient_id])
   end

app/controllers/imports/issues_controller.rb

@@ -40,7 +40,6 @@ def set_import_issues
     @patients =
       policy_scope(Patient).with_pending_changes.includes(
         :gp_practice,
-        :pending_sessions,
         :school,
         :school_moves
       )

app/controllers/patient_sessions/base_controller.rb

@@ -36,7 +36,11 @@ def set_patient
 
   def set_patient_location
     @patient_location =
-      PatientLocation.find_by!(patient: @patient, session: @session)
+      PatientLocation.find_by!(
+        patient: @patient,
+        location: @session.location,
+        academic_year: @session.academic_year
+      )
   end
 
   def set_programme

app/controllers/patients_controller.rb

@@ -26,10 +26,11 @@ def edit
   end
 
   def invite_to_clinic
-    session =
-      current_team.generic_clinic_session(academic_year: AcademicYear.pending)
-
-    PatientLocation.find_or_create_by!(patient: @patient, session:)
+    PatientLocation.find_or_create_by!(
+      patient: @patient,
+      location: current_team.generic_clinic,
+      academic_year: AcademicYear.pending
+    )
 
     redirect_to patient_path(@patient),
                 flash: {
@@ -46,15 +47,16 @@ 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_locations.exists?(
+        location: current_team.generic_clinic,
+        academic_year: AcademicYear.pending
+      )
   end
 
   def record_access_log_entry