Merge pull request #6456 from NHSDigital/revert-remove-parents-keep-existing-flow

Author: murugapl

app/forms/import_duplicate_form.rb

@@ -58,8 +58,6 @@ 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!
@@ -92,18 +90,4 @@ def changeset_for_keep_both
   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

db/data/20260327000001_reinstate_removed_parent_relationships.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class ReinstateRemovedParentRelationships < ActiveRecord::Migration[8.1]
+  def up
+    destroyed_audits =
+      Audited::Audit.where(
+        auditable_type: "ParentRelationship",
+        action: "destroy"
+      ).where("created_at > ?", Date.new(2026, 2, 19))
+
+    reinstated = 0
+
+    destroyed_audits.in_batches(of: 1000) do |batch|
+      batch.each do |audit|
+        changes = audit.audited_changes
+        patient_id = changes["patient_id"]
+        parent_id = changes["parent_id"]
+
+        next unless Patient.exists?(patient_id)
+        next unless Parent.exists?(parent_id)
+
+        # Only reinstate relationships that were removed as part of discarding
+        # an import duplicate — identified by a pending_changes clear on the
+        # same patient within the same minute.
+        contemporaneous_discard =
+          Audited::Audit
+            .where(
+              auditable_type: "Patient",
+              auditable_id: patient_id,
+              action: "update",
+              created_at:
+                (audit.created_at - 1.minute)..(audit.created_at + 1.minute)
+            )
+            .any? do |patient_audit|
+              patient_audit.audited_changes.key?("pending_changes") &&
+                patient_audit.audited_changes["pending_changes"].second == {}
+            end
+
+        next unless contemporaneous_discard
+
+        ParentRelationship.find_or_create_by!(patient_id:, parent_id:) do |pr|
+          pr.type = changes["type"]
+          pr.other_name = changes["other_name"]
+        end
+
+        reinstated += 1
+      end
+    end
+
+    say "Reinstated #{reinstated} parent relationship(s)"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/data_schema.rb

@@ -1 +1 @@
-DataMigrate::Data.define(version: 2026_03_26_110653)
+DataMigrate::Data.define(version: 2026_03_27_000001)

spec/forms/import_duplicate_form_spec.rb

@@ -93,7 +93,7 @@
           expect(class_import.patients.reload).to contain_exactly(new_patient)
         end
 
-        it "removes imported parent relationships when discarding changes" do
+        it "keeps imported parent relationships when discarding changes" do
           form =
             described_class.new(
               apply_changes: "discard",
@@ -103,9 +103,7 @@
 
           expect(form.save).to be(true)
 
-          expect { import_relationship.reload }.to raise_error(
-            ActiveRecord::RecordNotFound
-          )
+          expect(import_relationship.reload.patient).to eq(existing_patient)
           expect(existing_relationship.reload.patient).to eq(existing_patient)
           expect(changeset.reload.patient).to eq(existing_patient)
         end