add school type validation and remove singularization of types

Author: starswan

app/models/school.rb

@@ -6,6 +6,15 @@ class School < Organisation
 
   validates :urn, uniqueness: true
 
+  ACADEMY_TYPE = "Academies".freeze
+  LA_SCHOOL_TYPE = "Local authority maintained schools".freeze
+  FREE_SCHOOL_TYPE = "Free Schools".freeze
+  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)
+  validates :school_type, inclusion: { in: VALID_SCHOOL_TYPES }
+
   EXCLUDED_DETAILED_SCHOOL_TYPES = [
     "Further education",
     "Other independent school",
@@ -69,10 +78,6 @@ def catholic_school?
     religious_character&.include?("Catholic") || false
   end
 
-  def school_type
-    read_attribute(:school_type).singularize
-  end
-
   def key_stages
     return if phase == "not_applicable"
 

app/queries/vacancy_filter_query.rb

@@ -39,11 +39,11 @@ def add_organisation_type_filters(filters, built_scope)
     selected_school_types = []
 
     if filters[:organisation_types].include?("Academy")
-      selected_school_types.push("Academy", "Academies", "Free schools", "Free school")
+      selected_school_types.push(School::ACADEMY_TYPE, School::FREE_SCHOOL_TYPE)
     end
 
     if filters[:organisation_types].include?("Local authority maintained schools")
-      selected_school_types << "Local authority maintained schools"
+      selected_school_types << School::LA_SCHOOL_TYPE
     end
 
     built_scope.joins(organisation_vacancies: :organisation).where(organisations: { school_type: selected_school_types }).distinct

app/services/gias/import_schools_and_local_authorities.rb

@@ -10,17 +10,20 @@ def initialize
     reset_data
   end
 
+  class ImportFailure < StandardError
+  end
+
   def call
     log_benchmark("Importing schools and local authorities") do
-      Gias::Data.new(SCHOOLS_AND_LOCAL_AUTHORITIES_CSV).each_with_index do |row, index|
-        local_authorities.add(group_data(row))
-        schools.push(school_data(row))
-        memberships.push(membership_data(row))
-
-        import_batch if (index % BATCH_SIZE).zero?
+      import_errors = Gias::Data.new(SCHOOLS_AND_LOCAL_AUTHORITIES_CSV).each_slice(BATCH_SIZE).flat_map do |group|
+        group.each do |row|
+          local_authorities.add(group_data(row))
+          schools.push(school_data(row))
+          memberships.push(membership_data(row))
+        end
+        import_batch
       end
-
-      import_batch
+      raise ImportFailure, import_errors.map(&:errors) if import_errors.any?
     end
   end
 
@@ -35,11 +38,12 @@ def reset_data
   end
 
   def import_batch
-    import_local_authorities if local_authorities.any?
-    import_schools if schools.any?
-    import_memberships if memberships.any?
-
-    reset_data
+    failures = import_local_authorities.failed_instances +
+      import_schools.failed_instances +
+      import_memberships.failed_instances
+    failures.tap do
+      reset_data
+    end
   end
 
   def import_local_authorities
@@ -59,7 +63,6 @@ def import_schools
         conflict_target: [:urn],
         columns: schools.first.keys,
       },
-      batch_size: 1000,
     )
   end
 

app/services/search/school_search.rb

@@ -94,11 +94,11 @@ def apply_organisation_type_filter(scope)
     selected_school_types = []
 
     if organisation_types.include?("Academy")
-      selected_school_types.push("Academy", "Academies", "Free schools", "Free school")
+      selected_school_types.push(School::ACADEMY_TYPE, School::FREE_SCHOOL_TYPE)
     end
 
     if organisation_types.include?("Local authority maintained schools")
-      selected_school_types << "Local authority maintained schools"
+      selected_school_types << School::LA_SCHOOL_TYPE
     end
 
     scope.where(school_type: selected_school_types)

db/seeds.rb

@@ -21,6 +21,13 @@
 # Church of England school
 osmaston_cofe = School.find_by!(urn: "112847")
 
+# academy special converter
+oakwoods = School.find_by!(urn: "139468")
+# community special school
+northcott = School.find_by!(urn: "118138")
+# Special free school
+martinbacon = School.find_by!(urn: "147661")
+
 # Team users
 users = [
   { email: "alex.lee@education.gov.uk", family_name: "Lee", given_name: "Alex" },
@@ -48,6 +55,9 @@
            southampton_la.schools.detect { |s| s.phase != "not_applicable" && s.phase.exclude?("middle") },
            abraham_moss,
            st_anthony,
+           oakwoods,
+           northcott,
+           martinbacon,
            osmaston_cofe]
 
 user_emails = users.map { |u| u.fetch(:email) }
@@ -65,14 +75,14 @@
 
 schools.each do |school|
   attrs = { organisations: [school],
-            phases: [school.phase],
+            phases: (school.phase == "not_applicable" ? %w[secondary] : [school.phase]),
             publisher_organisation: school,
             publisher: Publisher.all.sample }
-  3.times { FactoryBot.create(:vacancy, :for_seed_data, **attrs) }
+  2.times { FactoryBot.create(:vacancy, :for_seed_data, **attrs) }
   FactoryBot.create(:vacancy, :for_seed_data, :no_tv_applications, **attrs)
-  2.times { FactoryBot.create(:vacancy, :for_seed_data, :future_publish, **attrs) }
+  FactoryBot.create(:vacancy, :for_seed_data, :future_publish, **attrs)
   FactoryBot.create(:draft_vacancy, :for_seed_data, **attrs)
-  2.times { FactoryBot.build(:vacancy, :for_seed_data, :expired, **attrs).save(validate: false) }
+  FactoryBot.build(:vacancy, :for_seed_data, :expired, **attrs).save(validate: false)
 end
 
 # Vacancies at Weydon trust central office

spec/factories/schools.rb

@@ -34,7 +34,7 @@
     region { "South-East England" }
     safeguarding_information { Faker::Lorem.paragraph(sentence_count: 1) }
     sequence(:slug) { |n| "#{name.parameterize}-#{n}" }
-    school_type { "LA maintained school" }
+    school_type { School::INDEPENDENT_SCHOOL_TYPE }
     postcode { FFaker::AddressUK.postcode }
     town { Faker::Address.city.delete("'") }
     # URN is validated unique for a school
@@ -101,7 +101,11 @@
     end
   end
 
+  trait :free_school do
+    school_type { School::FREE_SCHOOL_TYPE }
+  end
+
   factory :academy, parent: :school do
-    school_type { "Academy" }
+    school_type { School::ACADEMY_TYPE }
   end
 end