Refactor plan fetching in AnswersController action

aaronskiba · aaronskiba · commit 609d5df3b8a6 · 2025-04-29T10:35:39.000-06:00
- This refactor simply applies DRY principles to some of the plan fetching code in `AnswersController#create_or_update`.
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
@@ -85,14 +85,7 @@ def create_or_update
     #      check should probably happen on create/update
     return unless @answer.present?
 
-    @plan = Plan.includes(
-      sections: {
-        questions: %i[
-          answers
-          question_format
-        ]
-      }
-    ).find(p_params[:plan_id])
+    @plan = fetch_plan_with_associations(p_params[:plan_id])
     @question = @answer.question
     @section = @plan.sections.find_by(id: @question.section_id)
     template = @section.phase.template
@@ -108,14 +101,7 @@ def create_or_update
       end
     end
     # Now update @plan after removing answers of questions removed from the plan.
-    @plan = Plan.includes(
-      sections: {
-        questions: %i[
-          answers
-          question_format
-        ]
-      }
-    ).find(p_params[:plan_id])
+    @plan = fetch_plan_with_associations(p_params[:plan_id])
 
     # Now get list of question ids to remove based on remaining answers.
     remove_list_question_ids = remove_list(@plan)
@@ -196,6 +182,17 @@ def permitted_params
   end
   # rubocop:enable Metrics/AbcSize
 
+  def fetch_plan_with_associations(plan_id)
+    Plan.includes(
+      sections: {
+        questions: %i[
+          answers
+          question_format
+        ]
+      }
+    ).find(plan_id)
+  end
+
   def check_answered(section, q_array, all_answers)
     n_qs = section.questions.count { |question| q_array.include?(question.id) }
     n_ans = all_answers.count { |ans| q_array.include?(ans.question.id) and ans.answered? }
