Merge pull request #3882 from akostadinov/tenant_id

further associations tune-up
3scale · Sep 6, 2024 · 1533335 · 1533335
2 parents f39b1b2 + b55583e
commit 1533335
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -154,7 +154,7 @@ def schedule_backend_sync_worker
   has_many :messages, -> { visible }, foreign_key: :sender_id, class_name: 'Message'
   has_many :sent_messages, foreign_key: :sender_id, class_name: 'Message'
 
-  has_many :mail_dispatch_rules, dependent: :destroy
+  has_many :mail_dispatch_rules, dependent: :destroy, inverse_of: :account
   has_many :system_operations, through: :mail_dispatch_rules
 
   # Deleted received messages

diff --git a/app/models/account_contract.rb b/app/models/account_contract.rb
@@ -2,8 +2,6 @@ class AccountContract < Contract
   alias account_plan plan
   attr_reader :old_plan
 
-  belongs_to :user_account, class_name: 'Account', inverse_of: :bought_account_contract, autosave: false
-
   # TODO: remove this when also Account states (pending, aproved ...) are handled on an
   # account contract.
   #

diff --git a/app/models/mail_dispatch_rule.rb b/app/models/mail_dispatch_rule.rb
@@ -1,5 +1,5 @@
 class MailDispatchRule < ApplicationRecord
-  belongs_to :account
+  belongs_to :account, inverse_of: :mail_dispatch_rules
   belongs_to :system_operation
 
   validates :account_id, :system_operation_id, presence: true