From fc3b822bdfed07daaaffaa3f4981d16849104b7e Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 5 Sep 2019 00:00:15 -0500 Subject: [PATCH] artists: reduce queries in artist summaries. Avoid a few queries when searching for single artist tags. --- app/models/artist.rb | 8 -------- app/views/artists/_summary.html.erb | 7 ++----- test/unit/artist_test.rb | 15 --------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/app/models/artist.rb b/app/models/artist.rb index 36cfce3a6..7bf3d772e 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -386,14 +386,6 @@ class Artist < ApplicationRecord end module TagMethods - def has_tag_alias? - TagAlias.active.exists?(["antecedent_name = ?", name]) - end - - def tag_alias_name - TagAlias.active.find_by_antecedent_name(name).consequent_name - end - def category_name Tag.category_for(name) end diff --git a/app/views/artists/_summary.html.erb b/app/views/artists/_summary.html.erb index 9c50f7561..c0d531e65 100644 --- a/app/views/artists/_summary.html.erb +++ b/app/views/artists/_summary.html.erb @@ -3,16 +3,13 @@
  • Status <%= artist.status %>
  • <% if !artist.is_banned? || CurrentUser.is_member? %> - <% if artist.has_tag_alias? %> -
  • Tag Alias <%= artist.tag_alias_name %>
  • - <% end %> <% if artist.other_names.present? %>
  • Other Names <%= link_to_artists(artist.other_names) %>
  • <% end %> <% if artist.group_name.present? %>
  • Group <%= link_to_artist(artist.group_name) %>
  • <% end %> - <% if artist.members.any? %> + <% if artist.members.present? %>
  • Members <%= link_to_artists(artist.members.map(&:name)) %>
  • <% end %> <% if artist.domains.any? %> @@ -23,7 +20,7 @@ <% end %> <% end %> - <% if artist.urls.any? %> + <% if artist.urls.present? %>
  • URLs