Refactor AppPatientSessionSearchResultCardComponent

This refactors the component to accept a separate patient and session in
preparation for the removal of the `PatientSession` model.

Jira-Issue: MAV-1822

Author: thomasleese

app/components/app_patient_session_search_result_card_component.rb

@@ -42,10 +42,10 @@ class AppPatientSessionSearchResultCardComponent < ViewComponent::Base
               end
             end
 
-            if context != :patient_specific_direction && (note = patient_session.latest_note)
+            if context != :patient_specific_direction && latest_note
               summary_list.with_row do |row|
                 row.with_key { "Notes" }
-                row.with_value { render note_to_log_event(note) }
+                row.with_value { render note_to_log_event(latest_note) }
               end
             end
           end %>
@@ -59,7 +59,7 @@ class AppPatientSessionSearchResultCardComponent < ViewComponent::Base
     <% end %>
   ERB
 
-  def initialize(patient_session, context:, programmes: [])
+  def initialize(patient:, session:, context:, programmes: [])
     unless context.in?(
              %i[
                patients
@@ -73,10 +73,8 @@ def initialize(patient_session, context:, programmes: [])
       raise "Unknown context: #{context}"
     end
 
-    @patient_session = patient_session
-    @patient = patient_session.patient
-    @session = patient_session.session
-
+    @patient = patient
+    @session = session
     @context = context
 
     @programmes =
@@ -89,7 +87,7 @@ def initialize(patient_session, context:, programmes: [])
 
   private
 
-  attr_reader :patient_session, :patient, :session, :context, :programmes
+  attr_reader :patient, :session, :context, :programmes
 
   delegate :govuk_button_to,
            :govuk_summary_list,
@@ -283,6 +281,14 @@ def patient_specific_direction_status_tag
     }
   end
 
+  def latest_note
+    patient
+      .notes
+      .sort_by(&:created_at)
+      .reverse
+      .find { it.session_id == session.id }
+  end
+
   def note_to_log_event(note)
     truncated_body = note.body.truncate_words(80, omission: "…")
 

app/controllers/sessions/consent_controller.rb

@@ -29,7 +29,7 @@ def show
       @session
         .patient_sessions
         .includes_programmes
-        .includes(:latest_note, patient: :consent_statuses)
+        .includes(patient: [:consent_statuses, { notes: :created_by }])
         .has_consent_status(
           statuses_except_not_required,
           programme: @form.programmes

app/controllers/sessions/patients_controller.rb

@@ -13,8 +13,7 @@ def show
 
     scope =
       @session.patient_sessions.includes_programmes.includes(
-        :latest_note,
-        patient: :vaccination_statuses
+        patient: [:vaccination_statuses, { notes: :created_by }]
       )
 
     patient_sessions = @form.apply(scope)

app/controllers/sessions/record_controller.rb

@@ -17,8 +17,12 @@ class Sessions::RecordController < ApplicationController
   def show
     scope =
       @session.patient_sessions.includes(
-        :latest_note,
-        patient: %i[consent_statuses triage_statuses vaccination_statuses]
+        patient: [
+          :consent_statuses,
+          :triage_statuses,
+          :vaccination_statuses,
+          { notes: :created_by }
+        ]
       )
 
     if @session.requires_registration?

app/controllers/sessions/register_controller.rb

@@ -15,12 +15,12 @@ def show
 
     scope =
       @session.patient_sessions.includes_programmes.includes(
-        :latest_note,
-        patient: %i[
-          consent_statuses
-          registration_statuses
-          triage_statuses
-          vaccination_statuses
+        patient: [
+          :consent_statuses,
+          :registration_statuses,
+          :triage_statuses,
+          :vaccination_statuses,
+          { notes: :created_by }
         ]
       )
 

app/controllers/sessions/triage_controller.rb

@@ -15,7 +15,7 @@ def show
       @session
         .patient_sessions
         .includes_programmes
-        .includes(:latest_note, patient: :triage_statuses)
+        .includes(patient: [:triage_statuses, { notes: :created_by }])
         .has_triage_status(@statuses, programme: @form.programmes)
 
     patient_sessions = @form.apply(scope)

app/models/patient_session.rb

@@ -53,13 +53,6 @@ class PatientSession < ApplicationRecord
            -> { where(patient_id: it.patient_id) },
            through: :session
 
-  has_many :notes, -> { where(session_id: it.session_id) }, through: :patient
-
-  has_one :latest_note,
-          -> { where(session_id: it.session_id).order(created_at: :desc) },
-          through: :patient,
-          source: :notes
-
   has_many :pre_screenings,
            -> { where(patient_id: it.patient_id) },
            through: :session

app/views/sessions/consent/show.html.erb

@@ -24,7 +24,10 @@
     <%= render AppSearchResultsComponent.new(@pagy, label: "children") do %>
       <% @patient_sessions.each do |patient_session| %>
         <%= render AppPatientSessionSearchResultCardComponent.new(
-              patient_session, context: :consent, programmes: @form.programmes,
+              patient: patient_session.patient,
+              session: patient_session.session,
+              context: :consent,
+              programmes: @form.programmes,
             ) %>
       <% end %>
     <% end %>

app/views/sessions/patient_specific_directions/show.html.erb

@@ -39,7 +39,11 @@
     <%= render AppSessionNeedsReviewWarningComponent.new(session: @session) %>
     <%= render AppSearchResultsComponent.new(@pagy, label: "children", heading: "Review PSDs") do %>
       <% @patient_sessions.each do |patient_session| %>
-        <%= render AppPatientSessionSearchResultCardComponent.new(patient_session, context: :patient_specific_direction) %>
+        <%= render AppPatientSessionSearchResultCardComponent.new(
+              patient: patient_session.patient,
+              session: patient_session.session,
+              context: :patient_specific_direction,
+            ) %>
       <% end %>
     <% end %>
   </div>

app/views/sessions/patients/show.html.erb

@@ -24,7 +24,10 @@
     <%= render AppSearchResultsComponent.new(@pagy, label: "children") do %>
       <% @patient_sessions.each do |patient_session| %>
         <%= render AppPatientSessionSearchResultCardComponent.new(
-              patient_session, context: :patients, programmes: @form.programmes,
+              patient: patient_session.patient,
+              session: patient_session.session,
+              context: :patients,
+              programmes: @form.programmes,
             ) %>
       <% end %>
     <% end %>