From 31bfe19d77c254e214c25f9efb7ecc90c1dfb8a6 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 26 Nov 2020 14:07:02 +0500 Subject: [PATCH 1/9] Move DomainUpdateConfirm from Que to ActiveJob --- app/jobs/application_job.rb | 2 ++ app/jobs/domain_update_confirm_job.rb | 7 ++++--- app/models/registrant_verification.rb | 4 ++-- test/jobs/domain_update_confirm_job_test.rb | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 app/jobs/application_job.rb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index f3665f1e8..2025354e6 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,5 +1,7 @@ -class DomainUpdateConfirmJob < Que::Job - def run(domain_id, action, initiator = nil) +class DomainUpdateConfirmJob < ApplicationJob + queue_as :default + + def perform(domain_id, action, initiator = nil) ::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do @@ -27,7 +29,6 @@ class DomainUpdateConfirmJob < Que::Job domain.preclean_pendings domain.clean_pendings! end - destroy # it's best to destroy the job in the same transaction end end diff --git a/app/models/registrant_verification.rb b/app/models/registrant_verification.rb index 097f0cfa9..7e238cecc 100644 --- a/app/models/registrant_verification.rb +++ b/app/models/registrant_verification.rb @@ -18,13 +18,13 @@ class RegistrantVerification < ApplicationRecord def domain_registrant_change_confirm!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = CONFIRMED - DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED, initiator if save + DomainUpdateConfirmJob.perform_later domain.id, CONFIRMED, initiator if save end def domain_registrant_change_reject!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = REJECTED - DomainUpdateConfirmJob.run domain.id, REJECTED, initiator if save + DomainUpdateConfirmJob.perform_later domain.id, REJECTED, initiator if save end def domain_registrant_delete_confirm!(initiator) diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index 9cca81eb7..f01e7c41e 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -20,7 +20,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase end 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 assert_equal(last_registrar_notification.attached_obj_id, @domain.id) @@ -28,7 +28,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase end 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 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.reload - DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::CONFIRMED) + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED) @domain.reload assert_equal @domain.registrant.code, @new_registrant.code @@ -58,7 +58,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase @domain.pending_json['frame'] = epp_xml @domain.update(pending_json: @domain.pending_json) - DomainUpdateConfirmJob.enqueue(@domain.id, RegistrantVerification::REJECTED) + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED) @domain.reload assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION From 4b7cffbb572ea1e63e8d02962df994791770ef8b Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 26 Nov 2020 15:01:09 +0500 Subject: [PATCH 2/9] Move functionality from job to interactor --- .../domain_update_confirm_interaction/base.rb | 22 ++++++++++++ .../process_action.rb | 15 ++++++++ .../process_update_confirmed.rb | 20 +++++++++++ .../process_update_rejected.rb | 16 +++++++++ app/jobs/domain_update_confirm_job.rb | 36 +++---------------- 5 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 app/interactions/domain_update_confirm_interaction/base.rb create mode 100644 app/interactions/domain_update_confirm_interaction/process_action.rb create mode 100644 app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb create mode 100644 app/interactions/domain_update_confirm_interaction/process_update_rejected.rb diff --git a/app/interactions/domain_update_confirm_interaction/base.rb b/app/interactions/domain_update_confirm_interaction/base.rb new file mode 100644 index 000000000..18a96fc99 --- /dev/null +++ b/app/interactions/domain_update_confirm_interaction/base.rb @@ -0,0 +1,22 @@ +module DomainUpdateConfirmInteraction + class Base < ActiveInteraction::Base + object :domain, + class: Domain, + description: 'Domain to confirm update' + string :action + string :initiator, + default: nil + + validates :domain, :action, presence: true + validates :action, inclusion: { in: [RegistrantVerification::CONFIRMED, + RegistrantVerification::REJECTED] } + + def raise_errors!(domain) + if domain.errors.any? + message = "domain #{domain.name} failed with errors #{domain.errors.full_messages}" + throw message + end + end + end +end + diff --git a/app/interactions/domain_update_confirm_interaction/process_action.rb b/app/interactions/domain_update_confirm_interaction/process_action.rb new file mode 100644 index 000000000..9def919d1 --- /dev/null +++ b/app/interactions/domain_update_confirm_interaction/process_action.rb @@ -0,0 +1,15 @@ +module DomainUpdateConfirmInteraction + class ProcessAction < Base + def execute + ::PaperTrail.request.whodunnit = "interaction - #{self.class.name} - #{action} by"\ + " #{initiator}" + + case action + when RegistrantVerification::CONFIRMED + compose(ProcessUpdateConfirmed, inputs) + when RegistrantVerification::REJECTED + compose(ProcessUpdateRejected, inputs) + end + end + end +end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb new file mode 100644 index 000000000..bb235dcb9 --- /dev/null +++ b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb @@ -0,0 +1,20 @@ +module DomainUpdateConfirmInteraction + class ProcessUpdateConfirmed < Base + def execute + ActiveRecord::Base.transaction do + domain.is_admin = true + old_registrant = domain.registrant + domain.notify_registrar(:poll_pending_update_confirmed_by_registrant) + + domain.apply_pending_update! + raise_errors!(domain) + + domain.clean_pendings! + raise_errors!(domain) + RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm + end + end + + + end +end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb new file mode 100644 index 000000000..5875d17d5 --- /dev/null +++ b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb @@ -0,0 +1,16 @@ +module DomainUpdateConfirmInteraction + class ProcessUpdateRejected < Base + def execute + ActiveRecord::Base.transaction do + RegistrantChangeMailer.rejected(domain: domain, + registrar: domain.registrar, + registrant: domain.registrant).deliver_now + + domain.notify_registrar(:poll_pending_update_rejected_by_registrant) + + domain.preclean_pendings + domain.clean_pendings! + end + end + end +end diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 2025354e6..8f1fd1688 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -2,37 +2,9 @@ class DomainUpdateConfirmJob < ApplicationJob queue_as :default def perform(domain_id, action, initiator = nil) - ::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" - # it's recommended to keep transaction against job table as short as possible. - ActiveRecord::Base.transaction do - domain = Epp::Domain.find(domain_id) - domain.is_admin = true - case action - when RegistrantVerification::CONFIRMED - old_registrant = domain.registrant - domain.notify_registrar(:poll_pending_update_confirmed_by_registrant) - raise_errors!(domain) - - domain.apply_pending_update! - raise_errors!(domain) - - domain.clean_pendings! - raise_errors!(domain) - RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm - when RegistrantVerification::REJECTED - RegistrantChangeMailer.rejected(domain: domain, - registrar: domain.registrar, - registrant: domain.registrant).deliver_now - - domain.notify_registrar(:poll_pending_update_rejected_by_registrant) - - domain.preclean_pendings - domain.clean_pendings! - end - end - end - - def raise_errors!(domain) - throw "domain #{domain.name} failed with errors #{domain.errors.full_messages}" if domain.errors.any? + domain = Epp::Domain.find(domain_id) + DomainUpdateConfirmInteraction::ProcessAction.run(domain: domain, + action: action, + initiator: initiator) end end From 8ef748fc7d61e34e784529722add638d1862d380 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 26 Nov 2020 15:21:22 +0500 Subject: [PATCH 3/9] Move apply_pending_update! method from model to interactor --- .codeclimate.yml | 3 ++ .../domain_update_confirm_interaction/base.rb | 17 +++++--- .../process_update_confirmed.rb | 42 ++++++++++++++++--- .../process_update_rejected.rb | 2 +- app/models/domain.rb | 3 ++ app/models/epp/domain.rb | 19 --------- 6 files changed, 56 insertions(+), 30 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 2bc90b200..d079d891f 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -20,6 +20,9 @@ plugins: channel: eslint-5 fixme: enabled: true + checks: + TODO: + enabled: false rubocop: enabled: true channel: rubocop-0-74 diff --git a/app/interactions/domain_update_confirm_interaction/base.rb b/app/interactions/domain_update_confirm_interaction/base.rb index 18a96fc99..d78f3a6a9 100644 --- a/app/interactions/domain_update_confirm_interaction/base.rb +++ b/app/interactions/domain_update_confirm_interaction/base.rb @@ -12,11 +12,18 @@ module DomainUpdateConfirmInteraction RegistrantVerification::REJECTED] } def raise_errors!(domain) - if domain.errors.any? - message = "domain #{domain.name} failed with errors #{domain.errors.full_messages}" - throw message - end + return unless domain.errors.any? + + message = "domain #{domain.name} failed with errors #{domain.errors.full_messages}" + throw message + end + + def notify_registrar(message_key) + domain.registrar.notifications.create!( + text: "#{I18n.t(message_key)}: #{domain.name}", + attached_obj_id: domain.id, + attached_obj_type: domain.class.to_s + ) end end end - diff --git a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb index bb235dcb9..43c053ba2 100644 --- a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb +++ b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb @@ -4,17 +4,49 @@ module DomainUpdateConfirmInteraction ActiveRecord::Base.transaction do domain.is_admin = true old_registrant = domain.registrant - domain.notify_registrar(:poll_pending_update_confirmed_by_registrant) + notify_registrar(:poll_pending_update_confirmed_by_registrant) - domain.apply_pending_update! - raise_errors!(domain) - - domain.clean_pendings! + apply_pending_update! raise_errors!(domain) RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm end end + def apply_pending_update! + preclean_pendings + update_domain + clean_pendings! + domain.save! + WhoisRecord.find_by(domain_id: domain.id).save # need to reload model + end + + def preclean_pendings + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + end + + def update_domain + user = ApiUser.find(domain.pending_json['current_user_id']) + frame = Nokogiri::XML(domain.pending_json['frame']) + domain.upid = user.registrar.id if user.registrar + domain.update(frame, user, false) + end + + def clean_pendings! + domain.up_date = Time.zone.now + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + domain.pending_json = {} + clear_statuses + end + + def clear_statuses + domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) + domain.statuses.delete(DomainStatus::PENDING_UPDATE) + domain.statuses.delete(DomainStatus::PENDING_DELETE) + domain.status_notes[DomainStatus::PENDING_UPDATE] = '' + domain.status_notes[DomainStatus::PENDING_DELETE] = '' + end end end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb index 5875d17d5..09da14971 100644 --- a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb +++ b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb @@ -6,7 +6,7 @@ module DomainUpdateConfirmInteraction registrar: domain.registrar, registrant: domain.registrant).deliver_now - domain.notify_registrar(:poll_pending_update_rejected_by_registrant) + notify_registrar(:poll_pending_update_rejected_by_registrant) domain.preclean_pendings domain.clean_pendings! diff --git a/app/models/domain.rb b/app/models/domain.rb index dc7d86da8..d2f555977 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -327,6 +327,7 @@ class Domain < ApplicationRecord end def notify_registrar(message_key) + # TODO: To be deleted with DomainDeleteConfirm refactoring registrar.notifications.create!( text: "#{I18n.t(message_key)}: #{name}", attached_obj_id: id, @@ -335,11 +336,13 @@ class Domain < ApplicationRecord end def preclean_pendings + # TODO: To be deleted with refactoring self.registrant_verification_token = nil self.registrant_verification_asked_at = nil end def clean_pendings! + # TODO: To be deleted with refactoring preclean_pendings self.pending_json = {} statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 7fb23a6e9..d8f5f2bb9 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -508,25 +508,6 @@ class Epp::Domain < Domain errors.empty? && super(at) end - def apply_pending_update! - preclean_pendings - user = ApiUser.find(pending_json['current_user_id']) - frame = Nokogiri::XML(pending_json['frame']) - - self.statuses.delete(DomainStatus::PENDING_UPDATE) - self.upid = user.registrar.id if user.registrar - self.up_date = Time.zone.now - - return unless update(frame, user, false) - clean_pendings! - - save! - - WhoisRecord.find_by(domain_id: id).save # need to reload model - - true - end - def apply_pending_delete! preclean_pendings statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) From 6f0b8b15a3c4994b1719c361c2e447ec5cf609c1 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 26 Nov 2020 16:13:50 +0500 Subject: [PATCH 4/9] Move clean pendings used from model to interactor base --- .../domain_update_confirm_interaction/base.rb | 20 ++++++++++++++++ .../process_update_confirmed.rb | 24 +++---------------- .../process_update_rejected.rb | 4 ++-- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app/interactions/domain_update_confirm_interaction/base.rb b/app/interactions/domain_update_confirm_interaction/base.rb index d78f3a6a9..1a1f61b12 100644 --- a/app/interactions/domain_update_confirm_interaction/base.rb +++ b/app/interactions/domain_update_confirm_interaction/base.rb @@ -25,5 +25,25 @@ module DomainUpdateConfirmInteraction attached_obj_type: domain.class.to_s ) end + + def preclean_pendings + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + end + + def clean_pendings! + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + domain.pending_json = {} + clear_statuses + end + + def clear_statuses + domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) + domain.statuses.delete(DomainStatus::PENDING_UPDATE) + domain.statuses.delete(DomainStatus::PENDING_DELETE) + domain.status_notes[DomainStatus::PENDING_UPDATE] = '' + domain.status_notes[DomainStatus::PENDING_DELETE] = '' + end end end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb index 43c053ba2..0e173c533 100644 --- a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb +++ b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb @@ -21,32 +21,14 @@ module DomainUpdateConfirmInteraction WhoisRecord.find_by(domain_id: domain.id).save # need to reload model end - def preclean_pendings - domain.registrant_verification_token = nil - domain.registrant_verification_asked_at = nil - end - + # rubocop:disable Metrics/AbcSize def update_domain user = ApiUser.find(domain.pending_json['current_user_id']) frame = Nokogiri::XML(domain.pending_json['frame']) domain.upid = user.registrar.id if user.registrar + domain.up_date = Time.zone.now domain.update(frame, user, false) end - - def clean_pendings! - domain.up_date = Time.zone.now - domain.registrant_verification_token = nil - domain.registrant_verification_asked_at = nil - domain.pending_json = {} - clear_statuses - end - - def clear_statuses - domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) - domain.statuses.delete(DomainStatus::PENDING_UPDATE) - domain.statuses.delete(DomainStatus::PENDING_DELETE) - domain.status_notes[DomainStatus::PENDING_UPDATE] = '' - domain.status_notes[DomainStatus::PENDING_DELETE] = '' - end + # rubocop:enable Metrics/AbcSize end end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb index 09da14971..390f8db49 100644 --- a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb +++ b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb @@ -8,8 +8,8 @@ module DomainUpdateConfirmInteraction notify_registrar(:poll_pending_update_rejected_by_registrant) - domain.preclean_pendings - domain.clean_pendings! + preclean_pendings + clean_pendings! end end end From 42012863e23a8e2b3a31ad08a84aa1d325f640f6 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 30 Nov 2020 17:53:36 +0500 Subject: [PATCH 5/9] Move interactor to the Domains namespace --- .../domain_update_confirm_interaction/base.rb | 49 ------------------ .../process_action.rb | 15 ------ .../process_update_confirmed.rb | 34 ------------- .../process_update_rejected.rb | 16 ------ .../domains/update_confirm/base.rb | 51 +++++++++++++++++++ .../domains/update_confirm/process_action.rb | 17 +++++++ .../process_update_confirmed.rb | 36 +++++++++++++ .../update_confirm/process_update_rejected.rb | 18 +++++++ app/jobs/domain_update_confirm_job.rb | 6 +-- 9 files changed, 125 insertions(+), 117 deletions(-) delete mode 100644 app/interactions/domain_update_confirm_interaction/base.rb delete mode 100644 app/interactions/domain_update_confirm_interaction/process_action.rb delete mode 100644 app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb delete mode 100644 app/interactions/domain_update_confirm_interaction/process_update_rejected.rb create mode 100644 app/interactions/domains/update_confirm/base.rb create mode 100644 app/interactions/domains/update_confirm/process_action.rb create mode 100644 app/interactions/domains/update_confirm/process_update_confirmed.rb create mode 100644 app/interactions/domains/update_confirm/process_update_rejected.rb diff --git a/app/interactions/domain_update_confirm_interaction/base.rb b/app/interactions/domain_update_confirm_interaction/base.rb deleted file mode 100644 index 1a1f61b12..000000000 --- a/app/interactions/domain_update_confirm_interaction/base.rb +++ /dev/null @@ -1,49 +0,0 @@ -module DomainUpdateConfirmInteraction - class Base < ActiveInteraction::Base - object :domain, - class: Domain, - description: 'Domain to confirm update' - string :action - string :initiator, - default: nil - - validates :domain, :action, presence: true - validates :action, inclusion: { in: [RegistrantVerification::CONFIRMED, - RegistrantVerification::REJECTED] } - - def raise_errors!(domain) - return unless domain.errors.any? - - message = "domain #{domain.name} failed with errors #{domain.errors.full_messages}" - throw message - end - - def notify_registrar(message_key) - domain.registrar.notifications.create!( - text: "#{I18n.t(message_key)}: #{domain.name}", - attached_obj_id: domain.id, - attached_obj_type: domain.class.to_s - ) - end - - def preclean_pendings - domain.registrant_verification_token = nil - domain.registrant_verification_asked_at = nil - end - - def clean_pendings! - domain.registrant_verification_token = nil - domain.registrant_verification_asked_at = nil - domain.pending_json = {} - clear_statuses - end - - def clear_statuses - domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) - domain.statuses.delete(DomainStatus::PENDING_UPDATE) - domain.statuses.delete(DomainStatus::PENDING_DELETE) - domain.status_notes[DomainStatus::PENDING_UPDATE] = '' - domain.status_notes[DomainStatus::PENDING_DELETE] = '' - end - end -end diff --git a/app/interactions/domain_update_confirm_interaction/process_action.rb b/app/interactions/domain_update_confirm_interaction/process_action.rb deleted file mode 100644 index 9def919d1..000000000 --- a/app/interactions/domain_update_confirm_interaction/process_action.rb +++ /dev/null @@ -1,15 +0,0 @@ -module DomainUpdateConfirmInteraction - class ProcessAction < Base - def execute - ::PaperTrail.request.whodunnit = "interaction - #{self.class.name} - #{action} by"\ - " #{initiator}" - - case action - when RegistrantVerification::CONFIRMED - compose(ProcessUpdateConfirmed, inputs) - when RegistrantVerification::REJECTED - compose(ProcessUpdateRejected, inputs) - end - end - end -end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb b/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb deleted file mode 100644 index 0e173c533..000000000 --- a/app/interactions/domain_update_confirm_interaction/process_update_confirmed.rb +++ /dev/null @@ -1,34 +0,0 @@ -module DomainUpdateConfirmInteraction - class ProcessUpdateConfirmed < Base - def execute - ActiveRecord::Base.transaction do - domain.is_admin = true - old_registrant = domain.registrant - notify_registrar(:poll_pending_update_confirmed_by_registrant) - - apply_pending_update! - raise_errors!(domain) - RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm - end - end - - def apply_pending_update! - preclean_pendings - update_domain - clean_pendings! - domain.save! - - WhoisRecord.find_by(domain_id: domain.id).save # need to reload model - end - - # rubocop:disable Metrics/AbcSize - def update_domain - user = ApiUser.find(domain.pending_json['current_user_id']) - frame = Nokogiri::XML(domain.pending_json['frame']) - domain.upid = user.registrar.id if user.registrar - domain.up_date = Time.zone.now - domain.update(frame, user, false) - end - # rubocop:enable Metrics/AbcSize - end -end diff --git a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb b/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb deleted file mode 100644 index 390f8db49..000000000 --- a/app/interactions/domain_update_confirm_interaction/process_update_rejected.rb +++ /dev/null @@ -1,16 +0,0 @@ -module DomainUpdateConfirmInteraction - class ProcessUpdateRejected < Base - def execute - ActiveRecord::Base.transaction do - RegistrantChangeMailer.rejected(domain: domain, - registrar: domain.registrar, - registrant: domain.registrant).deliver_now - - notify_registrar(:poll_pending_update_rejected_by_registrant) - - preclean_pendings - clean_pendings! - end - end - end -end diff --git a/app/interactions/domains/update_confirm/base.rb b/app/interactions/domains/update_confirm/base.rb new file mode 100644 index 000000000..ab5584c03 --- /dev/null +++ b/app/interactions/domains/update_confirm/base.rb @@ -0,0 +1,51 @@ +module Domains + module UpdateConfirm + class Base < ActiveInteraction::Base + object :domain, + class: Domain, + description: 'Domain to confirm update' + string :action + string :initiator, + default: nil + + validates :domain, :action, presence: true + validates :action, inclusion: { in: [RegistrantVerification::CONFIRMED, + RegistrantVerification::REJECTED] } + + def raise_errors!(domain) + return unless domain.errors.any? + + message = "domain #{domain.name} failed with errors #{domain.errors.full_messages}" + throw message + end + + def notify_registrar(message_key) + domain.registrar.notifications.create!( + text: "#{I18n.t(message_key)}: #{domain.name}", + attached_obj_id: domain.id, + attached_obj_type: domain.class.to_s + ) + end + + def preclean_pendings + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + end + + def clean_pendings! + domain.registrant_verification_token = nil + domain.registrant_verification_asked_at = nil + domain.pending_json = {} + clear_statuses + end + + def clear_statuses + domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) + domain.statuses.delete(DomainStatus::PENDING_UPDATE) + domain.statuses.delete(DomainStatus::PENDING_DELETE) + domain.status_notes[DomainStatus::PENDING_UPDATE] = '' + domain.status_notes[DomainStatus::PENDING_DELETE] = '' + end + end + end +end diff --git a/app/interactions/domains/update_confirm/process_action.rb b/app/interactions/domains/update_confirm/process_action.rb new file mode 100644 index 000000000..6ef8d0fe6 --- /dev/null +++ b/app/interactions/domains/update_confirm/process_action.rb @@ -0,0 +1,17 @@ +module Domains + module UpdateConfirm + class ProcessAction < Base + def execute + ::PaperTrail.request.whodunnit = "interaction - #{self.class.name} - #{action} by"\ + " #{initiator}" + + case action + when RegistrantVerification::CONFIRMED + compose(ProcessUpdateConfirmed, inputs) + when RegistrantVerification::REJECTED + compose(ProcessUpdateRejected, inputs) + end + end + end + end +end diff --git a/app/interactions/domains/update_confirm/process_update_confirmed.rb b/app/interactions/domains/update_confirm/process_update_confirmed.rb new file mode 100644 index 000000000..0402994dd --- /dev/null +++ b/app/interactions/domains/update_confirm/process_update_confirmed.rb @@ -0,0 +1,36 @@ +module Domains + module UpdateConfirm + class ProcessUpdateConfirmed < Base + def execute + ActiveRecord::Base.transaction do + domain.is_admin = true + old_registrant = domain.registrant + notify_registrar(:poll_pending_update_confirmed_by_registrant) + + apply_pending_update! + raise_errors!(domain) + RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm + end + end + + def apply_pending_update! + preclean_pendings + update_domain + clean_pendings! + domain.save! + + WhoisRecord.find_by(domain_id: domain.id).save # need to reload model + end + + # rubocop:disable Metrics/AbcSize + def update_domain + user = ApiUser.find(domain.pending_json['current_user_id']) + frame = Nokogiri::XML(domain.pending_json['frame']) + domain.upid = user.registrar.id if user.registrar + domain.up_date = Time.zone.now + domain.update(frame, user, false) + end + # rubocop:enable Metrics/AbcSize + end + end +end diff --git a/app/interactions/domains/update_confirm/process_update_rejected.rb b/app/interactions/domains/update_confirm/process_update_rejected.rb new file mode 100644 index 000000000..1d7b75b0e --- /dev/null +++ b/app/interactions/domains/update_confirm/process_update_rejected.rb @@ -0,0 +1,18 @@ +module Domains + module UpdateConfirm + class ProcessUpdateRejected < Base + def execute + ActiveRecord::Base.transaction do + RegistrantChangeMailer.rejected(domain: domain, + registrar: domain.registrar, + registrant: domain.registrant).deliver_now + + notify_registrar(:poll_pending_update_rejected_by_registrant) + + preclean_pendings + clean_pendings! + end + end + end + end +end diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 8f1fd1688..403318ca6 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -3,8 +3,8 @@ class DomainUpdateConfirmJob < ApplicationJob def perform(domain_id, action, initiator = nil) domain = Epp::Domain.find(domain_id) - DomainUpdateConfirmInteraction::ProcessAction.run(domain: domain, - action: action, - initiator: initiator) + Domains::UpdateConfirm::ProcessAction.run(domain: domain, + action: action, + initiator: initiator) end end From a0bc60ac74a1b29e5f18274f8d8cdd9896d8fb80 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Tue, 1 Dec 2020 18:28:34 +0500 Subject: [PATCH 6/9] Fix rejecting changes clearance --- .../domains/update_confirm/process_update_rejected.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/interactions/domains/update_confirm/process_update_rejected.rb b/app/interactions/domains/update_confirm/process_update_rejected.rb index 1d7b75b0e..19969d970 100644 --- a/app/interactions/domains/update_confirm/process_update_rejected.rb +++ b/app/interactions/domains/update_confirm/process_update_rejected.rb @@ -11,6 +11,7 @@ module Domains preclean_pendings clean_pendings! + domain.save! end end end From 6ab08dbd673e2b9d9e8801ec23ff58e903b6d155 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Wed, 2 Dec 2020 13:51:49 +0500 Subject: [PATCH 7/9] Fix rejecting updates --- .../process_update_confirmed.rb | 2 +- .../update_confirm/process_update_rejected.rb | 2 +- test/jobs/domain_update_confirm_job_test.rb | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/interactions/domains/update_confirm/process_update_confirmed.rb b/app/interactions/domains/update_confirm/process_update_confirmed.rb index 0402994dd..a4ceb1d3e 100644 --- a/app/interactions/domains/update_confirm/process_update_confirmed.rb +++ b/app/interactions/domains/update_confirm/process_update_confirmed.rb @@ -17,7 +17,7 @@ module Domains preclean_pendings update_domain clean_pendings! - domain.save! + domain.save(validate: false) WhoisRecord.find_by(domain_id: domain.id).save # need to reload model end diff --git a/app/interactions/domains/update_confirm/process_update_rejected.rb b/app/interactions/domains/update_confirm/process_update_rejected.rb index 19969d970..5ce818e66 100644 --- a/app/interactions/domains/update_confirm/process_update_rejected.rb +++ b/app/interactions/domains/update_confirm/process_update_rejected.rb @@ -11,7 +11,7 @@ module Domains preclean_pendings clean_pendings! - domain.save! + domain.save(validate: false) end end end diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index f01e7c41e..38aaa5339 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -64,4 +64,24 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE end + + def test_clears_pending_update_and_inactive_after_denial + epp_xml = "\n\n \n \n \n #{@domain.name}\n" \ + " \n #{@new_registrant.code}\n \n \n \n \n \n" \ + " \n #{@legal_doc_path}\n \n" \ + " \n 20alla-1594199756\n \n\n" + @domain.pending_json['frame'] = epp_xml + @domain.update(pending_json: @domain.pending_json) + @domain.update(statuses: [DomainStatus::INACTIVE, DomainStatus::PENDING_UPDATE]) + @domain.nameservers.destroy_all + @domain.reload + + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED) + @domain.reload + + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE + assert_not @domain.statuses.include? DomainStatus::PENDING_UPDATE + assert @domain.statuses.include? DomainStatus::INACTIVE + end end From 252d39464af5f299d2a9ad1fa101a4564ac67659 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 3 Dec 2020 13:39:58 +0500 Subject: [PATCH 8/9] Fix updating procedure --- .../domains/update_confirm/base.rb | 2 ++ .../update_confirm/process_update_confirmed.rb | 2 -- .../update_confirm/process_update_rejected.rb | 1 - test/jobs/domain_update_confirm_job_test.rb | 18 ++++++++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/interactions/domains/update_confirm/base.rb b/app/interactions/domains/update_confirm/base.rb index ab5584c03..0e1fa81d3 100644 --- a/app/interactions/domains/update_confirm/base.rb +++ b/app/interactions/domains/update_confirm/base.rb @@ -33,10 +33,12 @@ module Domains end def clean_pendings! + domain.is_admin = true domain.registrant_verification_token = nil domain.registrant_verification_asked_at = nil domain.pending_json = {} clear_statuses + domain.save end def clear_statuses diff --git a/app/interactions/domains/update_confirm/process_update_confirmed.rb b/app/interactions/domains/update_confirm/process_update_confirmed.rb index a4ceb1d3e..cb69d042e 100644 --- a/app/interactions/domains/update_confirm/process_update_confirmed.rb +++ b/app/interactions/domains/update_confirm/process_update_confirmed.rb @@ -3,7 +3,6 @@ module Domains class ProcessUpdateConfirmed < Base def execute ActiveRecord::Base.transaction do - domain.is_admin = true old_registrant = domain.registrant notify_registrar(:poll_pending_update_confirmed_by_registrant) @@ -17,7 +16,6 @@ module Domains preclean_pendings update_domain clean_pendings! - domain.save(validate: false) WhoisRecord.find_by(domain_id: domain.id).save # need to reload model end diff --git a/app/interactions/domains/update_confirm/process_update_rejected.rb b/app/interactions/domains/update_confirm/process_update_rejected.rb index 5ce818e66..1d7b75b0e 100644 --- a/app/interactions/domains/update_confirm/process_update_rejected.rb +++ b/app/interactions/domains/update_confirm/process_update_rejected.rb @@ -11,7 +11,6 @@ module Domains preclean_pendings clean_pendings! - domain.save(validate: false) end end end diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index 38aaa5339..afffae157 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -84,4 +84,22 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase assert_not @domain.statuses.include? DomainStatus::PENDING_UPDATE assert @domain.statuses.include? DomainStatus::INACTIVE end + + def test_clears_pending_update_and_sets_ok_after_denial + epp_xml = "\n\n \n \n \n #{@domain.name}\n" \ + " \n #{@new_registrant.code}\n \n \n \n \n \n" \ + " \n #{@legal_doc_path}\n \n" \ + " \n 20alla-1594199756\n \n\n" + @domain.pending_json['frame'] = epp_xml + @domain.update(pending_json: @domain.pending_json) + @domain.update(statuses: [DomainStatus::OK, DomainStatus::PENDING_UPDATE]) + + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED) + @domain.reload + + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE + assert_not @domain.statuses.include? DomainStatus::PENDING_UPDATE + assert @domain.statuses.include? DomainStatus::OK + end end From 7a90ef528abb14d0df62b956b6738a26d3593c5e Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 4 Dec 2020 13:57:53 +0500 Subject: [PATCH 9/9] Add a couple of domain status tests --- test/jobs/domain_update_confirm_job_test.rb | 39 ++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index afffae157..ded0d3d8a 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -48,6 +48,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase @domain.reload assert_equal @domain.registrant.code, @new_registrant.code + assert @domain.statuses.include? DomainStatus::OK end def test_clears_pending_update_after_denial @@ -65,6 +66,42 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE end + def test_protects_statuses_after_denial + epp_xml = "\n\n \n \n \n #{@domain.name}\n" \ + " \n #{@new_registrant.code}\n \n \n \n \n \n" \ + " \n #{@legal_doc_path}\n \n" \ + " \n 20alla-1594199756\n \n\n" + @domain.pending_json['frame'] = epp_xml + @domain.update(pending_json: @domain.pending_json) + @domain.update(statuses: [DomainStatus::DELETE_CANDIDATE, DomainStatus::DISPUTED]) + + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED) + @domain.reload + + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE + assert @domain.statuses.include? DomainStatus::DELETE_CANDIDATE + assert @domain.statuses.include? DomainStatus::DISPUTED + end + + def test_protects_statuses_after_confirm + epp_xml = "\n\n \n \n \n #{@domain.name}\n" \ + " \n #{@new_registrant.code}\n \n \n \n \n \n" \ + " \n #{@legal_doc_path}\n \n" \ + " \n 20alla-1594199756\n \n\n" + @domain.pending_json['frame'] = epp_xml + @domain.update(pending_json: @domain.pending_json) + @domain.update(statuses: [DomainStatus::DELETE_CANDIDATE, DomainStatus::DISPUTED]) + + DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED) + @domain.reload + + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION + assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE + assert @domain.statuses.include? DomainStatus::DELETE_CANDIDATE + assert @domain.statuses.include? DomainStatus::DISPUTED + end + def test_clears_pending_update_and_inactive_after_denial epp_xml = "\n\n \n \n \n #{@domain.name}\n" \ " \n #{@new_registrant.code}\n \n \n \n \n \n" \ @@ -72,7 +109,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase " \n 20alla-1594199756\n \n\n" @domain.pending_json['frame'] = epp_xml @domain.update(pending_json: @domain.pending_json) - @domain.update(statuses: [DomainStatus::INACTIVE, DomainStatus::PENDING_UPDATE]) + @domain.update(statuses: [DomainStatus::PENDING_UPDATE]) @domain.nameservers.destroy_all @domain.reload