Use has_many through instead of has_and_belongs_to_many

app/models/message.rb

@@ -19,10 +19,10 @@
 #  updated_at                                  :datetime         not null
 
 class Message < ApplicationRecord
-  has_and_belongs_to_many :tags
-  has_many :messages_tags, dependent: :destroy
   belongs_to :thread, class_name: 'MessageThread', foreign_key: :message_thread_id
   belongs_to :author, class_name: 'User', foreign_key: :author_id, optional: true
+  has_many :messages_tags, dependent: :destroy
+  has_many :tags, through: :messages_tags
   has_many :objects, class_name: 'MessageObject', dependent: :destroy
   has_many :attachments, -> { where(object_type: "ATTACHMENT") }, class_name: 'MessageObject'
   # used for joins only

app/models/tag.rb

@@ -11,13 +11,15 @@
 
 class Tag < ApplicationRecord
   belongs_to :tenant
-  has_and_belongs_to_many :messages
-  has_and_belongs_to_many :message_threads
+  belongs_to :owner, class_name: 'User', optional: true, foreign_key: :user_id
   has_many :tag_users, dependent: :destroy
   has_many :users, through: :tag_users
   has_many :tag_groups, dependent: :destroy
   has_many :groups, through: :tag_groups
-  belongs_to :owner, class_name: 'User', optional: true, foreign_key: :user_id
+  has_many :messages_tags
+  has_many :messages, through: :messages_tags
+  has_many :message_threads_tags
+  has_many :message_threads, through: :message_threads_tags
 
   validates :name, presence: true
   validates :name, uniqueness: { scope: :tenant_id, case_sensitive: false }