Update program type before save is committed

`after_save :update_program_type!` sets the program type after the record has been saved to the database. This doesn't update the database record unless it is saved again.
DFE-Digital · Nov 22, 2024 · cbf3d15 · cbf3d15
1 parent 137a46e
commit cbf3d15
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/app/models/course.rb b/app/models/course.rb
@@ -116,7 +116,7 @@ class Course < ApplicationRecord
   after_validation :remove_unnecessary_enrichments_validation_message
   before_save :set_applications_open_from
 
-  after_save :update_program_type!, if: :saved_change_to_funding?
+  before_save :update_program_type!, if: :will_save_change_to_funding?
 
   belongs_to :provider
 

diff --git a/spec/features/find/result_page_filters/salary_spec.rb b/spec/features/find/result_page_filters/salary_spec.rb
@@ -26,49 +26,56 @@ def given_i_have_salaried_and_fee_courses
       :secondary,
       :open,
       site_statuses:,
-      program_type: :higher_education_programme
+      program_type: :higher_education_programme,
+      funding: :fee
     )
     @course_scitt_salaried_programme = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :scitt_salaried_programme
+      program_type: :scitt_salaried_programme,
+      funding: :salary
     )
     @course_higher_education_salaried_programme = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :higher_education_salaried_programme
+      program_type: :higher_education_salaried_programme,
+      funding: :salary
     )
     @course_school_direct_training_programme = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :school_direct_training_programme
+      program_type: :school_direct_training_programme,
+      funding: :fee
     )
     @course_school_direct_salaried_training_programme = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :school_direct_salaried_training_programme
+      program_type: :school_direct_salaried_training_programme,
+      funding: :salary
     )
     @course_scitt_programme = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :scitt_programme
+      program_type: :scitt_programme,
+      funding: :fee
     )
     @course_pg_teaching_apprenticeship = create(
       :course,
       :secondary,
       :open,
       site_statuses:,
-      program_type: :pg_teaching_apprenticeship
+      program_type: :pg_teaching_apprenticeship,
+      funding: :apprenticeship
     )
   end