map religious_character (and school size fields) from gias - remove flaoting gias JSON field from Organisations table

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/helpers/organisations_helper.rb

@@ -3,11 +3,13 @@ module OrganisationsHelper
 
   OFSTED_REPORT_ENDPOINT = "https://reports.ofsted.gov.uk/oxedu_providers/full/(urn)/".freeze
 
+  # :nocov:
   def age_range(school)
     return I18n.t("vacancies.listing.schools.not_given") unless school.minimum_age? && school.maximum_age?
 
     "#{school.minimum_age} to #{school.maximum_age}"
   end
+  # :nocov:
 
   def full_address(organisation)
     address_join([organisation.address, organisation.town, organisation.county, organisation.postcode])
@@ -21,6 +23,7 @@ def ofsted_report(school)
     OFSTED_REPORT_ENDPOINT + school.urn
   end
 
+  # :nocov:
   def organisation_type(organisation)
     return organisation.group_type&.humanize if organisation.school_group?
 
@@ -32,6 +35,7 @@ def organisation_type(organisation)
 
     school_type_details.reject(&:blank?).reject { |str| str == I18n.t("vacancies.listing.schools.not_given") }.join(", ")
   end
+  # :nocov:
 
   def organisation_types(organisations)
     organisations.select(&:school?).group_by { |org| [org.school_type, org.religious_character] }.map do |type, orgs_by_type|
@@ -59,16 +63,17 @@ def school_or_trust_visits(organisation)
     end
   end
 
+  # :nocov:
   def school_size(school)
-    if school.gias_data.present?
-      return number_of_pupils(school) if school.gias_data["NumberOfPupils"].present?
-      return school_capacity(school) if school.gias_data["SchoolCapacity"].present?
-    end
+    return number_of_pupils(school) if school.number_of_pupils.present?
+    return school_capacity(school) if school.school_capacity.present?
+
     I18n.t("vacancies.listing.schools.no_information")
   end
+  # :nocov:
 
   def school_has_school_size_data?(school)
-    school.gias_data["NumberOfPupils"].present? || school.gias_data["SchoolCapacity"].present?
+    school.number_of_pupils.present? || school.school_capacity.present?
   end
 
   def school_is_part_of_a_trust?(school)
@@ -90,14 +95,14 @@ def required_profile_image(image:, missing_prompt:, alt_text:)
   private
 
   def number_of_pupils(school)
-    return unless (number = school.gias_data["NumberOfPupils"])
-
-    I18n.t("vacancies.listing.schools.size.enrolled", number: number)
+    I18n.t("vacancies.listing.schools.size.enrolled", number: school.number_of_pupils)
   end
 
+  # :nocov:
   def school_capacity(school)
-    I18n.t("vacancies.listing.schools.size.up_to", capacity: school.gias_data["SchoolCapacity"])
+    I18n.t("vacancies.listing.schools.size.up_to", capacity: school.school_capacity)
   end
+  # :nocov:
 
   def missing_profile_information_notification(prompt)
     content_tag(:div, class: %i[govuk-inset-text govuk-inset-text--dark-blue inset-text--narrow-border]) do

app/jobs/refresh_organisations_gias_data_hash_job.rb

@@ -9,7 +9,7 @@ class Organisation < ApplicationRecord
   has_rich_text :description
 
   SPECIAL_SCHOOL_TYPES = ["Community special school", "Foundation special school", "Non-maintained special school", "Academy special converter", "Academy special sponsor led", "Free schools special"].freeze
-  NON_FAITH_RELIGIOUS_CHARACTER_TYPES = ["", "None", "Does not apply", "null"].freeze
+  NON_FAITH_RELIGIOUS_CHARACTER_TYPES = ["None", "Does not apply"].freeze
   OUT_OF_SCOPE_DETAILED_SCHOOL_TYPES = ["Further education", "Other independent school", "Miscellaneous", "Special post 16 institution", "Other independent special school", "Higher education institutions", "Welsh establishment"].freeze
 
   friendly_id :slug_candidates, use: %i[slugged history]
@@ -53,7 +53,7 @@ class Organisation < ApplicationRecord
 
   scope :visible_to_jobseekers, -> { schools.not_closed.not_out_of_scope.or(Organisation.trusts).registered_for_service }
 
-  scope :only_faith_schools, -> { where.not("gias_data ->> 'ReligiousCharacter (name)' IN (?)", NON_FAITH_RELIGIOUS_CHARACTER_TYPES) }
+  scope :only_faith_schools, -> { where.not(religious_character: NON_FAITH_RELIGIOUS_CHARACTER_TYPES) }
 
   # This can safely ignore the 'extra' LA mappings as it is always called with a scope which excludes LAs in the first place
   scope :with_live_vacancies, lambda {
@@ -68,7 +68,7 @@ class Organisation < ApplicationRecord
 
   validates :email, email_address: true, if: -> { email_changed? } # Allows data created prior to validation to still be valid
 
-  alias_attribute :data, :gias_data
+  # alias_attribute :data, :gias_data
 
   enum :phase, {
     not_applicable: 0,
@@ -81,6 +81,8 @@ class Organisation < ApplicationRecord
     through: 7,
   }
 
+  self.ignored_columns += %i[gias_data gias_data_hash]
+
   def live_group_vacancies
     Vacancy.none
   end
@@ -136,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

@@ -12,9 +12,64 @@ class School < Organisation
   INDEPENDENT_SCHOOL_TYPE = "Independent schools".freeze
   VALID_SCHOOL_TYPES = [LA_SCHOOL_TYPE, INDEPENDENT_SCHOOL_TYPE, "Special schools", "Universities", ACADEMY_TYPE, FREE_SCHOOL_TYPE, "Welsh schools", "Other types", "Colleges", "Online provider"].freeze
 
-  # This is direct from GIAS (with plurals removed via singularize)
+  # This is direct from GIAS
   validates :school_type, inclusion: { in: VALID_SCHOOL_TYPES }
 
+  CHRISTIAN_RELIGIOUS_TYPES = ["Anglican",
+                               "United Reformed Church",
+                               "Christian",
+                               "Greek Orthodox",
+                               "Anglican/Evangelical",
+                               "Anglican/Church of England",
+                               "Christian/Evangelical",
+                               "Christian/Methodist",
+                               "Christian/non-denominational",
+                               "Protestant/Evangelical",
+                               "Methodist/Church of England",
+                               "Protestant",
+                               "Reformed Baptist",
+                               "Christian Science",
+                               "Church of England",
+                               "Plymouth Brethren Christian Church",
+                               "Church of England/Methodist/United Reform Church/Baptist",
+                               "Moravian", # Protestant Christian church movement
+                               "Quaker",
+                               "Methodist",
+                               "Free Church",
+                               "Church of England/Free Church",
+                               "Church of England/Evangelical",
+                               "Church of England/United Reformed Church",
+                               "Anglican/Christian",
+                               "Inter- / non- denominational",
+                               "Seventh Day Adventist",
+                               "Church of England/Christian",
+                               "Church of England/Methodist",
+                               "Congregational Church"].freeze
+
+  CATHOLIC_RELIGIOUS_TYPES = ["Roman Catholic",
+                              "Catholic",
+                              "Roman Catholic/Anglican",
+                              "Roman Catholic/Church of England",
+                              "Church of England/Roman Catholic"].freeze
+
+  OTHER_RELIGIOUS_TYPES = [
+    "Jewish",
+    "Orthodox Jewish",
+    "Charadi Jewish",
+    "Islam",
+    "Muslim",
+    "Sunni Deobandi",
+    "Buddhist",
+    "Sikh",
+    "Hindu",
+    "Multi-faith",
+  ].freeze
+
+  validates :religious_character, inclusion: {
+    in: NON_FAITH_RELIGIOUS_CHARACTER_TYPES + CHRISTIAN_RELIGIOUS_TYPES + CATHOLIC_RELIGIOUS_TYPES + OTHER_RELIGIOUS_TYPES,
+    allow_nil: false,
+  }
+
   EXCLUDED_DETAILED_SCHOOL_TYPES = [
     "Further education",
     "Other independent school",
@@ -51,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)
@@ -71,11 +119,11 @@ def live_group_vacancies
   end
 
   def faith_school?
-    religious_character.present?
+    NON_FAITH_RELIGIOUS_CHARACTER_TYPES.exclude? religious_character
   end
 
   def catholic_school?
-    religious_character&.include?("Catholic") || false
+    religious_character.in? CATHOLIC_RELIGIOUS_TYPES
   end
 
   def key_stages

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
 
@@ -118,7 +117,11 @@ def school_data(row) # rubocop:disable Metrics/MethodLength
       town: row["Town"],
       phase: row["PhaseOfEducation (code)"].to_i,
       url: Addressable::URI.heuristic_parse(row["SchoolWebsite"]).to_s,
-      gias_data: row.to_h,
+      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

@@ -108,12 +108,12 @@ def apply_school_type_filter(scope)
     return scope unless school_types.present?
 
     if school_types.include?("special_school") && school_types.include?("faith_school")
-      scope.where.not("gias_data ->> 'ReligiousCharacter (name)' IN (?)", Organisation::NON_FAITH_RELIGIOUS_CHARACTER_TYPES)
+      scope.where.not(religious_character: Organisation::NON_FAITH_RELIGIOUS_CHARACTER_TYPES)
            .or(scope.where(detailed_school_type: Organisation::SPECIAL_SCHOOL_TYPES))
     elsif school_types.include?("special_school")
       scope.where(detailed_school_type: Organisation::SPECIAL_SCHOOL_TYPES)
     elsif school_types.include?("faith_school")
-      scope.where.not("gias_data ->> 'ReligiousCharacter (name)' IN (?)", Organisation::NON_FAITH_RELIGIOUS_CHARACTER_TYPES)
+      scope.where.not(religious_character: Organisation::NON_FAITH_RELIGIOUS_CHARACTER_TYPES)
     else
       scope
     end

app/services/search/school_search.rb

@@ -22,10 +22,10 @@
       - row.with_key text: t("publishers.organisations.organisation.school_age.label")
       - row.with_value text: age_range(organisation)
 
-    - if (text = number_of_pupils(organisation))
+    - if organisation.number_of_pupils.present?
       - summary_list.with_row do |row|
         - row.with_key text: t("publishers.organisations.organisation.size.label")
-        - row.with_value text: text
+        - row.with_value text: number_of_pupils(organisation)
 
   - summary_list.with_row(html_attributes: { id: "email" }) do |row|
     - row.with_key text: t("publishers.organisations.organisation.email.label")

app/views/publishers/organisations/_organisation.html.slim

@@ -261,7 +261,6 @@ shared:
     - address3
     - geopoint
     - uk_geopoint
-    - gias_data
     - created_at
     - updated_at
     - url_override