Remove references to old job role categories

app/controllers/publishers/jobseeker_profiles_controller.rb

@@ -12,7 +12,7 @@ def show
   private
 
   def jobseeker_profile_search_params
-    params.permit(locations: [], qualified_teacher_status: [], teaching_job_roles: [], teaching_support_job_roles: [], non_teaching_support_job_roles: [], support_job_roles: [], working_patterns: [], education_phases: [], key_stages: [], subjects: [], right_to_work_in_uk: [])
+    params.permit(locations: [], qualified_teacher_status: [], teaching_job_roles: [], support_job_roles: [], working_patterns: [], education_phases: [], key_stages: [], subjects: [], right_to_work_in_uk: [])
           .transform_values(&:compact_blank)
           .merge(current_organisation:)
   end

app/controllers/subscriptions_controller.rb

@@ -164,13 +164,13 @@ def campaign_params
 
   def search_criteria_params
     params.require(:search_criteria)
-          .permit(:keyword, :location, :organisation_slug, :radius, teaching_job_roles: [], teaching_support_job_roles: [], non_teaching_support_job_roles: [], support_job_roles: [], ect_statuses: [], subjects: [], phases: [], working_patterns: [])
+          .permit(:keyword, :location, :organisation_slug, :radius, teaching_job_roles: [], support_job_roles: [], ect_statuses: [], subjects: [], phases: [], working_patterns: [])
   end
 
   def subscription_params
     params.require(:jobseekers_subscription_form)
           .permit(:email, :frequency, :keyword, :location, :organisation_slug, :radius, :campaign, :user_name,
-                  teaching_job_roles: [], teaching_support_job_roles: [], non_teaching_support_job_roles: [], support_job_roles: [],
+                  teaching_job_roles: [], support_job_roles: [],
                   visa_sponsorship_availability: [], ect_statuses: [], subjects: [], phases: [], working_patterns: [])
   end
 

app/form_models/jobseekers/job_preferences_form.rb

@@ -28,14 +28,6 @@ def teaching_job_roles_options
         Vacancy::TEACHING_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_job_role_options.#{option}")] }
       end
 
-      def teaching_support_job_roles_options
-        Vacancy::TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_support_job_role_options.#{option}")] }
-      end
-
-      def non_teaching_support_job_roles_options
-        Vacancy::NON_TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.non_teaching_support_job_role_options.#{option}")] }
-      end
-
       def support_job_roles_options
         Vacancy::SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.support_job_role_options.#{option}")] }
       end

app/form_models/jobseekers/subscription_form.rb

@@ -5,8 +5,6 @@ class Jobseekers::SubscriptionForm < BaseForm
                 :location,
                 :radius,
                 :teaching_job_roles,
-                :teaching_support_job_roles,
-                :non_teaching_support_job_roles,
                 :support_job_roles,
                 :visa_sponsorship_availability,
                 :ect_statuses,
@@ -40,8 +38,6 @@ def initialize(params = {}) # rubocop:disable Metrics/AbcSize,Metrics/Cyclomatic
     @keyword = params[:keyword] || search_criteria[:keyword]
     @location = params[:location] || search_criteria[:location]
     @teaching_job_roles = params[:teaching_job_roles]&.reject(&:blank?) || search_criteria[:teaching_job_roles] || []
-    @teaching_support_job_roles = params[:teaching_support_job_roles]&.reject(&:blank?) || search_criteria[:teaching_support_job_roles] || []
-    @non_teaching_support_job_roles = params[:non_teaching_support_job_roles]&.reject(&:blank?) || search_criteria[:non_teaching_support_job_roles] || []
     @support_job_roles = params[:support_job_roles]&.reject(&:blank?) || search_criteria[:support_job_roles] || []
     @visa_sponsorship_availability = params[:visa_sponsorship_availability]&.reject(&:blank?) || search_criteria[:visa_sponsorship_availability]
     @ect_statuses = params[:ect_statuses]&.reject(&:blank?) || search_criteria[:ect_statuses] || []
@@ -70,8 +66,6 @@ def search_criteria_hash
       location: location,
       radius: (@location.present? ? radius : nil),
       teaching_job_roles: teaching_job_roles,
-      teaching_support_job_roles: teaching_support_job_roles,
-      non_teaching_support_job_roles: non_teaching_support_job_roles,
       support_job_roles: support_job_roles,
       visa_sponsorship_availability: visa_sponsorship_availability,
       ect_statuses: ect_statuses,
@@ -87,9 +81,7 @@ def search_criteria_hash
   def set_facet_options
     @visa_sponsorship_availability_options =  [["true", I18n.t("jobs.filters.visa_sponsorship_availability.subscriptions")]]
     @teaching_job_role_options = Vacancy::TEACHING_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_job_role_options.#{option}")] }
-    @teaching_support_job_role_options = Vacancy::TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_support_job_role_options.#{option}")] }
     @support_job_role_options = Vacancy::SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.support_job_role_options.#{option}")] }
-    @non_teaching_support_job_role_options = Vacancy::NON_TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.non_teaching_support_job_role_options.#{option}")] }
     @phase_options = Vacancy.phases.keys.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_education_phases_form.phases_options.#{option}")] }
     @ect_status_options = [["ect_suitable", I18n.t("jobs.filters.ect_suitable")]]
     @working_pattern_options = Vacancy.working_patterns.keys.map do |option|
@@ -99,7 +91,7 @@ def set_facet_options
 
   def location_and_one_other_criterion_selected
     errors.add(:base, I18n.t("subscriptions.errors.no_location_and_other_criterion_selected")) unless
-      location.present? && %i[keyword teaching_job_roles teaching_support_job_roles non_teaching_support_job_roles support_job_roles subjects phases working_patterns].any? { |criterion| public_send(criterion).present? }
+      location.present? && %i[keyword teaching_job_roles support_job_roles subjects phases working_patterns].any? { |criterion| public_send(criterion).present? }
   end
 
   def unique_job_alert

app/form_models/publishers/job_listing/job_role_form.rb

@@ -19,14 +19,6 @@ def teaching_job_roles_options
     Vacancy::TEACHING_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_job_role_options.#{option}")] }
   end
 
-  def teaching_support_job_roles_options
-    Vacancy::TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_support_job_role_options.#{option}")] }
-  end
-
-  def non_teaching_support_job_roles_options
-    Vacancy::NON_TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.non_teaching_support_job_role_options.#{option}")] }
-  end
-
   def support_job_roles_options
     Vacancy::SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.support_job_role_options.#{option}")] }
   end

app/form_models/publishers/jobseeker_profile_search_form.rb

@@ -6,8 +6,6 @@ class Publishers::JobseekerProfileSearchForm
   attribute :locations
   attribute :qualified_teacher_status
   attribute :teaching_job_roles
-  attribute :teaching_support_job_roles
-  attribute :non_teaching_support_job_roles
   attribute :support_job_roles
   attribute :working_patterns
   attribute :education_phases
@@ -23,14 +21,6 @@ def teaching_job_role_options
     Vacancy::TEACHING_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_job_role_options.#{option}")] }
   end
 
-  def teaching_support_job_role_options
-    Vacancy::TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_support_job_role_options.#{option}")] }
-  end
-
-  def non_teaching_support_job_role_options
-    Vacancy::NON_TEACHING_SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.non_teaching_support_job_role_options.#{option}")] }
-  end
-
   def support_job_role_options
     Vacancy::SUPPORT_JOB_ROLES.map { |option| [option, I18n.t("helpers.label.publishers_job_listing_job_role_form.support_job_role_options.#{option}")] }
   end

app/models/vacancy.rb

@@ -37,9 +37,6 @@ class Vacancy < ApplicationRecord
 
   TEACHING_JOB_ROLES = %w[teacher head_of_year_or_phase head_of_department_or_curriculum assistant_headteacher
                           deputy_headteacher headteacher sendco].freeze
-  TEACHING_SUPPORT_JOB_ROLES = %w[teaching_assistant higher_level_teaching_assistant education_support].freeze
-  NON_TEACHING_SUPPORT_JOB_ROLES = %w[administration_hr_data_and_finance catering_cleaning_and_site_management
-                                      it_support pastoral_health_and_welfare other_leadership other_support].freeze
   SUPPORT_JOB_ROLES = %w[teaching_assistant higher_level_teaching_assistant education_support
                          administration_hr_data_and_finance catering_cleaning_and_site_management
                          it_support pastoral_health_and_welfare other_leadership other_support].freeze

app/presenters/subscription_presenter.rb

@@ -7,8 +7,6 @@ class SubscriptionPresenter < BasePresenter
                                   location
                                   job_roles
                                   teaching_job_roles
-                                  teaching_support_job_roles
-                                  non_teaching_support_job_roles
                                   support_job_roles
                                   ect_statuses
                                   visa_sponsorship_availability
@@ -56,10 +54,6 @@ def job_roles_filter(field, value)
       render_legacy_job_roles_filter(value)
     when "teaching_job_roles"
       render_teaching_job_roles_filter(value)
-    when "teaching_support_job_roles"
-      render_teaching_support_job_roles_filter(value)
-    when "non_teaching_support_job_roles"
-      render_non_teaching_support_job_roles_filter(value)
     when "support_job_roles"
       render_support_job_roles_filter(value)
     else
@@ -85,14 +79,6 @@ def render_teaching_job_roles_filter(value)
     { teaching_job_roles: value.map { |role| I18n.t("helpers.label.publishers_job_listing_job_role_form.job_role_options.#{role}") }.join(", ") }
   end
 
-  def render_teaching_support_job_roles_filter(value)
-    { teaching_support_job_roles: value.map { |role| I18n.t("helpers.label.publishers_job_listing_job_role_form.teaching_support_job_role_options.#{role}") }.join(", ") }
-  end
-
-  def render_non_teaching_support_job_roles_filter(value)
-    { non_teaching_support_job_roles: value.map { |role| I18n.t("helpers.label.publishers_job_listing_job_role_form.non_teaching_support_job_role_options.#{role}") }.join(", ") }
-  end
-
   def render_support_job_roles_filter(value)
     { support_job_roles: value.map { |role| I18n.t("helpers.label.publishers_job_listing_job_role_form.support_job_role_options.#{role}") }.join(", ") }
   end

app/queries/vacancy_filter_query.rb

@@ -20,7 +20,7 @@ def call(filters) # rubocop:disable Metrics/AbcSize
     # General filters
     built_scope = built_scope.visa_sponsorship_available if filters[:visa_sponsorship_availability]
 
-    job_role_keys = %i[job_roles teaching_job_roles support_job_roles teaching_support_job_roles non_teaching_support_job_roles]
+    job_role_keys = %i[job_roles teaching_job_roles support_job_roles]
     built_scope = apply_job_roles(job_role_keys, built_scope, filters)
 
     built_scope = built_scope.ect_suitable if filters[:ect_statuses]&.include?("ect_suitable") || filters[:job_roles]&.include?("ect_suitable")

app/services/search/criteria_inventor.rb

@@ -13,8 +13,7 @@ def criteria
       working_patterns: [],
       phases: @vacancy.phases,
       teaching_job_roles: @vacancy.job_roles & Vacancy::TEACHING_JOB_ROLES,
-      teaching_support_job_roles: @vacancy.job_roles & Vacancy::TEACHING_SUPPORT_JOB_ROLES,
-      non_teaching_support_job_roles: @vacancy.job_roles & Vacancy::NON_TEACHING_SUPPORT_JOB_ROLES,
+      support_job_roles: @vacancy.job_roles & Vacancy::SUPPORT_JOB_ROLES,
       ect_statuses: [@vacancy.ect_status],
       subjects: subjects,
     }.delete_if { |_k, v| v.blank? }

app/services/search/jobseeker_profile_search.rb

@@ -24,7 +24,7 @@ def jobseeker_profiles # rubocop:disable Metrics/AbcSize
   end
 
   def roles_filter
-    role_filters = %i[teaching_job_roles teaching_support_job_roles non_teaching_support_job_roles support_job_roles]
+    role_filters = %i[teaching_job_roles support_job_roles]
 
     role_filters.flat_map { |filter_type| filters[filter_type] }.compact
   end
@@ -34,12 +34,12 @@ def total_count
   end
 
   def total_filters
-    filter_counts = %i[qualified_teacher_status teaching_job_roles teaching_support_job_roles non_teaching_support_job_roles support_job_roles working_patterns education_phases key_stages subjects right_to_work_in_uk].map { |filter| @filters[filter]&.count || 0 }
+    filter_counts = %i[qualified_teacher_status teaching_job_roles support_job_roles working_patterns education_phases key_stages subjects right_to_work_in_uk].map { |filter| @filters[filter]&.count || 0 }
     filter_counts.sum
   end
 
   def clear_filters_params
-    @filters.merge({ qualified_teacher_status: [], teaching_job_roles: [], teaching_support_job_roles: [], non_teaching_support_job_roles: [], support_job_roles: [], working_patterns: [], education_phases: [], key_stages: [], subjects: [], right_to_work_in_uk: [] })
+    @filters.merge({ qualified_teacher_status: [], teaching_job_roles: [], support_job_roles: [], working_patterns: [], education_phases: [], key_stages: [], subjects: [], right_to_work_in_uk: [] })
   end
 
   def filter_by_qts(scope)

app/services/search/vacancy_search.rb

@@ -19,7 +19,7 @@ def active_criteria
   end
 
   def clear_filters_params
-    active_criteria.merge(teaching_job_roles: [], teaching_support_job_roles: [], non_teaching_support_job_roles: [], ect_statuses: [], phases: [], working_patterns: [], quick_apply: [], subjects: [], organisation_types: [], school_types: [], previous_keyword: keyword, visa_sponsorship_availability: [], skip_strip_checkboxes: true)
+    active_criteria.merge(teaching_job_roles: [], support_job_roles: [], ect_statuses: [], phases: [], working_patterns: [], quick_apply: [], subjects: [], organisation_types: [], school_types: [], previous_keyword: keyword, visa_sponsorship_availability: [], skip_strip_checkboxes: true)
   end
 
   def remove_filter_params

app/views/subscriptions/campaign/_job_roles_fields.slim

@@ -1,13 +1,9 @@
 - teaching_job_roles = capture do
   = f.govuk_collection_check_boxes(:teaching_job_roles, form.teaching_job_role_options, :first, :last, small: false,
                                    legend: { text: t("jobs.filters.campaign.teaching_job_roles") }, hint: nil)
-- teaching_support_job_roles = capture do
-  = f.govuk_collection_check_boxes(:teaching_support_job_roles, form.teaching_support_job_role_options, :first, :last, small: false,
-                                   legend: { text: t("jobs.filters.campaign.teaching_support_job_roles") }, hint: nil)
-- non_teaching_support_job_roles = capture do
-  = f.govuk_collection_check_boxes(:non_teaching_support_job_roles, form.non_teaching_support_job_role_options, :first, :last, small: false,
-                                   legend: { text: t("jobs.filters.campaign.non_teaching_support_job_roles") }, hint: nil)
+- support_job_roles = capture do
+  = f.govuk_collection_check_boxes(:support_job_roles, form.support_job_role_options, :first, :last, small: false,
+                                   legend: { text: t("jobs.filters.campaign.support_job_roles") }, hint: nil)
 
 - filters_component.with_group key: "teaching_job_roles", component: teaching_job_roles
-- filters_component.with_group key: "teaching_support_job_roles", component: teaching_support_job_roles
-- filters_component.with_group key: "non_teaching_support_job_roles", component: non_teaching_support_job_roles
+- filters_component.with_group key: "support_job_roles", component: support_job_roles

config/landing_pages.yml

@@ -27,7 +27,7 @@ shared:
     ect_statuses:
       - ect_suitable
   education-support-jobs:
-    teaching_support_job_roles:
+    support_job_roles:
       - education_support
   head-of-year-or-phase-jobs:
     teaching_job_roles:
@@ -39,7 +39,7 @@ shared:
     teaching_job_roles:
       - headteacher
   higher-level-teaching-assistant-jobs:
-    teaching_support_job_roles:
+    support_job_roles:
       - higher_level_teaching_assistant
   sendco-jobs:
     teaching_job_roles:
@@ -48,7 +48,7 @@ shared:
     teaching_job_roles:
       - teacher
   teaching-assistant-jobs:
-    teaching_support_job_roles:
+    support_job_roles:
       - teaching_assistant
 
   ### Phases

config/locales/jobs.yml

@@ -36,14 +36,11 @@ en:
     filters:
       campaign:
         teaching_job_roles: Teaching & leadership roles
-        teaching_support_job_roles: Teaching support roles
-        non_teaching_support_job_roles: Non-teaching support roles
+        support_job_roles: Support roles
       job_filters: Job Filters
       job_type: Job type
       job_roles: Job role
       teaching_job_roles: Teaching & leadership
-      teaching_support_job_roles: Teaching support
-      non_teaching_support_job_roles: Non-teaching support
       support_job_roles: Support
       ect_suitable: Suitable for early career teachers
       subject: Subject
@@ -412,6 +409,4 @@ en:
       sort_by_link: Sort jobs by %{column} in %{order}ending order
       filters:
         teaching_job_roles: Teaching & leadership job roles
-        teaching_support_job_roles: Teaching support job roles
-        non_teaching_support_job_roles: Non-teaching support job roles
         support_job_roles: Support job roles

config/search/keyword_filter_mappings.yml

@@ -223,7 +223,7 @@
   subjects:
     - History
 "hlta":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
 "hospitality":
   phases:
@@ -319,7 +319,7 @@
     - head_of_year_or_phase
     - head_of_department_or_curriculum
 "learning support assistant":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
     - education_support
 "literacy":
@@ -334,7 +334,7 @@
   subjects:
     - English
 "lsa":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
     - education_support
 "mandarin":
@@ -616,7 +616,7 @@
   ect_statuses:
     - ect_suitable
 "support":
-  teaching_support_job_roles:
+  support_job_roles:
     - education_support
 "systems":
   phases:
@@ -625,7 +625,7 @@
   subjects:
     - Design and technology
 "ta":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
 "teach":
   teaching_job_roles:
@@ -652,10 +652,10 @@
   teaching_job_roles:
     - teacher
 "teaching assistant":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
 "teaching assistants":
-  teaching_support_job_roles:
+  support_job_roles:
     - teaching_assistant
 "textiles":
   phases:

spec/factories/subscriptions.rb

@@ -8,8 +8,7 @@
         radius: "10",
         working_patterns: %w[full_time part_time],
         teaching_job_roles: %w[teacher],
-        teaching_support_job_roles: %w[teaching_assistant],
-        non_teaching_support_job_roles: %w[it_support],
+        support_job_roles: %w[teaching_assistant it_support],
         ect_statuses: %w[ect_suitable],
         phases: %w[primary] }
     end