refactor: remove cross tenant configuration

Author: miguelmarcondesf

lib/active_record/tenanted/cross_tenant_associations.rb

@@ -6,15 +6,6 @@ module CrossTenantAssociations
       extend ActiveSupport::Concern
 
       class_methods do
-        # I think we can have more configs later
-        def cross_tenant_config(**config)
-          @cross_tenant_config = config
-        end
-
-        def get_cross_tenant_config
-          @cross_tenant_config ||= {}
-        end
-
         def has_one(name, scope = nil, **options)
           define_enhanced_association(:has_one, name, scope, **options)
         end
@@ -26,9 +17,8 @@ def has_many(name, scope = nil, **options)
         private
           # For now association methods are identical
           def define_enhanced_association(association_type, name, scope, **options)
-            config = get_cross_tenant_config
-            tenant_column = config[:tenant_column] || :tenant_id
-            custom_options = options.merge(tenant_column: tenant_column)
+            tenant_key = options.delete(:tenant_key)
+            custom_options = { tenant_key: tenant_key || :tenant_id }
 
             enhanced_scope = enhance_cross_tenant_association(name, scope, custom_options)
             method(association_type).super_method.call(name, enhanced_scope, **options)
@@ -40,11 +30,11 @@ def enhance_cross_tenant_association(name, scope, options)
             return scope unless target_class
 
             unless target_class.tenanted?
-              tenant_column = options[:tenant_column]
+              tenant_key = options[:tenant_key]
 
               return ->(record) {
                 base_scope = scope ? target_class.instance_exec(&scope) : target_class.all
-                base_scope.where(tenant_column => record.tenant)
+                base_scope.where(tenant_key => record.tenant)
               }
             end
 

test/unit/tenant_test.rb

@@ -657,8 +657,7 @@
         ActiveRecord::Base.connection.add_column :announcements, :custom_tenant_id, :string
         ActiveRecord::Base.connection.add_column :announcements, :user_id, :integer
 
-        User.cross_tenant_config(tenant_column: :custom_tenant_id)
-        User.has_one :announcement, class_name: "Announcement"
+        User.has_one :announcement, class_name: "Announcement", tenant_key: :custom_tenant_id
         Announcement.belongs_to :user
       end
 
@@ -688,8 +687,7 @@
         ActiveRecord::Base.connection.add_column :announcements, :custom_tenant_id, :string
         ActiveRecord::Base.connection.add_column :announcements, :user_id, :integer
 
-        User.cross_tenant_config(tenant_column: :custom_tenant_id)
-        User.has_many :announcements, class_name: "Announcement"
+        User.has_many :announcements, class_name: "Announcement", tenant_key: :custom_tenant_id
         Announcement.belongs_to :user
       end