template spike

Author: starswan

app/controllers/publishers/vacancies/wizard_base_controller.rb

@@ -9,7 +9,7 @@ class WizardBaseController < BaseController
 
       private
 
-      helper_method :current_step, :step_process, :all_steps_valid?, :next_invalid_step, :back_path
+      helper_method :current_step, :step_process, :back_path
 
       def step_process
         Publishers::Vacancies::VacancyStepProcess.new(

app/form_models/form_sequence.rb

@@ -1,60 +1,26 @@
-class Publishers::VacancyFormSequence < FormSequence
+class Publishers::VacancyFormSequence
   def initialize(vacancy:, organisation:, step_process:)
     @vacancy = vacancy
     @step_process = step_process
 
-    super(
-      model: @vacancy,
-      organisation: organisation,
-      step_names: @step_process.steps,
-      form_prefix: "publishers/job_listing",
-    )
+    @organisation = organisation
+    @step_names = @step_process.steps
+    @form_prefix = "publishers/job_listing"
+  end
+
+  def all_steps_valid?
+    validatable_steps.all? { |step| step_form(step).valid? }
   end
 
   def next_invalid_step
     # Due to subjects being an optional step (no validations) it needs to be handled differently
     return :subjects if next_incomplete_step_subjects?
 
-    validate_all_steps.filter_map { |step, form| step if form.invalid? }.first
+    validatable_steps.detect { |step| step_form(step).invalid? }
   end
 
   private
 
-  def validatable_steps
-    if @vacancy.published?
-      dependent_steps
-    else
-      super
-    end
-  end
-
-  def dependent_steps # rubocop:disable Metrics/MethodLength
-    case @step_process.current_step
-    when :job_location
-      %i[education_phases key_stages]
-    when :job_role
-      %i[key_stages about_the_role]
-    when :education_phases
-      %i[key_stages]
-    when :key_stages
-      %i[about_the_role]
-    when :applying_for_the_job
-      @vacancy.enable_job_applications ? [] : %i[how_to_receive_applications]
-    when :how_to_receive_applications
-      if @vacancy.uploaded_form?
-        %i[application_form]
-      else
-        %i[application_link]
-      end
-    when :include_additional_documents
-      %i[documents]
-    when :contact_details
-      @vacancy.contact_email_belongs_to_a_publisher? ? [] : %i[confirm_contact_details]
-    else
-      []
-    end
-  end
-
   def next_incomplete_step_subjects?
     return false unless @vacancy.allow_subjects?
     return false if @vacancy.completed_steps.include?("subjects")
@@ -69,4 +35,17 @@ def next_incomplete_step_subjects?
   def not_validatable_steps
     %i[subjects review].freeze
   end
+
+  def validatable_steps
+    @step_names - not_validatable_steps
+  end
+
+  def step_form(step_name)
+    step_form_class = File.join(@form_prefix, "#{step_name}_form").camelize.constantize
+
+    params = step_form_class.load_form(@vacancy)
+                            .merge(current_organisation: @organisation)
+
+    step_form_class.new(params, @vacancy)
+  end
 end

app/form_models/publishers/vacancy_form_sequence.rb

@@ -23,36 +23,38 @@ def initialize(current_step, vacancy:, organisation:)
   private
 
   def job_details_steps
-    steps = %i[job_location job_title job_role education_phases key_stages subjects contract_information start_date pay_package]
-    steps.delete(:job_location) if organisation.school?
-    steps.delete(:education_phases) unless vacancy.allow_phase_to_be_set?
-    steps.delete(:key_stages) unless vacancy.allow_key_stages?
-    steps.delete(:subjects) unless vacancy.allow_subjects?
-
-    steps
+    first = if organisation.school?
+              %i[job_title job_role]
+            else
+              %i[job_location job_title job_role]
+            end
+    phases = vacancy.allow_phase_to_be_set? ? %i[education_phases] : []
+    stages = vacancy.allow_key_stages? ? %i[key_stages] : []
+    last = if vacancy.allow_subjects?
+             %i[subjects contract_information start_date pay_package]
+           else
+             %i[contract_information start_date pay_package]
+           end
+    first + phases + stages + last
   end
 
   def application_process_steps
     # if the user enters a contact email that doesn't belong to a publisher in our service we want to make them confirm it.
-    core_steps = %i[contact_details confirm_contact_details]
     early_steps = vacancy.published? ? [] : %i[applying_for_the_job]
 
-    if vacancy.enable_job_applications
-      early_steps + %i[anonymise_applications] + core_steps
-    else
-      first_steps = early_steps + %i[how_to_receive_applications]
-      # receive_applications may not be present (yet) as it is asked in how_to_receive_applications
-      if vacancy.receive_applications.present?
-        last_steps = if vacancy.uploaded_form?
-                       %i[anonymise_applications] + core_steps
-                     else
-                       core_steps
-                     end
-        first_steps + [APPLICATION_METHOD_TO_STEP.fetch(vacancy.receive_applications.to_sym)] + last_steps
-      else
-        first_steps + core_steps
-      end
-    end
+    start_steps = if vacancy.enable_job_applications
+                    early_steps + %i[anonymise_applications]
+                  else
+                    first_steps = early_steps + %i[how_to_receive_applications]
+                    # receive_applications may not be present (yet) as it is asked in how_to_receive_applications
+                    if vacancy.receive_applications.present?
+                      last_steps = vacancy.uploaded_form? ? %i[anonymise_applications] : []
+                      first_steps + [APPLICATION_METHOD_TO_STEP.fetch(vacancy.receive_applications.to_sym)] + last_steps
+                    else
+                      first_steps
+                    end
+                  end
+    start_steps + %i[contact_details confirm_contact_details]
   end
 
   def about_the_role_steps

app/services/publishers/vacancies/vacancy_step_process.rb

@@ -34,69 +34,9 @@
       about_the_role
       include_additional_documents
       documents
-      review
     ]
   end
 
-  describe "#validate_all_steps" do
-    it "uses forms to validate each validatable step" do
-      validatable_steps = all_steps - %i[subjects review]
-      valid_steps = validatable_steps - [:school_visits]
-
-      validated_forms = sequence.validate_all_steps
-
-      valid_steps.each do |step|
-        form = validated_forms[step]
-        next unless form
-
-        expect(form.errors).to be_none
-        expect(form).to be_valid
-      end
-
-      invalid_form = validated_forms[:school_visits]
-      expect(invalid_form.errors).to have_key(:school_visits)
-      expect(invalid_form).not_to be_valid
-
-      expect(vacancy.errors).to have_key(:school_visits)
-      expect(vacancy.errors.where(:school_visits).first.options[:step]).to eq(:school_visits)
-    end
-
-    context "when the vacancy has been published" do
-      let(:vacancy) { create(:vacancy, :secondary, organisations: [organisation]) }
-
-      context "when the current step has dependent steps" do
-        let(:current_step) { :job_location }
-        let(:validated_forms) { sequence.validate_all_steps }
-
-        context "when the dependent steps are invalid" do
-          let(:vacancy) { create(:vacancy, phases: nil, key_stages: nil, organisations: [organisation]) }
-
-          before { allow(vacancy).to receive(:allow_key_stages?).and_return(true) }
-
-          it "returns a hash containing invalid forms for each dependent step" do
-            validated_forms.each_value { |form| expect(form).to be_invalid }
-          end
-        end
-
-        context "when the dependent steps are valid" do
-          let(:vacancy) { create(:vacancy, :secondary, organisations: [organisation]) }
-
-          it "returns a hash containing valid forms for each dependent step" do
-            validated_forms.each_value { |form| expect(form).to be_valid }
-          end
-        end
-      end
-
-      context "when the current step does not have dependent steps" do
-        let(:current_step) { :job_title }
-
-        it "returns an empty hash" do
-          expect(sequence.validate_all_steps).to eq({})
-        end
-      end
-    end
-  end
-
   describe "#all_steps_valid?" do
     it "is true if all steps are valid" do
       expect(sequence).not_to be_all_steps_valid
@@ -122,6 +62,7 @@
           let(:vacancy) { create(:vacancy, :secondary, organisations: [organisation]) }
 
           it "returns true" do
+            pending("removing dependant steps")
             expect(sequence.all_steps_valid?).to be true
           end
         end
@@ -131,6 +72,7 @@
         let(:current_step) { :job_title }
 
         it "returns true" do
+          pending("removing dependant steps")
           expect(sequence.all_steps_valid?).to be true
         end
       end
@@ -153,6 +95,7 @@
             let(:enable_job_applications) { true }
 
             it "does not validate how_to_receive_applications" do
+              pending("removing dependant steps")
               expect(sequence.all_steps_valid?).to be true
             end
           end
@@ -170,6 +113,7 @@
             let(:belongs_to_publisher) { true }
 
             it "does not validate confirm_contact_details" do
+              pending("removing dependant steps")
               expect(sequence.all_steps_valid?).to be true
             end
           end
@@ -192,7 +136,7 @@
     end
 
     context "when the next incomplete step is subjects" do
-      let(:vacancy) { create(:vacancy, :secondary, completed_steps: %w[job_location job_role education_phases job_title key_stages]) }
+      let(:vacancy) { create(:draft_vacancy, :secondary, completed_steps: %w[job_location job_role education_phases job_title key_stages]) }
 
       before { allow(vacancy).to receive(:allow_key_stages?).and_return(true) }