From c863cb26786e0c80d38e8099ec8a19a92efad32b Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 19 Dec 2019 17:09:40 +0500 Subject: [PATCH] Move force delete dates to one day ahead --- app/models/concerns/domain/force_delete.rb | 6 +++--- db/structure.sql | 2 -- test/models/domain/force_delete_test.rb | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index 81b792106..c8cbe6b0a 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -35,8 +35,8 @@ module Concerns::Domain::ForceDelete def force_delete_fast_track preserve_current_statuses_for_force_delete add_force_delete_statuses - self.force_delete_date = force_delete_fast_track_start_date - self.force_delete_start = Time.zone.today + self.force_delete_date = force_delete_fast_track_start_date + 1.day + self.force_delete_start = Time.zone.today + 1.day stop_all_pending_actions allow_deletion save(validate: false) @@ -67,7 +67,7 @@ module Concerns::Domain::ForceDelete end 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 + Setting.redemption_grace_period.days end diff --git a/db/structure.sql b/db/structure.sql index f7401285a..7d15804a4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -4336,8 +4336,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191206183853'), ('20191212133136'), ('20191227110904'), -('20191203083643'), -('20191206183853'), ('20200113091254'); diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index a36615113..f59cf58bd 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -14,8 +14,8 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase @domain.reload assert @domain.force_delete_scheduled? - assert_equal Date.parse('2010-08-19'), @domain.force_delete_date.to_date - assert_equal Date.parse('2010-07-05'), @domain.force_delete_start.to_date + assert_equal Date.parse('2010-08-20'), @domain.force_delete_date.to_date + assert_equal Date.parse('2010-07-06'), @domain.force_delete_start.to_date end def test_schedules_force_delete_soft_year_ahead @@ -27,8 +27,8 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase @domain.reload assert @domain.force_delete_scheduled? - assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date - assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date + assert_equal Date.parse('2010-09-20'), @domain.force_delete_date.to_date + assert_equal Date.parse('2010-08-06'), @domain.force_delete_start.to_date end 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') @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 @domain.reload assert_includes(@domain.statuses, asserted_status)