Merge pull request #6749 from DFE-Digital/reinstate_legacy_job_roles_…

…for_subscriptions Temporarily allow legacy job role in job alerts
DFE-Digital · Mar 21, 2024 · d1f5055 · d1f5055
2 parents f98ea22 + 02c3132
commit d1f5055
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/presenters/subscription_presenter.rb b/app/presenters/subscription_presenter.rb
@@ -5,6 +5,7 @@ class SubscriptionPresenter < BasePresenter
   SEARCH_CRITERIA_SORT_ORDER = %w[organisation_slug
                                   keyword
                                   location
+                                  job_roles
                                   teaching_job_roles
                                   teaching_support_job_roles
                                   non_teaching_support_job_roles
@@ -50,6 +51,8 @@ def search_criteria_field(field, value)
 
   def job_roles_filter(field, value)
     case field
+    when "job_roles"
+      render_legacy_job_roles_filter(value)
     when "teaching_job_roles"
       render_teaching_job_roles_filter(value)
     when "teaching_support_job_roles"
@@ -71,6 +74,10 @@ def render_location_filter(location, radius)
     end
   end
 
+  def render_legacy_job_roles_filter(value)
+    { job_role: value.map { |role| I18n.t("helpers.label.publishers_job_listing_job_role_form.job_role_options.#{role}") }.join(", ") }
+  end
+
   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

diff --git a/spec/presenters/subscription_presenter_spec.rb b/spec/presenters/subscription_presenter_spec.rb
@@ -102,6 +102,7 @@
           phases: %w[secondary sixth_form_or_college],
           organisation_slug: organisation.slug,
           radius: "10",
+          job_roles: %w[headteacher head_of_year_or_phase],
           teaching_job_roles: %w[headteacher head_of_year_or_phase],
           teaching_support_job_roles: %w[teaching_assistant],
           non_teaching_support_job_roles: %w[it_support],
@@ -119,6 +120,7 @@
           organisation_type_basic(organisation).titleize,
           "keyword",
           "location",
+          "job_role",
           "teaching_job_roles",
           "teaching_support_job_roles",
           "non_teaching_support_job_roles",
@@ -140,6 +142,7 @@
           something_else: "testing",
           phases: %w[secondary sixth_form_or_college],
           organisation_slug: organisation.slug,
+          job_roles: %w[headteacher head_of_year_or_phase],
           teaching_job_roles: %w[headteacher head_of_year_or_phase],
           teaching_support_job_roles: %w[teaching_assistant],
           non_teaching_support_job_roles: %w[it_support],
@@ -155,6 +158,7 @@
           organisation_type_basic(organisation).titleize,
           "keyword",
           "location",
+          "job_role",
           "teaching_job_roles",
           "teaching_support_job_roles",
           "non_teaching_support_job_roles",