From 08b9d0251feb7403850e4880b13c6542ab88e3f4 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Fri, 30 Oct 2015 19:10:10 +0200
Subject: [PATCH] Story #104525314 - remove pendingDeleteConfirmation when
 declined or also go to pendingDelete when confirmed

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

diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb
index 9b30a6cbd..7d890ef16 100644
--- a/app/jobs/domain_delete_confirm_job.rb
+++ b/app/jobs/domain_delete_confirm_job.rb
@@ -10,6 +10,7 @@ class DomainDeleteConfirmJob < Que::Job
         domain.clean_pendings!
       when RegistrantVerification::REJECTED
         DomainMailer.pending_delete_rejected_notification(domain).deliver_now
+        domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
         domain.poll_message!(:poll_pending_delete_rejected_by_registrant)
         domain.clean_pendings!
       end
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 2aabbc9f6..4a446d25c 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -491,9 +491,11 @@ class Epp::Domain < Domain
 
   def apply_pending_delete!
     preclean_pendings
+    statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
     statuses.delete(DomainStatus::PENDING_DELETE)
     DomainMailer.delete_confirmation(self).deliver_now
 
+    # TODO: confirm that this actually makes sense
     clean_pendings! if valid? && set_pending_delete!
     true
   end