jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tags: update category cache whenever category changes.

Browse Source 
Do `update_category_cache_for_all` in a callback instead of calling it
manually everywhere.
This commit is contained in:
evazion
2017-12-23 13:07:23 -06:00
parent 806513836b
commit 19bda2056c
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/tags_controller.rb
View File

@@ -36,7 +36,6 @@ class TagsController < ApplicationController
@tag = Tag.find(params[:id]) @tag = Tag.find(params[:id])
check_privilege(@tag) check_privilege(@tag)
@tag.update_attributes(params[:tag], :as => CurrentUser.role) @tag.update_attributes(params[:tag], :as => CurrentUser.role)
@tag.update_category_cache_for_all
respond_with(@tag) respond_with(@tag)
end end

1
app/logical/alias_and_implication_importer.rb
View File

@@ -117,7 +117,6 @@ private
tag = Tag.find_by_name(token[1]) tag = Tag.find_by_name(token[1])
tag.category = Tag.categories.value_for(token[2]) tag.category = Tag.categories.value_for(token[2])
tag.save tag.save
tag.update_category_cache_for_all
else else
raise "Unknown token: #{token[0]}" raise "Unknown token: #{token[0]}"

5
app/models/tag.rb
View File

@@ -15,6 +15,8 @@ class Tag < ApplicationRecord
validates :name, uniqueness: true, tag_name: true, on: :create validates :name, uniqueness: true, tag_name: true, on: :create
validates_inclusion_of :category, in: TagCategory.category_ids validates_inclusion_of :category, in: TagCategory.category_ids
after_save :update_category_cache_for_all, if: :category_changed?
module ApiMethods module ApiMethods
def to_legacy_json def to_legacy_json
return { return {
@@ -221,8 +223,7 @@ class Tag < ApplicationRecord
tag.update_category_cache tag.update_category_cache
if category_id != tag.category && !tag.is_locked? && ((CurrentUser.is_builder? && tag.post_count < 10_000) || tag.post_count <= 50) if category_id != tag.category && !tag.is_locked? && ((CurrentUser.is_builder? && tag.post_count < 10_000) || tag.post_count <= 50)
tag.update_column(:category, category_id) tag.update_attribute(:category, category_id)
tag.update_category_cache_for_all
end end
end end

1
app/models/tag_alias.rb
View File

@@ -173,7 +173,6 @@ class TagAlias < TagRelationship
def ensure_category_consistency def ensure_category_consistency
if antecedent_tag.category != consequent_tag.category && antecedent_tag.category != Tag.categories.general if antecedent_tag.category != consequent_tag.category && antecedent_tag.category != Tag.categories.general
consequent_tag.update_attribute(:category, antecedent_tag.category) consequent_tag.update_attribute(:category, antecedent_tag.category)
consequent_tag.update_category_cache_for_all
end end
true true

2
test/unit/tag_test.rb
View File

@@ -112,11 +112,9 @@ class TagTest < ActiveSupport::TestCase
should "reset its category after updating" do should "reset its category after updating" do
tag = FactoryGirl.create(:artist_tag) tag = FactoryGirl.create(:artist_tag)
tag.update_category_cache_for_all
assert_equal(Tag.categories.artist, Cache.get("tc:#{Cache.hash(tag.name)}")) assert_equal(Tag.categories.artist, Cache.get("tc:#{Cache.hash(tag.name)}"))
tag.update_attribute(:category, Tag.categories.copyright) tag.update_attribute(:category, Tag.categories.copyright)
tag.update_category_cache_for_all
assert_equal(Tag.categories.copyright, Cache.get("tc:#{Cache.hash(tag.name)}")) assert_equal(Tag.categories.copyright, Cache.get("tc:#{Cache.hash(tag.name)}"))
end end