From 772c1188e16f852111ea1937cd83cbf13ba0b86b Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 24 Nov 2022 09:36:32 +0000 Subject: [PATCH] move status_during_startdate into validations files --- app/models/location.rb | 11 -------- app/models/validations/date_validations.rb | 15 +++++++++-- app/models/validations/setup_validations.rb | 29 ++++++++++++++------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index 136589c3e..46cb1da6c 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -393,17 +393,6 @@ class Location < ApplicationRecord status == :reactivating_soon end - def status_during(date) - return if date.blank? - - closest_reactivation = location_deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } - return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present? - return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date - - open_deactivation = location_deactivation_periods.deactivations_without_reactivation.first - return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date - end - private PIO = PostcodeService.new diff --git a/app/models/validations/date_validations.rb b/app/models/validations/date_validations.rb index b7865ab2b..813464a2c 100644 --- a/app/models/validations/date_validations.rb +++ b/app/models/validations/date_validations.rb @@ -60,7 +60,7 @@ module Validations::DateValidations record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date") end - location_status_during_startdate = record.location&.status_during(record.startdate) + location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from) if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end @@ -73,7 +73,7 @@ module Validations::DateValidations record.errors.add :startdate, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end - scheme_status_during_startdate = record.scheme&.status_during(record.startdate) + scheme_status_during_startdate = status_during_startdate(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from) if scheme_status_during_startdate.present? && scheme_status_during_startdate[:status] == :deactivated record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_scheme", name: record.scheme.service_name, date: scheme_status_during_startdate[:date].to_formatted_s(:govuk_date)) end @@ -117,4 +117,15 @@ private def is_rsnvac_first_let?(record) [15, 16, 17].include?(record["rsnvac"]) end + + def status_during_startdate(date, deactivation_periods, available_from) + return if date.blank? + + closest_reactivation = deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present? + return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present? + return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date + + open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present? + return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date + end end diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 4f5f1b128..525a44295 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -6,22 +6,22 @@ module Validations::SetupValidations end def validate_location(record) - status_during_startdate = record.location&.status_during(record.startdate) - if status_during_startdate.present? && status_during_startdate[:status] == :deactivated - record.errors.add :location_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date)) + location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from) + if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated + record.errors.add :location_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end - if status_during_startdate.present? && status_during_startdate[:status] == :reactivating_soon - record.errors.add :location_id, I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date), deactivation_date: status_during_startdate[:deactivation_date].to_formatted_s(:govuk_date)) + if location_status_during_startdate.present? && location_status_during_startdate[:status] == :reactivating_soon + record.errors.add :location_id, I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date), deactivation_date: location_status_during_startdate[:deactivation_date].to_formatted_s(:govuk_date)) end - if status_during_startdate.present? && status_during_startdate[:status] == :activating_soon - record.errors.add :location_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date)) + if location_status_during_startdate.present? && location_status_during_startdate[:status] == :activating_soon + record.errors.add :location_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end end def validate_scheme(record) - location_status_during_startdate = record.location&.status_during(record.startdate) + location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from) if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated record.errors.add :scheme_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end @@ -34,7 +34,7 @@ module Validations::SetupValidations record.errors.add :scheme_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date)) end - scheme_status_during_startdate = record.scheme&.status_during(record.startdate) + scheme_status_during_startdate = status_during_startdate(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from) if scheme_status_during_startdate.present? && scheme_status_during_startdate[:status] == :deactivated record.errors.add :scheme_id, I18n.t("validations.setup.startdate.during_deactivated_scheme", name: record.scheme.service_name, date: scheme_status_during_startdate[:date].to_formatted_s(:govuk_date)) end @@ -53,4 +53,15 @@ private def intermediate_product_rent_type?(record) record.rent_type == 5 end + + def status_during_startdate(date, deactivation_periods, available_from) + return if date.blank? + + closest_reactivation = deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present? + return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present? + return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date + + open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present? + return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date + end end