Merge pull request #4369 from nhsuk/session-attendance-patient-session-foreign-key

Replace session attendance patient session foreign key

Author: thomasleese

app/components/app_patient_session_search_result_card_component.rb

@@ -97,8 +97,8 @@ def initialize(patient_session, context:, programmes: [])
   def can_register_attendance?
     session_attendance =
       SessionAttendance.new(
-        patient_session:,
-        session_date: SessionDate.new(value: Date.current)
+        patient:,
+        session_date: SessionDate.new(session:, value: Date.current)
       )
 
     policy(session_attendance).new?

app/controllers/patient_sessions/session_attendances_controller.rb

@@ -43,10 +43,12 @@ def update
 
   def set_session_attendance
     @session_attendance =
-      authorize @patient_session
-                  .session_attendances
-                  .includes(:patient, :session_date)
-                  .find_or_initialize_by(session_date: @session_date)
+      authorize(
+        @patient
+          .session_attendances
+          .includes(:patient, session_date: { session: :programmes })
+          .find_or_initialize_by(session_date: @session_date)
+      )
   end
 
   def session_attendance_params

app/lib/generate/vaccination_records.rb

@@ -23,17 +23,20 @@ def create_vaccinations
     vaccination_records = []
 
     random_patient_sessions.each do |patient_session|
-      patient_session_id = patient_session.id
-      session_date_ids = patient_session.session.session_dates.pluck(:id)
-
-      unless SessionAttendance.exists?(
-               patient_session_id:,
-               session_date_id: session_date_ids
+      patient = patient_session.patient
+      session = patient_session.session
+
+      unless SessionAttendance.joins(:session_date).exists?(
+               patient:,
+               session_date: {
+                 session:
+               }
              )
         session_attendances << FactoryBot.build(
           :session_attendance,
           :present,
-          patient_session:
+          patient:,
+          session:
         )
       end
 

app/lib/status_updater.rb

@@ -59,6 +59,7 @@ def update_registration_statuses!
       .where(patient_session_id: patient_sessions.select(:id))
       .includes(
         :session_attendances,
+        :session_date,
         :vaccination_records,
         patient_session: {
           session: :programmes

app/models/patient.rb

@@ -65,6 +65,7 @@ class Patient < ApplicationRecord
   has_many :consent_notifications
   has_many :consent_statuses
   has_many :consents
+  has_many :gillick_assessments
   has_many :notes
   has_many :notify_log_entries
   has_many :parent_relationships, -> { order(:created_at) }
@@ -73,17 +74,16 @@ class Patient < ApplicationRecord
   has_many :pre_screenings
   has_many :school_move_log_entries
   has_many :school_moves
+  has_many :session_attendances
   has_many :session_notifications
   has_many :triage_statuses
   has_many :triages
   has_many :vaccination_records, -> { kept }
   has_many :vaccination_statuses
   has_many :patient_specific_directions
 
-  has_many :gillick_assessments
   has_many :parents, through: :parent_relationships
   has_many :patient_specific_directions
-  has_many :session_attendances, through: :patient_sessions
   has_many :sessions, through: :patient_sessions
   has_many :teams, -> { distinct }, through: :sessions
 

app/models/patient_session.rb

@@ -44,7 +44,6 @@ class PatientSession < ApplicationRecord
   belongs_to :patient
   belongs_to :session
 
-  has_many :session_attendances, dependent: :destroy
   has_one :registration_status
 
   has_one :location, through: :session
@@ -67,6 +66,10 @@ class PatientSession < ApplicationRecord
            -> { where(patient_id: it.patient_id) },
            through: :session
 
+  has_many :session_attendances,
+           -> { where(patient_id: it.patient_id) },
+           through: :session
+
   has_many :session_notifications,
            -> { where(session_id: it.session_id) },
            through: :patient
@@ -315,9 +318,10 @@ def programmes = session.programmes_for(patient:, academic_year:)
 
   def todays_attendance
     if (session_date = session.session_dates.today.first)
-      session_attendances.includes(:session_date).find_or_initialize_by(
-        session_date:
-      )
+      patient
+        .session_attendances
+        .includes(:patient, session_date: { session: :programmes })
+        .find_or_initialize_by(session_date:)
     end
   end
 

app/models/patient_session/registration_status.rb

@@ -21,21 +21,24 @@ class PatientSession::RegistrationStatus < ApplicationRecord
   belongs_to :patient_session
 
   has_one :patient, through: :patient_session
+  has_one :session, through: :patient_session
 
   has_many :vaccination_records,
            -> { kept.order(performed_at: :desc) },
            through: :patient
 
-  has_many :session_attendances,
-           -> { includes(:session_date) },
-           through: :patient_session
+  has_one :session_date, -> { today }, through: :session, source: :session_dates
+
+  has_many :session_attendances, through: :patient
 
   enum :status,
        { unknown: 0, attending: 1, not_attending: 2, completed: 3 },
        default: :unknown,
        validate: true
 
-  def session_attendance = session_attendances.find(&:today?)
+  def session_attendance
+    session_attendances.find { it.session_date_id == session_date.id }
+  end
 
   def assign_status
     self.status = generator.status

app/models/session.rb

@@ -55,6 +55,7 @@ class Session < ApplicationRecord
   has_many :programmes, through: :session_programmes
   has_many :gillick_assessments, through: :session_dates
   has_many :patients, through: :patient_sessions
+  has_many :session_attendances, through: :session_dates
   has_many :vaccines, through: :programmes
 
   has_many :location_programme_year_groups,

app/models/session_attendance.rb

@@ -4,31 +4,31 @@
 #
 # Table name: session_attendances
 #
-#  id                 :bigint           not null, primary key
-#  attending          :boolean          not null
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  patient_session_id :bigint           not null
-#  session_date_id    :bigint           not null
+#  id              :bigint           not null, primary key
+#  attending       :boolean          not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  patient_id      :bigint           not null
+#  session_date_id :bigint           not null
 #
 # Indexes
 #
-#  idx_on_patient_session_id_session_date_id_be8bd21ddf  (patient_session_id,session_date_id) UNIQUE
-#  index_session_attendances_on_session_date_id          (session_date_id)
+#  index_session_attendances_on_patient_id                      (patient_id)
+#  index_session_attendances_on_patient_id_and_session_date_id  (patient_id,session_date_id) UNIQUE
+#  index_session_attendances_on_session_date_id                 (session_date_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (patient_session_id => patient_sessions.id)
+#  fk_rails_...  (patient_id => patients.id)
 #  fk_rails_...  (session_date_id => session_dates.id)
 #
 class SessionAttendance < ApplicationRecord
-  audited associated_with: :patient_session
+  audited associated_with: :patient
 
-  belongs_to :patient_session
+  belongs_to :patient
   belongs_to :session_date
 
-  has_one :session, through: :patient_session
-  has_one :patient, through: :patient_session
+  has_one :session, through: :session_date
   has_one :location, through: :session
 
   scope :today, -> { joins(:session_date).merge(SessionDate.today) }

app/policies/session_attendance_policy.rb

@@ -11,23 +11,22 @@ def update?
 
   private
 
-  delegate :patient_session, :session_date, to: :record
-
-  def academic_year = patient_session.session.academic_year
+  delegate :patient, :session_date, to: :record
+  delegate :session, to: :session_date
+  delegate :academic_year, to: :session
 
   def already_vaccinated?
-    patient_session.programmes.all? do |programme|
-      patient_session
-        .patient
-        .vaccination_status(programme:, academic_year:)
-        .vaccinated?
-    end
+    session
+      .programmes_for(patient:, academic_year:)
+      .all? do |programme|
+        patient.vaccination_status(programme:, academic_year:).vaccinated?
+      end
   end
 
   def was_seen_by_nurse?
     VaccinationRecord.kept.exists?(
-      patient_id: patient_session.patient_id,
-      session_id: patient_session.session_id,
+      patient:,
+      session:,
       performed_at: session_date.value.all_day
     )
   end