faith schools: Convert religious forms to single step with 'complete …

…later' field (#7435)

app/components/job_application_review_component.rb

@@ -8,11 +8,11 @@ class JobApplicationReviewComponent < ApplicationComponent
 
   renders_many(:sections, lambda do |section_name, **kwargs|
     case section_name
-    when :catholic_following_religion
+    when :catholic
       CatholicReligiousInformationSection.new(@job_application,
                                               name: section_name,
                                               allow_edit: @allow_edit)
-    when :school_ethos
+    when :non_catholic
       NonCatholicReligiousInformationSection.new(@job_application,
                                                  name: section_name,
                                                  allow_edit: @allow_edit)

app/components/job_application_review_component/catholic_religious_information_section.rb

@@ -1,11 +1,5 @@
 class JobApplicationReviewComponent::CatholicReligiousInformationSection < JobApplicationReviewComponent::Section
   def initialize(job_application, allow_edit:, name:)
-    # only include the details form if we follow a religion
-    forms = if job_application.following_religion
-              %w[CatholicFollowingReligionForm CatholicReligionDetailsForm]
-            else
-              %w[CatholicFollowingReligionForm]
-            end
-    super(job_application, forms: forms, name: name, allow_edit: allow_edit)
+    super(job_application, forms: %w[CatholicForm], name: name, allow_edit: allow_edit)
   end
 end

app/components/job_application_review_component/non_catholic_religious_information_section.rb

@@ -2,12 +2,6 @@
 
 class JobApplicationReviewComponent::NonCatholicReligiousInformationSection < JobApplicationReviewComponent::Section
   def initialize(job_application, allow_edit:, name:)
-    # only include the details form if we follow a religion
-    forms = if job_application.following_religion
-              %w[SchoolEthosForm NonCatholicFollowingReligionForm NonCatholicReligionDetailsForm]
-            else
-              %w[SchoolEthosForm NonCatholicFollowingReligionForm]
-            end
-    super(job_application, forms: forms, name: name, allow_edit: allow_edit)
+    super(job_application, forms: %w[NonCatholicForm], name: name, allow_edit: allow_edit)
   end
 end

app/controllers/jobseekers/job_applications/build_controller.rb

@@ -55,15 +55,12 @@ def form_attributes
                  when "show"
                    form_class.load_form(job_application)
                  when "update"
-                   form_params
+                   form_class.load_form(job_application).merge(form_params)
                  end
 
     case step
     when :professional_status
-      attributes.merge(jobseeker_profile_attributes)
-                .merge(trn_params)
-    when :references
-      attributes.merge(references: job_application.references)
+      attributes.merge(trn_params)
     when :employment_history
       attributes.merge(unexplained_employment_gaps: job_application.unexplained_employment_gaps)
     else
@@ -108,7 +105,7 @@ def update_params
   end
 
   def update_fields
-    # This version doesn't work with date fields
+    # This version doesn't work with date fields as they are submitted in 3 parts (hence form_params doesn't contain the right key)
     # form_class.storable_fields.select { |f| form_params.key?(f) }.index_with { |field| form.public_send(field) }
     form_params.except(*form_class.unstorable_fields)
   end
@@ -121,15 +118,7 @@ def vacancy
     @vacancy ||= job_application.vacancy
   end
 
-  def jobseeker_profile_attributes
-    {
-      jobseeker_profile: current_jobseeker.jobseeker_profile,
-    }
-  end
-
   def trn_params
-    return {} unless step == :professional_status
-
     {
       teacher_reference_number: form_params[:teacher_reference_number] || current_jobseeker&.jobseeker_profile&.teacher_reference_number,
       has_teacher_reference_number: form_params[:has_teacher_reference_number] || current_jobseeker&.jobseeker_profile&.has_teacher_reference_number,

app/form_models/jobseekers/job_application/ask_for_support_form.rb

@@ -17,7 +17,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :ask_for_support)))
+          super.merge(completed_attrs(model, :ask_for_support))
         end
       end
       attr_accessor(*FIELDS)

app/form_models/jobseekers/job_application/base_form.rb

@@ -15,11 +15,7 @@ def storable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes)
-        end
-
-        def load_form_attributes(attrs)
-          attrs.symbolize_keys.slice(*fields)
+          model.slice(*storable_fields)
         end
       end
     end

app/form_models/jobseekers/job_application/catholic_form.rb

@@ -0,0 +1,36 @@
+module Jobseekers
+  module JobApplication
+    class CatholicForm < ReligiousInformationForm
+      FIELDS = %i[baptism_certificate
+                  baptism_address].freeze
+
+      class << self
+        def storable_fields
+          super + FIELDS + [:baptism_date]
+        end
+
+        def unstorable_fields
+          %i[catholic_section_completed]
+        end
+
+        def load_form(model)
+          model.slice(*storable_fields).merge(completed_attrs(model, :catholic))
+        end
+      end
+
+      attr_accessor(*FIELDS)
+
+      attribute :baptism_date, :date
+
+      validates :religious_reference_type,
+                inclusion: { in: ::JobApplication::RELIGIOUS_REFERENCE_TYPES.keys.map(&:to_s), nil: false },
+                if: -> { catholic_section_completed && following_religion }
+
+      completed_attribute(:catholic)
+
+      def section_completed
+        catholic_section_completed
+      end
+    end
+  end
+end

app/form_models/jobseekers/job_application/declarations_form.rb

@@ -17,7 +17,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :declarations)))
+          super.merge(completed_attrs(model, :declarations))
         end
       end
       attr_accessor(*FIELDS)

app/form_models/jobseekers/job_application/employment_history_form.rb

@@ -18,7 +18,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :employment_history)))
+          super.merge(completed_attrs(model, :employment_history))
         end
       end
       attr_accessor(*FIELDS, :unexplained_employment_gaps)

app/form_models/jobseekers/job_application/equal_opportunities_form.rb

@@ -17,7 +17,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :equal_opportunities)))
+          super.merge(completed_attrs(model, :equal_opportunities))
         end
       end
       attr_accessor(*FIELDS)

app/form_models/jobseekers/job_application/non_catholic_form.rb

@@ -0,0 +1,31 @@
+module Jobseekers
+  module JobApplication
+    class NonCatholicForm < ReligiousInformationForm
+      class << self
+        def storable_fields
+          super + [:ethos_and_aims]
+        end
+
+        def unstorable_fields
+          %i[non_catholic_section_completed]
+        end
+
+        def load_form(model)
+          super.merge(completed_attrs(model, :non_catholic))
+        end
+      end
+
+      attr_accessor(:ethos_and_aims)
+
+      validates_presence_of :ethos_and_aims
+
+      validates :religious_reference_type, inclusion: { in: %w[referee no_referee], nil: false }, if: -> { non_catholic_section_completed && following_religion }
+
+      completed_attribute(:non_catholic)
+
+      def section_completed
+        non_catholic_section_completed
+      end
+    end
+  end
+end

app/form_models/jobseekers/job_application/personal_details_form.rb

@@ -37,7 +37,7 @@ def load_form(model)
           new_attrs = {
             has_ni_number: model.national_insurance_number.present? ? "yes" : "no",
           }.merge(completed_attrs(model, :personal_details))
-          load_form_attributes(model.attributes.merge(new_attrs))
+          super.merge(new_attrs)
         end
       end
 

app/form_models/jobseekers/job_application/personal_statement_form.rb

@@ -17,7 +17,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :personal_statement)))
+          super.merge(completed_attrs(model, :personal_statement))
         end
       end
       attr_accessor(*FIELDS)

app/form_models/jobseekers/job_application/professional_status_form.rb

@@ -11,11 +11,10 @@ class ProfessionalStatusForm < BaseForm
         qualified_teacher_status_details
         statutory_induction_complete
         teacher_reference_number
-        has_teacher_reference_number
         statutory_induction_complete_details
       ].freeze
 
-      attr_accessor(*FIELDS)
+      attr_accessor(*FIELDS, :has_teacher_reference_number)
 
       class << self
         def storable_fields
@@ -27,18 +26,11 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :professional_status)))
+          super.merge(completed_attrs(model, :professional_status))
+               .merge(has_teacher_reference_number: model[:teacher_reference_number].present? ? "yes" : "no")
         end
       end
 
-      def statutory_induction_complete_options
-        [
-          ["yes", I18n.t("helpers.label.jobseekers_job_application_professional_status_form.statutory_induction_complete_options.yes")],
-          ["no", I18n.t("helpers.label.jobseekers_job_application_professional_status_form.statutory_induction_complete_options.no")],
-
-        ]
-      end
-
       def initialize(attributes = {})
         jobseeker_profile = attributes.delete(:jobseeker_profile)
         super
@@ -65,9 +57,5 @@ def initialize(attributes = {})
 
       completed_attribute(:professional_status)
     end
-
-    def load(attrs)
-      super(attrs.merge(has_teacher_reference_number: attrs[:teacher_reference_number].present? ? "yes" : "no"))
-    end
   end
 end

app/form_models/jobseekers/job_application/qualifications_form.rb

@@ -11,7 +11,7 @@ def unstorable_fields
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(completed_attrs(model, :qualifications)))
+          super.merge(completed_attrs(model, :qualifications))
         end
       end
 

app/form_models/jobseekers/job_application/references_form.rb

@@ -15,7 +15,8 @@ def optional?
         end
 
         def load_form(model)
-          load_form_attributes(model.attributes.merge(references: model.references).merge(completed_attrs(model, :references)))
+          super.merge(references: model.references)
+                                    .merge(completed_attrs(model, :references))
         end
       end