Merge pull request #4308 from nhsuk/fix-parent-deduplication-imports

Deduplicate parents before importing changesets

Author: murugapl

app/jobs/commit_patient_changesets_job.rb

@@ -32,7 +32,7 @@ def perform(import)
 
   def import_patients_and_parents(changesets, import)
     patients = changesets.map(&:patient)
-    parents = changesets.flat_map(&:parents)
+    parents = changesets.flat_map(&:parents).uniq
     relationships =
       changesets
         .flat_map(&:parent_relationships)

spec/features/import_child_pds_lookup_extravaganza_spec.rb

@@ -155,9 +155,11 @@ def and_an_existing_patient_record_exists
       type: "unknown"
     )
 
+    create(:parent, full_name: "David Williams", email: "david.w@email.com")
+
     expect(Patient.count).to eq(3)
     expect(ParentRelationship.count).to eq(1)
-    expect(Parent.count).to eq(1)
+    expect(Parent.count).to eq(2)
   end
 
   def and_pds_lookup_during_import_is_enabled
@@ -330,15 +332,12 @@ def and_i_see_address_differences_for_review
   def and_catherine_parents_are_handled_correctly
     catherine =
       Patient.find_by(given_name: "Catherine", family_name: "Williams")
-    expect(catherine.parents.count).to eq(2)
+    expect(catherine.parents.count).to eq(1)
 
     guardian = catherine.parents.find_by(full_name: "David Williams")
     guardian_relationship =
       catherine.parent_relationships.find_by(parent: guardian)
     expect(guardian_relationship.type).to eq("guardian")
-
-    mother = catherine.parents.find_by(full_name: "Sarah Williams")
-    expect(mother.phone).to be_present
   end
 
   def and_charlie_has_no_parents_as_expected
@@ -392,14 +391,14 @@ def then_school_moves_are_created_appropriately
   end
 
   def and_all_parent_relationships_are_established
-    expect(Parent.count).to eq(8)
-    expect(ParentRelationship.count).to eq(8)
+    expect(Parent.count).to eq(7)
+    expect(ParentRelationship.count).to eq(7)
 
     father_relationships = ParentRelationship.where(type: "father")
     expect(father_relationships.count).to eq(3) # John Tweedle, Mike HomeDad, Robert Samson
 
     mother_relationships = ParentRelationship.where(type: "mother")
-    expect(mother_relationships.count).to eq(3) # Mary Tweedle, Linda Samson, Sarah Williams
+    expect(mother_relationships.count).to eq(2) # Mary Tweedle, Linda Samson
 
     guardian_relationships = ParentRelationship.where(type: "guardian")
     expect(guardian_relationships.count).to eq(1) # David Williams

spec/fixtures/cohort_import/pds_extravaganza.csv

@@ -1,7 +1,7 @@
 CHILD_SCHOOL_URN,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE,CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_PREFERRED_GIVEN_NAME,CHILD_DATE_OF_BIRTH,CHILD_YEAR_GROUP,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_NHS_NUMBER
 123456,John Tweedle,Father,john.tweedle@email.com,01234567890,Mary Tweedle,Mother,mary.tweedle@email.com,01234567891,Albert,Tweedle,,2009-12-29,8,38A Battersea Rise,,London,SW11 1EH,9999075320
 123456,Robert Samson,Dad,bob.samson@email.com,01234567892,Linda Samson,Mum,linda.samson@email.com,,Betty,Samson,Beth,2010-01-01,8,123 High Street,,London,SW1A 1AA,
-123456,David Williams,Guardian,david.w@email.com,,Sarah Williams,Mother,sarah.w@email.com,01234567894,Catherine,Williams,,2009-05-15,8,456 New Street,,London,SW2 2BB,
+123456,David Williams,Guardian,david.w@email.com,,Sarah Williams,Mother,david.w@email.com,01234567894,Catherine,Williams,,2009-05-15,8,456 New Street,,London,SW2 2BB,
 123456,,,,,,,,,Charlie,Brown,,2011-03-15,9,42 Wallaby Way,,London,SW2 2BB,
 999999,Mike HomeDad,Father,mike@home.com,01234567895,,,,,Emma,Homeschool,,2010-06-01,8,123 Home Street,,London,SW3 3AA,
 123456,Jane Doe,,,01234567896,,,,,Oliver,Green,,2010-08-15,8,789 Silent Street,,London,SW1W 8JL,9435753868