Move force delete dates to one day ahead

internetee · Dec 19, 2019 · f20518b · f20518b
1 parent a1d6eeb
commit f20518b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb
@@ -35,8 +35,8 @@ def schedule_force_delete(type: :fast_track)
   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 @@ def calculate_soft_delete_date
   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/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
@@ -14,8 +14,8 @@ def test_schedules_force_delete_fast_track
     @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 @@ def test_schedules_force_delete_soft_year_ahead
     @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 @@ def test_force_delete_soft_year_ahead_sets_client_hold
     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)