Merge pull request #4383 from nhsuk/fix-wildcard-search

Skip wildcard searches for names ≤ 3 characters

Author: murugapl

app/jobs/process_patient_changesets_job.rb

@@ -92,12 +92,14 @@ def steps
         no_matches: :no_fuzzy_with_wildcard_family_name,
         one_match: :no_fuzzy_with_wildcard_family_name,
         too_many_matches: :no_fuzzy_with_wildcard_family_name,
+        skip_step: :no_fuzzy_with_wildcard_family_name,
         format_query: ->(query) { query[:given_name][3..] = "*" }
       },
       no_fuzzy_with_wildcard_family_name: {
         no_matches: :fuzzy_without_history,
         one_match: :fuzzy_without_history,
         too_many_matches: :fuzzy_without_history,
+        skip_step: :fuzzy_without_history,
         format_query: ->(query) { query[:family_name][3..] = "*" }
       },
       fuzzy_without_history: {
@@ -123,6 +125,14 @@ def steps
 
   def search_for_patient(attrs, step_name)
     return :no_postcode, nil if attrs["address_postcode"].blank?
+
+    case step_name
+    when :no_fuzzy_with_wildcard_given_name
+      return :skip_step, nil if attrs["given_name"].length <= 3
+    when :no_fuzzy_with_wildcard_family_name
+      return :skip_step, nil if attrs["family_name"].length <= 3
+    end
+
     query = {
       family_name: attrs["family_name"].dup,
       given_name: attrs["given_name"].dup,

app/models/pds_search_result.rb

@@ -42,6 +42,13 @@ class PDSSearchResult < ApplicationRecord
        validate: true
 
   enum :result,
-       { no_matches: 0, one_match: 1, too_many_matches: 2, error: 3 },
+       {
+         no_matches: 0,
+         one_match: 1,
+         too_many_matches: 2,
+         error: 3,
+         skip_step: 4,
+         no_postcode: 5
+       },
        validate: true
 end

spec/jobs/process_patient_changesets_job_spec.rb

@@ -107,6 +107,47 @@
     end
   end
 
+  context "when given name is too short for wildcard search" do
+    let(:step) { :no_fuzzy_with_wildcard_given_name }
+
+    before do
+      patient_changeset.child_attributes["given_name"] = "Al"
+      allow(described_class).to receive(:perform_now).and_call_original
+      allow(PDS::Patient).to receive(:search).and_return(nil)
+    end
+
+    it "skips to the next appropriate step" do
+      perform
+
+      expect(described_class).to have_received(:perform_now).with(
+        patient_changeset,
+        :no_fuzzy_with_wildcard_family_name
+      )
+
+      expect(patient_changeset).to be_processed
+      given_name_result =
+        patient_changeset.search_results.find do |result|
+          result["step"] == "no_fuzzy_with_wildcard_given_name"
+        end
+      expect(given_name_result["result"]).to eq("skip_step")
+    end
+  end
+
+  context "when patient has no postcode" do
+    before { patient_changeset.child_attributes["address_postcode"] = "" }
+
+    it "finishes processing without performing search" do
+      expect(PDS::Patient).not_to receive(:search)
+
+      perform
+
+      expect(patient_changeset).to be_processed
+      expect(patient_changeset.search_results.last["result"]).to eq(
+        "no_postcode"
+      )
+    end
+  end
+
   context "when import is slow" do
     before do
       allow(patient_changeset.import).to receive(:slow?).and_return(true)