wip ci run

app/models/concerns/eligibility_checkable.rb

@@ -50,6 +50,7 @@ def trainee_teacher?
 
   def common_ineligible_attributes?
     [
+      policy_closed?,
       indicated_ineligible_school?,
       supply_teacher_lacking_either_long_contract_or_direct_employment?,
       poor_performance?,
@@ -59,6 +60,10 @@ def common_ineligible_attributes?
     ].any?
   end
 
+  def policy_closed?
+    policy.closed?(claim_year)
+  end
+
   def indicated_ineligible_school?
     current_school.present? && !policy::SchoolEligibility.new(current_school).eligible?
   end

app/models/policies/early_career_payments.rb

@@ -173,5 +173,9 @@ def future_years(year)
     def selectable_itt_years_for_claim_year(claim_year)
       (AcademicYear.new(claim_year - 5)...AcademicYear.new(claim_year)).to_a
     end
+
+    def closed?(claim_year)
+      claim_year > POLICY_END_YEAR
+    end
   end
 end

app/models/policies/early_career_payments/eligibility.rb

@@ -34,7 +34,7 @@ def policy
           hsh[year] = AcademicYear::Type.new.serialize(year)
         end.merge({AcademicYear.new => AcademicYear::Type.new.serialize(AcademicYear.new)})
 
-      enum :itt_academic_year, ITT_ACADEMIC_YEARS
+      enum :itt_academic_year, ITT_ACADEMIC_YEARS, validate: true
 
       enum :qualification, {
         postgraduate_itt: 0,

app/models/policies/levelling_up_premium_payments.rb

@@ -158,5 +158,9 @@ def future_years(year)
     def selectable_itt_years_for_claim_year(claim_year)
       (AcademicYear.new(claim_year - 5)...AcademicYear.new(claim_year)).to_a
     end
+
+    def closed?(claim_year)
+      claim_year > POLICY_END_YEAR
+    end
   end
 end

app/views/additional_payments/claims/_ineligibility_ecp_only_ecp_closed.html.erb

@@ -0,0 +1,17 @@
+<p class="govuk-body">
+  You are not eligible for the
+  <%= link_to("early-career payment (opens in new tab)", Policies::EarlyCareerPayments.eligibility_criteria_url, class: "govuk-link", target: "_blank") %>
+  because the policy has now closed.
+</p>
+<p class="govuk-body">
+  You are not eligible for the
+  <%= link_to("#{I18n.t("levelling_up_premium_payments.policy_short_name").downcase} (opens in new tab)", Policies::LevellingUpPremiumPayments.eligibility_criteria_url, class: "govuk-link", target: "_blank") %>
+  because the school you teach in is not eligible. <%= I18n.t("levelling_up_premium_payments.policy_short_name").capitalize.pluralize %> are offered in schools identified as having a higher need for teachers.
+</p>
+
+<p class="govuk-body">
+  For more information, check the eligibility criteria for
+  <%= link_to("early-career payments", Policies::EarlyCareerPayments.eligibility_criteria_url, class: "govuk-link") %>
+  and
+  <%= link_to(I18n.t("levelling_up_premium_payments.policy_short_name").downcase.pluralize, Policies::LevellingUpPremiumPayments.eligibility_criteria_url, class: "govuk-link") %>.
+</p>

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2024_11_26_105650) do
+ActiveRecord::Schema[8.0].define(version: 2024_11_29_103823) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "pg_catalog.plpgsql"
@@ -113,7 +113,11 @@
     t.date "onelogin_idv_date_of_birth"
     t.datetime "started_at", precision: nil, null: false
     t.datetime "verified_at"
+    t.index "lower((email_address)::text)", name: "index_claims_on_lower_email_address"
+    t.index "lower((first_name)::text), lower((surname)::text), date_of_birth", name: "index_claims_on_personal_details"
+    t.index "lower((national_insurance_number)::text)", name: "index_claims_on_lower_national_insurance_number"
     t.index ["academic_year"], name: "index_claims_on_academic_year"
+    t.index ["bank_account_number", "bank_sort_code"], name: "index_claims_on_bank_details"
     t.index ["created_at"], name: "index_claims_on_created_at"
     t.index ["eligibility_type", "eligibility_id"], name: "index_claims_on_eligibility_type_and_eligibility_id"
     t.index ["held"], name: "index_claims_on_held"

lib/ineligibility_reason_checker.rb

@@ -4,7 +4,9 @@ def initialize(answers)
   end
 
   def reason
-    if current_school?
+    if ecp_only_and_ecp_closed?
+      :ecp_only_ecp_closed
+    elsif current_school?
       :current_school
     elsif dqt_data_ineligible?
       :dqt_data_ineligible
@@ -41,6 +43,15 @@ def reason
 
   private
 
+  def ecp_only_and_ecp_closed?
+    school = @answers.current_school
+
+    [
+      Policies::EarlyCareerPayments::SchoolEligibility.new(school).eligible?,
+      !Policies::LevellingUpPremiumPayments::SchoolEligibility.new(school).eligible?
+    ].all? && Policies::EarlyCareerPayments.closed?(@answers.policy_year)
+  end
+
   def current_school?
     school = @answers.current_school
 

spec/factories/policies/early_career_payments/eligibilities.rb

@@ -2,6 +2,10 @@
   factory :early_career_payments_eligibility, class: "Policies::EarlyCareerPayments::Eligibility" do
     award_amount { 5000.0 }
 
+    itt_academic_year do
+      Journeys.for_policy(Policies::EarlyCareerPayments).configuration.current_academic_year - 3
+    end
+
     trait :eligible do
       teacher_reference_number { generate(:teacher_reference_number) }
       eligible_now

spec/features/combined_teacher_claim_journey_spec.rb

@@ -6,9 +6,9 @@
   end
   let(:eligibility) { claim.eligibility }
 
-  before { create(:journey_configuration, :additional_payments, current_academic_year: AcademicYear.new(2023)) }
-
   scenario "Eligible for both" do
+    create(:journey_configuration, :additional_payments, current_academic_year: AcademicYear.new(2023))
+
     school = create(:school, :combined_journey_eligibile_for_all)
 
     visit new_claim_path(Journeys::AdditionalPaymentsForTeaching::ROUTING_NAME)
@@ -243,6 +243,8 @@
   end
 
   scenario "Eligible for only one" do
+    create(:journey_configuration, :additional_payments, current_academic_year: AcademicYear.new(2023))
+
     school = create(:school, :early_career_payments_uplifted)
 
     visit new_claim_path(Journeys::AdditionalPaymentsForTeaching::ROUTING_NAME)
@@ -323,4 +325,84 @@
     expect(page).not_to have_selector('input[type="radio"]')
     expect(page).to have_button("Apply now")
   end
+
+  context "when ECP is closed" do
+    before do
+      create(
+        :journey_configuration,
+        :additional_payments,
+        current_academic_year: AcademicYear.new(2025)
+      )
+    end
+
+    scenario "choosing an ecp only school is ineligible" do
+      school = create(:school, :early_career_payments_eligible)
+
+      visit new_claim_path(Journeys::AdditionalPaymentsForTeaching::ROUTING_NAME)
+
+      click_on "Continue without signing"
+
+      choose_school school
+
+      expect(page).to have_content "You are not eligible"
+      expect(page).to have_content "the policy has now closed"
+    end
+
+    scenario "choosing a lup eligible school allows completing the journey" do
+      school = create(:school, :combined_journey_eligibile_for_all)
+
+      visit new_claim_path(Journeys::AdditionalPaymentsForTeaching::ROUTING_NAME)
+
+      click_on "Continue without signing"
+
+      choose_school school
+      click_on "Continue"
+
+      # - Have you started your first year as a newly qualified teacher?
+      choose "Yes"
+      click_on "Continue"
+
+      # - Have you completed your induction as an early-career teacher?
+      choose "Yes"
+      click_on "Continue"
+
+      # - Are you currently employed as a supply teacher
+      choose "No"
+      click_on "Continue"
+
+      # - Poor performance
+      within all(".govuk-fieldset")[0] do
+        choose("No")
+      end
+      within all(".govuk-fieldset")[1] do
+        choose("No")
+      end
+      click_on "Continue"
+
+      # - What route into teaching did you take?
+      choose("Undergraduate initial teacher training (ITT)")
+      click_on "Continue"
+
+      # - In which academic year did you complete your undergraduate ITT?
+      choose("2024 to 2025")
+      click_on "Continue"
+
+      # - Which subject did you do your undergraduate ITT in
+      choose "Mathematics"
+      click_on "Continue"
+
+      # Do you spend at least half of your contracted hours teaching eligible
+      # subjects?
+      choose "Yes"
+      click_on "Continue"
+
+      # Check your answers
+      click_on "Continue"
+
+      expect(page).to have_content("You’re eligible for an additional payment")
+      expect(page).to have_content(
+        "you can apply for a school targeted retention incentive"
+      )
+    end
+  end
 end

spec/models/policies/early_career_payments/eligibility_spec.rb

@@ -3,6 +3,14 @@
 require "rails_helper"
 
 RSpec.describe Policies::EarlyCareerPayments::Eligibility, type: :model do
+  let(:academic_year) do
+    Policies::EarlyCareerPayments::Eligibility::ITT_ACADEMIC_YEARS.keys.first
+  end
+
+  before do
+    create(:journey_configuration, :additional_payments)
+  end
+
   describe "#policy" do
     let(:early_career_payments_eligibility) { build(:early_career_payments_eligibility) }
 
@@ -16,7 +24,7 @@
 
     context "current_school not set and school_somewhere_else is not set return one is required error" do
       it "returns an error" do
-        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: nil, school_somewhere_else: nil)
+        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: nil, school_somewhere_else: nil, itt_academic_year: academic_year)
 
         expect(eligibility).not_to be_valid(:"correct-school")
         expect(eligibility.errors.messages[:current_school]).to eq(["Select the school you teach at or choose somewhere else"])
@@ -25,22 +33,22 @@
 
     context "selects a school suggested from TPS" do
       it "sets current_school and sets school_somewhere_else to false" do
-        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: school, school_somewhere_else: false)
+        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: school, school_somewhere_else: false, itt_academic_year: academic_year)
 
         expect(eligibility).to be_valid(:"correct-school")
       end
     end
 
     context "selects somewhere else and not the suggested school" do
       it "sets school_somewhere_else to true and current_school stays nil" do
-        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: nil, school_somewhere_else: true)
+        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: nil, school_somewhere_else: true, itt_academic_year: academic_year)
 
         expect(eligibility).to be_valid(:"correct-school")
       end
 
       # e.g. the teacher presses the backlink a school is already set
       it "sets school_somewhere_else to true and current_school stays remains if already set" do
-        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: school, school_somewhere_else: true)
+        eligibility = Policies::EarlyCareerPayments::Eligibility.new(current_school: school, school_somewhere_else: true, itt_academic_year: academic_year)
 
         expect(eligibility).to be_valid(:"correct-school")
       end
@@ -108,18 +116,18 @@
       end
 
       it "validates that award_amount is a positive number" do
-        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: -1_000)).not_to be_valid
-        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: 2_500)).to be_valid
+        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: -1_000, itt_academic_year: academic_year)).not_to be_valid
+        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: 2_500, itt_academic_year: academic_year)).to be_valid
       end
 
       it "validates that award_amount can be zero" do
-        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: 0)).to be_valid
+        expect(Policies::EarlyCareerPayments::Eligibility.new(award_amount: 0, itt_academic_year: academic_year)).to be_valid
       end
 
       it "validates that the award_amount is less than £7,500 when amending a claim" do
-        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_501)).not_to be_valid(:amendment)
-        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_500)).to be_valid(:amendment)
-        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_499)).to be_valid(:amendment)
+        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_501, itt_academic_year: academic_year)).not_to be_valid(:amendment)
+        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_500, itt_academic_year: academic_year)).to be_valid(:amendment)
+        expect(Policies::EarlyCareerPayments::Eligibility.new(teacher_reference_number: "1234567", award_amount: 7_499, itt_academic_year: academic_year)).to be_valid(:amendment)
       end
     end
   end