zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-26 04:28:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry

Browse source
This commit is contained in:
Martin Lensment 2015-08-10 17:18:53 +03:00
commit 81d704e4f5
6 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/domain_delete_confirm_job.rb
View file

@ -5,10 +5,12 @@ class DomainDeleteConfirmJob < Que::Job
domain = Epp::Domain.find(domain_id) domain = Epp::Domain.find(domain_id)
case action case action
when RegistrantVerification::CONFIRMED when RegistrantVerification::CONFIRMED
domain.poll_message!(:poll_pending_delete_confirmed_by_registrant)
domain.apply_pending_delete! domain.apply_pending_delete!
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.poll_message!(:poll_pending_delete_rejected_by_registrant)
domain.clean_pendings! domain.clean_pendings!
end end
destroy # it's best to destroy the job in the same transaction destroy # it's best to destroy the job in the same transaction

2
app/jobs/domain_update_confirm_job.rb
View file

@ -5,10 +5,12 @@ class DomainUpdateConfirmJob < Que::Job
domain = Epp::Domain.find(domain_id) domain = Epp::Domain.find(domain_id)
case action case action
when RegistrantVerification::CONFIRMED when RegistrantVerification::CONFIRMED
domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
domain.apply_pending_update! domain.apply_pending_update!
domain.clean_pendings! domain.clean_pendings!
when RegistrantVerification::REJECTED when RegistrantVerification::REJECTED
DomainMailer.pending_update_rejected_notification_for_new_registrant(domain).deliver_now DomainMailer.pending_update_rejected_notification_for_new_registrant(domain).deliver_now
domain.poll_message!(:poll_pending_update_rejected_by_registrant)
domain.clean_pendings! domain.clean_pendings!
end end
destroy # it's best to destroy the job in the same transaction destroy # it's best to destroy the job in the same transaction

8
app/models/domain.rb
View file

@ -348,6 +348,14 @@ class Domain < ActiveRecord::Base
true true
end end
def poll_message!(message_key)
registrar.messages.create!(
body: "#{I18n.t(message_key)}: #{name}",
attached_obj_id: id,
attached_obj_type: self.class.to_s
)
end
def preclean_pendings def preclean_pendings
self.registrant_verification_token = nil self.registrant_verification_token = nil
self.registrant_verification_asked_at = nil self.registrant_verification_asked_at = nil

2
config/application.rb
View file

@ -74,3 +74,5 @@ module Registry
} }
end end
end end
require 'validates_email_format_of'

5
config/locales/en.yml
View file

@ -899,3 +899,8 @@ en:
new_zone: 'New zone' new_zone: 'New zone'
edit_zone: 'Edit zone' edit_zone: 'Edit zone'
there_are_count_domains_in_this_zone: 'There are %{count} domains in this zone' there_are_count_domains_in_this_zone: 'There are %{count} domains in this zone'
poll_pending_update_confirmed_by_registrant: 'Registrant confirmed domain update'
poll_pending_update_rejected_by_registranti: 'Registrant rejected domain update'
poll_pending_delete_rejected_by_registrant: 'Registrant rejected domain deletion'
poll_pending_delete_confirmed_by_registrant: 'Registrant confirmed domain deletion'

6
spec/models/domain_spec.rb
View file

@ -418,6 +418,12 @@ describe Domain do
@domain.statuses = DomainStatus::OK # restore @domain.statuses = DomainStatus::OK # restore
end end
it 'should add poll message to registrar' do
domain = Fabricate(:domain, name: 'testpollmessage123.ee')
domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
domain.registrar.messages.first.body.should == 'Registrant confirmed domain update: testpollmessage123.ee'
end
context 'about registrant update confirm' do context 'about registrant update confirm' do
before :all do before :all do
@domain.registrant_verification_token = 123 @domain.registrant_verification_token = 123