From 1294264ce8a11f8db08264f3a3b8cabc5c9a23fd Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 28 Nov 2022 11:07:38 +0000 Subject: [PATCH] Extract scheme validation method --- app/models/validations/setup_validations.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 5d8531625..19eb7dcf3 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -11,11 +11,7 @@ module Validations::SetupValidations def validate_scheme(record) validate_location_during_startdate(record, :scheme_id) - - scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from) - if scheme_inactive_status.present? - record.errors.add :scheme_id, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date)) - end + validate_scheme_during_startdate(record) end private @@ -41,4 +37,11 @@ private record.errors.add field, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date)) end end + + def validate_scheme_during_startdate(record) + scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from) + if scheme_inactive_status.present? + record.errors.add :scheme_id, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date)) + end + end end