trusts_code for Single acedamty trust

Author: starswan

app/controllers/omniauth_callbacks_controller.rb

@@ -108,9 +108,8 @@ def organisation_from_request
       # contained within the trust and use that instead
       uid = auth_hash.dig("extra", "raw_info", "organisation", "uid")
       contained_school = School.find_by(
-        "gias_data->>'TrustSchoolFlag (code)' = ? AND gias_data->>'Trusts (code)' = ?",
-        "5", # "Supported by a single-academy trust"
-        uid,
+        trust_school_flag_code: 5, # "Supported by a single-academy trust"
+        trusts_code: uid,
       )
 
       contained_school || raise("Could not find a school contained in SAT (UID #{uid})")

app/jobs/refresh_organisations_gias_data_hash_job.rb

@@ -138,13 +138,6 @@ def trust_or_la?
     trust? || local_authority?
   end
 
-  # def refresh_gias_data_hash
-  #   computed_hash = gias_data.presence && Digest::SHA256.hexdigest(gias_data.to_s)
-  #   return if gias_data_hash == computed_hash
-  #
-  #   update(gias_data_hash: computed_hash)
-  # end
-
   def has_ofsted_report?
     urn.present?
   end

app/models/organisation.rb

@@ -106,13 +106,6 @@ class School < Organisation
     through: %i[early_years ks1 ks2 ks3 ks4 ks5],
   }.freeze
 
-  # def religious_character
-  #   return if !respond_to?(:gias_data) || gias_data.nil?
-  #   return if ["None", "Does not apply"].include?(gias_data["ReligiousCharacter (name)"])
-  #
-  #   gias_data["ReligiousCharacter (name)"]
-  # end
-
   def live_group_vacancies
     if part_of_a_trust?
       org_ids = [trust.id] + trust.schools.pluck(:id)

app/models/school.rb

@@ -95,7 +95,6 @@ def group_data(row)
       local_authority_code: row["LA (code)"],
       name: row["LA (name)"],
       group_type: "local_authority",
-      # gias_data: row.to_h.slice("LA (code)", "LA (name)"),
     }
   end
 
@@ -121,6 +120,8 @@ def school_data(row) # rubocop:disable Metrics/MethodLength
       religious_character: row.fetch("ReligiousCharacter (name)").presence || "None",
       number_of_pupils: row.fetch("NumberOfPupils"),
       school_capacity: row.fetch("SchoolCapacity"),
+      trust_school_flag_code: row.fetch("TrustSchoolFlag (code)"),
+      trusts_code: row.fetch("Trusts (code)"),
     }.merge(school_location_data(row)).transform_values(&:presence)
   end
 

app/services/gias/import_schools_and_local_authorities.rb

@@ -130,7 +130,6 @@ def trust_data(row)
       group_type: row["Group Type"],
       town: row["Group Town"],
       postcode: row["Group Postcode"],
-      # gias_data: row.to_h,
     }
   end
 

app/services/gias/import_trusts.rb

@@ -162,6 +162,8 @@
   :organisations:
   - religious_character
   - number_of_pupils
+  - trust_school_flag_code
+  - trusts_code
   - school_capacity
   - slug
   - searchable_content

config/analytics_blocklist.yml

@@ -175,11 +175,6 @@ import_organisation_data:
   class: 'ImportOrganisationDataJob'
   queue: low
 
-refresh_organisations_gias_data_hash:
-  cron: '0 23 * * *' # "At 23:00."
-  class: 'RefreshOrganisationsGiasDataHashJob'
-  queue: low
-
 index_newly_published_vacancies:
   cron: '01 00 * * *' # "At 00:01."
   class: 'IndexNewlyPublishedVacanciesJob'

config/schedule.yml

@@ -3,5 +3,7 @@ def change
     add_column :organisations, :religious_character, :string
     add_column :organisations, :number_of_pupils, :integer
     add_column :organisations, :school_capacity, :integer
+    add_column :organisations, :trust_school_flag_code, :integer
+    add_column :organisations, :trusts_code, :integer
   end
 end

db/migrate/20260423141519_add_religious_character_to_school.rb

@@ -576,6 +576,8 @@
     t.string "religious_character"
     t.integer "number_of_pupils"
     t.integer "school_capacity"
+    t.integer "trust_school_flag_code"
+    t.integer "trusts_code"
     t.index ["geopoint"], name: "index_organisations_on_geopoint", using: :gist
     t.index ["local_authority_code"], name: "index_organisations_on_local_authority_code", unique: true
     t.index ["searchable_content"], name: "index_organisations_on_searchable_content", using: :gin