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

Remove unused Domain#set_expired

Browse source 
#235
This commit is contained in:
Artur Beljajev 2016-11-07 02:14:54 +02:00
parent 1cc780f3ce
commit 049219efed
2 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/domain.rb
View file

@ -602,19 +602,6 @@ class Domain < ActiveRecord::Base
self.statuses |= [DomainStatus::EXPIRED] self.statuses |= [DomainStatus::EXPIRED]
end 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 = (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
def set_expired!
set_expired
save(validate: false)
end
def pending_update? def pending_update?
statuses.include?(DomainStatus::PENDING_UPDATE) && !statuses.include?(DomainStatus::FORCE_DELETE) statuses.include?(DomainStatus::PENDING_UPDATE) && !statuses.include?(DomainStatus::FORCE_DELETE)
end end

11
spec/models/domain_spec.rb
View file

@ -350,17 +350,6 @@ RSpec.describe Domain do
@domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true
end end
it 'should set expired status and update outzone_at and delete_at' do
domain = Fabricate(:domain)
domain.statuses.should == ['ok']
domain.set_expired
domain.changes.keys.should == ['statuses', 'outzone_at', 'delete_at']
domain.save
domain.statuses.should == ['expired']
end
it 'should know its create price' do it 'should know its create price' do
Fabricate(:pricelist, { Fabricate(:pricelist, {
category: 'ee', category: 'ee',