Merge pull request #4338 from nhsuk/v3.1.1-wip

Version 3.1.1

Author: thomasleese

app/components/app_programme_stats_component.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 class AppProgrammeStatsComponent < ViewComponent::Base
-  def initialize(programme, academic_year:, patients:)
+  def initialize(programme, academic_year:, patient_ids:)
     super
 
     @programme = programme
     @academic_year = academic_year
-    @patients = patients
+    @patient_ids = patient_ids
   end
 
-  delegate :count, to: :patients, prefix: true
+  def patients_count = patient_ids.length
 
   def vaccinations_count
     helpers
       .policy_scope(VaccinationRecord)
       .administered
-      .where(patient: patients, programme:)
+      .where(patient_id: patient_ids, programme:)
       .count
   end
 
@@ -25,11 +25,11 @@ def consent_notifications_count
       .has_programme(programme)
       .joins(:session)
       .where(session: { academic_year: })
-      .where(patient: patients)
+      .where(patient_id: patient_ids)
       .count
   end
 
   private
 
-  attr_reader :programme, :academic_year, :patients
+  attr_reader :programme, :academic_year, :patient_ids
 end

app/controllers/programmes/base_controller.rb

@@ -20,13 +20,23 @@ def set_academic_year
     end
   end
 
-  def patients
-    # We do this instead of using `team.patients` as that has a `distinct` on
-    # it which means we cannot apply ordering or grouping.
-    @patients ||=
-      Patient
-        .where(id: current_team.patient_sessions.select(:patient_id).distinct)
-        .appear_in_programmes([@programme], academic_year: @academic_year)
+  def patient_ids
+    @patient_ids ||=
+      PatientSession
+        .distinct
+        .joins(:patient, :session)
+        .where(session_id: 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])
+        .pluck(:id)
   end
 end

app/controllers/programmes/overview_controller.rb

@@ -2,7 +2,7 @@
 
 class Programmes::OverviewController < Programmes::BaseController
   before_action :set_consents
-  before_action :set_patients
+  before_action :set_patient_ids
   before_action :set_patient_count_by_year_group
 
   def show
@@ -13,21 +13,21 @@ def show
   def set_consents
     @consents =
       policy_scope(Consent).where(
-        patient: patients,
+        patient_id: patient_ids,
         programme: @programme,
         academic_year: @academic_year
       )
   end
 
-  def set_patients
-    @patients = patients
+  def set_patient_ids
+    @patient_ids = patient_ids
   end
 
   def set_patient_count_by_year_group
     year_groups = current_team.programme_year_groups[@programme]
 
     patient_count_by_birth_academic_year =
-      patients.group(:birth_academic_year).count
+      Patient.where(id: patient_ids).group(:birth_academic_year).count
 
     @patient_count_by_year_group =
       year_groups.index_with do |year_group|

app/controllers/programmes/patients_controller.rb

@@ -9,7 +9,7 @@ def index
     @year_groups = current_team.programme_year_groups[@programme]
 
     scope =
-      patients.includes(
+      Patient.where(id: patient_ids).includes(
         :consent_statuses,
         :triage_statuses,
         :vaccination_statuses,

app/helpers/imports_helper.rb

@@ -3,15 +3,12 @@
 module ImportsHelper
   def import_issues_count
     vaccination_records_with_issues =
-      policy_scope(VaccinationRecord).with_pending_changes.distinct
+      policy_scope(VaccinationRecord).with_pending_changes.distinct.pluck(
+        :patient_id
+      )
 
-    patients_with_issues = policy_scope(Patient).with_pending_changes
+    patients_with_issues = policy_scope(Patient).with_pending_changes.pluck(:id)
 
-    unique_import_issues =
-      (vaccination_records_with_issues + patients_with_issues).uniq do |record|
-        record.is_a?(VaccinationRecord) ? record.patient_id : record.id
-      end
-
-    unique_import_issues.count
+    (vaccination_records_with_issues + patients_with_issues).uniq.length
   end
 end

app/jobs/commit_patient_changesets_job.rb

@@ -22,6 +22,8 @@ def perform(import)
           increment_column_counts!(import, counts, changesets)
         end
 
+      import.postprocess_rows!
+
       import.update_columns(
         processed_at: Time.zone.now,
         status: :processed,

app/lib/patient_merger.rb

@@ -89,6 +89,8 @@ def call
 
       PatientSession.where(patient: patient_to_destroy).destroy_all
 
+      patient_to_destroy.changesets.update_all(patient_id: nil)
+
       patient_to_destroy.class_imports.each do |import|
         unless patient_to_keep.class_imports.include?(import)
           patient_to_keep.class_imports << import

app/models/class_import.rb

@@ -47,12 +47,6 @@ class ClassImport < PatientImport
            as: :import,
            dependent: :destroy
 
-  private
-
-  def parse_row(data)
-    ClassImportRow.new(data:, team:, academic_year:, location:, year_groups:)
-  end
-
   def postprocess_rows!
     # Remove patients already in the sessions but not in the class list.
 
@@ -86,4 +80,10 @@ def postprocess_rows!
 
     PatientsAgedOutOfSchoolJob.perform_later
   end
+
+  private
+
+  def parse_row(data)
+    ClassImportRow.new(data:, team:, academic_year:, location:, year_groups:)
+  end
 end

app/models/cohort_import.rb

@@ -41,13 +41,13 @@ class CohortImport < PatientImport
            as: :import,
            dependent: :destroy
 
+  def postprocess_rows!
+    PatientsAgedOutOfSchoolJob.perform_later
+  end
+
   private
 
   def parse_row(data)
     CohortImportRow.new(data:, team:, academic_year:)
   end
-
-  def postprocess_rows!
-    PatientsAgedOutOfSchoolJob.perform_later
-  end
 end

app/models/patient.rb

@@ -61,6 +61,7 @@ class Patient < ApplicationRecord
 
   has_many :access_log_entries
   has_many :archive_reasons
+  has_many :changesets, class_name: "PatientChangeset"
   has_many :consent_notifications
   has_many :consent_statuses
   has_many :consents