From a13b336f54c5fa73e3b40183a02e57e9d57b17f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Mon, 5 Oct 2020 14:44:48 +0300
Subject: [PATCH 1/2] Allow renewal regardless of pendingDelete status flag

---
 app/models/domain.rb     | 4 ++--
 app/models/epp/domain.rb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index 679669728..9a8441eb5 100644
--- a/app/models/domain.rb
+++ b/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_DELETE_CONFIRMATION, DomainStatus::SERVER_RENEW_PROHIBITED]
+                  DomainStatus::PENDING_UPDATE, DomainStatus::SERVER_RENEW_PROHIBITED,
+                  DomainStatus::PENDING_DELETE_CONFIRMATION]
 
     (statuses & disallowed)
   end
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 530e54a0f..c46732712 100644
--- a/app/models/epp/domain.rb
+++ b/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

From d81fd763e28b37e87cb523f372ae9e17b01c937b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Mon, 5 Oct 2020 15:33:38 +0300
Subject: [PATCH 2/2] Test domain is renewable if pendingDelete is set

---
 test/models/domain_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/models/domain_test.rb b/test/models/domain_test.rb
index a943be6ef..4a9240f57 100644
--- a/test/models/domain_test.rb
+++ b/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