zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove extra day from soft delete years

Browse source 
Closes #1720
This commit is contained in:
Alex Sherman 2020-10-26 14:00:19 +05:00
parent a7587b9c4f
commit 9503850d71
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/domain/force_delete.rb
View file

@ -106,7 +106,7 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end end
def soft_delete_dates(years) def soft_delete_dates(years)
self.force_delete_start = valid_to - years.years + 1.day self.force_delete_start = valid_to - years.years
self.force_delete_date = force_delete_start + Setting.expire_warning_period.days + self.force_delete_date = force_delete_start + Setting.expire_warning_period.days +
Setting.redemption_grace_period.days Setting.redemption_grace_period.days
end end

4
test/models/domain/force_delete_test.rb
View file

@ -27,8 +27,8 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase
@domain.reload @domain.reload
assert @domain.force_delete_scheduled? assert @domain.force_delete_scheduled?
assert_equal Date.parse('2010-09-20'), @domain.force_delete_date.to_date assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date
assert_equal Date.parse('2010-08-06'), @domain.force_delete_start.to_date assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
end end
def test_schedules_force_delete_soft_less_than_year_ahead def test_schedules_force_delete_soft_less_than_year_ahead