From d95ff454774f10597e875f0185cd12903d7358b2 Mon Sep 17 00:00:00 2001 From: Carolyn Date: Thu, 13 Mar 2025 22:02:58 +0000 Subject: [PATCH] rename variable for clarity --- app/models/location_deactivation_period.rb | 6 +++--- app/models/scheme_deactivation_period.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/location_deactivation_period.rb b/app/models/location_deactivation_period.rb index 3f222509e..11296d64e 100644 --- a/app/models/location_deactivation_period.rb +++ b/app/models/location_deactivation_period.rb @@ -3,9 +3,9 @@ class LocationDeactivationPeriodValidator < ActiveModel::Validator def validate(record) location = record.location - recent_deactivation = location.location_deactivation_periods.deactivations_without_reactivation.first - if recent_deactivation.present? && recent_deactivation.deactivation_date <= 6.months.from_now - validate_reactivation(record, recent_deactivation, location) + open_deactivation = location.location_deactivation_periods.deactivations_without_reactivation.first + if open_deactivation.present? && open_deactivation.deactivation_date <= 6.months.from_now + validate_reactivation(record, open_deactivation, location) else validate_deactivation(record, location) end diff --git a/app/models/scheme_deactivation_period.rb b/app/models/scheme_deactivation_period.rb index cb27534f7..2c61d59f9 100644 --- a/app/models/scheme_deactivation_period.rb +++ b/app/models/scheme_deactivation_period.rb @@ -3,9 +3,9 @@ class SchemeDeactivationPeriodValidator < ActiveModel::Validator def validate(record) scheme = record.scheme - recent_deactivation = scheme.scheme_deactivation_periods.deactivations_without_reactivation.first - if recent_deactivation.present? && recent_deactivation.deactivation_date <= 6.months.from_now - validate_reactivation(record, recent_deactivation, scheme) + open_deactivation = scheme.scheme_deactivation_periods.deactivations_without_reactivation.first + if open_deactivation.present? && open_deactivation.deactivation_date <= 6.months.from_now + validate_reactivation(record, open_deactivation, scheme) else validate_deactivation(record, scheme) end