feat: only clear newly not routed answers on second pass

app/models/form.rb

@@ -192,55 +192,65 @@ class Form
 
   def reset_checkbox_questions_if_not_routed(log)
     checkbox_questions = routed_and_not_routed_questions_by_type(log, type: "checkbox")
-    checkbox_questions[:not_routed].each do |not_routed_question|
+    checkbox_clearing_pass(log, checkbox_questions[:routed], checkbox_questions[:not_routed])
-      valid_options = checkbox_questions[:routed]
+
-                                        .select { |q| q.id == not_routed_question.id }
+    checkbox_questions_recalculated = routed_and_not_routed_questions_by_type(log, type: "checkbox")
-                                        .flat_map { |q| q.answer_options.keys }
+    newly_not_routed_checkbox_questions = checkbox_questions_recalculated[:not_routed].reject { |question| checkbox_questions[:not_routed].include?(question) }
+    checkbox_clearing_pass(log, checkbox_questions_recalculated[:routed], newly_not_routed_checkbox_questions)
+  end
+
+  def reset_radio_questions_if_not_routed_or_invalid_answers(log)
+    radio_questions = routed_and_not_routed_questions_by_type(log, type: "radio")
+    radio_clearing_pass(log, radio_questions[:routed], radio_questions[:not_routed])
+
+    radio_questions_recalculated = routed_and_not_routed_questions_by_type(log, type: "radio")
+    newly_not_routed_radio_questions = radio_questions_recalculated[:not_routed].reject { |question| radio_questions[:not_routed].include?(question) }
+    radio_clearing_pass(log, radio_questions_recalculated[:routed], newly_not_routed_radio_questions)
+
+  end
+
+  def reset_free_user_input_questions_if_not_routed(log)
+    non_radio_checkbox_questions = routed_and_not_routed_questions_by_type(log)
+    free_user_input_clearing_pass(log, non_radio_checkbox_questions[:routed], non_radio_checkbox_questions[:not_routed])
+
+    non_radio_checkbox_questions_recalculated = routed_and_not_routed_questions_by_type(log)
+    newly_not_routed_non_radio_checkbox_questions = non_radio_checkbox_questions_recalculated[:not_routed].reject { |question| non_radio_checkbox_questions[:not_routed].include?(question) }
+    free_user_input_clearing_pass(log, non_radio_checkbox_questions_recalculated[:routed], newly_not_routed_non_radio_checkbox_questions)
+  end
+
+  def checkbox_clearing_pass(log, routed_questions, not_routed_questions)
+    not_routed_questions.each do |not_routed_question|
+      valid_options = routed_questions
+                        .select { |q| q.id == not_routed_question.id }
+                        .flat_map { |q| q.answer_options.keys }
       not_routed_question.answer_options.each_key do |invalid_option|
-        if !log.respond_to?(invalid_option) || valid_options.include?(invalid_option) || log.public_send(invalid_option).nil?
+        clear_attribute(log, invalid_option) if log.respond_to?(invalid_option) && valid_options.exclude?(invalid_option) && log.public_send(invalid_option).present?
-          next
-        else
-          clear_attribute(log, invalid_option)
-        end
       end
     end
   end
 
-  def reset_radio_questions_if_not_routed_or_invalid_answers(log)
+  def radio_clearing_pass(log, routed_questions, not_routed_questions)
-    radio_questions = routed_and_not_routed_questions_by_type(log, type: "radio")
+    valid_radio_options = routed_questions
-    valid_radio_options = radio_questions[:routed]
+                            .group_by(&:id)
-                                         .group_by(&:id)
+                            .transform_values! { |q_array| q_array.flat_map { |q| q.answer_options.keys } }
-                                         .transform_values! { |q_array| q_array.flat_map { |q| q.answer_options.keys } }
+    not_routed_questions.each do |not_routed_question|
-    radio_questions[:not_routed].each do |not_routed_question|
       question_id = not_routed_question.id
-      if !log.respond_to?(question_id) || log.public_send(question_id).nil? || valid_radio_options.key?(question_id)
+      clear_attribute(log, question_id) if log.respond_to?(question_id) && log.public_send(question_id).present? && !valid_radio_options.key?(question_id)
-        next
-      else
-        clear_attribute(log, question_id)
-      end
     end
     valid_radio_options.each do |question_id, valid_options|
-      if !log.respond_to?(question_id) || valid_options.include?(log.public_send(question_id).to_s)
+      clear_attribute(log, question_id) if log.respond_to?(question_id) && valid_options.exclude?(log.public_send(question_id).to_s)
-        next
-      else
-        clear_attribute(log, question_id)
-      end
     end
   end
 
-  def reset_free_user_input_questions_if_not_routed(log)
+  def free_user_input_clearing_pass(log, routed_questions, not_routed_questions)
-    non_radio_checkbox_questions = routed_and_not_routed_questions_by_type(log)
+    enabled_question_ids = routed_questions.map(&:id)
-    enabled_question_ids = non_radio_checkbox_questions[:routed].map(&:id)
+    not_routed_questions.each do |not_routed_question|
-    non_radio_checkbox_questions[:not_routed].each do |not_routed_question|
       question_id = not_routed_question.id
-      if log.public_send(question_id).nil? || enabled_question_ids.include?(question_id)
+      clear_attribute(log, question_id) if log.public_send(question_id).present? && enabled_question_ids.exclude?(question_id)
-        next
-      else
-        clear_attribute(log, question_id)
-      end
     end
   end
 
+
   def routed_and_not_routed_questions_by_type(log, type: nil, current_user: nil)
     questions_by_type = if type
                           questions.reject { |q| q.type != type || q.disable_clearing_if_not_routed_or_dynamic_answer_options }

app/models/log.rb

@@ -238,9 +238,7 @@ private
   def reset_invalidated_dependent_fields!
     return unless form
 
-    2.times do
+    form.reset_not_routed_questions_and_invalid_answers(self)
-      form.reset_not_routed_questions_and_invalid_answers(self)
-    end
     reset_created_by!
   end