Merge pull request #17418 from kbrock/tag_category

convert tag.category to a regular association

app/models/tag.rb

@@ -1,7 +1,7 @@
 class Tag < ApplicationRecord
   has_many :taggings, :dependent => :destroy
   has_one :classification
-  virtual_has_one :category,       :class_name => "Classification"
+  has_one :category, :through => :classification, :source => :parent
   virtual_has_one :categorization, :class_name => "Hash"
 
   has_many :container_label_tag_mappings
@@ -137,10 +137,6 @@ def ==(comparison_object)
     super || name.downcase == comparison_object.to_s.downcase
   end
 
-  def category
-    @category ||= Classification.find_by_name(name_path.split('/').first, nil)
-  end
-
   def show
     category.try(:show)
   end

spec/models/ems_refresh/save_inventory/save_tags_inventory_spec.rb

@@ -6,7 +6,7 @@ def mapped_tag(category_name, tag_name)
     mapping = FactoryGirl.create(:tag_mapping_with_category,
                                  :category_name        => category_name,
                                  :category_description => category_name)
-    category = mapping.tag.category
+    category = mapping.tag.classification
     entry = category.add_entry(:name => tag_name, :description => tag_name)
     entry.tag
   end

spec/models/tag_spec.rb

@@ -102,6 +102,11 @@
 
       expect(categorization).to eq(expected_categorization)
     end
+
+    it "category tags have no category" do
+      category_tag = @tag.category.tag
+      expect(category_tag.category).to be_nil
+    end
   end
 
   describe ".find_by_classification_name" do