Use strings in PDSCascadingSearchJob

This is in preparation for converting this job to Sidekiq where all
arguments need to be JSON serialisable, of which symbols are not.

We also store these values in a JSON blob on the `PatientChangeset`
model so I think it makes sense to use strings here since they will be
serialised in to strings anyway.

I've removed a `describe` block from the test to simplify the file,
which has resulted in a whitespace change on each line as the code is
de-indented.

Jira-Issue: MAV-7288

Author: thomasleese

app/jobs/pds_cascading_search_job.rb

@@ -6,9 +6,12 @@ class PDSCascadingSearchJob < ApplicationJob
   queue_as :pds
   retry_on Faraday::ServerError, wait: :polynomially_longer
 
-  def perform(searchable, step_name: nil, search_results: [], queue: :pds)
-    step_name ||= :no_fuzzy_with_history
-
+  def perform(
+    searchable,
+    step_name: "no_fuzzy_with_history",
+    search_results: [],
+    queue: "pds"
+  )
     SemanticLogger.tagged(
       searchable: "#{searchable.class.name}##{searchable.id}",
       step: step_name
@@ -19,15 +22,15 @@ def perform(searchable, step_name: nil, search_results: [], queue: :pds)
           given_name: searchable.given_name,
           date_of_birth: searchable.date_of_birth,
           address_postcode: searchable.address_postcode,
-          step_name: step_name
+          step_name:
         )
 
       search_result = {
-        step: step_name,
-        result: result,
-        nhs_number: pds_patient&.nhs_number,
-        created_at: Time.current
-      }.with_indifferent_access
+        "step" => step_name,
+        "result" => result.to_s,
+        "nhs_number" => pds_patient&.nhs_number,
+        "created_at" => Time.current.iso8601
+      }
 
       if searchable.is_a?(PatientChangeset)
         searchable.search_results << search_result
@@ -39,9 +42,9 @@ def perform(searchable, step_name: nil, search_results: [], queue: :pds)
 
       next_step = STEPS[step_name][result]
 
-      if result == :error || next_step.nil? || next_step == :give_up ||
+      if result == :error || next_step.nil? || next_step == "give_up" ||
            multiple_nhs_numbers_found?(search_results) ||
-           next_step == :save_nhs_number_if_unique
+           next_step == "save_nhs_number_if_unique"
         searchable.save!
         if searchable.is_a?(PatientChangeset)
           ProcessPatientChangesetJob.perform_later(searchable.id)
@@ -60,45 +63,45 @@ def perform(searchable, step_name: nil, search_results: [], queue: :pds)
   private
 
   STEPS = {
-    no_fuzzy_with_history: {
-      no_matches: :no_fuzzy_with_wildcard_postcode,
-      one_match: :save_nhs_number_if_unique,
-      too_many_matches: :no_fuzzy_without_history
+    "no_fuzzy_with_history" => {
+      no_matches: "no_fuzzy_with_wildcard_postcode",
+      one_match: "save_nhs_number_if_unique",
+      too_many_matches: "no_fuzzy_without_history"
     },
-    no_fuzzy_without_history: {
-      no_matches: :give_up,
-      one_match: :save_nhs_number_if_unique,
-      too_many_matches: :give_up,
+    "no_fuzzy_without_history" => {
+      no_matches: "give_up",
+      one_match: "save_nhs_number_if_unique",
+      too_many_matches: "give_up",
       format_query: ->(query) { query.merge(history: false) }
     },
-    no_fuzzy_with_wildcard_postcode: {
-      no_matches: :no_fuzzy_with_wildcard_given_name,
-      one_match: :no_fuzzy_with_wildcard_given_name,
-      too_many_matches: :no_fuzzy_with_wildcard_given_name,
+    "no_fuzzy_with_wildcard_postcode" => {
+      no_matches: "no_fuzzy_with_wildcard_given_name",
+      one_match: "no_fuzzy_with_wildcard_given_name",
+      too_many_matches: "no_fuzzy_with_wildcard_given_name",
       format_query:
         lambda do |query|
           query[:address_postcode] = query[:address_postcode].dup
           query[:address_postcode][2..] = "*"
           query
         end
     },
-    no_fuzzy_with_wildcard_given_name: {
-      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,
+    "no_fuzzy_with_wildcard_given_name" => {
+      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:
         lambda do |query|
           query[:given_name] = query[:given_name].dup
           query[:given_name][3..] = "*"
           query
         end
     },
-    no_fuzzy_with_wildcard_family_name: {
-      no_matches: :save_nhs_number_if_unique,
-      one_match: :save_nhs_number_if_unique,
-      too_many_matches: :save_nhs_number_if_unique,
-      skip_step: :save_nhs_number_if_unique,
+    "no_fuzzy_with_wildcard_family_name" => {
+      no_matches: "save_nhs_number_if_unique",
+      one_match: "save_nhs_number_if_unique",
+      too_many_matches: "save_nhs_number_if_unique",
+      skip_step: "save_nhs_number_if_unique",
       format_query:
         lambda do |query|
           query[:family_name] = query[:family_name].dup
@@ -118,9 +121,9 @@ def search_for_patient(
     return :no_postcode, nil if address_postcode.blank?
 
     case step_name
-    when :no_fuzzy_with_wildcard_given_name
+    when "no_fuzzy_with_wildcard_given_name"
       return :skip_step, nil if given_name.length <= 3
-    when :no_fuzzy_with_wildcard_family_name
+    when "no_fuzzy_with_wildcard_family_name"
       return :skip_step, nil if family_name.length <= 3
     end
 

app/models/patient_import.rb

@@ -178,7 +178,7 @@ def enqueue_pds_cascading_searches(changesets)
     changesets.find_each do |cs|
       PDSCascadingSearchJob.set(queue: :imports).perform_later(
         cs,
-        queue: :imports
+        queue: "imports"
       )
     end
   end