Access page_slug from page inside Step class

This removes the separate page_slug instance variable, which was
passed into the initializer for Step via the StepFactory. As the
original Page object is also passed in, we can reference it directly
from that object. This helps simplify the code and makes it easier for
future refactoring.

`page_slug` will always equal the `page.id` as the StepFactory matches
them, otherwise it raises an error.

Author: theseanything

app/controllers/forms/add_another_answer_controller.rb

@@ -4,7 +4,7 @@ class AddAnotherAnswerController < PageController
 
     def show
       @rows = rows
-      back_link(@step.page_slug)
+      back_link(@step.id)
       @add_another_answer_input = AddAnotherAnswerInput.new
     end
 
@@ -13,7 +13,7 @@ def save
 
       if @add_another_answer_input.invalid?
         @rows = rows
-        back_link(@step.page_slug)
+        back_link(@step.id)
         return render :show
       end
 
@@ -28,18 +28,18 @@ def save
 
     def add_another_path
       if changing_existing_answer
-        form_change_answer_path(@form.id, @form.form_slug, @step.page_slug, answer_index: @step.next_answer_index)
+        form_change_answer_path(@form.id, @form.form_slug, @step.id, answer_index: @step.next_answer_index)
       else
-        form_page_path(@form.id, @form.form_slug, @step.page_slug, answer_index: @step.next_answer_index)
+        form_page_path(@form.id, @form.form_slug, @step.id, answer_index: @step.next_answer_index)
       end
     end
 
     def rows
       @step.questions.map.with_index(1) do |question, answer_index|
-        actions = [{ text: t("forms.add_another_answer.rows.change"), href: form_change_answer_path(@form.id, @form.form_slug, @step.page_slug, answer_index:), visually_hidden_text: I18n.t("forms.add_another_answer.rows.action_hidden_text", answer_index:) }]
+        actions = [{ text: t("forms.add_another_answer.rows.change"), href: form_change_answer_path(@form.id, @form.form_slug, @step.id, answer_index:), visually_hidden_text: I18n.t("forms.add_another_answer.rows.action_hidden_text", answer_index:) }]
 
         unless @step.min_answers?
-          actions << { text: t("forms.add_another_answer.rows.remove"), href: form_remove_answer_path(@form.id, @form.form_slug, @step.page_slug, answer_index:, changing_existing_answer:), visually_hidden_text: I18n.t("forms.add_another_answer.rows.action_hidden_text", answer_index:) }
+          actions << { text: t("forms.add_another_answer.rows.remove"), href: form_remove_answer_path(@form.id, @form.form_slug, @step.id, answer_index:, changing_existing_answer:), visually_hidden_text: I18n.t("forms.add_another_answer.rows.action_hidden_text", answer_index:) }
         end
 
         {
@@ -61,9 +61,9 @@ def add_another_input_params
     def redirect_if_not_repeating
       unless @step.is_a?(RepeatableStep)
         if changing_existing_answer
-          redirect_to form_change_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+          redirect_to form_change_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
         else
-          redirect_to form_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+          redirect_to form_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
         end
       end
     end

app/controllers/forms/check_your_answers_controller.rb

@@ -100,7 +100,7 @@ def back_link
       previous_step = current_context.previous_step(CheckYourAnswersStep::CHECK_YOUR_ANSWERS_PAGE_SLUG)
 
       if previous_step.present?
-        previous_step.repeatable? ? add_another_answer_path(form_id: current_context.form.id, form_slug: current_context.form.form_slug, page_slug: previous_step.page_slug) : form_page_path(current_context.form.id, current_context.form.form_slug, previous_step.page_id)
+        previous_step.repeatable? ? add_another_answer_path(form_id: current_context.form.id, form_slug: current_context.form.form_slug, page_slug: previous_step.id) : form_page_path(current_context.form.id, current_context.form.form_slug, previous_step.page_id)
       end
     end
   end

app/controllers/forms/exit_pages_controller.rb

@@ -1,9 +1,9 @@
 module Forms
   class ExitPagesController < PageController
     def show
-      return redirect_to form_page_path(@form.id, @form.form_slug, current_context.next_page_slug) unless current_context.can_visit?(@step.page_slug)
+      return redirect_to form_page_path(@form.id, @form.form_slug, current_context.next_page_slug) unless current_context.can_visit?(@step.id)
 
-      @back_link = form_page_path(@form.id, @form.form_slug, @step.page_slug)
+      @back_link = form_page_path(@form.id, @form.form_slug, @step.id)
       @condition = @step.routing_conditions.first
     end
   end

app/controllers/forms/page_controller.rb

@@ -9,10 +9,10 @@ def set_request_logging_attributes
     end
 
     def show
-      return redirect_to form_page_path(@form.id, @form.form_slug, current_context.next_page_slug) unless current_context.can_visit?(@step.page_slug)
+      return redirect_to form_page_path(@form.id, @form.form_slug, current_context.next_page_slug) unless current_context.can_visit?(@step.id)
       return redirect_to review_file_page if answered_file_question?
 
-      back_link(@step.page_slug)
+      back_link(@step.id)
       setup_instance_vars_for_view
     end
 
@@ -53,7 +53,7 @@ def answer_index
 
     def setup_instance_vars_for_view
       @is_question = true
-      @question_edit_link = "#{Settings.forms_admin.base_url}/forms/#{@form.id}/pages/#{@step.page_slug}/edit/question"
+      @question_edit_link = "#{Settings.forms_admin.base_url}/forms/#{@form.id}/pages/#{@step.id}/edit/question"
       @save_url = save_url
     end
 
@@ -67,20 +67,20 @@ def back_link(page_slug)
       if changing_existing_answer
         @back_link = check_your_answers_path(form_id: current_context.form.id)
       elsif previous_step
-        @back_link = previous_step.repeatable? ? add_another_answer_path(form_id: current_context.form.id, form_slug: current_context.form.form_slug, page_slug: previous_step.page_slug) : form_page_path(@form.id, @form.form_slug, previous_step.page_id)
+        @back_link = previous_step.repeatable? ? add_another_answer_path(form_id: current_context.form.id, form_slug: current_context.form.form_slug, page_slug: previous_step.id) : form_page_path(@form.id, @form.form_slug, previous_step.page_id)
       end
     end
 
     def redirect_post_save
       return redirect_to review_file_page, success: t("banner.success.file_uploaded") if answered_file_question?
-      return redirect_to exit_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug) if @step.exit_page_condition_matches?
+      return redirect_to exit_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id) if @step.exit_page_condition_matches?
 
       redirect_to next_page
     end
 
     def redirect_if_not_answered_file_question
       unless @step.question.is_a?(Question::File) && @step.question.file_uploaded?
-        redirect_to form_page_path(@form.id, @form.form_slug, @step.page_slug)
+        redirect_to form_page_path(@form.id, @form.form_slug, @step.id)
       end
     end
 
@@ -89,7 +89,7 @@ def answered_file_question?
     end
 
     def review_file_page
-      review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
+      review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
     end
 
     def next_page
@@ -102,15 +102,15 @@ def next_page
 
     def next_step_path
       if should_show_add_another?(@step)
-        return add_another_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+        return add_another_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
       end
 
       next_step_in_form_path
     end
 
     def next_step_changing
       if should_show_add_another?(@step)
-        return change_add_another_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+        return change_add_another_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
       end
 
       check_answers_path
@@ -160,7 +160,7 @@ def admin_edit_condition_url(form_id, page_id)
     end
 
     def is_first_page?
-      current_context.form.start_page == @step.id
+      current_context.form.start_page.to_s == @step.id
     end
 
     def save_url

app/controllers/forms/remove_answer_controller.rb

@@ -31,9 +31,9 @@ def remove_answer
 
     def next_page_after_removing
       if @step.question.is_optional? && @step.show_answer.blank?
-        form_page_path(@form.id, @form.form_slug, @step.page_slug, changing_existing_answer:)
+        form_page_path(@form.id, @form.form_slug, @step.id, changing_existing_answer:)
       else
-        add_another_answer_path(@form.id, @form.form_slug, @step.page_slug, changing_existing_answer:)
+        add_another_answer_path(@form.id, @form.form_slug, @step.id, changing_existing_answer:)
       end
     end
   end

app/controllers/forms/remove_file_controller.rb

@@ -21,7 +21,7 @@ def destroy
         return redirect_to redirect_after_delete_path, success: t("banner.success.file_removed")
       end
 
-      redirect_to review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
+      redirect_to review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
     end
 
   private
@@ -32,15 +32,15 @@ def remove_input_params
 
     def redirect_after_delete_path
       if changing_existing_answer
-        return form_change_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+        return form_change_answer_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
       end
 
-      form_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug)
+      form_page_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id)
     end
 
     def setup_urls
-      @back_link = review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
-      @remove_file_url = remove_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
+      @back_link = review_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
+      @remove_file_url = remove_file_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
     end
   end
 end

app/controllers/forms/review_file_controller.rb

@@ -3,9 +3,9 @@ class ReviewFileController < PageController
     before_action :redirect_if_not_answered_file_question
 
     def show
-      back_link(@step.page_slug)
-      @remove_file_confirmation_url = remove_file_confirmation_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
-      @continue_url = review_file_continue_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.page_slug, changing_existing_answer:)
+      back_link(@step.id)
+      @remove_file_confirmation_url = remove_file_confirmation_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
+      @continue_url = review_file_continue_path(form_id: @form.id, form_slug: @form.form_slug, page_slug: @step.id, changing_existing_answer:)
     end
 
     def continue

app/lib/flow/journey.rb

@@ -29,12 +29,12 @@ def initialize(answer_store:, form:)
     end
 
     def find_or_create(page_slug)
-      step = completed_steps.find { |s| s.page_slug == page_slug }
+      step = completed_steps.find { |s| s.id == page_slug }
       step || @step_factory.create_step(page_slug)
     end
 
     def previous_step(page_slug)
-      index = completed_steps.find_index { |step| step.page_slug == page_slug }
+      index = completed_steps.find_index { |step| step.id == page_slug }
       return nil if completed_steps.empty? || index&.zero?
 
       return completed_steps.last if index.nil?
@@ -45,7 +45,7 @@ def previous_step(page_slug)
     def next_page_slug
       return nil if completed_steps.last&.end_page?
 
-      completed_steps.last&.next_page_slug_after_routing || @step_factory.start_step.page_slug
+      completed_steps.last&.next_page_slug_after_routing || @step_factory.start_step.id
     end
 
     def next_step
@@ -55,7 +55,7 @@ def next_step
     end
 
     def can_visit?(page_slug)
-      (completed_steps.map(&:page_slug).include? page_slug) || page_slug == next_page_slug
+      (completed_steps.map(&:id).include? page_slug) || page_slug == next_page_slug
     end
 
     def all_steps
@@ -111,7 +111,7 @@ def each_step_with_routing
           break if visited_page_slugs.include?(next_page_slug)
 
           yielder << current_step
-          visited_page_slugs << current_step.page_slug
+          visited_page_slugs << current_step.id
 
           break if next_page_slug.nil?
 

app/lib/flow/step_factory.rb

@@ -26,7 +26,7 @@ def create_step(page_slug_or_start)
 
       question = QuestionRegister.from_page(page)
 
-      step_class(page).new(question:, page:, page_slug:)
+      step_class(page).new(question:, page:)
     end
 
     def start_step

app/models/step.rb

@@ -1,20 +1,17 @@
 class Step
   attr_accessor :page, :question
-  attr_reader :page_slug
 
   GOTO_PAGE_ERROR_NAMES = %w[cannot_have_goto_page_before_routing_page goto_page_doesnt_exist].freeze
 
-  def initialize(page:, question:, page_slug:)
+  def initialize(page:, question:)
     @page = page
     @question = question
-
-    @page_slug = page_slug
   end
 
   alias_attribute :id, :page_id
 
   def page_id
-    page&.id
+    page&.id.to_s
   end
 
   def page_number