mirror of
https://github.com/internetee/registry.git
synced 2025-08-03 16:32:04 +02:00
Change domains.delete_at
database column type to date, rename to
`delete_date` Closes #1125
This commit is contained in:
parent
ab9c5c45de
commit
cea834d5b7
31 changed files with 159 additions and 71 deletions
|
@ -20,6 +20,6 @@ module Concerns::Domain::Deletable
|
|||
end
|
||||
|
||||
def deletion_deadline
|
||||
delete_at + 24.hours
|
||||
delete_date + 24.hours
|
||||
end
|
||||
end
|
|
@ -22,7 +22,7 @@ module Concerns::Domain::Expirable
|
|||
def expirable?
|
||||
return false if expire_time > Time.zone.now
|
||||
|
||||
if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_at.present?
|
||||
if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_date.present?
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
|
@ -15,16 +15,16 @@ module Concerns
|
|||
|
||||
def releasable_domains
|
||||
if release_to_auction
|
||||
where('(delete_at < ? OR force_delete_date <= ?)' \
|
||||
where('(delete_date <= ? OR force_delete_date <= ?)' \
|
||||
' AND ? != ALL(coalesce(statuses, array[]::varchar[]))',
|
||||
Time.zone.now,
|
||||
Time.zone.today,
|
||||
Time.zone.today,
|
||||
DomainStatus::SERVER_DELETE_PROHIBITED)
|
||||
else
|
||||
where('(delete_at < ? OR force_delete_date <= ?)' \
|
||||
where('(delete_date <= ? OR force_delete_date <= ?)' \
|
||||
' AND ? != ALL(coalesce(statuses, array[]::varchar[])) AND' \
|
||||
' ? != ALL(COALESCE(statuses, array[]::varchar[]))',
|
||||
Time.zone.now,
|
||||
Time.zone.today,
|
||||
Time.zone.today,
|
||||
DomainStatus::SERVER_DELETE_PROHIBITED,
|
||||
DomainStatus::DELETE_CANDIDATE)
|
||||
|
|
|
@ -399,7 +399,7 @@ class Domain < ActiveRecord::Base
|
|||
def cancel_pending_delete
|
||||
statuses.delete DomainStatus::PENDING_DELETE_CONFIRMATION
|
||||
statuses.delete DomainStatus::PENDING_DELETE
|
||||
self.delete_at = nil
|
||||
self.delete_date = nil
|
||||
end
|
||||
|
||||
def pricelist(operation_category, period_i = nil, unit = nil)
|
||||
|
@ -459,7 +459,7 @@ class Domain < ActiveRecord::Base
|
|||
|
||||
def set_graceful_expired
|
||||
self.outzone_at = expire_time + self.class.expire_warning_period
|
||||
self.delete_at = outzone_at + self.class.redemption_grace_period
|
||||
self.delete_date = outzone_at + self.class.redemption_grace_period
|
||||
self.statuses |= [DomainStatus::EXPIRED]
|
||||
end
|
||||
|
||||
|
@ -484,7 +484,7 @@ class Domain < ActiveRecord::Base
|
|||
unless update.include? s
|
||||
case s
|
||||
when DomainStatus::PENDING_DELETE
|
||||
self.delete_at = nil
|
||||
self.delete_date = nil
|
||||
when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set
|
||||
self.outzone_at = Time.zone.now if force_delete_scheduled?
|
||||
when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set
|
||||
|
|
|
@ -549,7 +549,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)).utc.beginning_of_day
|
||||
self.delete_date = Time.zone.today + Setting.redemption_grace_period.days + 1.day
|
||||
set_pending_delete
|
||||
set_server_hold if server_holdable?
|
||||
save(validate: false)
|
||||
|
@ -576,7 +576,7 @@ class Epp::Domain < Domain
|
|||
|
||||
self.expire_time = renewed_expire_time
|
||||
self.outzone_at = nil
|
||||
self.delete_at = nil
|
||||
self.delete_date = nil
|
||||
self.period = period
|
||||
self.period_unit = unit
|
||||
|
||||
|
|
|
@ -40,8 +40,7 @@ class WhoisRecord < ActiveRecord::Base
|
|||
h[:changed] = domain.updated_at.try(:to_s, :iso8601)
|
||||
h[:expire] = domain.valid_to.to_date.to_s
|
||||
h[:outzone] = domain.outzone_at.try(:to_date).try(:to_s)
|
||||
h[:delete] = [domain.delete_at, domain.force_delete_date].compact.min.try(:to_date)
|
||||
.try(:to_s)
|
||||
h[:delete] = [domain.delete_date, domain.force_delete_date].compact.min.try(:to_s)
|
||||
|
||||
h[:registrant] = registrant.name
|
||||
h[:registrant_kind] = registrant.kind
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue