Merge pull request #1770 from internetee/1769-move-domain-release-processing-to-interactor

Move domain delete confirm procedure to interactor

app/interactions/domains/delete_confirm/base.rb

@@ -0,0 +1,53 @@
+module Domains
+  module DeleteConfirm
+    class Base < ActiveInteraction::Base
+      object :domain,
+             class: Domain,
+             description: 'Domain to confirm release'
+      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.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
+        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

app/interactions/domains/delete_confirm/process_action.rb

@@ -0,0 +1,17 @@
+module Domains
+  module DeleteConfirm
+    class ProcessAction < Base
+      def execute
+        ::PaperTrail.request.whodunnit = "interaction - #{self.class.name} - #{action} by"\
+          " #{initiator}"
+
+        case action
+        when RegistrantVerification::CONFIRMED
+          compose(ProcessDeleteConfirmed, inputs)
+        when RegistrantVerification::REJECTED
+          compose(ProcessDeleteRejected, inputs)
+        end
+      end
+    end
+  end
+end

app/interactions/domains/delete_confirm/process_delete_confirmed.rb

@@ -0,0 +1,50 @@
+module Domains
+  module DeleteConfirm
+    class ProcessDeleteConfirmed < Base
+      def execute
+        notify_registrar(:poll_pending_delete_confirmed_by_registrant)
+        domain.apply_pending_delete!
+        raise_errors!(domain)
+      end
+
+      def apply_pending_delete!
+        preclean_pendings
+        clean_pendings!
+        DomainDeleteMailer.accepted(domain).deliver_now
+        domain.set_pending_delete!
+      end
+
+      def set_pending_delete!
+        unless domain.pending_deletable?
+          add_epp_error
+          return
+        end
+
+        domain.delete_date = delete_date
+        domain.statuses << DomainStatus::PENDING_DELETE
+        set_server_hold if server_holdable?
+        domain.save(validate: false)
+      end
+
+      def set_server_hold
+        domain.statuses << DomainStatus::SERVER_HOLD
+        domain.outzone_at = Time.current
+      end
+
+      def server_holdable?
+        return false if domain.statuses.include?(DomainStatus::SERVER_HOLD)
+        return false if domain.statuses.include?(DomainStatus::SERVER_MANUAL_INZONE)
+
+        true
+      end
+
+      def delete_date
+        Time.zone.today + Setting.redemption_grace_period.days + 1.day
+      end
+
+      def add_epp_error
+        domain.add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
+      end
+    end
+  end
+end

app/interactions/domains/delete_confirm/process_delete_rejected.rb

@@ -0,0 +1,32 @@
+module Domains
+  module DeleteConfirm
+    class ProcessDeleteRejected < Base
+      def execute
+        domain.cancel_pending_delete
+        notify_registrar(:poll_pending_delete_rejected_by_registrant)
+        domain.save(validate: false)
+        raise_errors!(domain)
+
+        send_domain_delete_rejected_email
+      end
+
+      def send_domain_delete_rejected_email
+        if domain.registrant_verification_token.blank?
+          warn "EMAIL NOT DELIVERED: registrant_verification_token is missing for #{domain.name}"
+        elsif domain.registrant_verification_asked_at.blank?
+          warn "EMAIL NOT DELIVERED: registrant_verification_asked_at is missing for #{domain.name}"
+        else
+          send_email
+        end
+      end
+
+      def warn(message)
+        Rails.logger.warn(message)
+      end
+
+      def send_email
+        DomainDeleteMailer.rejected(domain).deliver_now
+      end
+    end
+  end
+end

app/interactions/domains/delete_confirm_email/send_request.rb

@@ -1,5 +1,5 @@
 module Domains
-  module DeleteConfirm
+  module DeleteConfirmEmail
     class SendRequest < ActiveInteraction::Base
       object :domain,
              class: Domain,

app/jobs/domain_delete_confirm_job.rb

@@ -1,39 +1,11 @@
-class DomainDeleteConfirmJob < Que::Job
-  def run(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
+class DomainDeleteConfirmJob < ApplicationJob
+  queue_as :default
+
+  def perform(domain_id, action, initiator = nil)
     domain = Epp::Domain.find(domain_id)
 
-      case action
-      when RegistrantVerification::CONFIRMED
-        domain.notify_registrar(:poll_pending_delete_confirmed_by_registrant)
-        domain.apply_pending_delete!
-        raise_errors!(domain)
-
-      when RegistrantVerification::REJECTED
-        domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
-        domain.notify_registrar(:poll_pending_delete_rejected_by_registrant)
-
-        domain.cancel_pending_delete
-        domain.save(validate: false)
-        raise_errors!(domain)
-
-        if domain.registrant_verification_token.blank?
-          Rails.logger.warn "EMAIL NOT DELIVERED: registrant_verification_token is missing for #{domain.name}"
-        elsif domain.registrant_verification_asked_at.blank?
-          Rails.logger.warn "EMAIL NOT DELIVERED: registrant_verification_asked_at is missing for #{domain.name}"
-        else
-          DomainDeleteMailer.rejected(domain).deliver_now
-        end
-      end
-
-      destroy # it's best to destroy the job in the same transaction
-    end
-  end
-
-
-  def raise_errors!(domain)
-    throw "domain #{domain.name} failed with errors #{domain.errors.full_messages}" if domain.errors.any?
+    Domains::DeleteConfirm::ProcessAction.run(domain: domain,
+                                              action: action,
+                                              initiator: initiator)
   end
 end

app/models/domain.rb

@@ -421,7 +421,7 @@ class Domain < ApplicationRecord
     pending_delete_confirmation!
     save(validate: false) # should check if this did succeed
 
-    Domains::DeleteConfirm::SendRequest.run(domain: self)
+    Domains::DeleteConfirmEmail::SendRequest.run(domain: self)
   end
 
   def cancel_pending_delete

app/models/registrant_verification.rb

@@ -30,12 +30,12 @@ class RegistrantVerification < ApplicationRecord
   def domain_registrant_delete_confirm!(initiator)
     self.action_type = DOMAIN_DELETE
     self.action = CONFIRMED
-    DomainDeleteConfirmJob.enqueue domain.id, CONFIRMED, initiator if save
+    DomainDeleteConfirmJob.perform_later domain.id, CONFIRMED, initiator if save
   end
 
   def domain_registrant_delete_reject!(initiator)
     self.action_type = DOMAIN_DELETE
     self.action = REJECTED
-    DomainDeleteConfirmJob.enqueue domain.id, REJECTED, initiator if save
+    DomainDeleteConfirmJob.perform_later domain.id, REJECTED, initiator if save
   end
 end

test/jobs/domain_delete_confirm_job_test.rb

@@ -18,7 +18,7 @@ class DomainDeleteConfirmJobTest < ActiveSupport::TestCase
       new_registrant_email: @new_registrant.email,
       current_user_id: @user.id })
 
-    DomainDeleteConfirmJob.enqueue(@domain.id, RegistrantVerification::REJECTED)
+    DomainDeleteConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED)
 
     last_registrar_notification = @domain.registrar.notifications.last
     assert_equal(last_registrar_notification.attached_obj_id, @domain.id)
@@ -31,7 +31,7 @@ class DomainDeleteConfirmJobTest < ActiveSupport::TestCase
       new_registrant_email: @new_registrant.email,
       current_user_id: @user.id })
 
-    DomainDeleteConfirmJob.enqueue(@domain.id, RegistrantVerification::CONFIRMED)
+    DomainDeleteConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED)
 
     last_registrar_notification = @domain.registrar.notifications.last
     assert_equal(last_registrar_notification.attached_obj_id, @domain.id)
@@ -51,7 +51,7 @@ class DomainDeleteConfirmJobTest < ActiveSupport::TestCase
     assert @domain.registrant_delete_confirmable?(@domain.registrant_verification_token)
     assert_equal @user.id, @domain.pending_json['current_user_id']
 
-    DomainDeleteConfirmJob.enqueue(@domain.id, RegistrantVerification::CONFIRMED)
+    DomainDeleteConfirmJob.perform_now(@domain.id, RegistrantVerification::CONFIRMED)
     @domain.reload
 
     assert @domain.statuses.include? DomainStatus::PENDING_DELETE
@@ -72,7 +72,7 @@ class DomainDeleteConfirmJobTest < ActiveSupport::TestCase
     assert @domain.registrant_delete_confirmable?(@domain.registrant_verification_token)
     assert_equal @user.id, @domain.pending_json['current_user_id']
 
-    DomainDeleteConfirmJob.enqueue(@domain.id, RegistrantVerification::REJECTED)
+    DomainDeleteConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED)
     @domain.reload
 
     assert_equal ['ok'], @domain.statuses

test/system/registrant_area/domains/domain_delete_confirms_test.rb

@@ -1,6 +1,7 @@
 require 'application_system_test_case'
 
 class DomainDeleteConfirmsTest < ApplicationSystemTestCase
+  include ActionMailer::TestHelper
   setup do
     @user = users(:registrant)
     sign_in @user
@@ -13,7 +14,9 @@ class DomainDeleteConfirmsTest < ApplicationSystemTestCase
   def test_enqueues_approve_job_after_verification
     visit registrant_domain_delete_confirm_url(@domain.id, token: @domain.registrant_verification_token)
 
+    perform_enqueued_jobs do
       click_on 'Confirm domain delete'
+    end
     assert_text 'Domain registrant change has successfully received.'
 
     @domain.reload
@@ -23,7 +26,9 @@ class DomainDeleteConfirmsTest < ApplicationSystemTestCase
   def test_enqueues_reject_job_after_verification
     visit registrant_domain_delete_confirm_url(@domain.id, token: @domain.registrant_verification_token)
 
+    perform_enqueued_jobs do
       click_on 'Reject domain delete'
+    end
     assert_text 'Domain registrant change has been rejected successfully.'
 
     @domain.reload