Merge pull request #2528 from DFE-Digital/AQTS-688-dev-code-architect…

…ure-change-dqt-match-column-name

[AQTS-688] Change dqt_match column name to trs_match

app/jobs/update_trs_match_job.rb

@@ -15,7 +15,7 @@ def perform(application_form)
         TRS::Client::FindTeachers.call(application_form:, reverse_name: true)
     end
 
-    application_form.update!(dqt_match: { teachers: })
+    application_form.update!(trs_match: { teachers: })
 
     UpdateTRSMatchJob.set(wait: 24.hours).perform_later(application_form)
   end

app/models/application_form.rb

@@ -46,6 +46,7 @@
 #  submitted_at                                  :datetime
 #  teaching_authority_provides_written_statement :boolean          default(FALSE), not null
 #  teaching_qualification_part_of_degree         :boolean
+#  trs_match                                     :jsonb
 #  withdrawn_at                                  :datetime
 #  work_history_status                           :string           default("not_started"), not null
 #  working_days_since_submission                 :integer

app/view_objects/assessor_interface/application_forms_show_view_object.rb

@@ -15,7 +15,7 @@ def application_form
   end
 
   def duplicate_matches
-    dqt_match.fetch("teachers", dqt_match.present? ? [dqt_match] : [])
+    trs_match.fetch("teachers", trs_match.present? ? [trs_match] : [])
   end
 
   def task_list_sections
@@ -85,7 +85,7 @@ def management_tasks
   attr_reader :params, :current_staff
 
   delegate :assessment,
-           :dqt_match,
+           :trs_match,
            :teacher,
            :teaching_authority_provides_written_statement,
            :work_histories,

config/analytics.yml

@@ -48,6 +48,7 @@
     - teacher_id
     - teaching_authority_provides_written_statement
     - teaching_qualification_part_of_degree
+    - trs_match
     - updated_at
     - withdrawn_at
     - work_history_status

config/analytics_hidden_pii.yml

@@ -7,6 +7,7 @@
     - given_names
     - registration_number
     - dqt_match
+    - trs_match
   :assessments:
     - recommendation_assessor_note
   :further_information_request_items:

db/migrate/20241122110920_add_trs_match_column_to_application_forms.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTRSMatchColumnToApplicationForms < ActiveRecord::Migration[7.2]
+  def up
+    add_column :application_forms, :trs_match, :jsonb, default: {}
+
+    ApplicationForm.update_all("trs_match = dqt_match")
+  end
+
+  def down
+    remove_column :application_forms, :trs_match
+  end
+end

db/scripts/sanitise.sql

@@ -14,6 +14,7 @@ SET
   alternative_given_names = '',
   alternative_family_name = '',
   dqt_match = '{}',
+  trs_match = '{}',
   registration_number = '';
 
 -- AssessmentSectionFailureReason

spec/factories/application_forms.rb

@@ -46,6 +46,7 @@
 #  submitted_at                                  :datetime
 #  teaching_authority_provides_written_statement :boolean          default(FALSE), not null
 #  teaching_qualification_part_of_degree         :boolean
+#  trs_match                                     :jsonb
 #  withdrawn_at                                  :datetime
 #  work_history_status                           :string           default("not_started"), not null
 #  working_days_since_submission                 :integer

spec/forms/support_interface/country_form_spec.rb

@@ -251,7 +251,7 @@
       it "sets has_regions to true" do
         expect(subject).to have_attributes(
           has_regions: true,
-          region_names: "Madrid\nBarcelona",
+          region_names: country.reload.regions.map(&:name).join("\n"),
         )
       end
     end

spec/jobs/update_trs_match_job_spec.rb

@@ -26,7 +26,7 @@
     end
 
     it "does not update the application form if no results are returned" do
-      expect { perform }.to change(application_form, :dqt_match).to(
+      expect { perform }.to change(application_form, :trs_match).to(
         { "teachers" => [] },
       )
     end
@@ -51,7 +51,7 @@
         application_form:,
       ).and_return(results)
 
-      expect { perform }.to change(application_form, :dqt_match).to(
+      expect { perform }.to change(application_form, :trs_match).to(
         { "teachers" => results },
       )
     end

spec/models/application_form_spec.rb

@@ -46,6 +46,7 @@
 #  submitted_at                                  :datetime
 #  teaching_authority_provides_written_statement :boolean          default(FALSE), not null
 #  teaching_qualification_part_of_degree         :boolean
+#  trs_match                                     :jsonb
 #  withdrawn_at                                  :datetime
 #  work_history_status                           :string           default("not_started"), not null
 #  working_days_since_submission                 :integer

spec/system/assessor_interface/duplicate_applicant_application_form_spec.rb

@@ -38,7 +38,7 @@ def and_i_see_the_warning_of_an_existing_record_in_dqt
   end
 
   def and_the_applicant_matches_a_record_in_dqt
-    application_form.update!(dqt_match:)
+    application_form.update!(trs_match:)
   end
 
   def application_form
@@ -64,7 +64,7 @@ def application_form
 
   delegate :reference, to: :application_form
 
-  def dqt_match
+  def trs_match
     {
       "first_name" => "John",
       "last_name" => "Smith",