Add auto acceptance of preferred names

Automatically accept `:preferred_given_name` and `:preferred_family_name`, if the value in Mavis is `nil`, and the incoming value is not `nil`.

Author: alistair-white-horne-tng

app/models/patient_import_row.rb

@@ -57,6 +57,19 @@ def to_patient
         %w[male female not_specified]
       )
 
+      auto_accept_attribute(
+        existing_patient,
+        attributes,
+        :preferred_given_name,
+        :present?
+      )
+      auto_accept_attribute(
+        existing_patient,
+        attributes,
+        :preferred_family_name,
+        :present?
+      )
+
       if address_postcode.present? &&
            address_postcode.to_postcode != existing_patient.address_postcode
         attributes.merge!(

spec/models/class_import_row_spec.rb

@@ -304,6 +304,81 @@
       end
     end
 
+    context "with an existing patient without preferred names" do
+      let(:data) do
+        valid_data.merge(
+          "CHILD_PREFERRED_FIRST_NAME" => "Jim",
+          "CHILD_PREFERRED_LAST_NAME" => "Smithy"
+        )
+      end
+
+      let!(:existing_patient) do
+        create(
+          :patient,
+          address_postcode: "SW1A 1AA",
+          family_name: "Smith",
+          given_name: "Jimmy",
+          date_of_birth: Date.new(2010, 1, 1)
+        )
+      end
+
+      it { should eq(existing_patient) }
+
+      it "saves the incoming preferred names" do
+        expect(patient).to have_attributes(
+          preferred_given_name: "Jim",
+          preferred_family_name: "Smithy"
+        )
+      end
+
+      it "doesn't stage the preferred names differences" do
+        expect(patient.pending_changes).to be_empty
+      end
+    end
+
+    context "with an existing patient already with preferred names" do
+      let(:data) do
+        valid_data.merge(
+          "CHILD_PREFERRED_FIRST_NAME" => "Jim",
+          "CHILD_PREFERRED_LAST_NAME" => "Smithy"
+        )
+      end
+
+      let!(:existing_patient) do
+        create(
+          :patient,
+          address_postcode: "SW1A 1AA",
+          family_name: "Smith",
+          given_name: "Jimmy",
+          preferred_given_name: "Jimothy",
+          preferred_family_name: "Smithers",
+          nhs_number: "9990000018",
+          address_line_1: "10 Downing Street",
+          address_line_2: "",
+          address_town: "London",
+          birth_academic_year: 2009,
+          date_of_birth: Date.new(2010, 1, 1),
+          registration: "8AB"
+        )
+      end
+
+      it { should eq(existing_patient) }
+
+      it "does not save the incoming gender" do
+        expect(patient).to have_attributes(
+          preferred_given_name: "Jimothy",
+          preferred_family_name: "Smithers"
+        )
+      end
+
+      it "does stage the gender differences" do
+        expect(patient.pending_changes).to include(
+          "preferred_given_name" => "Jim",
+          "preferred_family_name" => "Smithy"
+        )
+      end
+    end
+
     context "with an existing patient without address" do
       let(:data) do
         valid_data.merge(

spec/models/cohort_import_row_spec.rb

@@ -29,7 +29,8 @@
       "CHILD_POSTCODE" => "SW1A 1AA",
       "CHILD_FIRST_NAME" => "Jimmy",
       "CHILD_LAST_NAME" => "Smith",
-      "CHILD_PREFERRED_GIVEN_NAME" => "Jim",
+      "CHILD_PREFERRED_FIRST_NAME" => "Jim",
+      "CHILD_PREFERRED_LAST_NAME" => "Smithy",
       "CHILD_DATE_OF_BIRTH" => "2010-01-01",
       "CHILD_GENDER" => "Male",
       "CHILD_NHS_NUMBER" => "9990000018",
@@ -291,6 +292,74 @@
       end
     end
 
+    context "with an existing patient without preferred names" do
+      let!(:existing_patient) do
+        create(
+          :patient,
+          address_postcode: "SW1A 1AA",
+          family_name: "Smith",
+          gender_code: "male",
+          given_name: "Jimmy",
+          nhs_number: "9990000018",
+          address_line_1: "10 Downing Street",
+          address_line_2: "",
+          address_town: "London",
+          birth_academic_year: 2009,
+          date_of_birth: Date.new(2010, 1, 1),
+          registration: "8AB"
+        )
+      end
+
+      it { should eq(existing_patient) }
+
+      it "saves the incoming preferred names" do
+        expect(patient).to have_attributes(
+          preferred_given_name: "Jim",
+          preferred_family_name: "Smithy"
+        )
+      end
+
+      it "doesn't stage the preferred names differences" do
+        expect(patient.pending_changes).to be_empty
+      end
+    end
+
+    context "with an existing patient already with preferred names" do
+      let!(:existing_patient) do
+        create(
+          :patient,
+          address_postcode: "SW1A 1AA",
+          given_name: "Jimmy",
+          family_name: "Smith",
+          preferred_given_name: "Jimothy",
+          preferred_family_name: "Smithers",
+          nhs_number: "9990000018",
+          address_line_1: "10 Downing Street",
+          address_line_2: "",
+          address_town: "London",
+          birth_academic_year: 2009,
+          date_of_birth: Date.new(2010, 1, 1),
+          registration: "8AB"
+        )
+      end
+
+      it { should eq(existing_patient) }
+
+      it "does not save the incoming gender" do
+        expect(patient).to have_attributes(
+          preferred_given_name: "Jimothy",
+          preferred_family_name: "Smithers"
+        )
+      end
+
+      it "does stage the gender differences" do
+        expect(patient.pending_changes).to include(
+          "preferred_given_name" => "Jim",
+          "preferred_family_name" => "Smithy"
+        )
+      end
+    end
+
     context "with an existing patient without address (ex. postcode)" do
       let!(:existing_patient) do
         create(