zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-21 18:26:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor domain expirable

Browse source 
#186
This commit is contained in:
Artur Beljajev 2016-10-29 00:51:42 +03:00
parent 14c5c3efed
commit 0cc3a53deb
3 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/concerns/domain/expirable.rb
View file

@ -12,17 +12,17 @@ module Concerns::Domain::Expirable
end
def registered?
valid_to >= Time.zone.now
!expired?
end
def expired?
statuses.include?(DomainStatus::EXPIRED)
expire_time <= Time.zone.now
end
def expirable?
return false if valid_to > Time.zone.now
if expired? && outzone_at.present? && delete_at.present?
if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_at.present?
return false
end

10
app/models/domain.rb
View file

@ -283,16 +283,6 @@ class Domain < ActiveRecord::Base
domain_transfers.find_by(status: DomainTransfer::PENDING)
end
def expirable?
return false if valid_to > Time.zone.now
if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_at.present?
return false
end
true
end
def server_holdable?
return false if statuses.include?(DomainStatus::SERVER_HOLD)
return false if statuses.include?(DomainStatus::SERVER_MANUAL_INZONE)