CAPT 2793 year2 reapply by raul-gracia · Pull Request #4136 · DFE-Digital/claim-additional-payments-for-teaching

raul-gracia · 2025-10-08T13:51:27Z

Add Year 2 provider verification auto-pass logic
Fix test failures for Year 2 provider verification

github-actions · 2025-10-08T21:06:13Z

Deployments

Journey	URL
Targeted Retention Payments	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/targeted-retention-incentive-payments/landing-page
Student Loans	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/student-loans/claim
Further Education	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/further-education-payments/landing-page
Further Education Providers	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/further-education-payments/providers/claims
Early Years Payment	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/early-years-payment/landing-page
Relocation Payments	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/get-a-teacher-relocation-payment/landing-page
Admin	https://claim-additional-payments-for-teaching-review-4136-web.test.teacherservices.cloud/admin

asmega · 2025-10-14T12:43:05Z

app/jobs/tasks/provider_verification_job.rb

+module Tasks
+  class ProviderVerificationJob < ApplicationJob


to keep everything aligned I think we plan to name it FeProviderVerificationV2Job

see:

https://github.com/DFE-Digital/claim-additional-payments-for-teaching/pull/4107/files#diff-e4eb3c43eb4f027ef2695156f7112467295c87db46877849edd11fe15bc5a39eR1-R2

https://github.com/DFE-Digital/claim-additional-payments-for-teaching/pull/4138/files#diff-e4eb3c43eb4f027ef2695156f7112467295c87db46877849edd11fe15bc5a39eR1-R2

I've renamed this to FeProviderVerificationV2Job

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb

asmega · 2025-10-15T11:36:12Z

app/models/automated_checks/claim_verifiers/provider_verification.rb

+module AutomatedChecks
+  module ClaimVerifiers
+    class ProviderVerification


the check was also renamed. otherwise i think calling the class one name and the task name another will lead to confusion. see:

https://github.com/DFE-Digital/claim-additional-payments-for-teaching/pull/4107/files#diff-ea102a66f389acaff1d3ec606dcfef7e797af8b5dd11ecf90c4bc3429c6c21beR1-R3

https://github.com/DFE-Digital/claim-additional-payments-for-teaching/pull/4138/files#diff-ea102a66f389acaff1d3ec606dcfef7e797af8b5dd11ecf90c4bc3429c6c21beR1-R3

Agreed.
I've already updated this in my latest changes:

Class: AutomatedChecks::ClaimVerifiers::ProviderVerificationV2

Task name: fe_provider_verification_v2

Job: Tasks::FeProviderVerificationV2Job

asmega · 2025-10-15T11:40:33Z

app/forms/further_education_payments/providers/claims/verification/check_answers_form.rb

            # this has been completed.
            if claim.eligibility.provider_verification_claimant_employment_check_declaration
              Policies::FurtherEducationPayments.alternative_idv_completed!(claim)
+            elsif claim.academic_year != AcademicYear.new("2024/2025")


i think this guard is not needed? as it looks like you've already got a guard on #perform on the automated check. i think if we delegate the responsibility down each job/check can decide if it wants to process the claim or not, pushing things down the stack

Also no 2024/2025 claims will go through this wizard

You're right, I'll remove the conditional and always call provider_verification_completed!

asmega · 2025-10-15T11:46:39Z

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb

+          verification: {
+            "verifier" => {


verifier also applies to Y1 and has been superseded by provider_verification_verified_by_id for Y2 I believe

I've updated the spec

rjlynch · 2025-10-15T12:28:10Z

spec/models/automated_checks/claim_verifiers/provider_verification_spec.rb

+                verification: {
+                  assertions: [
+                    {name: "teaching_responsibilities", outcome: true},
+                    {name: "teaching_start_year_matches_claim", outcome: true},
+                    {name: "half_teaching_hours", outcome: true},
+                    {name: "subjects_taught", outcome: true},
+                    {name: "taught_at_least_one_term", outcome: true}
+                  ],
+                  verifier: {
+                    dfe_sign_in_uid: "123",
+                    first_name: "Seymour",
+                    last_name: "Skinner",
+                    email: "seymore.skinner@springfield-elementary.edu",
+                    dfe_sign_in_organisation_name: "Springfield Elementary",
+                    dfe_sign_in_role_codes: ["teacher_payments_claim_verifier"]
+                  },
+                  created_at: Time.zone.now
+                }


For year 2 claims we wont be writing anything to the further_education_payments_eligibilities.verification column. The year 1 journey that did write to this column has been removed. The column is only kept around for displaying last year's claims

rjlynch · 2025-10-15T12:32:30Z

app/models/automated_checks/claim_verifiers/provider_verification_v2.rb

+        when "more_than_12"
+          "20_or_more_hours_per_week"
+        when "between_2_5_and_12"
+          "2_and_a_half_to_12_hours_per_week"
+        when "less_than_2_5"
+          "fewer_than_2_and_a_half_hours_per_week"
+        else
+          provider_hours
+        end


It looks like if the claimant choses more_than_20 then this task will always pass, even if the provider entered a different value (eg fewer_than_2_and_a_half_hours_per_week)?

rjlynch · 2025-10-15T12:35:53Z

app/models/automated_checks/claim_verifiers/provider_verification.rb

+      end
+
+      def find_or_create_verifier_user
+        verifier_data = verification.fetch("verifier")


This will always throw when this task runs as verification will be {}

https://app.rollbar.com/a/dfe-digital/fix/item/dfe-claims/2219#detail

rjlynch · 2025-10-15T12:45:58Z

app/models/policies/further_education_payments/admin_tasks_presenter.rb

+        claimant_value = case eligibility.teaching_qualification
+        when "yes"
+          "Yes"
+        when "not_yet"
+          "Not yet, I am currently enrolled on one and working towards completing it"
+        when "no_but_planned"
+          "No, but I plan to enrol on one in the next 12 months"
+        when "no_not_planned"
+          "No, and I do not plan to enrol on one in the next 12 months"
+        else
+          "Not provided"
+        end


Should probably use the locales file for this
I18n.t(eligibility.teaching_qualification, scope: 'further_education_payments.forms.teaching_qualification.options')

rjlynch · 2025-10-15T12:47:00Z

app/models/policies/further_education_payments/admin_tasks_presenter.rb

-          "Timetabled teaching hours",
+        claimant_mapped = case eligibility.teaching_hours_per_week
+        when "more_than_12"
+          "20 hours or more each week"


Should this be "12 hours or more each week"?

rjlynch · 2025-10-15T12:49:13Z

app/models/policies/further_education_payments.rb


    VERIFIERS = [
      AutomatedChecks::ClaimVerifiers::OneLoginIdentity,
+      AutomatedChecks::ClaimVerifiers::ProviderVerification, # Year 2+ only


I don't think we want this verifier in the list that runs on initial claim submission, I think we only want it to run after the provider has submitted their part of the claim (which we're doing a few lines below with the provider_verification_completed! hook)

rjlynch · 2025-10-15T13:00:17Z

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb

+      within(".fe_provider_verification_v2") do
+        first("a").click
+      end


Is there a reason we've changed this? Seems quite a bit less readable?

rjlynch · 2025-10-15T13:04:00Z

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb

+      claim.tasks.create!(
+        name: "fe_provider_verification_v2",
+        passed: false,
+        manual: true
+      )


How come we need to create a task here?
If the provider hasn't completed verification then there won't be a task (unless an admin manually submits the task form, which we don't want to allow until the verification has been completed.)

rjlynch · 2025-10-15T13:06:20Z

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb


  def within_table_row(label, &block)
-    within(first("tr", text: label)) do
+    within(first("th", exact_text: label).find(:xpath, "./..")) do


It's fine to change this but I'm just wondering why it needed to change if we've not changed any view files?

rjlynch · 2025-10-15T13:10:16Z

app/forms/further_education_payments/providers/claims/verification/check_answers_form.rb

            # this has been completed.
            if claim.eligibility.provider_verification_claimant_employment_check_declaration
              Policies::FurtherEducationPayments.alternative_idv_completed!(claim)
+            elsif claim.academic_year != AcademicYear.new("2024/2025")


We still want the provider_verification_completed! hook to run even if the provider had to do ALT IDV before verifying the claim's eligibility.

Implements Year 2 (2025/2026+) enhancements for FE provider verification: - Add new Year 2 specific fields to AdminTasksPresenter: * Teaching qualification with 4 options * Performance measures (renamed label) * Disciplinary action (renamed label) * Teaching hours with hour ranges * Conditional fields (hours next term, full academic year, taught one term) - Create ProviderVerification auto-check verifier: * Auto-pass when all conditions met * Auto-fail when any condition fails * Skip Year 1 (2024/2025) claims * Uses teaching_start_year_matches_claim field * Maps teaching hours correctly (more_than_12 -> 20_or_more_hours_per_week) - Add ProviderVerificationJob to trigger auto-check - Add provider_verification_completed! hook for Year 2+ claims - Add comprehensive test coverage for auto-pass/fail logic Adapted to master architecture: - Uses row-based AdminTasksPresenter approach (not separate presenter) - Field: teaching_start_year_matches_claim (not in_first_five_years) - Contract: no_direct_contract (not employed_by_another_organisation) - Year-based routing already exists via admin_tasks_presenter method

- Update further_education_payments_spec to include ProviderVerification in VERIFIERS - Update fe_provider_verification_v2_spec for Year 2 ordering and field displays - Change task name from 'provider_verification' to 'fe_provider_verification_v2' for Year 2 - Update all provider verification specs to use correct task name - Add academic_year specification to Year 2 tests - Update field label expectations (performance/disciplinary renamed with "Subject to") - Update hours display expectation (more_than_12 -> "20 hours or more each week") - Add teaching qualification and contract covers full year to test expectations

Address PR review feedback: - Rename ProviderVerificationJob to FeProviderVerificationV2Job for consistency - Remove unnecessary FactoryBot.reload from spec - Update verifier to check Year 2 eligibility columns instead of Year 1 assertions - Fix specs to include required Year 2 provider verification columns Changes: - Job: ProviderVerificationJob → FeProviderVerificationV2Job - Verifier: Check provider_verification_* columns directly instead of parsing assertions hash - Specs: Add missing provider_verification_teaching_responsibilities, provider_verification_teaching_start_year_matches_claim, and provider_verification_half_teaching_hours to test data - Remove Year 1 assertions array from Year 2 test data where not needed

- Fix FeProviderVerificationV2Job spec to create FE claims - Add valid reason check for teaching qualification in ProviderVerificationV2 - Fix I18n scope for teaching hours per week - Update AdminTasksPresenter spec to use flexible row matching - Update performance/disciplinary label expectations

asmega · 2026-02-27T10:13:19Z

No longer required, this is now a stale branch and requirements have been implemented elsewhere

raul-gracia added the deploy Deploy a review app for this PR label Oct 8, 2025

raul-gracia had a problem deploying to review October 8, 2025 14:07 — with GitHub Actions Failure

raul-gracia force-pushed the CAPT-2793-year2-reapply branch from 4880b9e to 6ea1201 Compare October 8, 2025 20:59

raul-gracia temporarily deployed to review October 8, 2025 21:03 — with GitHub Actions Inactive

raul-gracia force-pushed the CAPT-2793-year2-reapply branch from 6ea1201 to ee18207 Compare October 8, 2025 23:57

raul-gracia temporarily deployed to review October 8, 2025 23:58 — with GitHub Actions Inactive

raul-gracia requested review from asmega and rjlynch and removed request for rjlynch October 9, 2025 08:50

raul-gracia mentioned this pull request Oct 9, 2025

CAPT-2793 implement Year 2 enhancements for FE provider verification #4064

Closed

raul-gracia requested review from kenfodder and rjlynch October 9, 2025 16:36

raul-gracia temporarily deployed to review October 13, 2025 08:48 — with GitHub Actions Inactive

raul-gracia temporarily deployed to review October 14, 2025 12:22 — with GitHub Actions Inactive

asmega reviewed Oct 14, 2025

View reviewed changes

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb Outdated Show resolved Hide resolved

asmega reviewed Oct 14, 2025

View reviewed changes

spec/features/admin/tasks/further_education_payments/fe_provider_verification_v2_spec.rb Outdated Show resolved Hide resolved

raul-gracia temporarily deployed to review October 15, 2025 10:24 — with GitHub Actions Inactive

raul-gracia temporarily deployed to review October 15, 2025 11:05 — with GitHub Actions Inactive

asmega reviewed Oct 15, 2025

View reviewed changes

rjlynch reviewed Oct 15, 2025

View reviewed changes

raul-gracia force-pushed the CAPT-2793-year2-reapply branch from 552bee0 to 3de2159 Compare October 16, 2025 08:36

raul-gracia temporarily deployed to review October 16, 2025 08:38 — with GitHub Actions Inactive

raul-gracia removed the deploy Deploy a review app for this PR label Oct 24, 2025

raul-gracia force-pushed the CAPT-2793-year2-reapply branch 2 times, most recently from f50f551 to 2f29cec Compare October 24, 2025 13:30

raul-gracia added 5 commits October 24, 2025 14:39

Adding temporary seed data for easy review

7a15855

raul-gracia force-pushed the CAPT-2793-year2-reapply branch from 2f29cec to 75686d9 Compare October 24, 2025 14:25

raul-gracia added the deploy Deploy a review app for this PR label Oct 24, 2025

raul-gracia temporarily deployed to review October 24, 2025 14:31 — with GitHub Actions Inactive

asmega closed this Feb 27, 2026

asmega deleted the CAPT-2793-year2-reapply branch February 27, 2026 10:13

Conversation

raul-gracia commented Oct 8, 2025

Uh oh!

github-actions bot commented Oct 8, 2025

Deployments

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

asmega Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

asmega commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

asmega Oct 15, 2025 •

edited

Loading