Back to has_many :through, as it should be

Shopify · Mar 21, 2024 · c3622d0 · c3622d0
1 parent 6213f17
commit c3622d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -8,10 +8,8 @@ class Category < ApplicationRecord
   has_many :children, class_name: "Category", inverse_of: :parent
   belongs_to :parent, class_name: "Category", optional: true
 
-  has_and_belongs_to_many :properties,
-    join_table: :categories_properties,
-    foreign_key: :category_id,
-    association_foreign_key: :property_friendly_id
+  has_many :categories_properties, dependent: :destroy
+  has_many :properties, through: :categories_properties, foreign_key: :property_friendly_id
   def property_friendly_ids=(ids)
     self.properties = Property.where(friendly_id: ids)
   end

diff --git a/app/models/property.rb b/app/models/property.rb
@@ -3,13 +3,11 @@
 class Property < ApplicationRecord
   default_scope { order(:name) }
 
-  has_and_belongs_to_many :categories,
-    join_table: :categories_properties,
-    foreign_key: :property_friendly_id,
-    association_foreign_key: :category_id
+  has_many :categories_properties, dependent: :destroy, foreign_key: :property_friendly_id, primary_key: :friendly_id
+  has_many :categories, through: :categories_properties
 
-  has_and_belongs_to_many :property_values,
-    join_table: :properties_property_values
+  has_many :properties_property_values, dependent: :destroy
+  has_many :property_values, through: :properties_property_values
 
   validates :name, presence: true