Merge pull request #2635 from alphagov/fix-no-method-error-when-draft-question-is-wrong-type

Check the draft question's answer type is correct for answer type specific routes

Author: stephencdaly

app/controllers/pages/address_settings_controller.rb

@@ -1,4 +1,6 @@
 class Pages::AddressSettingsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("address") }
+
   def new
     settings = draft_question.answer_settings
     @address_settings_input = Pages::AddressSettingsInput.new(uk_address: settings.dig(:input_type, :uk_address),

app/controllers/pages/date_settings_controller.rb

@@ -1,4 +1,6 @@
 class Pages::DateSettingsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("date") }
+
   def new
     @date_settings_input = Pages::DateSettingsInput.new(input_type: draft_question.answer_settings[:input_type])
     @date_settings_path = date_settings_create_path(current_form.id)

app/controllers/pages/name_settings_controller.rb

@@ -1,4 +1,6 @@
 class Pages::NameSettingsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("name") }
+
   def new
     @name_settings_input = Pages::NameSettingsInput.new(input_type: draft_question.answer_settings[:input_type],
                                                         title_needed: draft_question.answer_settings[:title_needed])

app/controllers/pages/question_text_controller.rb

@@ -1,4 +1,6 @@
 class Pages::QuestionTextController < PagesController
+  before_action { redirect_if_unexpected_answer_type("selection") }
+
   def new
     @question_text_input = Pages::QuestionTextInput.new(question_text: draft_question.question_text)
     @question_text_path = question_text_create_path(current_form.id)

app/controllers/pages/selection/bulk_options_controller.rb

@@ -1,4 +1,6 @@
 class Pages::Selection::BulkOptionsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("selection") }
+
   def new
     @bulk_options_input = Pages::Selection::BulkOptionsInput.new(draft_question:)
     @bulk_options_input.assign_form_values

app/controllers/pages/selection/none_of_the_above_controller.rb

@@ -1,6 +1,8 @@
 class Pages::Selection::NoneOfTheAboveController < PagesController
   include PagesHelper
 
+  before_action { redirect_if_unexpected_answer_type("selection") }
+
   def new
     @none_of_the_above_input = input_object_from_draft_question
     @none_of_the_above_path = selection_none_of_the_above_create_path(current_form.id)

app/controllers/pages/selection/options_controller.rb

@@ -1,4 +1,6 @@
 class Pages::Selection::OptionsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("selection") }
+
   def new
     @selection_options_input = Pages::Selection::OptionsInput.new(draft_question:)
     @selection_options_input.assign_form_values

app/controllers/pages/selection/type_controller.rb

@@ -1,5 +1,8 @@
 class Pages::Selection::TypeController < PagesController
   include PagesHelper
+
+  before_action { redirect_if_unexpected_answer_type("selection") }
+
   def new
     @selection_type_input = Pages::Selection::TypeInput.new(only_one_option:, draft_question:)
     @selection_type_path = selection_type_create_path(current_form.id)

app/controllers/pages/text_settings_controller.rb

@@ -1,4 +1,6 @@
 class Pages::TextSettingsController < PagesController
+  before_action { redirect_if_unexpected_answer_type("text") }
+
   def new
     @text_settings_input = Pages::TextSettingsInput.new(input_type: draft_question.answer_settings[:input_type])
     @text_settings_path = text_settings_create_path(current_form.id)

app/controllers/pages/type_of_answer_controller.rb

@@ -9,7 +9,7 @@ def create
     @type_of_answer_input = Pages::TypeOfAnswerInput.new(answer_type_form_params)
 
     if @type_of_answer_input.submit
-      redirect_to next_page_path(current_form.id, @type_of_answer_input.answer_type, :create)
+      redirect_to next_page_path(@type_of_answer_input.answer_type)
     else
       @type_of_answer_path = type_of_answer_create_path(current_form.id)
       render :type_of_answer, locals: { current_form: }
@@ -26,7 +26,7 @@ def update
     @type_of_answer_input = Pages::TypeOfAnswerInput.new(answer_type_form_params)
 
     if @type_of_answer_input.submit
-      redirect_to next_page_path(current_form.id, @type_of_answer_input.answer_type, :update)
+      redirect_to next_page_path(@type_of_answer_input.answer_type)
     else
       @type_of_answer_path = type_of_answer_update_path(current_form.id)
       render :type_of_answer
@@ -35,54 +35,15 @@ def update
 
 private
 
-  def selection_path(form_id, action)
-    return question_text_new_path(form_id) if action == :create
-
-    selection_type_edit_path(form_id, page.id)
-  end
-
-  def text_path(form_id, action)
-    action == :create ? text_settings_new_path(form_id) : text_settings_edit_path(form_id)
-  end
-
-  def date_path(form_id, action)
-    action == :create ? date_settings_new_path(form_id) : date_settings_edit_path(form_id)
-  end
-
-  def address_path(form_id, action)
-    action == :create ? address_settings_new_path(form_id) : address_settings_edit_path(form_id)
-  end
-
-  def name_path(form_id, action)
-    action == :create ? name_settings_new_path(form_id) : name_settings_edit_path(form_id)
-  end
-
-  def default_path(form_id, action)
-    action == :create ? new_question_path(form_id) : edit_question_path(form_id)
-  end
-
-  def next_page_path(form_id, answer_type, action)
-    case answer_type
-    when "selection"
-      selection_path(form_id, action)
-    when "text"
-      text_path(form_id, action)
-    when "date"
-      date_path(form_id, action)
-    when "address"
-      address_path(form_id, action)
-    when "name"
-      name_path(form_id, action)
-    else
-      default_path(form_id, action)
-    end
-  end
-
   def answer_type_form_params
     params.require(:pages_type_of_answer_input).permit(:answer_type).merge(draft_question:, current_form:)
   end
 
   def answer_type_changed?
     @type_of_answer_input.answer_type != @type_of_answer_input.draft_question.answer_type
   end
+
+  def next_page_path(answer_type)
+    Pages::AddOrEditQuestionService.new(form_id: current_form.id, existing_page_id: page_id).new_or_edit_path_for_answer_type(answer_type)
+  end
 end