zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 02:39:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story #104525314 - remove pendingDeleteConfirmation when declined or also go to pendingDelete when confirmed

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 19:10:10 +02:00
parent a9c805f2ce
commit 08b9d0251f
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/jobs/domain_delete_confirm_job.rb
View file

@ -10,6 +10,7 @@ class DomainDeleteConfirmJob < Que::Job
domain.clean_pendings! domain.clean_pendings!
when RegistrantVerification::REJECTED when RegistrantVerification::REJECTED
DomainMailer.pending_delete_rejected_notification(domain).deliver_now 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.poll_message!(:poll_pending_delete_rejected_by_registrant)
domain.clean_pendings! domain.clean_pendings!
end end

2
app/models/epp/domain.rb
View file

@ -491,9 +491,11 @@ class Epp::Domain < Domain
def apply_pending_delete! def apply_pending_delete!
preclean_pendings preclean_pendings
statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
statuses.delete(DomainStatus::PENDING_DELETE) statuses.delete(DomainStatus::PENDING_DELETE)
DomainMailer.delete_confirmation(self).deliver_now DomainMailer.delete_confirmation(self).deliver_now
# TODO: confirm that this actually makes sense
clean_pendings! if valid? && set_pending_delete! clean_pendings! if valid? && set_pending_delete!
true true
end end