Merge pull request #6316 from NHSDigital/run-patient-status-updater-for-patient-imports

Run Patient Status Updater for patient imports

Author: murugapl

app/forms/import_duplicate_form.rb

@@ -55,6 +55,8 @@ def apply_pending_changes!
     object.patient.apply_pending_changes! if object.respond_to?(:patient)
 
     object.apply_pending_changes!
+
+    PatientStatusUpdater.call(patient: object) if object.is_a?(Patient)
   end
 
   def discard_pending_changes!
@@ -67,9 +69,11 @@ def keep_both_changes!
     return unless can_keep_both?
     return unless can_apply?
 
-    object.apply_pending_changes_to_new_record!(
-      changeset: changeset_for_keep_both
-    )
+    new_record =
+      object.apply_pending_changes_to_new_record!(
+        changeset: changeset_for_keep_both
+      )
+    PatientStatusUpdater.call(patient: new_record) if new_record.is_a?(Patient)
   end
 
   def changeset_for_keep_both

app/jobs/commit_patient_changesets_job.rb

@@ -46,6 +46,7 @@ def perform(patient_changeset_ids)
       to_skip.each(&:processed!)
 
       PatientTeamUpdater.call(patient_scope: import.patients)
+      PatientStatusUpdater.call(patient_scope: import.patients)
     end
 
     if finished_committing_changesets?(import)

spec/forms/import_duplicate_form_spec.rb

@@ -4,26 +4,55 @@
   let(:programme) { Programme.sample }
 
   describe "#save" do
-    context "resolving a vaccination record" do
-      subject do
-        described_class.new(
-          apply_changes: "apply",
-          object: vaccination_record,
-          current_team: team
-        ).save
-      end
+    subject(:save) { form.save }
+
+    let(:form) do
+      described_class.new(apply_changes:, object:, current_team: team)
+    end
 
+    context "resolving a vaccination record" do
+      let(:apply_changes) { "apply" }
+      let(:object) { vaccination_record }
       let(:team) { create(:team, programmes: [programme]) }
       let(:vaccination_record) do
         create(:vaccination_record, programme:, team:)
       end
 
       it_behaves_like "a method that updates team cached counts"
+
+      it "does not call PatientStatusUpdater" do
+        expect(PatientStatusUpdater).not_to receive(:call)
+        expect(save).to be(true)
+      end
     end
 
     context "resolving a patient record" do
+      let(:team) { create(:team, programmes: [programme]) }
+      let(:patient) do
+        create(:patient, pending_changes: { "given_name" => "Updated" })
+      end
+
+      context "when applying pending changes" do
+        let(:apply_changes) { "apply" }
+        let(:object) { patient }
+
+        it "calls PatientStatusUpdater" do
+          expect(PatientStatusUpdater).to receive(:call).with(patient:)
+          expect(save).to be(true)
+        end
+      end
+
+      context "when discarding changes" do
+        let(:apply_changes) { "discard" }
+        let(:object) { patient }
+
+        it "does not call PatientStatusUpdater" do
+          expect(PatientStatusUpdater).not_to receive(:call)
+          expect(save).to be(true)
+        end
+      end
+
       context "when a patient import issue includes parent relationships" do
-        let(:team) { create(:team, programmes: [programme]) }
         let(:session) { create(:session, team:, programmes: [programme]) }
         let(:class_import) { create(:class_import, session:) }
         let(:existing_patient) { create(:patient) }
@@ -93,6 +122,20 @@
           expect(class_import.patients.reload).to contain_exactly(new_patient)
         end
 
+        it "calls PatientStatusUpdater with the new patient when keeping both" do
+          form =
+            described_class.new(
+              apply_changes: "keep_both",
+              object: existing_patient,
+              current_team: team
+            )
+
+          expect(PatientStatusUpdater).to receive(:call).with(
+            patient: instance_of(Patient)
+          )
+          expect(form.save).to be(true)
+        end
+
         it "keeps imported parent relationships when discarding changes" do
           form =
             described_class.new(

spec/jobs/commit_patient_changesets_job_spec.rb

@@ -148,6 +148,14 @@
       ).with(location.id).once
     end
 
+    it "calls PatientStatusUpdater for imported patients" do
+      allow(PatientStatusUpdater).to receive(:call)
+      perform_job
+      expect(PatientStatusUpdater).to have_received(:call).with(
+        patient_scope: a_kind_of(ActiveRecord::Relation)
+      )
+    end
+
     it "imports PDS search results when present" do
       changeset = import.changesets.first
       changeset.data["search_results"] = [