Merge pull request #596 from maebeale/drop-unnecessary-category-association

Use visible scope instead of additional association in CategoryBlueprint

Author: maebeale

app/blueprints/category_blueprint.rb

@@ -8,6 +8,8 @@ class CategoryBlueprint < Blueprinter::Base
     # Note we are _not_ propogating the :with_subcategories view to children.
     # This is intentional because we don't currently have multiply
     # nested categories so we don't need to dig any deeper.
-    association :visible_subcategories, name: :subcategories, blueprint: CategoryBlueprint
+    association :subcategories, blueprint: CategoryBlueprint do |category|
+      category.categories.visible
+    end
   end
 end

app/blueprints/configuration_blueprint.rb

@@ -1,6 +1,6 @@
 class ConfigurationBlueprint < Blueprinter::Base
   association :categories, blueprint: CategoryBlueprint, view: :with_subcategories do
-    Category.visible.roots.includes(:visible_subcategories)
+    Category.visible.roots.includes(:categories)
   end
 
   association :contact_methods, blueprint: ContactMethodBlueprint do

app/models/category.rb

@@ -10,12 +10,6 @@ class Category < ApplicationRecord
     inverse_of: :parent
   )
 
-  has_many(:visible_subcategories, -> { visible.order(:display_order, :name) },
-           class_name: "Category",
-           foreign_key: :parent_id,
-           inverse_of: :parent
-  )
-
   validates :name, presence: true
 
   scope :visible, -> { where(display_to_public: true) }