From 17fecefa25297a3cd755dff6c75748795e744981 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 24 Nov 2022 13:10:44 +0000 Subject: [PATCH] Move collection start date logic to form handler --- app/models/form_handler.rb | 5 +++++ app/models/location.rb | 3 +-- app/models/scheme.rb | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb index 61b981436..03de5e290 100644 --- a/app/models/form_handler.rb +++ b/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 diff --git a/app/models/location.rb b/app/models/location.rb index 7b6c93624..4fa161e0b 100644 --- a/app/models/location.rb +++ b/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) - created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1) + FormHandler.instance.collection_start_date(created_at) end def status diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 598eefd68..73aecd6ac 100644 --- a/app/models/scheme.rb +++ b/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) - created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1) + FormHandler.instance.collection_start_date(created_at) end def status