Move methods that are only used for tests into test helper

Author: embarnard

app/helpers/application_helper.rb

@@ -162,7 +162,7 @@ def ctc_current_tax_year
   end
 
   def ctc_prior_tax_year
-    MultiTenantService.new(:ctc).prior_tax_year
+    MultiTenantService.new(:ctc).current_tax_year - 1
   end
 
   def request_domain

app/models/intake/gyr_intake.rb

@@ -618,17 +618,8 @@ def self.current_tax_year
     MultiTenantService.gyr.current_tax_year.to_i
   end
 
-  def most_recent_filing_year
-    filing_years.first || MultiTenantService.new(:gyr).current_tax_year
-  end
-
-  def most_recent_needs_help_or_filing_year
-    return filing_years.first if filing_years.first.present?
-    return MultiTenantService.new(:gyr).current_tax_year - 1 if needs_help_previous_year_1_yes?
-    return MultiTenantService.new(:gyr).current_tax_year - 2 if needs_help_previous_year_2_yes?
-    return MultiTenantService.new(:gyr).current_tax_year - 3 if needs_help_previous_year_3_yes?
-
-    MultiTenantService.new(:gyr).current_tax_year
+  def most_recent_filing_year(time = DateTime.now)
+    filing_years.first || MultiTenantService.new(:gyr).current_tax_year(time)
   end
 
   def year_before_most_recent_filing_year

app/models/state_file_dependent.rb

@@ -91,11 +91,6 @@ class StateFileDependent < ApplicationRecord
     message: :blank
   }, if: -> { id_has_grocery_credit_ineligible_months == "yes" }, on: :id_grocery_credit_form
 
-  def self.senior_cutoff_date
-    # Deprecated: please use `#senior?` (this method used only in tests)
-    MultiTenantService.statefile.end_of_current_tax_year.years_ago(65)
-  end
-
   def full_name
     parts = [first_name, middle_initial, last_name]
     parts << suffix if suffix.present?

app/services/multi_tenant_service.rb

@@ -91,14 +91,6 @@ def current_tax_year(time = DateTime.now)
     end
   end
 
-  def end_of_current_tax_year
-    DateTime.new(current_tax_year).end_of_year
-  end
-
-  def prior_tax_year
-    current_tax_year - 1
-  end
-
   def between_deadline_and_end_of_in_progress_intake?(now = DateTime.now)
     now.between?(Rails.configuration.tax_deadline, Rails.configuration.end_of_in_progress_intake)
   end
@@ -116,8 +108,8 @@ def filing_years(now = DateTime.now)
     end
   end
 
-  def backtax_years(now = DateTime.now)
-    filing_years(now).without(current_tax_year)
+  def backtax_years(time = DateTime.now)
+    filing_years(time).without(current_tax_year(time))
   end
 
   def twilio_creds
@@ -152,11 +144,8 @@ def statefile
   private
 
   def gyr_current_tax_year(time)
-    filing_seasons = Rails.configuration.tax_year_filing_seasons.select do |key, val|
-      # val = open, closed date
-      time > val[0]
-    end
-
-    filing_seasons.keys.max
+    Rails.configuration.tax_year_filing_seasons.select do |_year, (open_date, _close_date)|
+      time > open_date
+    end.keys.max
   end
 end

app/views/hub/clients/show.html.erb

@@ -345,11 +345,11 @@
             <div class="client-profile__field-group">
               <h2 class="text--bold">Prior Year AGI Amount</h2>
               <div class="field-display">
-                <span class="form-question">Primary Prior Year (<%= MultiTenantService.new(:ctc).prior_tax_year %>) AGI:</span>
+                <span class="form-question">Primary Prior Year (<%= ctc_prior_tax_year %>) AGI:</span>
                 <span class="label-value"><%= number_to_currency(@client.intake.primary_prior_year_agi_amount || 0) %></span>
               </div>
               <div class="field-display">
-                <span class="form-question">Spouse Prior Year (<%= MultiTenantService.new(:ctc).prior_tax_year %>) AGI:</span>
+                <span class="form-question">Spouse Prior Year (<%= ctc_prior_tax_year %>) AGI:</span>
                 <span class="label-value"><%= number_to_currency(@client.intake.spouse_prior_year_agi_amount || 0) %></span>
               </div>
             </div>

app/views/questions/backtaxes/edit.html.erb

@@ -22,18 +22,15 @@
     </p>
     <div class="form-card__stacked-checkboxes spacing-above-0">
       <% gyr_backtax_years.reverse.each do |backtax_year| %>
-<!--        does this need to use the filing year instead?-->
-<!--        MultiTenantService.gyr.current_tax_year should be gyr_backtax_years.max instead?-->
-        <% previous_year_index = gyr_backtax_years.max - backtax_year %>
+        <% previous_year_index = MultiTenantService.gyr.current_tax_year(app_time) - backtax_year %>
         <%= f.cfa_checkbox("needs_help_previous_year_#{previous_year_index}".to_sym,
                            backtax_year.to_s,
                            options: { checked_value: "yes", unchecked_value: "no" }) %>
       <% end %>
       <%= f.cfa_checkbox("needs_help_current_year".to_sym,
-                         MultiTenantService.gyr.current_tax_year.to_s,
+                         MultiTenantService.gyr.current_tax_year(app_time).to_s,
                          options: { checked_value: "yes", unchecked_value: "no" }) %>
     </div>
-    <% binding.pry %>
 
     <%= f.continue %>
   <% end %>

app/views/questions/start_with_current_year/edit.html.erb

@@ -1,4 +1,4 @@
-<% content_for :page_title, t("views.questions.start_with_current_year.title", :year => current_intake.most_recent_filing_year) %>
+<% content_for :page_title, t("views.questions.start_with_current_year.title", :year => current_intake.most_recent_filing_year(app_time)) %>
 
 <% content_for :card do %>
   <div class="form-card">

app/views/shared/_prior_agi.html.erb

@@ -1,11 +1,11 @@
 <div id="prior-agi">
   <div class="hub-form__card card-small">
     <h3>Prior Tax Year Adjusted Gross Income</h3>
-    <p>If the client filed taxes in <%= MultiTenantService.new(:ctc).prior_tax_year %>, either AGI field(s) or PIN field(s) must have accurate values.</p>
+    <p>If the client filed taxes in <%= ctc_prior_tax_year %>, either AGI field(s) or PIN field(s) must have accurate values.</p>
     <p>If PIN(s) are provided, PIN will be sent on the return. Otherwise, AGI is used.</p>
-    <%= f.cfa_input_field(:primary_prior_year_agi_amount, "Primary #{MultiTenantService.new(:ctc).prior_tax_year} AGI (Form 1040 8b)") %>
-    <%= f.cfa_input_field(:spouse_prior_year_agi_amount, "Spouse #{MultiTenantService.new(:ctc).prior_tax_year} AGI (Form 1040b)") %>
-    <%= f.cfa_input_field(:primary_prior_year_signature_pin, "Primary #{MultiTenantService.new(:ctc).prior_tax_year} Signature PIN") %>
-    <%= f.cfa_input_field(:spouse_prior_year_signature_pin, "Spouse #{MultiTenantService.new(:ctc).prior_tax_year} Signature PIN") %>
+    <%= f.cfa_input_field(:primary_prior_year_agi_amount, "Primary #{ctc_prior_tax_year} AGI (Form 1040 8b)") %>
+    <%= f.cfa_input_field(:spouse_prior_year_agi_amount, "Spouse #{ctc_prior_tax_year} AGI (Form 1040b)") %>
+    <%= f.cfa_input_field(:primary_prior_year_signature_pin, "Primary #{ctc_prior_tax_year} Signature PIN") %>
+    <%= f.cfa_input_field(:spouse_prior_year_signature_pin, "Spouse #{ctc_prior_tax_year} Signature PIN") %>
   </div>
 </div>

spec/controllers/state_file/questions/id_disability_controller_spec.rb

@@ -12,8 +12,8 @@
     render_views
 
     let!(:state_file1099_r) { create(:state_file1099_r, intake: intake, taxable_amount: 25) }
-    let(:between_dob) { Date.new((MultiTenantService.statefile.end_of_current_tax_year.year - 63), 1, 1) }
-    let(:not_between_dob) { Date.new((MultiTenantService.statefile.end_of_current_tax_year.year - 60), 1, 1) }
+    let(:between_dob) { age_at_end_of_tax_year(63) }
+    let(:not_between_dob) { age_at_end_of_tax_year(60) }
 
     it 'succeeds' do
       get :edit

spec/factories/state_file_az_intakes.rb

@@ -148,7 +148,7 @@
       spouse_first_name { "Senior" }
       spouse_middle_initial { "B" }
       spouse_last_name { "Spouse" }
-      spouse_birth_date { MultiTenantService.statefile.end_of_current_tax_year - 70 }
+      spouse_birth_date { age_at_end_of_tax_year(70) }
     end
 
     trait :with_az321_contributions do