Look up NHS numbers after importing

When importing patients, from either of the three imports (cohorts,
classes and immunisations), we should look up the NHS number of any
records for which we don't have the NHS number available, by using the
`PDSLookupJob`.

app/models/class_import.rb

@@ -40,7 +40,6 @@ class ClassImport < PatientImport
 
   has_and_belongs_to_many :parent_relationships
   has_and_belongs_to_many :parents
-  has_and_belongs_to_many :patients
 
   private
 

app/models/cohort_import.rb

@@ -40,7 +40,6 @@ class CohortImport < PatientImport
 
   has_and_belongs_to_many :parent_relationships
   has_and_belongs_to_many :parents
-  has_and_belongs_to_many :patients
 
   private
 

app/models/concerns/csv_importable.rb

@@ -16,6 +16,8 @@ module CSVImportable
                class_name: "User",
                foreign_key: :uploaded_by_user_id
 
+    has_and_belongs_to_many :patients
+
     scope :csv_not_removed, -> { where(csv_removed_at: nil) }
 
     enum :status,
@@ -101,11 +103,19 @@ def record!
 
       update_columns(recorded_at: Time.zone.now, status: :recorded, **counts)
     end
+
+    look_up_missing_nhs_numbers
   end
 
   def postprocess_rows!
   end
 
+  def look_up_missing_nhs_numbers
+    patients.without_nhs_number.find_each do |patient|
+      PDSLookupJob.perform_later(patient)
+    end
+  end
+
   def remove!
     return if csv_removed?
     update!(csv_data: nil, csv_removed_at: Time.zone.now)

app/models/immunisation_import.rb

@@ -42,7 +42,6 @@ class ImmunisationImport < ApplicationRecord
   has_and_belongs_to_many :batches
   has_and_belongs_to_many :locations
   has_and_belongs_to_many :patient_sessions
-  has_and_belongs_to_many :patients
   has_and_belongs_to_many :sessions
   has_and_belongs_to_many :vaccination_records
 

app/models/patient.rb

@@ -70,6 +70,8 @@ class Patient < ApplicationRecord
   # https://www.datadictionary.nhs.uk/attributes/person_gender_code.html
   enum :gender_code, { not_known: 0, male: 1, female: 2, not_specified: 9 }
 
+  scope :without_nhs_number, -> { where(nhs_number: [nil, ""]) }
+
   validates :given_name, :family_name, :date_of_birth, presence: true
 
   validates :nhs_number,

spec/features/dev_reset_team_spec.rb

@@ -7,6 +7,7 @@
 
   scenario "Resetting a team deletes all associated data" do
     given_an_example_programme_exists
+    and_requests_can_be_made_to_dps
     and_patients_have_been_imported
     and_vaccination_records_have_been_imported
 
@@ -27,6 +28,13 @@ def given_an_example_programme_exists
     @user = @team.users.first
   end
 
+  def and_requests_can_be_made_to_dps
+    stub_request(
+      :get,
+      "https://sandbox.api.service.nhs.uk/personal-demographics/FHIR/R4/Patient"
+    ).with(query: hash_including({})).to_return_json(body: { total: 0 })
+  end
+
   def and_patients_have_been_imported
     sign_in @user
     visit "/dashboard"

spec/features/import_vaccination_records_with_duplicates_spec.rb

@@ -3,6 +3,7 @@
 describe "Immunisation imports duplicates" do
   scenario "User reviews and selects between duplicate records" do
     given_i_am_signed_in
+    and_requests_can_be_made_to_dps
     and_an_hpv_programme_is_underway
     and_an_existing_patient_record_exists
 
@@ -50,6 +51,13 @@ def given_i_am_signed_in
     sign_in @team.users.first
   end
 
+  def and_requests_can_be_made_to_dps
+    stub_request(
+      :get,
+      "https://sandbox.api.service.nhs.uk/personal-demographics/FHIR/R4/Patient"
+    ).with(query: hash_including({})).to_return_json(body: { total: 0 })
+  end
+
   def and_an_hpv_programme_is_underway
     @programme = create(:programme, :hpv_all_vaccines)
     create(:team_programme, team: @team, programme: @programme)

spec/fixtures/cohort_import/valid.csv

@@ -1,4 +1,4 @@
 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_COMMON_NAME,CHILD_DATE_OF_BIRTH,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_NHS_NUMBER
 123456,,,,,,,,,Jennifer,Clarke,Jenny,2010-01-01,10 Downing Street,,London,SW1A 1AA,1234567890
 123456,John Smith,Father,[email protected],07412345678,,,,,Jimmy,Smith,Jim,02/01/2010,10 Downing Street,,London,SW1A 1AA,123 456 7891
-123456,Jane Doe,Mother,[email protected],07412345679,Richard Doe,Father,[email protected],,Mark,Doe,,2010-01-03,11 Downing Street,,London,SW1A 1AA,1234567892
+123456,Jane Doe,Mother,[email protected],07412345679,Richard Doe,Father,[email protected],,Mark,Doe,,2010-01-03,11 Downing Street,,London,SW1A 1AA,

spec/models/class_import_spec.rb

@@ -251,6 +251,10 @@
       expect(class_import.exact_duplicate_record_count).to eq(4)
     end
 
+    it "enqueues jobs to look up missing NHS numbers" do
+      expect { record! }.to have_enqueued_job(PDSLookupJob).once.on_queue(:pds)
+    end
+
     context "with an existing patient matching the name" do
       before do
         create(

spec/models/cohort_import_spec.rb

@@ -190,7 +190,7 @@
       expect(Patient.second.parent_relationships.first).to be_father
 
       expect(Patient.third).to have_attributes(
-        nhs_number: "1234567892",
+        nhs_number: nil,
         date_of_birth: Date.new(2010, 1, 3),
         full_name: "Mark Doe",
         school: location,
@@ -242,6 +242,10 @@
       expect(cohort_import.exact_duplicate_record_count).to eq(3)
     end
 
+    it "enqueues jobs to look up missing NHS numbers" do
+      expect { record! }.to have_enqueued_job(PDSLookupJob).once.on_queue(:pds)
+    end
+
     context "with an existing patient matching the name" do
       before do
         create(

spec/models/immunisation_import_spec.rb

@@ -182,6 +182,12 @@
           0
         ).to(7)
       end
+
+      it "enqueues jobs to look up missing NHS numbers" do
+        expect { record! }.to have_enqueued_job(PDSLookupJob).once.on_queue(
+          :pds
+        )
+      end
     end
 
     context "with valid HPV rows" do
@@ -255,6 +261,12 @@
           0
         ).to(11)
       end
+
+      it "enqueues jobs to look up missing NHS numbers" do
+        expect { record! }.to have_enqueued_job(PDSLookupJob).once.on_queue(
+          :pds
+        )
+      end
     end
 
     context "with an existing patient matching the name" do