diff --git a/app/models/concerns/eligibility_checkable.rb b/app/models/concerns/eligibility_checkable.rb index b5decfc117..77cd0f2dda 100644 --- a/app/models/concerns/eligibility_checkable.rb +++ b/app/models/concerns/eligibility_checkable.rb @@ -3,7 +3,6 @@ module EligibilityCheckable FIRST_COMBINED_ECP_AND_LUP_POLICY_YEAR = AcademicYear.new(2022) FINAL_COMBINED_ECP_AND_LUP_POLICY_YEAR = AcademicYear.new(2024) - FINAL_LUP_POLICY_YEAR = AcademicYear.new(2025) COMBINED_ECP_AND_LUP_POLICY_YEARS = FIRST_COMBINED_ECP_AND_LUP_POLICY_YEAR..FINAL_COMBINED_ECP_AND_LUP_POLICY_YEAR COMBINED_ECP_AND_LUP_POLICY_YEARS_BEFORE_FINAL_YEAR = FIRST_COMBINED_ECP_AND_LUP_POLICY_YEAR...FINAL_COMBINED_ECP_AND_LUP_POLICY_YEAR diff --git a/app/models/journeys/additional_payments_for_teaching.rb b/app/models/journeys/additional_payments_for_teaching.rb index 83c2dbafb6..a217a6abf4 100644 --- a/app/models/journeys/additional_payments_for_teaching.rb +++ b/app/models/journeys/additional_payments_for_teaching.rb @@ -30,16 +30,9 @@ module AdditionalPaymentsForTeaching } }.freeze - def final_policy_year(policy) - { - Policies::EarlyCareerPayments => EligibilityCheckable::FINAL_COMBINED_ECP_AND_LUP_POLICY_YEAR, - Policies::LevellingUpPremiumPayments => EligibilityCheckable::FINAL_LUP_POLICY_YEAR - }[policy] - end - def set_a_reminder?(itt_academic_year:, policy:) policy_year = configuration.current_academic_year - return false if policy_year >= final_policy_year(policy) + return false if policy_year >= policy::POLICY_END_YEAR next_year = policy_year + 1 eligible_itt_years = JourneySubjectEligibilityChecker.selectable_itt_years_for_claim_year(next_year) diff --git a/app/models/policies/levelling_up_premium_payments.rb b/app/models/policies/levelling_up_premium_payments.rb index 6926875a2f..3679b8c1a4 100644 --- a/app/models/policies/levelling_up_premium_payments.rb +++ b/app/models/policies/levelling_up_premium_payments.rb @@ -27,7 +27,7 @@ module LevellingUpPremiumPayments SEARCHABLE_ELIGIBILITY_ATTRIBUTES = %w[teacher_reference_number].freeze POLICY_START_YEAR = AcademicYear.new(2022).freeze - POLICY_END_YEAR = AcademicYear.new(2024).freeze + POLICY_END_YEAR = AcademicYear.new(2025).freeze # Percentage of claims to QA MIN_QA_THRESHOLD = 10 diff --git a/spec/lib/ineligibility_reason_checker_spec.rb b/spec/lib/ineligibility_reason_checker_spec.rb index d2c19ada0a..4547608848 100644 --- a/spec/lib/ineligibility_reason_checker_spec.rb +++ b/spec/lib/ineligibility_reason_checker_spec.rb @@ -278,7 +278,7 @@ :additional_payments_answers, :ecp_and_lup_eligible, :trainee_teacher, - academic_year: AcademicYear.new(2024), + academic_year: AcademicYear.new(2025), current_school_id: school.id ) end