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

Move force delete dates to one day ahead

Browse source
This commit is contained in:
Alex Sherman 2019-12-19 17:09:40 +05:00
parent d20821dd38
commit c863cb2678
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,8 @@ module Concerns::Domain::ForceDelete
def force_delete_fast_track def force_delete_fast_track
preserve_current_statuses_for_force_delete preserve_current_statuses_for_force_delete
add_force_delete_statuses add_force_delete_statuses
self.force_delete_date = force_delete_fast_track_start_date self.force_delete_date = force_delete_fast_track_start_date + 1.day
self.force_delete_start = Time.zone.today self.force_delete_start = Time.zone.today + 1.day
stop_all_pending_actions stop_all_pending_actions
allow_deletion allow_deletion
save(validate: false) save(validate: false)
@ -67,7 +67,7 @@ module Concerns::Domain::ForceDelete
end end
def soft_delete_dates(years) def soft_delete_dates(years)
self.force_delete_start = valid_to - years.years self.force_delete_start = valid_to - years.years + 1.day
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

2
db/structure.sql
View file

@ -4336,8 +4336,6 @@ INSERT INTO "schema_migrations" (version) VALUES
('20191206183853'), ('20191206183853'),
('20191212133136'), ('20191212133136'),
('20191227110904'), ('20191227110904'),
('20191203083643'),
('20191206183853'),
('20200113091254'); ('20200113091254');

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

@ -14,8 +14,8 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase
@domain.reload @domain.reload
assert @domain.force_delete_scheduled? assert @domain.force_delete_scheduled?
assert_equal Date.parse('2010-08-19'), @domain.force_delete_date.to_date assert_equal Date.parse('2010-08-20'), @domain.force_delete_date.to_date
assert_equal Date.parse('2010-07-05'), @domain.force_delete_start.to_date assert_equal Date.parse('2010-07-06'), @domain.force_delete_start.to_date
end end
def test_schedules_force_delete_soft_year_ahead def test_schedules_force_delete_soft_year_ahead
@ -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-19'), @domain.force_delete_date.to_date assert_equal Date.parse('2010-09-20'), @domain.force_delete_date.to_date
assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date assert_equal Date.parse('2010-08-06'), @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
@ -160,7 +160,7 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase
travel_to Time.zone.parse('2010-07-05') travel_to Time.zone.parse('2010-07-05')
@domain.schedule_force_delete(type: :soft) @domain.schedule_force_delete(type: :soft)
travel_to Time.zone.parse('2010-08-20') travel_to Time.zone.parse('2010-08-21')
DomainCron.start_client_hold DomainCron.start_client_hold
@domain.reload @domain.reload
assert_includes(@domain.statuses, asserted_status) assert_includes(@domain.statuses, asserted_status)