Merge pull request #1742 from DFE-Digital/fix-initial-status-change

Update application form status after submission

app/models/application_form.rb

@@ -111,7 +111,6 @@ class ApplicationForm < ApplicationRecord
   belongs_to :assessor, class_name: "Staff", optional: true
   belongs_to :reviewer, class_name: "Staff", optional: true
 
-  validates :submitted_at, presence: true, unless: :draft?
   validates :awarded_at, absence: true, if: :declined_at?
   validates :awarded_at, absence: true, if: :withdrawn_at?
   validates :declined_at, absence: true, if: :awarded_at?

app/services/submit_application_form.rb

@@ -12,21 +12,22 @@ def call
     return if application_form.submitted_at.present?
 
     ActiveRecord::Base.transaction do
-      application_form.subjects.compact_blank!
-      application_form.working_days_since_submission = 0
-      application_form.requires_preliminary_check =
-        region.requires_preliminary_check
-      application_form.submitted_at = Time.zone.now
-
-      ApplicationFormStatusUpdater.call(application_form:, user:)
+      application_form.update!(
+        subjects: application_form.subjects.compact_blank,
+        working_days_since_submission: 0,
+        requires_preliminary_check: region.requires_preliminary_check,
+        submitted_at: Time.zone.now,
+      )
 
       assessment = AssessmentFactory.call(application_form:)
 
-      create_professional_standing_request(assessment)
-
       if application_form.reduced_evidence_accepted
         UpdateAssessmentInductionRequired.call(assessment:)
       end
+
+      create_professional_standing_request(assessment)
+
+      ApplicationFormStatusUpdater.call(application_form:, user:)
     end
 
     TeacherMailer

spec/models/application_form_spec.rb

@@ -287,18 +287,6 @@
       it { is_expected.to validate_absence_of(:english_language_provider) }
     end
 
-    context "when submitted" do
-      before { application_form.status = "submitted" }
-
-      it { is_expected.to_not be_valid }
-
-      context "with submitted_at" do
-        before { application_form.submitted_at = Time.zone.now }
-
-        it { is_expected.to be_valid }
-      end
-    end
-
     context "when awarded and declined" do
       before do
         application_form.assign_attributes(

spec/services/submit_application_form_spec.rb

@@ -21,6 +21,20 @@
     end
   end
 
+  describe "application form preliminary check status" do
+    subject(:submitted?) { application_form.preliminary_check? }
+
+    it { is_expected.to be false }
+
+    context "when calling the service" do
+      let(:region) { create(:region, :requires_preliminary_check) }
+
+      before { call }
+
+      it { is_expected.to be true }
+    end
+  end
+
   describe "compacting blank subjects" do
     subject(:subjects) { application_form.subjects }