Refactor handling of c.option_list.empty?

aaronskiba · aaronskiba · commit 82984e25bdd0 · 2025-04-04T12:11:51.000-06:00
- Moved `c.option_list.empty?` immediately after `c.option_list` assignment to streamline logic.
- This change reduces unnecessary processing of `c.remove_data` and `c.webhook_data`.
- Isolating the `c.option_list.empty?` check also simplifies subsequent checks for `c.remove_data.empty?` and c.webhook_data.nil?` later in the code.
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -222,21 +222,24 @@ def save_condition(value, opt_map, question_id_map)
     # question options may have changed so rewrite them
     c.option_list = value['question_option']
     c.option_list = c.option_list.map { |qopt| opt_map[qopt] } if opt_map.present?
+    # Do not save the condition if the option_list is empty
+    if c.option_list.empty?
+      c.destroy
+      return
+    end
 
     if value['action_type'] == 'remove'
       c.remove_data = value['remove_question_id']
       c.remove_data = c.remove_data.map { |qid| question_id_map[qid] } if question_id_map.present?
-
-      # Do not save the condition if the option_list or remove_data is empty
-      if c.option_list.empty? || c.remove_data.empty?
+      # Do not save the condition if remove_data is empty
+      if c.remove_data.empty?
         c.destroy
         return
       end
     else
       c.webhook_data = handle_webhook_data(value)
-
-      # Do not save the condition if the option_list is empty or webhook_data is nil
-      if c.option_list.empty? || c.webhook_data.nil?
+      # Do not save the condition if webhook_data is nil
+      if c.webhook_data.nil?
         c.destroy
         return
       end
