Use with_tenant in ActiveJob extension

Implements the suggestion from ErwinM#328 (comment)
phinze · Jun 21, 2024 · 13c9fd1 · 13c9fd1
1 parent 7e3bd8a
commit 13c9fd1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/acts_as_tenant/active_job_extensions.rb b/lib/acts_as_tenant/active_job_extensions.rb
@@ -6,8 +6,10 @@ def serialize
 
     def deserialize(job_data)
       tenant_global_id = job_data.delete("current_tenant")
-      ActsAsTenant.current_tenant = tenant_global_id ? GlobalID::Locator.locate(tenant_global_id) : nil
-      super
-    end
+      tenant = tenant_global_id ? GlobalID::Locator.locate(tenant_global_id) : nil
+
+      ActsAsTenant.with_tenant tenant do
+        super
+      end
   end
 end