Remove claim as a form argument

app/controllers/claims_controller.rb

@@ -14,10 +14,6 @@ class ClaimsController < BasePublicController
   include FormSubmittable
   include ClaimsFormCallbacks
 
-  def current_data_object
-    current_claim
-  end
-
   def timeout
   end
 

app/controllers/concerns/form_submittable.rb

@@ -46,12 +46,6 @@ module FormSubmittable
     before_action :load_form_if_exists, only: [:show, :update, :create]
     around_action :handle_form_submission, only: [:update, :create]
 
-    def current_data_object
-      # This is the instance of the main resource handled by the form object,
-      # and should always be defined in the controller.
-      nil
-    end
-
     def new
       redirect_to_first_slug
     end
@@ -171,7 +165,7 @@ def log_event(callback_name)
     end
 
     def load_form_if_exists
-      @form ||= journey.form(claim: current_data_object, journey_session:, params:)
+      @form ||= journey.form(journey_session:, params:)
     end
   end
 end

app/controllers/journeys/additional_payments_for_teaching/reminders_controller.rb

@@ -11,9 +11,10 @@ class RemindersController < BasePublicController
 
       private
 
-      # Wrapping `current_reminder` with an abstract method that is fed to the form object.
-      def current_data_object
-        current_reminder
+      def load_form_if_exists
+        @form ||= AdditionalPaymentsForTeaching::FORMS.dig(
+          "reminders", params[:slug]
+        )&.new(reminder: current_reminder, journey: Journeys::AdditionalPaymentsForTeaching, journey_session:, params:)
       end
 
       def claim_from_session

app/forms/current_school_form.rb

@@ -6,7 +6,7 @@ class CurrentSchoolForm < Form
   validates :current_school_id, presence: {message: i18n_error_message(:select_the_school_you_teach_at)}
   validate :current_school_must_be_open, if: -> { current_school_id.present? }
 
-  def initialize(claim:, journey_session:, journey:, params:)
+  def initialize(journey_session:, journey:, params:)
     super
 
     load_schools

app/forms/form.rb

@@ -4,7 +4,6 @@ class Form
   include ActiveModel::Serialization
   include ActiveModel::Validations::Callbacks
 
-  attr_accessor :claim
   attr_accessor :journey
   attr_accessor :journey_session
   attr_accessor :params
@@ -20,16 +19,12 @@ def self.i18n_error_message(path)
   end
 
   # TODO RL: remove journey param and pull it from the journey_session
-  def initialize(claim:, journey_session:, journey:, params:)
+  def initialize(journey_session:, journey:, params:)
     super
 
     assign_attributes(attributes_with_current_value)
   end
 
-  def update!(attrs)
-    claim.update!(attrs)
-  end
-
   def view_path
     journey::VIEW_PATH
   end

app/forms/journeys/additional_payments_for_teaching/correct_school_form.rb

@@ -19,7 +19,7 @@ def current_school_id
       private
 
       def current_school
-        @current_school ||= journey_session.recent_tps_school || claim.school
+        @current_school ||= journey_session.recent_tps_school || answers.current_school
       end
 
       def change_school?

app/forms/journeys/additional_payments_for_teaching/nqt_in_academic_year_after_itt_form.rb

@@ -44,7 +44,6 @@ def set_qualification!
         QualificationForm.new(
           journey: journey,
           journey_session: journey_session,
-          claim: claim,
           params: ActionController::Parameters.new(
             claim: {
               qualification: :postgraduate_itt

app/forms/journeys/additional_payments_for_teaching/reminders/email_verification_form.rb

@@ -6,7 +6,7 @@ class EmailVerificationForm < Form
         attribute :sent_one_time_password_at
 
         # Required for shared partial in the view
-        delegate :email_address, to: :claim
+        delegate :email_address, to: :answers
 
         validate :sent_one_time_password_must_be_valid
         validate :otp_must_be_valid, if: :sent_one_time_password_at?
@@ -19,10 +19,19 @@ def self.model_name
           self.one_time_password = one_time_password.gsub(/\D/, "")
         end
 
+        attr_reader :reminder
+
+        def initialize(reminder:, journey_session:, journey:, params:)
+          @reminder = reminder
+          super(journey_session:, journey:, params:)
+
+          assign_attributes(attributes_with_current_value)
+        end
+
         def save
           return false unless valid?
 
-          update!(email_verified: true)
+          reminder.update!(email_verified: true)
         end
 
         private
@@ -49,19 +58,7 @@ def sent_one_time_password_at?
         end
 
         def load_current_value(attribute)
-          # TODO: re-implement when the underlying claim and eligibility data sources
-          # are moved to an alternative place e.g. a session hash
-
-          # Some, but not all attributes are present directly on the claim record.
-          return claim.public_send(attribute) if claim.has_attribute?(attribute)
-
-          # At the moment, some attributes are unique to a policy eligibility record,
-          # so we need to loop through all the claims in the wrapper and check each
-          # eligibility individually; if the search fails, it should return `nil`.
-          claim.claims.each do |c|
-            return c.eligibility.public_send(attribute) if c.eligibility.has_attribute?(attribute)
-          end
-          nil
+          reminder.public_send(attribute) if reminder.has_attribute?(attribute)
         end
       end
     end

app/forms/journeys/additional_payments_for_teaching/reminders/personal_details_form.rb

@@ -16,10 +16,19 @@ def self.model_name
           ActiveModel::Name.new(Form)
         end
 
+        attr_reader :reminder
+
+        def initialize(reminder:, journey_session:, journey:, params:)
+          @reminder = reminder
+          super(journey_session:, journey:, params:)
+
+          assign_attributes(attributes_with_current_value)
+        end
+
         def save
           return false unless valid?
 
-          update!(attributes)
+          reminder.update!(attributes)
         end
 
         private
@@ -29,19 +38,7 @@ def i18n_form_namespace
         end
 
         def load_current_value(attribute)
-          # TODO: re-implement when the underlying claim and eligibility data sources
-          # are moved to an alternative place e.g. a session hash
-
-          # Some, but not all attributes are present directly on the claim record.
-          return claim.public_send(attribute) if claim.has_attribute?(attribute)
-
-          # At the moment, some attributes are unique to a policy eligibility record,
-          # so we need to loop through all the claims in the wrapper and check each
-          # eligibility individually; if the search fails, it should return `nil`.
-          claim.claims.each do |c|
-            return c.eligibility.public_send(attribute) if c.eligibility.has_attribute?(attribute)
-          end
-          nil
+          reminder.public_send(attribute) if reminder.has_attribute?(attribute)
         end
       end
     end

app/forms/journeys/teacher_student_loan_reimbursement/claim_school_form.rb

@@ -8,7 +8,7 @@ class ClaimSchoolForm < Form
       validates :claim_school_id, presence: {message: i18n_error_message(:select_a_school)}
       validate :claim_school_must_exist, if: -> { claim_school_id.present? }
 
-      def initialize(claim:, journey_session:, journey:, params:)
+      def initialize(journey_session:, journey:, params:)
         super
 
         load_schools

app/forms/personal_details_form.rb

@@ -40,7 +40,7 @@ def future?
   validates :national_insurance_number, presence: {message: "Enter a National Insurance number in the correct format"}
   validate :ni_number_is_correct_format
 
-  def initialize(claim:, journey_session:, journey:, params:)
+  def initialize(journey_session:, journey:, params:)
     super
     assign_date_attributes
   end

app/models/journeys/additional_payments_for_teaching/slug_sequence.rb

@@ -176,11 +176,7 @@ def self.start_page_url
       private
 
       def personal_details_form
-        # FIXME RL: forms expect a claim argument even thought they don't use it
-        # this will be removed as part of no longer creating a claim at the
-        # start of the journey work
         PersonalDetailsForm.new(
-          claim: nil,
           journey_session: journey_session,
           journey: Journeys::AdditionalPaymentsForTeaching,
           params: ActionController::Parameters.new

app/models/journeys/base.rb

@@ -35,10 +35,10 @@ def slug_sequence
       self::SlugSequence
     end
 
-    def form(claim:, journey_session:, params:)
+    def form(journey_session:, params:)
       form = SHARED_FORMS.deep_merge(forms).dig(params[:controller].split("/").last, params[:slug])
 
-      form&.new(journey: self, journey_session:, claim:, params:)
+      form&.new(journey: self, journey_session:, params:)
     end
 
     def forms

app/models/journeys/teacher_student_loan_reimbursement/slug_sequence.rb

@@ -133,7 +133,6 @@ def self.start_page_url
 
       def personal_details_form
         PersonalDetailsForm.new(
-          claim: nil,
           journey_session: journey_session,
           journey: Journeys::TeacherStudentLoanReimbursement,
           params: ActionController::Parameters.new

app/views/additional_payments/claims/eligible_itt_subject.html.erb

@@ -21,7 +21,7 @@
     <% end %>
 
     <%= form_for @form, url: claim_path(current_journey_routing_name) do |f| %>
-      <%= form_group_tag f.object.claim do %>
+      <%= form_group_tag f.object do %>
 
         <%= f.hidden_field :eligible_itt_subject %>
 

app/views/additional_payments/claims/nqt_in_academic_year_after_itt.html.erb

@@ -13,7 +13,7 @@
         ) %>
       <% end %>
 
-      <%= form_group_tag f.object.claim do %>
+      <%= form_group_tag f.object do %>
 
         <%= f.hidden_field :nqt_in_academic_year_after_itt %>
 

app/views/additional_payments/claims/qualification_details.html.erb

@@ -69,7 +69,7 @@
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--m"><%= t("questions.details_correct") %></legend>
 
-        <%= errors_tag f.object.claim, :qualifications_details_check %>
+        <%= errors_tag f.object, :qualifications_details_check %>
 
         <div class="govuk-radios govuk-radios--inline" data-module="govuk-radios">
           <div class="govuk-radios__item">

app/views/claims/gender.html.erb

@@ -4,7 +4,7 @@
   <div class="govuk-grid-column-two-thirds">
     <%= render("shared/error_summary", instance: @form, errored_field_id_overrides: { payroll_gender: "claim_payroll_gender_female" }) if @form.errors.any? %>
     <%= form_for @form, url: claim_path(current_journey_routing_name) do |f| %>
-      <%= form_group_tag @form.claim do %>
+      <%= form_group_tag @form do %>
         <fieldset class="govuk-fieldset" aria-describedby="payroll_gender-hint" role="group">
 
           <legend class="govuk-fieldset__legend <%= fieldset_legend_css_class_for_journey(journey) %>">

app/views/claims/mobile_number.html.erb

@@ -13,7 +13,7 @@
 
     <%= form_for @form, url: claim_path(current_journey_routing_name) do |f| %>
       <span class="govuk-caption-xl"><%= t("questions.personal_details") %></span>
-      <%= form_group_tag f.object.claim do %>
+      <%= form_group_tag f.object do %>
         <h1 class="govuk-label-wrapper">
           <%= f.label(
             :mobile_number,
@@ -31,7 +31,7 @@
         <%= f.text_field(
           :mobile_number,
           spellcheck: "false",
-          class: css_classes_for_input(f.object.claim, :mobile_number),
+          class: css_classes_for_input(f.object, :mobile_number),
           "aria-describedby" => "mobile-number-hint"
         ) %>
 

app/views/claims/select_mobile.html.erb

@@ -20,7 +20,7 @@
     <%= form_for @form, url: claim_path(current_journey_routing_name) do |f| %>
 
       <span class="govuk-caption-xl"><%= t("questions.personal_details") %></span>
-      <%= form_group_tag f.object.claim do %>
+      <%= form_group_tag f.object do %>
 
         <fieldset class="govuk-fieldset" aria-describedby="phone-number-hint">
 

app/views/claims/teacher_reference_number.html.erb

@@ -32,7 +32,7 @@
             :teacher_reference_number,
             spellcheck: "false",
             autocomplete: "off",
-            class: css_classes_for_input(f.object.claim, :teacher_reference_number, 'govuk-input--width-10'),
+            class: css_classes_for_input(f.object, :teacher_reference_number, 'govuk-input--width-10'),
             "aria-describedby" => "teacher_reference_number-hint"
           ) %>
         </div>

app/views/student_loans/claims/qualification_details.html.erb

@@ -34,7 +34,7 @@
 
   <%= form_for @form, url: claim_path(current_journey_routing_name) do |f| %>
     <%= f.hidden_field :qualifications_details_check %>
-    <%= form_group_tag f.object.claim do %>
+    <%= form_group_tag f.object do %>
 
     <div class="govuk-radios">
       <fieldset class="govuk-fieldset">

app/views/student_loans/claims/still_teaching.html.erb

@@ -16,7 +16,7 @@
           <div class="govuk-radios">
             <%= form.hidden_field :employment_status %>
 
-            <%= render partial: "still_teaching_with_#{@form.tps_or_claim_school}", locals: { current_claim: @form.claim, form: form, school: @form.school }  %>
+            <%= render partial: "still_teaching_with_#{@form.tps_or_claim_school}", locals: { form: form, school: @form.school }  %>
           </div>
         </fieldset>
       <% end %>

spec/forms/address_form_spec.rb

@@ -3,7 +3,6 @@
 RSpec.describe AddressForm, type: :model do
   subject(:form) do
     described_class.new(
-      claim: CurrentClaim.new(claims: [build(:claim)]),
       journey: journey,
       params: params,
       journey_session: journey_session
@@ -102,10 +101,6 @@
   end
 
   describe "#save" do
-    before do
-      allow(form).to receive(:update!)
-    end
-
     context "valid params" do
       context "all required address lines provided" do
         before { form.save }

spec/forms/bank_details_form_spec.rb

@@ -29,7 +29,6 @@
 
     subject(:form) do
       described_class.new(
-        claim: CurrentClaim.new(claims: [build(:claim)]),
         journey_session: journey_session,
         journey: journey,
         params: ActionController::Parameters.new(slug:, claim: params)

spec/forms/bank_or_building_society_form_spec.rb

@@ -23,7 +23,6 @@
 
     subject(:form) do
       described_class.new(
-        claim: CurrentClaim.new(claims: [build(:claim)]),
         journey_session: journey_session,
         journey: journey,
         params: ActionController::Parameters.new({slug:, claim: claim_params})

spec/forms/current_school_form_spec.rb

@@ -7,18 +7,12 @@
       create(:journey_configuration, :additional_payments)
     }
 
-    let(:current_claim) do
-      claims = journey::POLICIES.map { |policy| create(:claim, policy: policy) }
-      CurrentClaim.new(claims: claims)
-    end
-
     let(:journey_session) { create(:"#{journey::I18N_NAMESPACE}_session") }
 
     let(:slug) { "current-school" }
 
     subject(:form) do
       described_class.new(
-        claim: CurrentClaim.new(claims: [build(:claim)]),
         journey_session: journey_session,
         journey: journey,
         params: params