zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '117131083-incorrect_force_delete_at_value' into staging

Browse source
This commit is contained in:
Stas 2016-04-13 01:15:27 +03:00
commit 14b9c347d5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/domain.rb
View file

@ -581,7 +581,7 @@ class Domain < ActiveRecord::Base
statuses << DomainStatus::SERVER_MANUAL_INZONE statuses << DomainStatus::SERVER_MANUAL_INZONE
end end
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day unless force_delete_at self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc unless force_delete_at
transaction do transaction do
save!(validate: false) save!(validate: false)
registrar.messages.create!( registrar.messages.create!(
@ -610,7 +610,7 @@ class Domain < ActiveRecord::Base
def set_graceful_expired def set_graceful_expired
self.outzone_at = valid_to + Setting.expire_warning_period.days self.outzone_at = valid_to + Setting.expire_warning_period.days
self.delete_at = outzone_at + Setting.redemption_grace_period.days self.delete_at = (outzone_at + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc
self.statuses |= [DomainStatus::EXPIRED] self.statuses |= [DomainStatus::EXPIRED]
end end
@ -618,7 +618,7 @@ class Domain < ActiveRecord::Base
# TODO: currently valid_to attribute update logic is open # TODO: currently valid_to attribute update logic is open
# self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) # 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.outzone_at = Time.zone.now + Setting.expire_warning_period.days
self.delete_at = Time.zone.now + Setting.redemption_grace_period.days self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc
statuses << DomainStatus::EXPIRED statuses << DomainStatus::EXPIRED
end end

2
app/models/epp/domain.rb
View file

@ -600,7 +600,7 @@ class Epp::Domain < Domain
msg: I18n.t(:object_status_prohibits_operation) msg: I18n.t(:object_status_prohibits_operation)
} unless pending_deletable? } unless pending_deletable?
self.delete_at = Time.zone.now + Setting.redemption_grace_period.days self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc
set_pending_delete set_pending_delete
set_server_hold if server_holdable? set_server_hold if server_holdable?
save(validate: false) save(validate: false)