AI: address review on PR #463

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 }
 

frontend/src/components/DraggableDroppableTagRow.test.tsx

@@ -1,9 +1,25 @@
+import { screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
 import { buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
+import type { CSSProperties, ReactNode } from 'react'
+
+vi.mock ('framer-motion', async importOriginal => {
+  const original = await importOriginal<typeof import ('framer-motion')> ()
+  return {
+      ...original,
+      motion: {
+	  ...original.motion,
+	  div: ({ children, style, layoutId }: {
+	      children?: ReactNode
+	      style?: CSSProperties
+	      layoutId?: string }) => (
+	      <div style={style} data-layout-id={layoutId}>{children}</div>) } }
+})
+
 const dndKit = vi.hoisted (() => ({
   useDraggable: vi.fn (),
   useDroppable: vi.fn (),
@@ -97,4 +113,32 @@ describe ('DraggableDroppableTagRow', () => {
 	}),
     )
   })
+
+  it.each ([false, true]) (
+      'separates same-id internal and external animation identities (sp=%s)',
+      sp => {
+	const internal = buildTag ({ id: 7, name: 'internal_collision' })
+	const external = buildTag ({
+	    id: 7, name: 'nico:external_collision', category: 'nico' })
+
+	renderWithProviders (
+	    <>
+	      {[internal, external].map (item => (
+		  <DraggableDroppableTagRow
+		      key={item.category}
+		      tag={item}
+		      nestLevel={0}
+		      pathKey={`cat-${ item.category }-7`}
+		      suppressClickRef={{ current: false }}
+		      sp={sp}/>))}
+	    </>)
+
+	const prefix = sp ? 'tag-sp-' : 'tag-'
+	for (const item of [internal, external])
+	{
+	  expect (screen.getByRole ('link', { name: item.name })
+	      .closest ('[data-layout-id]')).toHaveAttribute (
+		  'data-layout-id', `${ prefix }${ item.category }-7`)
+	}
+      })
 })

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -137,7 +137,7 @@ const DraggableDroppableTagRow: FC<Props> = ({
 		transition={{ layout: layoutTransition }}
 		layoutId={animationMode === 'off'
 		    ? undefined
-		    : `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
+		    : `tag-${ sp ? 'sp-' : '' }${ tag.category }-${ tag.id }`}>
 	      <TagLink tag={tag} nestLevel={nestLevel}/>
 	    </motion.div>)}
       </div>)

frontend/src/components/TagSidebar.test.tsx

@@ -0,0 +1,47 @@
+import { screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+
+import TagSidebar from '@/components/TagSidebar'
+import { buildPost, buildTag } from '@/test/factories'
+import { renderWithProviders } from '@/test/render'
+
+import type { ReactNode } from 'react'
+
+vi.mock ('@/components/TagSearch', () => ({ default: () => null }))
+vi.mock ('@/components/layout/SidebarComponent', () => ({
+    default: ({ children }: { children: ReactNode }) => <>{children}</> }))
+
+vi.mock ('framer-motion', async importOriginal => {
+  const original = await importOriginal<typeof import ('framer-motion')> ()
+  return {
+      ...original,
+      motion: {
+	  ...original.motion,
+	  div: ({ children, layoutId }: {
+	      children?: ReactNode
+	      layoutId?: string }) => (
+	      <div data-layout-id={layoutId}>{children}</div>) } }
+})
+
+describe ('TagSidebar', () => {
+  it ('keeps same-id internal and external tags with distinct identities', () => {
+    const errors = vi.spyOn (console, 'error').mockImplementation (() => {})
+    const internal = buildTag ({ id: 7, name: 'internal_collision' })
+    const external = buildTag ({
+	id: 7, name: 'nico:external_collision', category: 'nico' })
+
+    renderWithProviders (
+	<TagSidebar posts={[buildPost ({ tags: [internal, external] })]}/>)
+
+    for (const item of [internal, external])
+    {
+      const link = screen.getByRole ('link', { name: item.name })
+      expect (link).toBeInTheDocument ()
+      expect (link.closest ('[data-layout-id]')).toHaveAttribute (
+	  'data-layout-id', `tag-${ item.category }-7`)
+    }
+
+    expect (errors.mock.calls.filter (args =>
+	args.some (value => String (value).includes ('same key')))).toEqual ([])
+  })
+})

frontend/src/components/TagSidebar.tsx

@@ -84,7 +84,8 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	<ul>
 	  {CATEGORIES.flatMap (cat => cat in tags ? (
 	      tags[cat].map (tag => (
-		  <li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
+		  <li key={`${ cat }-${ tag.id }`}
+		      className="mb-1 min-w-0 max-w-full overflow-hidden">
 		    {animationsOff
 		     ? (
 			 <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
@@ -94,7 +95,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 			 <motion.div
 			     className="flex min-w-0 max-w-full items-baseline overflow-hidden"
 			     transition={{ layout: layoutTransition }}
-			     layoutId={`tag-${ tag.id }`}>
+			     layoutId={`tag-${ cat }-${ tag.id }`}>
 			   <TagLink tag={tag} onClick={onClick}/>
 			 </motion.div>)}
 		  </li>))) : [])}