Fix declaration cohort outside of factory

I wanted to do this in the factory originally, but it creates a cyclic dependency on the `participant_profile -> cohort` so we need to define it explicitly for now.
DFE-Digital · May 20, 2024 · 30e3704 · 30e3704
1 parent 397ed9d
commit 30e3704
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/spec/factories/participant_declaration.rb b/spec/factories/participant_declaration.rb
@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :participant_declaration do
     declaration_type { "started" }
-    cohort { participant_profile.schedule.cohort || Cohort.current || create(:cohort, :current) }
+    cohort { Cohort.current || create(:cohort, :current) }
 
     declaration_date do
       participant_profile.schedule.milestones.find_by!(declaration_type:).start_date

diff --git a/spec/factories/services/npq/npq_application.rb b/spec/factories/services/npq/npq_application.rb
@@ -116,7 +116,8 @@
                declaration_type: "started",
                participant_profile: npq_application.profile,
                course_identifier: npq_application.npq_course.identifier,
-               cpd_lead_provider: npq_application.npq_lead_provider.cpd_lead_provider)
+               cpd_lead_provider: npq_application.npq_lead_provider.cpd_lead_provider,
+               cohort: npq_application.cohort)
       end
     end
   end

diff --git a/spec/services/api/v3/participant_declarations_query_spec.rb b/spec/services/api/v3/participant_declarations_query_spec.rb
@@ -42,6 +42,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile1,
           delivery_partner: delivery_partner1,
+          cohort: participant_profile1.schedule.cohort,
         )
 
         ParticipantDeclaration.where(id: declaration.id).select(:id, :created_at).first
@@ -56,6 +57,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile2,
           delivery_partner: delivery_partner2,
+          cohort: participant_profile2.schedule.cohort,
         )
 
         ParticipantDeclaration.where(id: declaration.id).select(:id, :created_at).first
@@ -70,6 +72,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile3,
           delivery_partner: delivery_partner2,
+          cohort: participant_profile3.schedule.cohort,
         )
 
         ParticipantDeclaration.where(id: declaration.id).select(:id, :created_at).first
@@ -84,6 +87,7 @@
           cpd_lead_provider: cpd_lead_provider2,
           participant_profile: participant_profile4,
           delivery_partner: delivery_partner1,
+          cohort: participant_profile4.schedule.cohort,
         )
 
         ParticipantDeclaration.where(id: declaration.id).select(:id, :created_at).first
@@ -110,6 +114,7 @@
               cpd_lead_provider: cpd_lead_provider2,
               participant_profile: transfer_induction_record.participant_profile,
               delivery_partner: delivery_partner1,
+              cohort: transfer_induction_record.participant_profile.schedule.cohort,
             )
 
             ParticipantDeclaration.where(id: declaration.id).select(:id, :created_at).first
@@ -300,6 +305,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile1,
           delivery_partner: delivery_partner1,
+          cohort: participant_profile1.schedule.cohort,
         )
       end
     end
@@ -312,6 +318,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile2,
           delivery_partner: delivery_partner2,
+          cohort: participant_profile2.schedule.cohort,
         )
       end
     end
@@ -324,6 +331,7 @@
           cpd_lead_provider: cpd_lead_provider1,
           participant_profile: participant_profile3,
           delivery_partner: delivery_partner2,
+          cohort: participant_profile3.schedule.cohort,
         )
       end
     end
@@ -336,6 +344,7 @@
           cpd_lead_provider: cpd_lead_provider2,
           participant_profile: participant_profile4,
           delivery_partner: delivery_partner1,
+          cohort: participant_profile4.schedule.cohort,
         )
       end
     end
@@ -373,6 +382,7 @@
         cpd_lead_provider: cpd_lead_provider1,
         participant_profile: participant_profile1,
         delivery_partner: delivery_partner1,
+        cohort: participant_profile1.schedule.cohort,
       )
     end
 
@@ -402,6 +412,7 @@
           cpd_lead_provider: cpd_lead_provider2,
           participant_profile: transfer_induction_record.participant_profile,
           delivery_partner: delivery_partner1,
+          cohort: transfer_induction_record.participant_profile.schedule.cohort,
         )
       end