Move collection start date logic to form handler

app/models/form_handler.rb

@@ -49,6 +49,11 @@ class FormHandler
     today < window_end_date ? today.year - 1 : today.year
   end
 
+  def collection_start_date(date)
+    window_end_date = Time.zone.local(date.year, 4, 1)
+    date < window_end_date ? Time.zone.local(date.year - 1, 4, 1) : Time.zone.local(date.year, 4, 1)
+  end
+
   def current_collection_start_date
     Time.zone.local(current_collection_start_year, 4, 1)
   end

app/models/location.rb

@@ -372,8 +372,7 @@ class Location < ApplicationRecord
   def available_from
     return startdate if startdate.present?
 
-    window_end_date = Time.zone.local(created_at.year, 4, 1)
+    FormHandler.instance.collection_start_date(created_at)
-    created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1)
   end
 
   def status

app/models/scheme.rb

@@ -210,8 +210,7 @@ class Scheme < ApplicationRecord
   end
 
   def available_from
-    window_end_date = Time.zone.local(created_at.year, 4, 1)
+    FormHandler.instance.collection_start_date(created_at)
-    created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1)
   end
 
   def status