Merge pull request #1700 from internetee/1664-remove-pendingDelete-status-if-domain-is-renewed-and-block-other-transform-operations

Renew: Cancel pendingDelete when domain is renewed

app/models/domain.rb

@@ -320,8 +320,8 @@ class Domain < ApplicationRecord
   def renew_blocking_statuses
     disallowed = [DomainStatus::DELETE_CANDIDATE, DomainStatus::PENDING_RENEW,
                   DomainStatus::PENDING_TRANSFER, DomainStatus::CLIENT_RENEW_PROHIBITED,
-                  DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE,
+                  DomainStatus::PENDING_UPDATE, DomainStatus::SERVER_RENEW_PROHIBITED,
-                  DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::SERVER_RENEW_PROHIBITED]
+                  DomainStatus::PENDING_DELETE_CONFIRMATION]
 
     (statuses & disallowed)
   end

app/models/epp/domain.rb

@@ -612,6 +612,7 @@ class Epp::Domain < Domain
     statuses.delete(DomainStatus::SERVER_HOLD)
     statuses.delete(DomainStatus::EXPIRED)
     statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
+    cancel_pending_delete
 
     save
   end

test/models/domain_test.rb

@@ -444,6 +444,20 @@ class DomainTest < ActiveSupport::TestCase
     assert_not @domain.renewable?
   end
 
+  def test_renewable_if_pending_delete
+    assert @domain.renewable?
+    @domain.statuses << DomainStatus::PENDING_DELETE
+
+    assert @domain.renewable?
+  end
+
+  def test_not_renewable_if_pending_delete_unconfirmed
+    assert @domain.renewable?
+    @domain.statuses << DomainStatus::PENDING_DELETE_CONFIRMATION
+
+    assert_not @domain.renewable?
+  end
+
   private
 
   def valid_domain