zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-12 15:44:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Handle past domains.delete_at

Browse source
This commit is contained in:
Artur Beljajev 2018-07-22 23:58:25 +03:00
parent e4305e7865
commit 07bc0546bb
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/concerns/domain/deletable.rb
View file

@ -15,10 +15,11 @@ module Concerns::Domain::Deletable
end end
def deletion_time_span def deletion_time_span
Time.zone.now.to_i..deletion_deadline.to_i range_params = [Time.zone.now.to_i, deletion_deadline.to_i].sort
Range.new(*range_params)
end end
def deletion_deadline def deletion_deadline
delete_at + 24.hours delete_at + 24.hours
end end
end end

2
test/models/domain/discardable_test.rb
View file

@ -20,7 +20,7 @@ class DomainDiscardableTest < ActiveSupport::TestCase
def test_discarding_a_domain_schedules_deletion_at_random_time def test_discarding_a_domain_schedules_deletion_at_random_time
@domain.discard @domain.discard
other_domain = domains(:airport) other_domain = domains(:airport)
other_domain.delete_at = Time.zone.parse('2010-07-05 10:00') other_domain.delete_at = Time.zone.parse('2010-07-04')
other_domain.discard other_domain.discard
background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name)