Merge pull request #6647 from NHSDigital/patient-status-updater-improvements

Patient status updater improvements

Author: floehopper

app/lib/patient_status_updater.rb

@@ -92,8 +92,15 @@ def update_registration_statuses!
     merge_patient_scope(Patient::RegistrationStatus)
       .joins(session: :team_location)
       .where(team_location: { academic_year: academic_years })
-      .includes(:attendance_records, :patient, :session, :vaccination_records)
-      .find_in_batches do |batch|
+      .in_batches do |relation|
+        batch =
+          relation.includes(
+            :attendance_records,
+            :patient,
+            :session,
+            :vaccination_records
+          ).to_a
+
         batch.each(&:assign_status)
 
         Patient::RegistrationStatus.import!(
@@ -106,23 +113,6 @@ def update_registration_statuses!
       end
   end
 
-  def patient_statuses_to_import
-    @patient_statuses_to_import ||=
-      (patient_scope || Patient.all)
-        .pluck(:id, :birth_academic_year)
-        .flat_map do |patient_id, birth_academic_year|
-          academic_years.flat_map do |academic_year|
-            year_group = birth_academic_year.to_year_group(academic_year:)
-
-            programme_types_per_year_group
-              .fetch(year_group, [])
-              .map do |programme_type|
-                [patient_id, programme_type, academic_year]
-              end
-          end
-        end
-  end
-
   def programme_statuses_to_import
     @programme_statuses_to_import ||=
       (patient_scope || Patient.all)
@@ -161,19 +151,6 @@ def patient_location_statuses_to_import
       end
   end
 
-  def programme_types_per_year_group
-    @programme_types_per_year_group ||=
-      Location::ProgrammeYearGroup
-        .joins(:location_year_group)
-        .where(location_year_group: { academic_year: academic_years })
-        .distinct
-        .pluck(:programme_type, :"location_year_group.value")
-        .each_with_object({}) do |(programme_type, year_group), hash|
-          hash[year_group] ||= []
-          hash[year_group] << programme_type
-        end
-  end
-
   def programme_types_per_session_id_and_year_group
     @programme_types_per_session_id_and_year_group ||=
       Session::ProgrammeYearGroup

app/models/immunisation_import.rb

@@ -89,9 +89,6 @@ def process!
     end
 
     post_commit!
-    UpdatePatientsFromPDS.call(patients, queue: :imports)
-
-    TeamCachedCounts.new(team).reset_import_issues!
   end
 
   private
@@ -214,18 +211,22 @@ def postprocess_rows!
       .find_each do |vaccination_record|
         NextDoseTriageFactory.call(vaccination_record:)
       end
+  end
 
+  def post_commit!
     PatientTeamUpdater.call(patient_scope: patients)
     PatientStatusUpdater.call(patient_scope: Patient.where(id: patients.ids))
-  end
 
-  def post_commit!
     vaccination_records.sync_all_to_nhs_immunisations_api
 
     vaccination_records
       .includes(:patient, :team, :subteam)
       .find_each do |vaccination_record|
         AlreadyHadNotificationSender.call(vaccination_record:)
       end
+
+    UpdatePatientsFromPDS.call(patients, queue: :imports)
+
+    TeamCachedCounts.new(team).reset_import_issues!
   end
 end

spec/models/immunisation_import_spec.rb

@@ -524,15 +524,30 @@
       create(
         :immunisation_import,
         team:,
-        vaccination_records: [vaccination_record]
+        vaccination_records: [vaccination_record],
+        patients: [create(:patient)]
       )
     end
     let(:session) { create(:session, location: school, programmes:) }
     let(:vaccination_record) do
       create(:vaccination_record, programme: programmes.first, session:)
     end
 
-    before { Flipper.enable(:imms_api_sync_job) }
+    it "calls the PatientTeamUpdater with imported patients" do
+      expect(PatientTeamUpdater).to receive(:call).with(
+        patient_scope: immunisation_import.patients
+      )
+
+      immunisation_import.send :post_commit!
+    end
+
+    it "calls the PatientStatusUpdater with imported patients" do
+      expect(PatientStatusUpdater).to receive(:call).with(
+        patient_scope: Patient.where(id: immunisation_import.patients.ids)
+      )
+
+      immunisation_import.send :post_commit!
+    end
 
     it "syncs the flu vaccination record to the NHS Immunisations API" do
       expect { immunisation_import.send :post_commit! }.to enqueue_sidekiq_job(