AI: address review on PR #464

backend/app/controllers/tag_versions_controller.rb

@@ -69,8 +69,11 @@ class TagVersionsController < ApplicationController
 
       parent_tags =
           build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
-          .map do |h|
+          .filter_map do |h|
-            { tag: parent_json.fetch(h[:tag_id]),
+            parent = parent_json[h[:tag_id]]
+            next unless parent
+
+            { tag: parent,
               type: h[:type] }
           end
 

backend/app/services/post_tag_search.rb

@@ -3,8 +3,8 @@ class PostTagSearch
   def self.literals(locale, raw)
     tokens = raw.split.reject { _1.downcase == 'type:or' }
     names = tokens.map { _1.sub(/\Anot:/i, '') }
-    registered = matching_names(TagName.where(language_code: locale.language_code),
+    registered = TagName.where(language_code: locale.language_code, name: names)
-        names, 'tag_names.name', :tag_id).to_h
+        .pluck(:name, :tag_id).to_h
     primary = TagName.where(language_code: locale.language_code,
         tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
     tokens.zip(names).map do |token, name|
@@ -19,25 +19,12 @@ class PostTagSearch
 
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
-    internal = matching_names(TagName.where(language_code: locale.language_code),
+    internal = TagName.where(language_code: locale.language_code, name: names)
-        names, 'tag_names.name', :tag_id).group_by(&:first)
+        .pluck(:name, :tag_id).group_by(&:first)
-    external = matching_names(ExternalTag.all, names,
+    external = names.empty? ? {} : ExternalTag.where(
-        "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
+        "CONCAT(platform, ':', name) IN (?)", names)
+        .pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
     names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
                               external.fetch(name, []).map(&:last).uniq]] }
   end
-
-  def self.matching_names(scope, names, expression, identifier)
-    return [] if names.empty?
-
-    queries = names.uniq.map do |name|
-      scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
-    end
-    # Return the input spelling so Ruby does not recheck database equivalence.
-    scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
-      INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
-        ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
-    SQL
-  end
-  private_class_method :matching_names
 end

backend/spec/requests/posts_spec.rb

@@ -206,25 +206,6 @@ RSpec.describe 'Posts API', type: :request do
     end
 
     context 'when q is provided' do
-      ['SPEC_TAG', 'SpEc_TaG', 'spec_tág', 'MANKO', 'MaNkO', 'mánko'].each do |name|
-        it "matches #{ name } using database collation" do
-          get '/posts', params: { locale: 'ja', tags: name }
-
-          expect(response).to have_http_status(:ok)
-          expect(json.fetch('count')).to eq(2)
-          expect(json.fetch('posts').map { _1.fetch('id') })
-              .to contain_exactly(post_record.id, hit_post.id)
-        end
-
-        it "excludes #{ name } using database collation" do
-          get '/posts', params: { locale: 'ja', tags: "not:#{ name }" }
-
-          expect(response).to have_http_status(:ok)
-          expect(json.fetch('count')).to eq(1)
-          expect(json.fetch('posts').map { _1.fetch('id') }).to eq([miss_post.id])
-        end
-      end
-
       it 'filters posts by q (hit case)' do
         get '/posts', params: { tags: 'spec_tag' }
 
@@ -285,26 +266,6 @@ RSpec.describe 'Posts API', type: :request do
         PostExternalTag.create!(post: miss_post, external_tag:)
       end
 
-      ['NICO:SEARCH_EXTERNAL', 'NiCo:SeArCh_ExTeRnAl', 'nico:séarch_external'].each do |name|
-        it "matches #{ name } using database collation" do
-          get '/posts', params: { locale: 'ja', tags: name }
-
-          expect(response).to have_http_status(:ok)
-          expect(json.fetch('count')).to eq(2)
-          expect(json.fetch('posts').map { _1.fetch('id') })
-              .to contain_exactly(miss_post.id, both_post.id)
-        end
-
-        it "excludes #{ name } using database collation" do
-          get '/posts', params: { locale: 'ja', tags: "not:#{ name }" }
-
-          expect(response).to have_http_status(:ok)
-          expect(json.fetch('count')).to eq(2)
-          expect(json.fetch('posts').map { _1.fetch('id') })
-              .to contain_exactly(post_record.id, hit_post.id)
-        end
-      end
-
       it 'keeps internal name searches independent of colliding external ids' do
         get '/posts', params: { tags: primary_tag_name_for(tag, 'ja').name }
 

backend/spec/requests/tag_versions_spec.rb

@@ -215,6 +215,36 @@ RSpec.describe 'TagVersions API', type: :request do
       expect(first.fetch('created_at')).to eq(t_v1.iso8601)
     end
 
+    [:parent_shared, :parent_new, :parent_old].each do |parent_key|
+      it "omits deleted #{ parent_key } from parent diffs" do
+        deleted_parent = public_send(parent_key)
+        deleted_parent.tag_names.destroy_all
+        deleted_parent.destroy!
+
+        get '/tags/versions', params: { id: tag.id }
+
+        expect(response).to have_http_status(:ok)
+        expect(json.fetch('count')).to eq(2)
+
+        versions = json.fetch('versions')
+        expect(versions.map { _1.fetch('version_no') }).to eq([2, 1])
+
+        expected_parents = [
+            [parent_shared.id, 'context'],
+            [parent_new.id, 'added'],
+            [parent_old.id, 'removed']].reject { _1.first == deleted_parent.id }
+        expect(versions.first.fetch('parent_tags').map { |entry|
+          [entry.fetch('tag').fetch('id'), entry.fetch('type')]
+        }).to eq(expected_parents)
+
+        expected_first_parents = [parent_shared.id, parent_old.id]
+            .reject { _1 == deleted_parent.id }.map { [_1, 'added'] }
+        expect(versions.second.fetch('parent_tags').map { |entry|
+          [entry.fetch('tag').fetch('id'), entry.fetch('type')]
+        }).to eq(expected_first_parents)
+      end
+    end
+
     it 'returns empty when the specified tag has no versions' do
       fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)