Add ats notice on sign in

richardpattinson · richardpattinson · commit 3e0d38012947 · 2026-01-16T16:14:10.000Z
diff --git a/app/controllers/publishers/ats_interstitials_controller.rb b/app/controllers/publishers/ats_interstitials_controller.rb
@@ -0,0 +1,14 @@
+class Publishers::AtsInterstitialsController < Publishers::BaseController
+  def show
+    @school = current_organisation
+    @variant = @school.ats_interstitial_variant
+  end
+
+  def update
+    if current_publisher.update(acknowledged_ats_and_religious_form_interstitial: true)
+      redirect_to organisation_jobs_with_type_path
+    else
+      render :show
+    end
+  end
+end
diff --git a/app/controllers/publishers/base_controller.rb b/app/controllers/publishers/base_controller.rb
@@ -1,19 +1,22 @@
 module Publishers
-  class BaseController < ApplicationController
-    include ReturnPathTracking
+  class Publishers::BaseController < ApplicationController
     include LoginRequired
 
     before_action :check_terms_and_conditions
-    before_action :check_candidate_profiles_interstitial_acknowledged
+    before_action :check_ats_interstitial_acknowledged
 
     helper_method :current_user
 
     def check_terms_and_conditions
       redirect_to publishers_terms_and_conditions_path unless current_publisher.accepted_terms_at?
     end
 
-    def check_candidate_profiles_interstitial_acknowledged
-      redirect_to publishers_candidate_profiles_interstitial_path unless current_publisher.nil? || current_publisher.acknowledged_candidate_profiles_interstitial?
+    def check_ats_interstitial_acknowledged
+      return if current_publisher.nil? || current_publisher.acknowledged_ats_and_religious_form_interstitial?
+
+      return if controller_path == "publishers/ats_interstitials"
+
+      redirect_to publishers_ats_interstitial_path
     end
   end
 end
diff --git a/app/controllers/publishers/candidate_profiles_interstitials_controller.rb b/app/controllers/publishers/candidate_profiles_interstitials_controller.rb
diff --git a/app/controllers/publishers/terms_and_conditions_controller.rb b/app/controllers/publishers/terms_and_conditions_controller.rb
@@ -1,6 +1,5 @@
 class Publishers::TermsAndConditionsController < Publishers::BaseController
   skip_before_action :check_terms_and_conditions, only: %i[show update]
-  skip_before_action :check_candidate_profiles_interstitial_acknowledged, only: %i[show update]
 
   def show
     @terms_and_conditions_form = Publishers::TermsAndConditionsForm.new
@@ -10,7 +9,6 @@ def update
     @terms_and_conditions_form = Publishers::TermsAndConditionsForm.new(terms_params)
     if @terms_and_conditions_form.valid?
       current_publisher.update(accepted_terms_at: Time.current)
-      redirect_to publishers_candidate_profiles_interstitial_path
     else
       render :show
     end
diff --git a/app/models/school.rb b/app/models/school.rb
@@ -65,6 +65,10 @@ def faith_school?
     religious_character.present?
   end
 
+  def catholic_school?
+    religious_character&.include?("Catholic") || false
+  end
+
   def school_type
     read_attribute(:school_type).singularize
   end
@@ -90,4 +94,14 @@ def all_organisations
   def all_organisation_ids
     [id]
   end
+
+  def ats_interstitial_variant
+    if catholic_school?
+      "catholic"
+    elsif faith_school?
+      "other_faith"
+    else
+      "non_faith"
+    end
+  end
 end
diff --git a/app/views/publishers/ats_interstitials/show.html.slim b/app/views/publishers/ats_interstitials/show.html.slim
@@ -0,0 +1,30 @@
+- scope = "ats_interstitials.#{@variant}"
+- content_for :page_title_prefix, t("ats_interstitials.shared.page_title")
+
+.govuk-grid-row
+  .govuk-grid-column-two-thirds
+    h1.govuk-heading-xl = t("ats_interstitials.shared.page_title")
+    p.govuk-body = t("ats_interstitials.shared.intro")
+
+    h2.govuk-heading-m = t("ats_interstitials.shared.ats_list_header")
+    ul.govuk-list.govuk-list--bullet
+      - t("ats_interstitials.shared.ats_points").each do |item|
+        li = item
+
+    - if I18n.exists?("#{scope}.faith_paragraph")
+      p.govuk-body = t("#{scope}.faith_paragraph")
+
+    - if I18n.exists?("#{scope}.faith_intro")
+      p.govuk-body = t("#{scope}.faith_intro")
+
+    - if I18n.exists?("#{scope}.faith_points")
+      ul.govuk-list.govuk-list--bullet
+        - t("#{scope}.faith_points").each do |item|
+          li = item
+
+    p.govuk-body
+      = govuk_link_to t("ats_interstitials.shared.guidance_link_text"),
+        post_path(section: "get-help-hiring", subcategory: "how-to-create-job-listings-and-accept-applications", post_name: "accepting-job-applications-on-teaching-vacancies")
+
+    .govuk-button-group
+      = govuk_button_to "Continue", publishers_ats_interstitial_path, method: :patch, id: "acknowledge-interstitial-button"
diff --git a/app/views/publishers/candidate_profiles_interstitials/show.html.slim b/app/views/publishers/candidate_profiles_interstitials/show.html.slim
diff --git a/config/analytics.yml b/config/analytics.yml
@@ -292,7 +292,7 @@ shared:
     - id
     - oid
     - accepted_terms_at
-    - acknowledged_candidate_profiles_interstitial
+    - acknowledged_ats_and_religious_form_interstitial
     - email
     - email_opt_out
     - last_activity_at
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -398,17 +398,34 @@ en:
       show_count: Applications (%{count})
     statistics: Statistics
 
-  candidate_profiles_interstitials:
-    page_title: You can now view candidate profiles and invite them to apply to jobs
-    intro: A candidate's profile includes their job preferences, experience and qualifications.
-    list_header: "These candidates have specified:"
-    page_description_items:
-      - "that they're able to travel to your school"
-      - "that they're interested in an education phase that matches your school"
-    outro: You'll also be notified about any new candidate profiles that match your job listings.
-    button_text: View candidate profiles
-    skip_text: Skip to job listings
-
+  ats_interstitials:
+      shared:
+        page_title: "You can now use our Applicant Tracking System (ATS)"
+        intro: "We have launched our Applicant Tracking System (ATS). This means that when you use our Keeping Children Safe in Education (KCSIE) compliant application form, you can manage applications from the beginning to the end of the hiring process."
+        ats_list_header: "Using our ATS, you can:"
+        ats_points:
+          - "update multiple applications at once"
+          - "communicate with jobseekers"
+          - "keep track of interviews"
+          - "record notes on progress for colleagues"
+        guidance_link_text: "Read our How to accept job applications guidance to find out more."
+      non_faith:
+        # (Only non-shared specific text here if any)
+      catholic:
+        faith_paragraph: "You now also have the option to use our Catholic Education Service (CES) approved online application form."
+        faith_intro: "The form asks applicants about their:"
+        faith_points:
+          - "religion"
+          - "place of worship"
+          - "baptism"
+          - "religious referees"
+      other_faith:
+        faith_paragraph: "We offer a version of the form that asks applicants questions about religion. When you use this form, it gives applicants an opportunity to tell you:"
+        faith_points:
+          - "if they have a religious denomination or faith"
+          - "how they will meet your school’s ethos and aims"
+          - "their religious reference details"
+          - "their place of worship"
   candidate_profiles_banner:
     intro: 'Candidate profiles are a new feature that allows schools to contact you about relevant jobs. With a profile you can:'
     summary_list:
diff --git a/config/routes.rb b/config/routes.rb
@@ -261,7 +261,7 @@
       get "schools/preview", to: "/publishers/organisations/schools#preview"
     end
     resource :terms_and_conditions, only: %i[show update]
-    resource :candidate_profiles_interstitial, only: %i[show]
+    resource :ats_interstitial, only: %i[show update]
     get :remove_organisation_filter, to: "publisher_preferences#remove_organisation"
   end
 
diff --git a/db/migrate/20260112141400_add_ats_interstitial_to_publishers.rb b/db/migrate/20260112141400_add_ats_interstitial_to_publishers.rb
@@ -0,0 +1,8 @@
+class AddAtsInterstitialToPublishers < ActiveRecord::Migration[7.1]
+  def change
+    add_column :publishers, :acknowledged_ats_and_religious_form_interstitial, :boolean, default: false, null: false
+    safety_assured do
+      remove_column :publishers, :acknowledged_candidate_profiles_interstitial, :boolean, default: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -634,8 +634,8 @@
     t.text "given_name_ciphertext"
     t.datetime "dismissed_new_features_page_at", precision: nil
     t.datetime "unsubscribed_from_expired_vacancy_prompt_at", precision: nil
-    t.boolean "acknowledged_candidate_profiles_interstitial", default: false, null: false
     t.boolean "email_opt_out", default: false, null: false
+    t.boolean "acknowledged_ats_and_religious_form_interstitial", default: false, null: false
     t.index ["email"], name: "index_publishers_on_email"
     t.index ["oid"], name: "index_publishers_on_oid", unique: true
   end
diff --git a/spec/factories/publishers.rb b/spec/factories/publishers.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :publisher do
     accepted_terms_at { Date.current - 5.months }
-    acknowledged_candidate_profiles_interstitial { true }
+    acknowledged_ats_and_religious_form_interstitial { true }
     dismissed_new_features_page_at { Time.now }
     email { Faker::Internet.email(domain: "contoso.com") }
     family_name { Faker::Name.last_name.delete("'") }
diff --git a/spec/models/school_spec.rb b/spec/models/school_spec.rb
@@ -39,6 +39,70 @@
     end
   end
 
+  describe "#catholic_school?" do
+    subject { build(:school, gias_data: gias_data) }
+
+    context "when the religious character is Catholic" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Catholic" } }
+
+      it "returns true" do
+        expect(subject.catholic_school?).to be true
+      end
+    end
+
+    context "when the religious character is Roman Catholic" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Roman Catholic" } }
+
+      it "returns true" do
+        expect(subject.catholic_school?).to be true
+      end
+    end
+
+    context "when the school has no religious character" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Does not apply" } }
+
+      it "returns false" do
+        expect(subject.catholic_school?).to be false
+      end
+    end
+
+    context "when the school has no gias_data" do
+      let(:gias_data) { nil }
+
+      it "returns false" do
+        expect(subject.catholic_school?).to be false
+      end
+    end
+  end
+
+  describe "#ats_interstitial_variant" do
+    subject { build(:school, gias_data: gias_data) }
+
+    context "when catholic_school? is true" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Catholic" } }
+
+      it "returns catholic" do
+        expect(subject.ats_interstitial_variant).to eq("catholic")
+      end
+    end
+
+    context "when faith_school? is true but not catholic" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Church of England" } }
+
+      it "returns other_faith" do
+        expect(subject.ats_interstitial_variant).to eq("other_faith")
+      end
+    end
+
+    context "when the school has no faith" do
+      let(:gias_data) { { "ReligiousCharacter (name)" => "Does not apply" } }
+
+      it "returns non_faith" do
+        expect(subject.ats_interstitial_variant).to eq("non_faith")
+      end
+    end
+  end
+
   describe "#urn" do
     it "must be unique" do
       create(:school, urn: "12345")
diff --git a/spec/system/publishers/publishers_can_see_ats_interstitial_spec.rb b/spec/system/publishers/publishers_can_see_ats_interstitial_spec.rb
@@ -0,0 +1,51 @@
+require "rails_helper"
+
+RSpec.describe "ATS and religious form interstitial", :js do
+  let(:organisation) { create(:school) }
+  let(:publisher) { create(:publisher, acknowledged_ats_and_religious_form_interstitial: false, accepted_terms_at: Time.current) }
+
+  before do
+    login_publisher(publisher: publisher, organisation: organisation)
+  end
+
+  after { logout }
+
+  context "when the publisher has not yet acknowledged the interstitial" do
+    it "redirects to the interstitial page and allows acknowledgement" do
+      visit organisation_jobs_with_type_path
+      expect(page).to have_current_path(publishers_ats_interstitial_path)
+
+      visit publishers_ats_interstitial_path
+      expect(page).to have_content(I18n.t("ats_interstitials.shared.page_title"))
+
+      click_on "acknowledge-interstitial-button"
+
+      expect(page).to have_current_path(organisation_jobs_with_type_path)
+      expect(publisher.reload.acknowledged_ats_and_religious_form_interstitial).to be true
+    end
+  end
+
+  context "when the publisher has already acknowledged the interstitial" do
+    let(:publisher) { create(:publisher, acknowledged_ats_and_religious_form_interstitial: true) }
+
+    it "does not show the interstitial and proceeds to the dashboard" do
+      visit organisation_jobs_with_type_path
+
+      expect(page).to have_current_path(organisation_jobs_with_type_path)
+      expect(page).to have_no_content(I18n.t("ats_interstitials.shared.page_title"))
+    end
+  end
+
+  context "when the update fails" do
+    it "renders the show page" do
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(Publisher).to receive(:update).and_return(false)
+      # rubocop:enable RSpec/AnyInstance
+
+      visit publishers_ats_interstitial_path
+      click_on "acknowledge-interstitial-button"
+
+      expect(page).to have_content(I18n.t("ats_interstitials.shared.page_title"))
+    end
+  end
+end
diff --git a/spec/system/publishers/publishers_can_view_candidate_interstitial_spec.rb b/spec/system/publishers/publishers_can_view_candidate_interstitial_spec.rb
diff --git a/spec/system/publishers/publishers_have_to_accept_terms_spec.rb b/spec/system/publishers/publishers_have_to_accept_terms_spec.rb
