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.

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
 

spec/factories/courses.rb

@@ -165,18 +165,22 @@
 
     trait :with_higher_education do
       program_type { :higher_education_programme }
+      funding { :fee }
     end
 
     trait :with_school_direct do
       program_type { :school_direct_training_programme }
+      funding { :fee }
     end
 
     trait :with_scitt do
       program_type { :scitt_programme }
+      funding { :fee }
     end
 
     trait :with_apprenticeship do
       program_type { :pg_teaching_apprenticeship }
+      funding { :apprenticeship }
     end
 
     trait :with_teacher_degree_apprenticeship do
@@ -186,13 +190,15 @@
 
     trait :with_salary do
       program_type { :school_direct_salaried_training_programme }
+      funding { :salary }
     end
 
     trait :fee_type_based do
       program_type do
         %i[higher_education_programme school_direct_training_programme
            scitt_programme].sample
       end
+      funding { :fee }
     end
 
     trait :fee do
@@ -209,6 +215,7 @@
 
     trait :salary_type_based do
       program_type { %i[pg_teaching_apprenticeship school_direct_salaried_training_programme].sample }
+      funding { :salary }
     end
 
     trait :non_salary_type_based do

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
 

spec/features/publish/courses/editing_course_length_spec.rb

@@ -67,7 +67,7 @@ def and_there_is_a_5_year_course_i_want_to_edit
   end
 
   def and_there_is_an_uneditable_course
-    given_a_course_exists(program_type: 'TDA')
+    given_a_course_exists(program_type: 'TDA', funding: :apprenticeship)
   end
 
   def and_there_is_a_course_i_want_to_edit(course_length)

spec/models/course_spec.rb

@@ -1170,28 +1170,28 @@
       subject { described_class.with_salary }
 
       let!(:course_higher_education_programme) do
-        create(:course, program_type: :higher_education_programme)
+        create(:course, program_type: :higher_education_programme, funding: :fee)
       end
 
       let!(:course_scitt_salaried_programme) do
-        create(:course, program_type: :scitt_salaried_programme)
+        create(:course, program_type: :scitt_salaried_programme, funding: :salary)
       end
 
       let!(:course_higher_education_salaried_programme) do
-        create(:course, program_type: :higher_education_salaried_programme)
+        create(:course, program_type: :higher_education_salaried_programme, funding: :salary)
       end
 
       let!(:course_school_direct_training_programme) do
-        create(:course, program_type: :school_direct_training_programme)
+        create(:course, program_type: :school_direct_training_programme, funding: :fee)
       end
 
       let!(:course_school_direct_salaried_training_programme) do
-        create(:course, program_type: :school_direct_salaried_training_programme)
+        create(:course, program_type: :school_direct_salaried_training_programme, funding: :salary)
       end
 
-      let!(:course_scitt_programme) { create(:course, program_type: :scitt_programme) }
+      let!(:course_scitt_programme) { create(:course, program_type: :scitt_programme, funding: :fee) }
       let!(:course_pg_teaching_apprenticeship) do
-        create(:course, program_type: :pg_teaching_apprenticeship)
+        create(:course, program_type: :pg_teaching_apprenticeship, funding: :apprenticeship)
       end
 
       it 'only returns salaried training programme' do