Merge pull request #1725 from alphagov/forms-pages-via-repository

Add FormRepository pages method

Author: SamJamCul

app/controllers/forms_controller.rb

@@ -11,7 +11,7 @@ def show
 
   def mark_pages_section_completed
     authorize current_form, :can_view_form?
-    @pages = current_form.pages
+    @pages = FormRepository.pages(current_form)
     @mark_complete_input = Forms::MarkPagesSectionCompleteInput.new(mark_complete_input_params)
 
     if @mark_complete_input.submit

app/controllers/pages/routes_controller.rb

@@ -1,7 +1,7 @@
 class Pages::RoutesController < PagesController
   def show
     back_link_url = form_pages_path(current_form.id)
-    render locals: { current_form:, page:, pages: current_form.pages, back_link_url: }
+    render locals: { current_form:, page:, pages: FormRepository.pages(current_form), back_link_url: }
   end
 
   def delete

app/controllers/pages/secondary_skip_controller.rb

@@ -97,6 +97,6 @@ def ensure_secondary_skip_blank
   end
 
   def secondary_skip_condition
-    @secondary_skip_condition ||= current_form.pages.flat_map(&:routing_conditions).compact_blank.find { |c| c.secondary_skip? && c.check_page_id == page.id }
+    @secondary_skip_condition ||= FormRepository.pages(current_form).flat_map(&:routing_conditions).compact_blank.find { |c| c.secondary_skip? && c.check_page_id == page.id }
   end
 end

app/controllers/pages_controller.rb

@@ -4,7 +4,7 @@ class PagesController < ApplicationController
   after_action :verify_authorized
 
   def index
-    @pages = current_form.pages
+    @pages = FormRepository.pages(current_form)
     @mark_complete_input = Forms::MarkPagesSectionCompleteInput.new(form: current_form).assign_form_values
     render :index, locals: { current_form: }
   end
@@ -16,7 +16,7 @@ def delete
     @item_name = @page.question_text
     @back_url = edit_question_path(current_form.id, @page.id)
 
-    all_form_conditions = current_form.pages.flat_map(&:routing_conditions).compact_blank
+    all_form_conditions = FormRepository.pages(current_form).flat_map(&:routing_conditions).compact_blank
     @page_goto_conditions = all_form_conditions.select { |condition| condition.goto_page_id == @page.id }
 
     if @page.routing_conditions.any? && @page.routing_conditions.first.secondary_skip?

app/input_objects/pages/conditions_input.rb

@@ -37,7 +37,7 @@ def routing_answer_options
   end
 
   def goto_page_options
-    page_options = pages_after_current_page(form.pages, page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) }
+    page_options = pages_after_current_page(FormRepository.pages(form), page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) }
     page_options << OpenStruct.new(id: "check_your_answers", question_text: I18n.t("page_conditions.check_your_answers"))
 
     page_options

app/input_objects/pages/delete_condition_input.rb

@@ -16,6 +16,6 @@ def submit
   def goto_page_question_text
     return I18n.t("page_conditions.check_your_answers") if goto_page_id.nil? && record.skip_to_end
 
-    form.pages.filter { |p| p.id == goto_page_id }.first&.question_text
+    FormRepository.pages(form).filter { |p| p.id == goto_page_id }.first&.question_text
   end
 end

app/input_objects/pages/routes/delete_confirmation_input.rb

@@ -18,7 +18,7 @@ def to_partial_path
 private
 
   def delete_routes
-    all_form_routing_conditions = form.pages.flat_map(&:routing_conditions).compact_blank
+    all_form_routing_conditions = FormRepository.pages(form).flat_map(&:routing_conditions).compact_blank
     page_routes = all_form_routing_conditions.select { |rc| rc.check_page_id == page.id }
     page_routes.each do |rc|
       rc.prefix_options[:form_id] = form.id

app/input_objects/pages/secondary_skip_input.rb

@@ -46,17 +46,17 @@ def submit
 
   def goto_page_options
     [
-      *pages_after_current_page(form.pages, page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) },
+      *pages_after_current_page(FormRepository.pages(form), page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) },
       OpenStruct.new(id: "check_your_answers", question_text: I18n.t("page_conditions.check_your_answers")),
     ]
   end
 
   def routing_page_options
-    pages_after_current_page(form.pages, page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) }
+    pages_after_current_page(FormRepository.pages(form), page).map { |p| OpenStruct.new(id: p.id, question_text: p.question_with_number) }
   end
 
   def page_name(page_id)
-    target_page = form.pages.find { |page| page.id == page_id }
+    target_page = FormRepository.pages(form).find { |page| page.id == page_id }
 
     page_name = target_page.question_text
     page_position = target_page.position
@@ -99,8 +99,8 @@ def goto_question_page?
   def pages_in_valid_order
     if routing_page_id.present? && goto_page_id.present?
 
-      routing_page = form.pages.find { |page| page.id.to_s == routing_page_id.to_s }
-      goto_page = form.pages.find { |page| page.id.to_s == goto_page_id.to_s }
+      routing_page = FormRepository.pages(form).find { |page| page.id.to_s == routing_page_id.to_s }
+      goto_page = FormRepository.pages(form).find { |page| page.id.to_s == goto_page_id.to_s }
 
       if goto_page_id == routing_page_id
         errors.add(:goto_page_id, :equal, message: I18n.t("activemodel.errors.models.pages/secondary_skip_input.attributes.goto_page_id.equal"))

app/policies/form_policy.rb

@@ -17,7 +17,7 @@ def can_view_form?
   alias_method :destroy?, :delete?
 
   def can_add_page_routing_conditions?
-    form_has_two_or_more_pages = form.pages.length >= 2
+    form_has_two_or_more_pages = FormRepository.pages(form).length >= 2
     form_has_qualifying_pages = form.qualifying_route_pages.any?
 
     form_has_two_or_more_pages && form_has_qualifying_pages

app/services/form_repository.rb

@@ -42,5 +42,10 @@ def destroy(record)
       form = Form.new(record.attributes, true)
       form.destroy # rubocop:disable Rails/SaveBang
     end
+
+    def pages(record)
+      form = Form.new(record.attributes, true)
+      form.pages
+    end
   end
 end