zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-11 12:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove soft force delete from sample

Browse source
This commit is contained in:
olegphenomenon 2022-09-09 13:46:24 +03:00
parent d15119c622
commit 3d81164b23
4 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/interactions/domains/force_delete/set_status.rb
View file

@ -16,7 +16,7 @@ module Domains
def force_delete_soft def force_delete_soft
years = (domain.valid_to.to_date - Time.zone.today).to_i / 365 years = (domain.valid_to.to_date - Time.zone.today).to_i / 365
years.positive? ? soft_forcedelete_dates(years) : set_less_than_year_until_valid_to_date soft_forcedelete_dates(years) if years.positive?
end end
private private
@ -24,19 +24,12 @@ module Domains
def soft_forcedelete_dates(years) def soft_forcedelete_dates(years)
domain.force_delete_start = domain.valid_to - years.years domain.force_delete_start = domain.valid_to - years.years
domain.force_delete_date = domain.force_delete_start + domain.force_delete_date = domain.force_delete_start +
expire_warning_period_days + Setting.expire_warning_period.days +
redemption_grace_period_days Setting.redemption_grace_period.days
end
def set_less_than_year_until_valid_to_date
domain.force_delete_start = domain.valid_to
domain.force_delete_date = domain.force_delete_start +
expire_warning_period_days +
redemption_grace_period_days
end end
def redemption_grace_period_days def redemption_grace_period_days
Setting.redemption_grace_period.days Setting.redemption_grace_period.days + 1.day
end end
def expire_warning_period_days def expire_warning_period_days

1
app/jobs/outzone_invalid_email_domains_job.rb
View file

@ -3,7 +3,6 @@ class OutzoneInvalidEmailDomainsJob < ApplicationJob
def perform def perform
domains = Domain.where("force_delete_data->'template_name' = ?", 'invalid_email') domains = Domain.where("force_delete_data->'template_name' = ?", 'invalid_email')
.where("force_delete_data->'force_delete_type' = ?", 'soft')
.where(outzone_at: nil) .where(outzone_at: nil)
.where('Date(force_delete_start) <= ?', Time.zone.now) .where('Date(force_delete_start) <= ?', Time.zone.now)

19
test/interactions/force_delete_email/base_test.rb
View file

@ -20,25 +20,6 @@ class BaseTest < ActiveSupport::TestCase
assert_not @domain.force_delete_scheduled? assert_not @domain.force_delete_scheduled?
end end
def test_less_than_year_until_valid_to_date
refute @domain_airport.force_delete_scheduled?
@domain_airport.update!(valid_to: Time.zone.now + 11.months)
@domain_airport.reload
prepare_contact
contact = @domain_airport.admin_contacts.first
Domains::ForceDeleteEmail::Base.run(email: contact.email)
@domain_airport.reload
assert @domain_airport.force_delete_scheduled?
assert @domain_airport.valid_to < Time.zone.now + 1.year
assert_equal @domain_airport.force_delete_start, @domain_airport.valid_to
assert_equal @domain_airport.force_delete_date, (@domain_airport.force_delete_start +
Setting.expire_warning_period.days +
Setting.redemption_grace_period.days).to_date
end
def test_more_that_year_until_valid_to_date def test_more_that_year_until_valid_to_date
refute @domain_airport.force_delete_scheduled? refute @domain_airport.force_delete_scheduled?
@domain_airport.update!(valid_to: Time.zone.now + 3.years + 1.month + 1.day) @domain_airport.update!(valid_to: Time.zone.now + 3.years + 1.month + 1.day)

4
test/jobs/outzone_invalid_email_domains_job_test.rb
View file

@ -20,10 +20,6 @@ class OutzoneInvalidEmailDomainsJobTest < ActiveJob::TestCase
assert @domain.force_delete_scheduled? assert @domain.force_delete_scheduled?
assert @domain.valid_to < Time.zone.now + 1.year assert @domain.valid_to < Time.zone.now + 1.year
assert_equal @domain.force_delete_start, @domain.valid_to
assert_equal @domain.force_delete_date, (@domain.force_delete_start +
Setting.expire_warning_period.days +
Setting.redemption_grace_period.days).to_date
assert_equal @domain.outzone_at, @domain.force_delete_start + Setting.expire_warning_period.day assert_equal @domain.outzone_at, @domain.force_delete_start + Setting.expire_warning_period.day
end end