Import and export performing professional names

This stores the performing professional names on the vaccination record
(if the information is available) and again exports it to DPS (if the
information is available).

These values must be provided by Flu, and may be provided for HPV.

Author: thomasleese

app/models/dps_export.rb

@@ -36,7 +36,15 @@ def csv
         csv << DPSExportRow::FIELDS.map(&:upcase)
 
         vaccination_records
-          .includes(:batch, :location, :patient, :session, :team, :vaccine)
+          .includes(
+            :batch,
+            :location,
+            :patient,
+            :performed_by_user,
+            :session,
+            :team,
+            :vaccine
+          )
           .order(:recorded_at)
           .strict_loading
           .find_each { csv << DPSExportRow.new(_1).to_a }

app/models/dps_export_row.rb

@@ -108,11 +108,11 @@ def action_flag
   end
 
   def performing_professional_forename
-    # is not required
+    vaccination_record.performed_by&.given_name
   end
 
   def performing_professional_surname
-    # is not required
+    vaccination_record.performed_by&.family_name
   end
 
   def recorded_date

app/models/immunisation_import_row.rb

@@ -61,6 +61,11 @@ class ImmunisationImportRow
             allow_nil: true
   validates :care_setting, presence: true, if: :requires_care_setting?
 
+  validates :performed_by_given_name,
+            :performed_by_family_name,
+            presence: true,
+            if: :requires_performed_by?
+
   def initialize(data:, campaign:, user:, imported_from:)
     @data = data
     @campaign = campaign
@@ -79,12 +84,14 @@ def to_vaccination_record
       recorded_at:
     ).find_or_create_by!(
       administered_at:,
+      batch:,
       delivery_method:,
       delivery_site:,
       dose_sequence:,
       patient_session:,
+      performed_by_family_name:,
+      performed_by_given_name:,
       reason:,
-      batch:,
       vaccine:
     )
   end
@@ -261,6 +268,14 @@ def care_setting
     nil
   end
 
+  def performed_by_given_name
+    @data["PERFORMING_PROFESSIONAL_FORENAME"]&.strip&.presence
+  end
+
+  def performed_by_family_name
+    @data["PERFORMING_PROFESSIONAL_SURNAME"]&.strip&.presence
+  end
+
   private
 
   attr_reader :imported_from
@@ -348,7 +363,11 @@ def campaign_end_date_or_today
   end
 
   def requires_care_setting?
-    vaccine&.type == "hpv"
+    vaccine&.hpv?
+  end
+
+  def requires_performed_by?
+    vaccine&.flu?
   end
 
   def parse_date(key)

spec/models/dps_export_row_spec.rb

@@ -26,6 +26,9 @@
       }
     )
   end
+  let(:performed_by) { create(:user, family_name: "Doe", given_name: "Jane") }
+  let(:performed_by_given_name) { nil }
+  let(:performed_by_family_name) { nil }
   let(:vaccination_record) do
     create(
       :vaccination_record,
@@ -35,7 +38,9 @@
       delivery_site: :left_arm_upper_position,
       dose_sequence: 1,
       patient_session:,
-      performed_by: create(:user, family_name: "Doe", given_name: "Jane"),
+      performed_by:,
+      performed_by_given_name:,
+      performed_by_family_name:,
       recorded_at: Time.zone.local(2024, 7, 23, 19, 31, 47),
       uuid: "ea4860a5-6d97-4f31-b640-f5c50f43bfd2",
       vaccine:
@@ -101,12 +106,40 @@
       expect(array[11]).to eq "new"
     end
 
-    it "has performing_professional_forename" do
-      expect(array[12]).to be_nil
+    describe "performing_professional_forename" do
+      subject(:performing_professional_forename) { array[12] }
+
+      it { should eq("Jane") }
+
+      context "without a user" do
+        let(:performed_by) { nil }
+
+        it { should be_nil }
+
+        context "with a name" do
+          let(:performed_by_given_name) { "Jane" }
+
+          it { should eq("Jane") }
+        end
+      end
     end
 
-    it "has performing_professional_surname" do
-      expect(array[13]).to be_nil
+    describe "performing_professional_surname" do
+      subject(:performing_professional_surname) { array[13] }
+
+      it { should eq("Doe") }
+
+      context "without a user" do
+        let(:performed_by) { nil }
+
+        it { should be_nil }
+
+        context "with a name" do
+          let(:performed_by_family_name) { "Doe" }
+
+          it { should eq("Doe") }
+        end
+      end
     end
 
     it "has recorded_date" do

spec/models/immunisation_import_row_spec.rb

@@ -38,7 +38,9 @@
       "PERSON_GENDER_CODE" => "Male",
       "NHS_NUMBER" => nhs_number,
       "DATE_OF_VACCINATION" => "20240101",
-      "VACCINE_GIVEN" => "AstraZeneca Fluenz Tetra LAIV"
+      "VACCINE_GIVEN" => "AstraZeneca Fluenz Tetra LAIV",
+      "PERFORMING_PROFESSIONAL_FORENAME" => "John",
+      "PERFORMING_PROFESSIONAL_SURNAME" => "Smith"
     }
   end
 
@@ -218,7 +220,35 @@
           "PERSON_POSTCODE" => "SW1A 1AA",
           "PERSON_GENDER_CODE" => "Male",
           "DATE_OF_VACCINATION" => "20240101",
-          "VACCINE_GIVEN" => "AstraZeneca Fluenz Tetra LAIV"
+          "VACCINE_GIVEN" => "AstraZeneca Fluenz Tetra LAIV",
+          "PERFORMING_PROFESSIONAL_FORENAME" => "John",
+          "PERFORMING_PROFESSIONAL_SURNAME" => "Smith"
+        }
+      end
+
+      it { should be_valid }
+    end
+
+    context "with valid fields for HPV" do
+      let(:campaign) { create(:campaign, :hpv, academic_year: 2023) }
+
+      let(:data) do
+        {
+          "ORGANISATION_CODE" => "abc",
+          "BATCH_EXPIRY_DATE" => "20210101",
+          "BATCH_NUMBER" => "123",
+          "ANATOMICAL_SITE" => "left thigh",
+          "SCHOOL_NAME" => "Hogwarts",
+          "SCHOOL_URN" => "123456",
+          "PERSON_FORENAME" => "Harry",
+          "PERSON_SURNAME" => "Potter",
+          "PERSON_DOB" => "20120101",
+          "PERSON_POSTCODE" => "SW1A 1AA",
+          "PERSON_GENDER_CODE" => "Male",
+          "DATE_OF_VACCINATION" => "20240101",
+          "VACCINE_GIVEN" => "Gardasil9",
+          "DOSE_SEQUENCE" => "1",
+          "CARE_SETTING" => "1"
         }
       end
 
@@ -829,15 +859,53 @@
     end
   end
 
+  describe "#performed_by_given_name" do
+    subject(:performed_by_given_name) do
+      immunisation_import_row.performed_by_given_name
+    end
+
+    context "without a value" do
+      let(:data) { {} }
+
+      it { should be_nil }
+    end
+
+    context "with a value" do
+      let(:data) { { "PERFORMING_PROFESSIONAL_FORENAME" => "John" } }
+
+      it { should eq("John") }
+    end
+  end
+
+  describe "#performed_by_family_name" do
+    subject(:performed_by_family_name) do
+      immunisation_import_row.performed_by_family_name
+    end
+
+    context "without a value" do
+      let(:data) { {} }
+
+      it { should be_nil }
+    end
+
+    context "with a value" do
+      let(:data) { { "PERFORMING_PROFESSIONAL_SURNAME" => "Smith" } }
+
+      it { should eq("Smith") }
+    end
+  end
+
   describe "#to_vaccination_record" do
     subject(:vaccination_record) do
       immunisation_import_row.to_vaccination_record
     end
 
     let(:data) { valid_data }
 
-    it "does not have a vaccinator as that isn't provided in the import" do
-      expect(vaccination_record.performed_by).to be_nil
+    it "has a vaccinator" do
+      expect(vaccination_record.performed_by).to have_attributes(
+        full_name: "John Smith"
+      )
     end
 
     it "sets the administered at time" do