Update form when questions change

app/models/condition.rb

@@ -21,12 +21,11 @@ def self.create_and_update_form!(...)
 
   def save_and_update_form
     save!
-    form.question_section_completed = false
-    form.save_draft!
+    form.save_question_changes!
   end
 
   def destroy_and_update_form!
-    destroy! && form.update!(question_section_completed: false)
+    destroy! && form.save_question_changes!
   end
 
   def validation_errors

app/models/form.rb

@@ -51,6 +51,8 @@ class Form < ApplicationRecord
   def save_question_changes!
     self.question_section_completed = false
     save_draft!
+    # Make sure the updated_at is updated as we use this to determine if the form has changed in forms-runner.
+    touch unless changed?
   end
 
   def save_draft!

app/models/page.rb

@@ -46,7 +46,7 @@ def self.create_and_update_form!(...)
 
   def destroy_and_update_form!
     form = self.form
-    destroy! && form.update!(question_section_completed: false)
+    destroy! && form.save_question_changes!
   end
 
   def save_and_update_form

spec/models/condition_spec.rb

@@ -168,6 +168,33 @@
     end
   end
 
+  describe "#destroy_and_update_form!" do
+    subject(:condition) { create :condition, :with_exit_page, routing_page: page, check_page: page }
+
+    let(:page) { create :page, :with_selection_settings, form: }
+    let(:form) { create :form, question_section_completed: true }
+
+    before do
+      condition.destroy_and_update_form!
+    end
+
+    it "destroys the condition" do
+      expect(condition).to be_destroyed
+    end
+
+    it "sets form.question_section_completed to false" do
+      expect(form.reload.question_section_completed).to be false
+    end
+
+    context "when the form is live" do
+      let(:form) { create :form, :live }
+
+      it "updates the form state to live_with_draft" do
+        expect(form.reload.state).to eq("live_with_draft")
+      end
+    end
+  end
+
   describe "#validation_errors" do
     let(:form) { create :form }
     let(:routing_page) { create :page, form: }

spec/models/form_spec.rb

@@ -546,6 +546,14 @@
         }.to change { form.reload.state }.to("archived_with_draft")
       end
     end
+
+    context "when no attributes on the form will be changed" do
+      it "still changes the form's updated_at" do
+        expect {
+          form.save_question_changes!
+        }.to(change { form.reload.updated_at })
+      end
+    end
   end
 
   describe "#save_draft!" do

spec/models/page_spec.rb

@@ -418,13 +418,19 @@
     end
 
     context "when the form question section is complete" do
-      let(:form) { create(:form, question_section_completed: true) }
+      let(:form) { create(:form, :live, question_section_completed: true) }
 
       it "updates the form to mark the question section as incomplete" do
         expect {
           described_class.create_and_update_form!(**page_params)
         }.to change { form.reload.question_section_completed }.to(false)
       end
+
+      it "changes the form to live_with_draft" do
+        expect {
+          described_class.create_and_update_form!(**page_params)
+        }.to change { form.reload.state }.to("live_with_draft")
+      end
     end
 
     context "when the page has answer settings" do
@@ -444,14 +450,19 @@
   end
 
   describe "#destroy_and_update_form!" do
-    let(:page) { create :page }
-    let(:form) { page.form }
+    let(:form) { create :form, :live, question_section_completed: true }
+    let(:page) { create :page, form: }
 
     it "sets form.question_section_completed to false" do
-      form.update!(question_section_completed: true)
+      expect {
+        page.destroy_and_update_form!
+      }.to change { form.reload.question_section_completed }.to(false)
+    end
 
-      page.destroy_and_update_form!
-      expect(form.question_section_completed).to be false
+    it "changes the form to live_with_draft" do
+      expect {
+        page.destroy_and_update_form!
+      }.to change { form.reload.state }.to("live_with_draft")
     end
   end