Merge pull request #1948 from internetee/dependabot/bundler/active_interaction-4.0.0

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # core
-gem 'active_interaction', '~> 3.8'
+gem 'active_interaction', '~> 4.0'
 gem 'apipie-rails', '~> 0.5.18'
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'iso8601', '0.12.1' # for dates and times

Gemfile.lock

@@ -112,8 +112,8 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.3)
+    active_interaction (4.0.0)
-      activemodel (>= 4, < 7)
+      activemodel (>= 5, < 7)
     activejob (6.0.3.6)
       activesupport (= 6.0.3.6)
       globalid (>= 0.3.6)
@@ -507,7 +507,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  active_interaction (~> 3.8)
+  active_interaction (~> 4.0)
   activerecord-import
   airbrake
   apipie-rails (~> 0.5.18)

app/interactions/domains/cancel_force_delete/cancel_force_delete.rb

@@ -2,10 +2,10 @@ module Domains
   module CancelForceDelete
     class CancelForceDelete < Base
       def execute
-        compose(RemoveForceDeleteStatuses, inputs)
+        compose(RemoveForceDeleteStatuses, inputs.to_h)
-        compose(RestoreStatusesBeforeForceDelete, inputs)
+        compose(RestoreStatusesBeforeForceDelete, inputs.to_h)
-        compose(ClearForceDeleteData, inputs)
+        compose(ClearForceDeleteData, inputs.to_h)
-        compose(NotifyRegistrar, inputs)
+        compose(NotifyRegistrar, inputs.to_h)
       end
     end
   end

app/interactions/domains/delete/do_delete.rb

@@ -6,7 +6,7 @@ module Domains
         WhoisRecord.where(domain_id: domain.id).destroy_all
 
         domain.destroy
-        compose(Domains::Delete::NotifyRegistrar, inputs)
+        Domains::Delete::NotifyRegistrar.run(inputs.to_h)
       end
     end
   end

app/interactions/domains/delete_confirm/process_action.rb

@@ -7,9 +7,9 @@ module Domains
 
         case action
         when RegistrantVerification::CONFIRMED
-          compose(ProcessDeleteConfirmed, inputs)
+          compose(ProcessDeleteConfirmed, inputs.to_h)
         when RegistrantVerification::REJECTED
-          compose(ProcessDeleteRejected, inputs)
+          compose(ProcessDeleteRejected, inputs.to_h)
         end
       end
     end

app/interactions/domains/force_delete/set_force_delete.rb

@@ -2,12 +2,12 @@ module Domains
   module ForceDelete
     class SetForceDelete < Base
       def execute
-        compose(CheckDiscarded, inputs)
+        compose(CheckDiscarded, inputs.to_h)
-        compose(PrepareDomain, inputs)
+        compose(PrepareDomain, inputs.to_h)
-        compose(SetStatus, inputs)
+        compose(SetStatus, inputs.to_h)
-        compose(PostSetProcess, inputs)
+        compose(PostSetProcess, inputs.to_h)
-        compose(NotifyRegistrar, inputs)
+        compose(NotifyRegistrar, inputs.to_h)
-        compose(NotifyByEmail, inputs)
+        compose(NotifyByEmail, inputs.to_h)
       end
     end
   end

app/interactions/domains/update_confirm/process_action.rb

@@ -7,9 +7,9 @@ module Domains
 
         case action
         when RegistrantVerification::CONFIRMED
-          compose(ProcessUpdateConfirmed, inputs)
+          Domains::UpdateConfirm::ProcessUpdateConfirmed.run(inputs.to_h)
         when RegistrantVerification::REJECTED
-          compose(ProcessUpdateRejected, inputs)
+          Domains::UpdateConfirm::ProcessUpdateRejected.run(inputs.to_h)
         end
       end
     end

app/interactions/whois/update.rb

@@ -13,7 +13,7 @@ module Whois
       Array(names).each do |name|
         record = find_record(klass, name)
         if record
-          Whois::UpdateRecord.run(record: record, type: type)
+          Whois::UpdateRecord.run(record: { klass: klass.to_s, id: record.id, type: type })
         else
           Whois::DeleteRecord.run(name: name, type: type)
         end

app/interactions/whois/update_record.rb

@@ -1,12 +1,14 @@
 module Whois
   class UpdateRecord < ActiveInteraction::Base
-    interface :record
+    hash :record do
-    string :type
+      string :klass
-
+      integer :id
-    validates :type, inclusion: { in: %w[reserved blocked domain disputed zone] }
+      string :type
+    end
 
     def execute
-      send "update_#{type}", record
+      data = record['klass'].constantize.find_by(id: record['id'])
+      send "update_#{record['type']}", data
     end
 
     def update_domain(domain)

app/jobs/domain_update_confirm_job.rb

@@ -1,8 +1,11 @@
 class DomainUpdateConfirmJob < ApplicationJob
   def perform(domain_id, action, initiator = nil)
     domain = Epp::Domain.find(domain_id)
-    Domains::UpdateConfirm::ProcessAction.run(domain: domain,
+    attrs = {
-                                              action: action,
+      domain: domain,
-                                              initiator: initiator)
+      action: action,
+      initiator: initiator,
+    }
+    Domains::UpdateConfirm::ProcessAction.run(attrs)
   end
 end

test/jobs/dispute_status_update_job_test.rb

@@ -56,7 +56,7 @@ class DisputeStatusUpdateJobTest < ActiveJob::TestCase
 
     # Dispute status is added automatically if starts_at is not in future
     perform_enqueued_jobs do
-      Dispute.create(domain_name: 'shop.test', starts_at: Time.zone.parse('2010-07-05'))
+      Dispute.create(domain_name: 'shop.test', starts_at: Time.zone.today)
     end
     domain.reload