extract get collection year method

app/models/case_log.rb

@@ -48,15 +48,16 @@ class CaseLog < ApplicationRecord
     FormHandler.instance.get_form(form_name) || FormHandler.instance.forms.first.second
   end
 
+  def get_collection_start_year
+    window_end_date = Time.zone.local(startdate.year, 4, 1)
+    startdate < window_end_date ? startdate.year - 1 : startdate.year
+  end
+
   def form_name
     return unless startdate
 
-    window_end_date = Time.zone.local(startdate.year, 4, 1)
-    if startdate < window_end_date
-      "#{startdate.year - 1}_#{startdate.year}"
-    else
-      "#{startdate.year}_#{startdate.year + 1}"
-    end
+    collection_start_year = get_collection_start_year
+    "#{collection_start_year}_#{collection_start_year + 1}"
   end
 
   def self.editable_fields

app/models/validations/financial_validations.rb

@@ -135,8 +135,7 @@ private
   def validate_rent_range(record)
     return if record.startdate.blank?
 
-    window_end_date = Time.zone.local(record.year, 4, 1)
-    collection_year = record.startdate < window_end_date ? record.year - 1 : record.year
+    collection_year = record.get_collection_start_year
     rent_range = LaRentRange.find_by(start_year: collection_year, la: record.la, beds: record.beds, lettype: record.lettype)
 
     if rent_range.present? && !weekly_value_in_range(record, "brent", rent_range.hard_min, rent_range.hard_max)

lib/tasks/rent_ranges.rake

@@ -22,7 +22,7 @@ namespace :data_import do
           hard_max: row["hard_max"] },
         unique_by: %i[start_year lettype beds la],
       )
-      count +=1
+      count += 1
     end
     pp "Created/updated #{count} records"
   end