Remove shim

Now now form are writing to the journey session we can remove the shim classes
DFE-Digital · Jun 13, 2024 · 7291f39 · 7291f39
1 parent c78098c
commit 7291f39
Show file tree

Hide file tree

Showing 26 changed files with 77 additions and 324 deletions.
diff --git a/app/controllers/claims_controller.rb b/app/controllers/claims_controller.rb
@@ -96,14 +96,7 @@ def claim_in_progress?
   end
 
   def claim_ineligible?
-    journey::EligibilityChecker.new(journey_session: shim).ineligible?
-  end
-
-  def shim
-    @shim ||= journey::ClaimJourneySessionShim.new(
-      current_claim: current_claim,
-      journey_session: journey_session
-    )
+    journey::EligibilityChecker.new(journey_session: journey_session).ineligible?
   end
 
   def page_sequence

diff --git a/app/controllers/concerns/journey_concern.rb b/app/controllers/concerns/journey_concern.rb
@@ -56,7 +56,12 @@ def find_journey_session
   end
 
   def create_journey_session!
-    journey::Session.create!(journey: params[:journey])
+    journey::Session.create!(
+      journey: params[:journey],
+      answers: {
+        academic_year: journey_configuration.current_academic_year
+      }
+    )
   end
 
   def journey_session_key

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
@@ -4,12 +4,7 @@ class SubmissionsController < BasePublicController
   skip_before_action :send_unstarted_claimants_to_the_start, only: [:show]
 
   def create
-    shim = journey::ClaimJourneySessionShim.new(
-      current_claim: current_claim,
-      journey_session: journey_session
-    )
-
-    @form = journey::ClaimSubmissionForm.new(journey_session: shim)
+    @form = journey::ClaimSubmissionForm.new(journey_session: journey_session)
 
     if @form.save
       current_claim.claims.each(&:destroy!)

diff --git a/app/forms/claim_submission_base_form.rb b/app/forms/claim_submission_base_form.rb
@@ -64,12 +64,7 @@ def set_eligibility_attributes(eligibility)
   end
 
   def set_attributes_for_claim_submission
-    # Temp conditional while we're working with the shim
-    claim.journey_session = if journey_session.is_a?(ClaimJourneySessionShim)
-      journey_session.journey_session
-    else
-      journey_session
-    end
+    claim.journey_session = journey_session
     claim.policy_options_provided = generate_policy_options_provided
     claim.reference = generate_reference
     claim.submitted_at = Time.zone.now

diff --git a/app/forms/form.rb b/app/forms/form.rb
@@ -51,16 +51,6 @@ def persisted?
     true
   end
 
-  # NOTE RL: temporary method while migrating away from current claim for when
-  # we need to check against either answers or the claim for some information
-  # Will be removed once the migration is complete and we delete the shim
-  def shim
-    @shim ||= Journeys::AdditionalPaymentsForTeaching::ClaimJourneySessionShim.new(
-      current_claim: claim,
-      journey_session: journey_session
-    )
-  end
-
   private
 
   def permitted_attributes

diff --git a/app/forms/journeys/additional_payments_for_teaching/eligibility_confirmed_form.rb b/app/forms/journeys/additional_payments_for_teaching/eligibility_confirmed_form.rb
@@ -31,7 +31,7 @@ def policies_eligible_now_and_sorted
       end
 
       def award_amount(policy)
-        policy::PolicyEligibilityChecker.new(answers: shim.answers).calculate_award_amount
+        policy::PolicyEligibilityChecker.new(answers: answers).calculate_award_amount
       end
 
       def selected_policy?(policy)
@@ -47,7 +47,7 @@ def allowed_policy_names
       end
 
       def eligibility_checker
-        @eligibility_checker ||= EligibilityChecker.new(journey_session: shim)
+        @eligibility_checker ||= EligibilityChecker.new(journey_session: journey_session)
       end
     end
   end

diff --git a/app/forms/journeys/additional_payments_for_teaching/eligible_itt_subject_form.rb b/app/forms/journeys/additional_payments_for_teaching/eligible_itt_subject_form.rb
@@ -27,7 +27,7 @@ def chemistry_or_physics_available?
 
       def subject_symbols
         @subject_symbols ||=
-          JourneySubjectEligibilityChecker.selectable_subject_symbols(shim.answers)
+          JourneySubjectEligibilityChecker.selectable_subject_symbols(answers)
       end
 
       def save

diff --git a/app/models/claim_journey_session_shim.rb b/app/models/claim_journey_session_shim.rb
diff --git a/app/models/concerns/policies/early_career_payments/eligible.rb b/app/models/concerns/policies/early_career_payments/eligible.rb
@@ -18,7 +18,7 @@ def ecp_only_school?
           !Policies::LevellingUpPremiumPayments::SchoolEligibility.new(current_school).eligible?
       end
 
-      def calculate_award_amount
+      def calculate_award_amount(debug = false)
         return 0 if eligible_itt_subject.blank?
 
         args = {policy_year: claim_year, itt_year: itt_academic_year, subject_symbol: eligible_itt_subject.to_sym, school: current_school}

diff --git a/app/models/journeys/additional_payments_for_teaching/claim_journey_session_shim.rb b/app/models/journeys/additional_payments_for_teaching/claim_journey_session_shim.rb
diff --git a/app/models/journeys/additional_payments_for_teaching/slug_sequence.rb b/app/models/journeys/additional_payments_for_teaching/slug_sequence.rb
@@ -255,23 +255,16 @@ def set_by_teacher_id?(field)
         answers.teacher_id_user_info[field].present?
       end
 
-      def shim
-        @shim ||= Journeys::AdditionalPaymentsForTeaching::ClaimJourneySessionShim.new(
-          current_claim: claim,
-          journey_session: journey_session
-        )
-      end
-
       def overall_eligibility_status
-        @overall_eligibility_status ||= EligibilityChecker.new(journey_session: shim).status
+        @overall_eligibility_status ||= EligibilityChecker.new(journey_session: journey_session).status
       end
 
       def ecp_eligibility_checker
-        @ecp_eligibility_checker ||= Policies::EarlyCareerPayments::PolicyEligibilityChecker.new(answers: shim.answers)
+        @ecp_eligibility_checker ||= Policies::EarlyCareerPayments::PolicyEligibilityChecker.new(answers: answers)
       end
 
       def lup_eligibility_checker
-        @lup_eligibility_checker ||= Policies::LevellingUpPremiumPayments::PolicyEligibilityChecker.new(answers: shim.answers)
+        @lup_eligibility_checker ||= Policies::LevellingUpPremiumPayments::PolicyEligibilityChecker.new(answers: answers)
       end
     end
   end

diff --git a/app/models/journeys/page_sequence.rb b/app/models/journeys/page_sequence.rb
@@ -114,18 +114,11 @@ def journey
     end
 
     def claim_submittable?
-      journey::ClaimSubmissionForm.new(journey_session: shim).valid?
-    end
-
-    def shim
-      @shim ||= journey::ClaimJourneySessionShim.new(
-        current_claim: @claim,
-        journey_session: @journey_session
-      )
+      journey::ClaimSubmissionForm.new(journey_session: @journey_session).valid?
     end
 
     def journey_ineligible?
-      @journey_ineligible ||= journey::EligibilityChecker.new(journey_session: shim).ineligible?
+      @journey_ineligible ||= journey::EligibilityChecker.new(journey_session: @journey_session).ineligible?
     end
   end
 end
diff --git a/app/models/journeys/teacher_student_loan_reimbursement/claim_journey_session_shim.rb b/app/models/journeys/teacher_student_loan_reimbursement/claim_journey_session_shim.rb
diff --git a/app/models/journeys/teacher_student_loan_reimbursement/slug_sequence.rb b/app/models/journeys/teacher_student_loan_reimbursement/slug_sequence.rb
@@ -146,14 +146,7 @@ def ineligible?
       end
 
       def eligibility_checker
-        @eligibility_checker ||= Policies::StudentLoans::PolicyEligibilityChecker.new(answers: shim.answers)
-      end
-
-      def shim
-        @shim ||= ClaimJourneySessionShim.new(
-          current_claim: claim,
-          journey_session: journey_session
-        )
+        @eligibility_checker ||= Policies::StudentLoans::PolicyEligibilityChecker.new(answers: answers)
       end
 
       def signed_in_with_dfe_identity_and_details_match?

diff --git a/app/views/additional_payments/claims/eligible_itt_subject.html.erb b/app/views/additional_payments/claims/eligible_itt_subject.html.erb
@@ -1,7 +1,7 @@
 <% content_for(
   :page_title,
   page_title(
-    eligible_itt_subject_translation(@form.shim.answers, @form.subject_symbols),
+    eligible_itt_subject_translation(@form.answers, @form.subject_symbols),
     journey: current_journey_routing_name,
     show_error: @form.errors.any?
   )
@@ -29,7 +29,7 @@
 
           <legend class="govuk-fieldset__legend <%= fieldset_legend_css_class_for_journey(f.object.journey) %>">
             <h1 class="govuk-fieldset__heading">
-              <%= eligible_itt_subject_translation(f.object.shim.answers, f.object.subject_symbols) %>
+              <%= eligible_itt_subject_translation(f.object.answers, f.object.subject_symbols) %>
             </h1>
           </legend>
 

diff --git a/app/views/additional_payments/claims/ineligible.html.erb b/app/views/additional_payments/claims/ineligible.html.erb
@@ -1,10 +1,5 @@
 <% require "./lib/ineligibility_reason_checker.rb" %>
-<% reason = IneligibilityReasonChecker.new(
-  Journeys::AdditionalPaymentsForTeaching::ClaimJourneySessionShim.new(
-    current_claim: current_claim,
-    journey_session: journey_session
-  ).answers
-).reason %>
+<% reason = IneligibilityReasonChecker.new(journey_session.answers).reason %>
 <% title_and_h1_content = reason == :current_school ? I18n.t("additional_payments.ineligible.school_heading") : I18n.t("additional_payments.ineligible.heading") %>
 <% content_for(:page_title, page_title(title_and_h1_content, journey: current_journey_routing_name)) %>