diff --git a/app/models/domain.rb b/app/models/domain.rb index 755044e2b..cabaf8364 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -581,7 +581,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)).beginning_of_day.utc unless force_delete_at + self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day unless force_delete_at transaction do save!(validate: false) registrar.messages.create!( @@ -610,7 +610,7 @@ class Domain < ActiveRecord::Base 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)).beginning_of_day.utc + self.delete_at = (outzone_at + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day self.statuses |= [DomainStatus::EXPIRED] end @@ -618,7 +618,7 @@ class Domain < ActiveRecord::Base # 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)).beginning_of_day.utc + self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day statuses << DomainStatus::EXPIRED end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 5c28dbcda..e519c6907 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -600,7 +600,7 @@ class Epp::Domain < Domain msg: I18n.t(:object_status_prohibits_operation) } unless pending_deletable? - self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc + self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day set_pending_delete set_server_hold if server_holdable? save(validate: false)