CST-2558: newly registered participants with induction start date in …

…payments-frozen cohort are now placed in the cohort currently open for registration
DFE-Digital · May 29, 2024 · 77a3410 · 77a3410
1 parent 5d16337
commit 77a3410
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/forms/schools/add_participants/base_wizard.rb b/app/forms/schools/add_participants/base_wizard.rb
@@ -467,8 +467,9 @@ def cohort_to_place_participant
         if transfer?
           existing_participant_cohort || existing_participant_profile&.schedule&.cohort
         elsif ect_participant? && induction_start_date.present?
-          Cohort.containing_date(induction_start_date).tap do |cohort|
+          Cohort.for_induction_start_date(induction_start_date).tap do |cohort|
             return Cohort.current if cohort.blank? || cohort.npq_plus_one_or_earlier?
+            return Cohort.active_registration_cohort if cohort.payments_frozen?
           end
         elsif Cohort.within_automatic_assignment_period?
           # true from 1/9 to end of automatic assignment period

diff --git a/spec/models/cohort_spec.rb b/spec/models/cohort_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 RSpec.describe Cohort, type: :model do
-  let!(:cohort_2024) { FactoryBot.create :seed_cohort, start_year: 2024 }
+  let!(:cohort_2024) { Cohort.find_by_start_year(2024) }
 
   describe "associations" do
     it { is_expected.to have_many(:call_off_contracts) }