Revert "Find duplicates using full name"

This reverts commit 00821ad.

Author: thomasleese

app/controllers/patients_controller.rb

@@ -10,7 +10,7 @@ def index
 
     if (@q = params[:q]).present?
       @q.strip!
-      scope = scope.search_by_full_name(@q)
+      scope = scope.search_by_name(@q)
     end
 
     @pagy, @patients = pagy(scope.order_by_name)

app/models/patient.rb

@@ -114,32 +114,22 @@ class Patient < ApplicationRecord
 
   scope :with_pending_changes, -> { where.not(pending_changes: {}) }
 
-  # Trigram matching requires at least 3 characters
-  scope :search_by_full_name,
+  scope :search_by_name,
         ->(query) do
+          # Trigram matching requires at least 3 characters
           if query.length < 3
             where(
               "given_name ILIKE :like_query OR family_name ILIKE :like_query",
               like_query: "#{query}%"
             )
           else
-            where("given_name % :query OR family_name % :query", query:)
-          end
-        end
-  scope :search_by_given_name,
-        ->(query) do
-          if query.length < 3
-            where("given_name ILIKE :query", query:)
-          else
-            where("given_name % :query", query:)
-          end
-        end
-  scope :search_by_family_name,
-        ->(query) do
-          if query.length < 3
-            where("family_name ILIKE :query", query:)
-          else
-            where("family_name % :query", query:)
+            where(
+              "given_name % :query OR " \
+                "family_name % :query OR " \
+                "similarity(given_name, :query) > 0.3 OR " \
+                "similarity(family_name, :query) > 0.3",
+              query:
+            )
           end
         end
 
@@ -182,16 +172,32 @@ def self.match_existing(
     end
 
     scope =
-      Patient.search_by_given_name(given_name).search_by_family_name(
-        family_name
-      )
-
-    scope =
-      if address_postcode.present?
-        scope.where(address_postcode:).or(scope.where(date_of_birth:))
-      else
-        scope.where(date_of_birth:)
-      end
+      Patient
+        .where(
+          "given_name ILIKE ? AND family_name ILIKE ?",
+          given_name,
+          family_name
+        )
+        .where(date_of_birth:)
+        .or(
+          Patient.where(
+            "given_name ILIKE ? AND family_name ILIKE ?",
+            given_name,
+            family_name
+          ).where(address_postcode:)
+        )
+        .or(
+          Patient.where("given_name ILIKE ?", given_name).where(
+            date_of_birth:,
+            address_postcode:
+          )
+        )
+        .or(
+          Patient.where("family_name ILIKE ?", family_name).where(
+            date_of_birth:,
+            address_postcode:
+          )
+        )
 
     if nhs_number.blank?
       scope.to_a

spec/models/patient_spec.rb

@@ -165,62 +165,22 @@
       it { should_not include(patient) }
     end
 
-    context "with first name and last name are similar and matching date of birth" do
-      let(:nhs_number) { nil }
-      let(:patient) do
-        create(
-          :patient,
-          given_name: "Johnny",
-          family_name: "Smith",
-          date_of_birth:
-        )
-      end
-
-      it { should include(patient) }
-    end
-
-    context "with first name and last name are similar and matching postcode" do
-      let(:nhs_number) { nil }
-      let(:patient) do
-        create(
-          :patient,
-          given_name: "John",
-          family_name: "Smyth",
-          address_postcode:
-        )
-      end
-
-      it { should include(patient) }
-    end
-
     context "with matching first name, date of birth and postcode" do
       let(:nhs_number) { nil }
       let(:patient) do
-        create(
-          :patient,
-          given_name:,
-          family_name: "Seldon",
-          date_of_birth:,
-          address_postcode:
-        )
+        create(:patient, given_name:, date_of_birth:, address_postcode:)
       end
 
-      it { should_not include(patient) }
+      it { should include(patient) }
     end
 
     context "with matching last name, date of birth and postcode" do
       let(:nhs_number) { nil }
       let(:patient) do
-        create(
-          :patient,
-          given_name: "Hari",
-          family_name:,
-          date_of_birth:,
-          address_postcode:
-        )
+        create(:patient, family_name:, date_of_birth:, address_postcode:)
       end
 
-      it { should_not include(patient) }
+      it { should include(patient) }
     end
 
     context "when matching everything except the NHS number" do