Merge pull request #5997 from nhsuk/fix-parent-relationships-move-or-remove-on-duplicate-resolution

Fix parent contacts being attached to the wrong patient after resolving import duplicates

Author: stevehook

app/forms/import_duplicate_form.rb

@@ -58,6 +58,8 @@ def apply_pending_changes!
   end
 
   def discard_pending_changes!
+    remove_imported_parent_relationships_if_needed!
+
     object.patient.discard_pending_changes! if object.respond_to?(:patient)
 
     object.discard_pending_changes!
@@ -70,4 +72,18 @@ def keep_both_changes!
   def reset_count!
     TeamCachedCounts.new(current_team).reset_import_issues!
   end
+
+  def remove_imported_parent_relationships_if_needed!
+    return unless object.is_a?(Patient)
+
+    changeset = object.changesets.includes(:import).order(:created_at).last
+    return if changeset.nil?
+
+    changeset
+      .import
+      .parent_relationships
+      .includes(:patient)
+      .where(patient: object)
+      .find_each(&:destroy!)
+  end
 end

app/models/patient.rb

@@ -757,6 +757,26 @@ def dup_for_pending_changes
     end
   end
 
+  def apply_pending_changes_to_new_record!
+    new_record = nil
+    changeset = changesets.includes(:import).order(:created_at).last
+
+    ActiveRecord::Base.transaction do
+      new_record = super
+
+      if changeset
+        changeset.update!(patient_id: new_record.id)
+        changeset
+          .import
+          .parent_relationships
+          .where(patient_id: id)
+          .update_all(patient_id: new_record.id)
+      end
+    end
+
+    new_record
+  end
+
   def clear_pending_sessions!(team: nil)
     scope = patient_locations.pending
 

spec/forms/import_duplicate_form_spec.rb

@@ -4,18 +4,101 @@
   let(:programme) { Programme.sample }
 
   describe "#save" do
-    subject do
-      described_class.new(
-        apply_changes: "apply",
-        object: vaccination_record,
-        current_team: team
-      ).save
-    end
+    context "resolving a vaccination record" do
+      subject do
+        described_class.new(
+          apply_changes: "apply",
+          object: vaccination_record,
+          current_team: team
+        ).save
+      end
 
-    let(:team) { create(:team, programmes: [programme]) }
-    let(:vaccination_record) { create(:vaccination_record, programme:, team:) }
+      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_behaves_like "a method that updates team cached counts"
+    end
+
+    context "resolving a patient record" do
+      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) }
+
+        let(:import_parent) { create(:parent) }
+        let(:existing_parent) { create(:parent) }
+
+        let(:import_relationship) do
+          create(
+            :parent_relationship,
+            patient: existing_patient,
+            parent: import_parent,
+            type: "father"
+          )
+        end
+
+        let!(:existing_relationship) do
+          create(
+            :parent_relationship,
+            patient: existing_patient,
+            parent: existing_parent,
+            type: "mother"
+          )
+        end
+
+        let!(:changeset) do
+          create(
+            :patient_changeset,
+            :class_import,
+            :import_issue,
+            import: class_import,
+            patient: existing_patient
+          )
+        end
+
+        before do
+          existing_patient.update!(pending_changes: { "given_name" => "Twin" })
+          class_import.parent_relationships << import_relationship
+        end
+
+        it "moves imported parent relationships to the new patient when keeping both" do
+          form =
+            described_class.new(
+              apply_changes: "keep_both",
+              object: existing_patient,
+              current_team: team
+            )
+
+          expect(form.save).to be(true)
+
+          new_patient = changeset.reload.patient
+
+          expect(new_patient).not_to eq(existing_patient)
+          expect(import_relationship.reload.patient).to eq(new_patient)
+          expect(existing_relationship.reload.patient).to eq(existing_patient)
+        end
+
+        it "removes imported parent relationships when discarding changes" do
+          form =
+            described_class.new(
+              apply_changes: "discard",
+              object: existing_patient,
+              current_team: team
+            )
+
+          expect(form.save).to be(true)
+
+          expect { import_relationship.reload }.to raise_error(
+            ActiveRecord::RecordNotFound
+          )
+          expect(existing_relationship.reload.patient).to eq(existing_patient)
+          expect(changeset.reload.patient).to eq(existing_patient)
+        end
+      end
+    end
   end
 
   describe "#can_apply?" do