From 6c177bcbe4a7bcdfaff5a8ef68eeab684dcae69b Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 2 Sep 2016 13:17:08 +0300 Subject: [PATCH 1/3] Story#129684535 add 1 extra day to extend valid_to --- app/models/domain.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 772fdcf40..1588b62cb 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -545,7 +545,8 @@ class Domain < ActiveRecord::Base def set_validity_dates self.registered_at = Time.zone.now self.valid_from = Time.zone.now - self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) + # we need + 1 day as this is more correct from juridical side + self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) + 1.day end # rubocop:disable Metrics/AbcSize From 06c92b1cfe0c397b188a3a1b781f4178cca6dc3f Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Mon, 5 Sep 2016 10:40:38 +0300 Subject: [PATCH 2/3] Story#129684535 updaet deletion and outzone and do not use time when to expire --- app/models/domain.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 1588b62cb..2efcbb8e2 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -546,7 +546,7 @@ class Domain < ActiveRecord::Base self.registered_at = Time.zone.now self.valid_from = Time.zone.now # we need + 1 day as this is more correct from juridical side - self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) + 1.day + self.valid_to = valid_from.utc.beginning_of_day + self.class.convert_period_to_time(period, period_unit) + 1.day end # rubocop:disable Metrics/AbcSize @@ -577,7 +577,7 @@ class Domain < ActiveRecord::Base statuses << DomainStatus::SERVER_MANUAL_INZONE end - self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day unless force_delete_at + self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days)).utc.beginning_of_day unless force_delete_at transaction do save!(validate: false) registrar.messages.create!( @@ -605,16 +605,16 @@ class Domain < ActiveRecord::Base end def set_graceful_expired - self.outzone_at = valid_to + Setting.expire_warning_period.days - self.delete_at = (outzone_at + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day + self.outzone_at = (valid_to + Setting.expire_warning_period.days).utc.beginning_of_day + self.delete_at = (outzone_at + Setting.redemption_grace_period.days).utc.beginning_of_day self.statuses |= [DomainStatus::EXPIRED] end def set_expired # TODO: currently valid_to attribute update logic is open # self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) - self.outzone_at = Time.zone.now + Setting.expire_warning_period.days - self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day + self.outzone_at = (valid_to + Setting.expire_warning_period.days).utc.beginning_of_day + self.delete_at = (outzone_at + Setting.redemption_grace_period.days).utc.beginning_of_day statuses << DomainStatus::EXPIRED end From 4a78ce43aa02f0c44457d6692365c8a0713edbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Mon, 5 Sep 2016 14:28:56 +0300 Subject: [PATCH 3/3] Update domain.rb restored +1day rule for force_delete_at to elliminate possible conflict with domain regulations --- app/models/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 2efcbb8e2..032164e25 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -577,7 +577,7 @@ class Domain < ActiveRecord::Base statuses << DomainStatus::SERVER_MANUAL_INZONE end - self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days)).utc.beginning_of_day unless force_delete_at + self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day unless force_delete_at transaction do save!(validate: false) registrar.messages.create!(