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

Move DomainUpdateConfirm from Que to ActiveJob

Browse source
This commit is contained in:
Alex Sherman 2020-11-26 14:07:02 +05:00
parent 42b9adbf44
commit 31bfe19d77
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/application_job.rb Normal file
View file

@ -0,0 +1,2 @@
class ApplicationJob < ActiveJob::Base
end

7
app/jobs/domain_update_confirm_job.rb
View file

@ -1,5 +1,7 @@
class DomainUpdateConfirmJob < Que::Job class DomainUpdateConfirmJob < ApplicationJob
def run(domain_id, action, initiator = nil) queue_as :default
def perform(domain_id, action, initiator = nil)
::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" ::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}"
# it's recommended to keep transaction against job table as short as possible. # it's recommended to keep transaction against job table as short as possible.
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@ -27,7 +29,6 @@ class DomainUpdateConfirmJob < Que::Job
domain.preclean_pendings domain.preclean_pendings
domain.clean_pendings! domain.clean_pendings!
end end
destroy # it's best to destroy the job in the same transaction
end end
end end

4
app/models/registrant_verification.rb
View file

@ -18,13 +18,13 @@ class RegistrantVerification < ApplicationRecord
def domain_registrant_change_confirm!(initiator) def domain_registrant_change_confirm!(initiator)
self.action_type = DOMAIN_REGISTRANT_CHANGE self.action_type = DOMAIN_REGISTRANT_CHANGE
self.action = CONFIRMED self.action = CONFIRMED
DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED, initiator if save DomainUpdateConfirmJob.perform_later domain.id, CONFIRMED, initiator if save
end end
def domain_registrant_change_reject!(initiator) def domain_registrant_change_reject!(initiator)
self.action_type = DOMAIN_REGISTRANT_CHANGE self.action_type = DOMAIN_REGISTRANT_CHANGE
self.action = REJECTED self.action = REJECTED
DomainUpdateConfirmJob.run domain.id, REJECTED, initiator if save DomainUpdateConfirmJob.perform_later domain.id, REJECTED, initiator if save
end end
def domain_registrant_delete_confirm!(initiator) def domain_registrant_delete_confirm!(initiator)

8
test/jobs/domain_update_confirm_job_test.rb
View file

@ -20,7 +20,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
end end
def test_rejected_registrant_verification_notifies_registrar def test_rejected_registrant_verification_notifies_registrar
DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::REJECTED) DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED)
last_registrar_notification = @domain.registrar.notifications.last last_registrar_notification = @domain.registrar.notifications.last
assert_equal(last_registrar_notification.attached_obj_id, @domain.id) assert_equal(last_registrar_notification.attached_obj_id, @domain.id)
@ -28,7 +28,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
end end
def test_accepted_registrant_verification_notifies_registrar def test_accepted_registrant_verification_notifies_registrar
DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::CONFIRMED) DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED)
last_registrar_notification = @domain.registrar.notifications.last last_registrar_notification = @domain.registrar.notifications.last
assert_equal(last_registrar_notification.attached_obj_id, @domain.id) assert_equal(last_registrar_notification.attached_obj_id, @domain.id)
@ -44,7 +44,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
@domain.update(pending_json: @domain.pending_json) @domain.update(pending_json: @domain.pending_json)
@domain.reload @domain.reload
DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::CONFIRMED) DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED)
@domain.reload @domain.reload
assert_equal @domain.registrant.code, @new_registrant.code assert_equal @domain.registrant.code, @new_registrant.code
@ -58,7 +58,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
@domain.pending_json['frame'] = epp_xml @domain.pending_json['frame'] = epp_xml
@domain.update(pending_json: @domain.pending_json) @domain.update(pending_json: @domain.pending_json)
DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::REJECTED) DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED)
@domain.reload @domain.reload
assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION