From 304b04bd61d592cfcfa20194c08fcd6b790a95c1 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 11 Jun 2018 06:19:33 +0300 Subject: [PATCH 1/3] Remove `domains.statuses_before_force_delete` from REST API --- app/models/domain.rb | 1 + doc/repp/v1/domain.md | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 55596aedf..ebe7e93d2 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -639,6 +639,7 @@ class Domain < ActiveRecord::Base hash = super hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement hash['valid_from'] = hash['registered_at'] # API v1 requirement + hash.delete('statuses_before_force_delete') hash end diff --git a/doc/repp/v1/domain.md b/doc/repp/v1/domain.md index adb9c4c8e..4c9476125 100644 --- a/doc/repp/v1/domain.md +++ b/doc/repp/v1/domain.md @@ -63,10 +63,7 @@ Content-Type: application/json ], "reserved": false, "status_notes": { - }, - "statuses_backup": [ - - ] + } } ], "total_number_of_records": 2 From 4e2bd9f2dabbece172c511db506217d1de34e080 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 11 Jun 2018 08:10:32 +0300 Subject: [PATCH 2/3] Improve readability --- test/models/domain/force_delete_test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 058a49bfb..c04244052 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -21,7 +21,7 @@ class DomainForceDeleteTest < ActiveSupport::TestCase end def test_scheduling_force_delete_adds_corresponding_statuses - statuses = [ + statuses_to_be_added = [ DomainStatus::FORCE_DELETE, DomainStatus::SERVER_RENEW_PROHIBITED, DomainStatus::SERVER_TRANSFER_PROHIBITED, @@ -31,11 +31,11 @@ class DomainForceDeleteTest < ActiveSupport::TestCase @domain.schedule_force_delete @domain.reload - assert (@domain.statuses & statuses) == statuses + assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added end def test_scheduling_force_delete_stops_pending_actions - statuses = [ + statuses_to_be_removed = [ DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED, DomainStatus::PENDING_UPDATE, @@ -44,10 +44,10 @@ class DomainForceDeleteTest < ActiveSupport::TestCase DomainStatus::PENDING_CREATE, ] - @domain.statuses = statuses + %w[other-status] + @domain.statuses = statuses_to_be_removed + %w[other-status] @domain.schedule_force_delete @domain.reload - assert_not (@domain.statuses & statuses).any?, 'Pending actions should be stopped' + assert_empty @domain.statuses & statuses_to_be_removed, 'Pending actions should be stopped' end def test_scheduling_force_delete_preserves_current_statuses @@ -103,7 +103,7 @@ class DomainForceDeleteTest < ActiveSupport::TestCase @domain.cancel_force_delete @domain.reload - assert (@domain.statuses & statuses).empty? + assert_empty @domain.statuses & statuses end def test_cancelling_force_delete_restores_statuses_that_a_domain_had_before_force_delete From c2d5b7c7040b1ab6c7eafb1bef107fb5807508bb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 11 Jun 2018 08:26:17 +0300 Subject: [PATCH 3/3] Extract method --- app/models/concerns/domain/force_delete.rb | 8 ++++++-- test/models/domain/force_delete_test.rb | 12 +++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index c7b3ef454..45f45dab6 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -11,6 +11,7 @@ module Concerns::Domain::ForceDelete self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc .beginning_of_day stop_all_pending_actions + allow_deletion save(validate: false) end @@ -26,8 +27,6 @@ module Concerns::Domain::ForceDelete private def stop_all_pending_actions - statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) - statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) statuses.delete(DomainStatus::PENDING_UPDATE) statuses.delete(DomainStatus::PENDING_TRANSFER) statuses.delete(DomainStatus::PENDING_RENEW) @@ -63,4 +62,9 @@ module Concerns::Domain::ForceDelete statuses.delete(DomainStatus::PENDING_DELETE) statuses.delete(DomainStatus::SERVER_MANUAL_INZONE) end + + def allow_deletion + statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) + statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) + end end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index c04244052..535ad84d8 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -34,10 +34,20 @@ class DomainForceDeleteTest < ActiveSupport::TestCase assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added end - def test_scheduling_force_delete_stops_pending_actions + def test_scheduling_force_delete_allows_domain_deletion statuses_to_be_removed = [ DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED, + ] + + @domain.statuses = statuses_to_be_removed + %w[other-status] + @domain.schedule_force_delete + @domain.reload + assert_empty @domain.statuses & statuses_to_be_removed + end + + def test_scheduling_force_delete_stops_pending_actions + statuses_to_be_removed = [ DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_RENEW,