Merge pull request #7 from hoppergee/active_job_support_enhencement

Active job support enhencement

Author: hoppergee

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [1.1.1] - 2021-10-07
+
+- Make sure all four job delivery ways work as expected
+  - MyJob.perform_now('hi')
+  - MyJob.perform_later('hi')
+  - MyJob.set(queue: 'high').perform_now('hi')
+  - MyJob.set(queue: 'high').perform_later('hi')
+
 ## [1.1.0] - 2021-10-07
 
 - Make tenant finding strategy customizable

lib/multi_tenant_support/active_job.rb

@@ -1,11 +1,30 @@
 module MultiTenantSupport
+
   module ActiveJob
     extend ActiveSupport::Concern
 
     included do
       attr_accessor :current_tenant
     end
 
+    class_methods do
+      if Gem::Version.new(Rails.version) < Gem::Version.new("7.0.0.alpha1")
+        def perform_now(*args)
+          job = job_or_instantiate(*args)
+          job.current_tenant = MultiTenantSupport.current_tenant
+          job.perform_now
+        end
+      else
+        eval("
+          def perform_now(...)
+            job = job_or_instantiate(...)
+            job.current_tenant = MultiTenantSupport.current_tenant
+            job.perform_now
+          end
+        ")
+      end
+    end
+
     def perform_now
       MultiTenantSupport.under_tenant(current_tenant) do
         super
@@ -43,6 +62,25 @@ def find_current_tenant(data)
       tenant_klass.find tenant_id
     end
   end
+
+  module ConfiguredJob
+    if Gem::Version.new(Rails.version) < Gem::Version.new("7.0.0.alpha1")
+      def perform_now(*args)
+        job = @job_class.new(*args)
+        job.current_tenant = MultiTenantSupport.current_tenant
+        job.perform_now
+      end
+    else
+      eval("
+        def perform_now(...)
+          job = @job_class.new(...)
+          job.current_tenant = MultiTenantSupport.current_tenant
+          job.perform_now
+        end
+      ")
+    end
+  end
 end
 
-ActiveJob::Base.include(MultiTenantSupport::ActiveJob)
+ActiveJob::Base.include(MultiTenantSupport::ActiveJob)
+ActiveJob::ConfiguredJob.prepend(MultiTenantSupport::ConfiguredJob)

lib/multi_tenant_support/version.rb

@@ -1,3 +1,3 @@
 module MultiTenantSupport
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

test/integration/active_job_test.rb renamed to test/integration/active_job_perform_later_test.rb

@@ -2,7 +2,7 @@
 require 'sidekiq'
 require 'sidekiq/testing'
 
-class ActiveJobIntegrationTest < ActiveSupport::TestCase
+class ActiveJobPeroformLaterIntegrationTest < ActiveSupport::TestCase
 
   setup do
     MultiTenantSupport.under_tenant(accounts(:amazon)) do

test/integration/active_job_perform_now_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class ActiveJobPeroformNowIntegrationTest < ActiveSupport::TestCase
+
+  test 'update succes update user when tenant account match' do
+    under_tenant(amazon) do
+      UserNameUpdateJob.perform_now(bezos)
+
+      assert_equal "Jeff Bezos UPDATE", bezos.reload.name
+    end
+  end
+
+  test 'fail to update user when tenant account is missing' do
+    under_tenant nil do
+      assert_raise(MultiTenantSupport::MissingTenantError) do
+        UserNameUpdateJob.perform_now(bezos)
+      end
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", @bezos.reload.name # Does not change
+    end
+  end
+
+  test 'fail to update user when tenant account is not match' do
+    under_tenant(apple) do
+      assert_raise(MultiTenantSupport::InvalidTenantAccess) do
+        UserNameUpdateJob.perform_now(bezos)
+      end
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", @bezos.reload.name # Does not change
+    end
+  end
+
+end

test/integration/active_job_preconfigured_perform_later_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+require 'sidekiq'
+require 'sidekiq/testing'
+
+class ActiveJobPreconfiguredPeroformLaterIntegrationTest < ActiveSupport::TestCase
+
+  teardown do
+    Sidekiq::RetrySet.new.clear
+  end
+
+  test 'update succes update user when tenant account match' do
+    under_tenant(amazon) do
+      UserNameUpdateJob.set(queue: :integration_tests).perform_later(bezos)
+    end
+
+    sleep 0.5
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos UPDATE", bezos.reload.name
+    end
+  end
+
+  test 'fail to update user when tenant account is missing on enqueue' do
+    UserNameUpdateJob.set(queue: :integration_tests).perform_later(bezos)
+
+    sleep 0.1
+
+    Sidekiq.redis do |connection|
+      retries = connection.zrange "retry", 0, -1
+      assert 1, retries.count
+      failed_job_data = JSON.parse(retries.last)
+      assert_equal "Error while trying to deserialize arguments: MultiTenantSupport::MissingTenantError", failed_job_data["error_message"]
+      assert_equal "ActiveJob::DeserializationError", failed_job_data["error_class"]
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", bezos.reload.name # Does not change
+    end
+  end
+
+  test 'fail to update user when tenant account is not match' do
+    under_tenant(apple) do
+      UserNameUpdateJob.set(queue: :integration_tests).perform_later(bezos)
+    end
+
+    sleep 0.2
+
+    Sidekiq.redis do |connection|
+      retries = connection.zrange "retry", 0, -1
+      assert 1, retries.count
+      failed_job_data = JSON.parse(retries.last)
+      assert_equal %Q{Error while trying to deserialize arguments: Couldn't find User with 'id'=#{bezos.id} [WHERE "users"."account_id" = $1]}, failed_job_data["error_message"]
+      assert_equal "ActiveJob::DeserializationError", failed_job_data["error_class"]
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", bezos.reload.name # Does not change
+    end
+  end
+
+end

test/integration/active_job_preconfigured_perform_now_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class ActiveJobPreconfiguredPeroformNowIntegrationTest < ActiveSupport::TestCase
+
+  test 'update succes update user when tenant account match' do
+    under_tenant(amazon) do
+      UserNameUpdateJob.set(queue: :integration_tests).perform_now(bezos)
+
+      assert_equal "Jeff Bezos UPDATE", bezos.reload.name
+    end
+  end
+
+  test 'fail to update user when tenant account is missing' do
+    under_tenant nil do
+      assert_raise(MultiTenantSupport::MissingTenantError) do
+      UserNameUpdateJob.set(queue: :integration_tests).perform_now(bezos)
+      end
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", @bezos.reload.name # Does not change
+    end
+  end
+
+  test 'fail to update user when tenant account is not match' do
+    under_tenant(apple) do
+      assert_raise(MultiTenantSupport::InvalidTenantAccess) do
+      UserNameUpdateJob.set(queue: :integration_tests).perform_now(bezos)
+      end
+    end
+
+    under_tenant(amazon) do
+      assert_equal "Jeff Bezos", @bezos.reload.name # Does not change
+    end
+  end
+
+end