Merge pull request #4392 from nhsuk/pds-fuzzy-search-history

Remove redundant PDS fuzzy search with history

Author: misaka

app/jobs/process_patient_changesets_job.rb

@@ -79,7 +79,7 @@ def steps
         too_many_matches: :no_fuzzy_without_history
       },
       no_fuzzy_without_history: {
-        no_matches: :fuzzy_without_history,
+        no_matches: :fuzzy,
         one_match: :save_nhs_number_if_unique,
         too_many_matches: :give_up,
         format_query: ->(query) { query.merge(history: false) }
@@ -98,28 +98,21 @@ def steps
         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,
+        no_matches: :fuzzy,
+        one_match: :fuzzy,
+        too_many_matches: :fuzzy,
+        skip_step: :fuzzy,
         format_query: ->(query) { query[:family_name][3..] = "*" }
       },
-      fuzzy_without_history: {
-        no_matches: :fuzzy_with_history,
-        one_match: :save_nhs_number_if_unique,
-        too_many_matches: :save_nhs_number_if_unique,
-        format_query: ->(query) do
-          query[:fuzzy] = true
-          query[:history] = false
-        end
-      },
-      fuzzy_with_history: {
+      fuzzy: {
         no_matches: :give_up,
         one_match: :save_nhs_number_if_unique,
         too_many_matches: :save_nhs_number_if_unique,
         format_query: ->(query) do
           query[:fuzzy] = true
-          query[:history] = true
+          # For fuzzy searches, history is the default. We get an error if we
+          # try to set it to true explicitly
+          query[:history] = nil
         end
       }
     }

app/models/pds_search_result.rb

@@ -36,8 +36,7 @@ class PDSSearchResult < ApplicationRecord
          no_fuzzy_with_wildcard_postcode: 3,
          no_fuzzy_with_wildcard_given_name: 4,
          no_fuzzy_with_wildcard_family_name: 5,
-         fuzzy_without_history: 6,
-         fuzzy_with_history: 7
+         fuzzy: 6
        },
        validate: true
 

spec/features/import_child_pds_lookup_extravaganza_spec.rb

@@ -797,15 +797,14 @@ def then_maia_has_the_uploaded_nhs_number
 
   def and_maia_has_multiple_pds_search_results
     maia = Patient.find_by(given_name: "Maia", family_name: "Smith")
-    expect(maia.pds_search_results.count).to eq(6)
+    expect(maia.pds_search_results.count).to eq(5)
     expect(maia.pds_search_results.pluck(:step)).to eq(
       %w[
         no_fuzzy_with_history
         no_fuzzy_with_wildcard_postcode
         no_fuzzy_with_wildcard_given_name
         no_fuzzy_with_wildcard_family_name
-        fuzzy_without_history
-        fuzzy_with_history
+        fuzzy
       ]
     )
   end

spec/jobs/process_patient_changesets_job_spec.rb

@@ -60,7 +60,7 @@
   end
 
   context "when a later fuzzy search finds a match" do
-    let(:step) { :fuzzy_without_history }
+    let(:step) { :fuzzy }
 
     before do
       patient_changeset["pending_changes"]["search_results"] = [
@@ -85,7 +85,7 @@
   end
 
   context "when fuzzy search returns conflicting NHS numbers" do
-    let(:step) { :fuzzy_without_history }
+    let(:step) { :fuzzy }
 
     before do
       patient_changeset["pending_changes"]["search_results"] = [