From a55408dc32da3704fc09538ee3d31e621ba4b135 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Wed, 18 Nov 2026 20:58:12 +0900 Subject: [PATCH 1/7] WIP: preserve failed Codex job issue-485-5cicl5k1 --- .../controllers/post_versions_controller.rb | 12 +- backend/app/models/history_access.rb | 11 +- .../requests/post_history_privacy_spec.rb | 158 +++++++++++++++++- frontend/src/lib/prefetchers.test.ts | 37 ++++ frontend/src/lib/prefetchers.ts | 4 +- 5 files changed, 207 insertions(+), 15 deletions(-) diff --git a/backend/app/controllers/post_versions_controller.rb b/backend/app/controllers/post_versions_controller.rb index 963fee3..d80bee5 100644 --- a/backend/app/controllers/post_versions_controller.rb +++ b/backend/app/controllers/post_versions_controller.rb @@ -29,14 +29,14 @@ class PostVersionsController < ApplicationController count = q.except(:select, :order, :limit, :offset).count - ids = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) - .limit(limit) - .offset(offset) - .pluck('post_versions.id') - versions = version_scope.merge(q).where(id: ids) + # Apply visibility and pagination before joining the previous snapshots. + page_scope = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) + .limit(limit).offset(offset).select('post_versions.*') + versions = version_scope.from(page_scope, :post_versions) .order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) - render json: { versions: serialise_versions(versions, locale.language_code), count:, population_count: HistoryAccess.population_count(PostVersion) } + render json: { versions: serialise_versions(versions, locale.language_code), + count:, population_count: HistoryAccess.population_count(PostVersion) } end private diff --git a/backend/app/models/history_access.rb b/backend/app/models/history_access.rb index 3500f50..7e1c03b 100644 --- a/backend/app/models/history_access.rb +++ b/backend/app/models/history_access.rb @@ -41,10 +41,9 @@ class HistoryAccess < ActiveSupport::CurrentAttributes table = model.table_name keys = KEYS.fetch(table) matches = keys.map { "boundary.#{ _1 } = #{ row }.#{ _1 }" }.join(' AND ') - boundaries = "SELECT #{ keys.join(', ') }, MAX(version_no) AS version_no FROM #{ table } " + - "WHERE event_type = 'discard' GROUP BY #{ keys.join(', ') }" - clauses = ["NOT EXISTS (SELECT 1 FROM (#{ boundaries }) boundary WHERE #{ matches } " + - "AND boundary.version_no >= #{ row }.version_no)"] + # Any discard at or after this version hides it, including after a restore. + clauses = ["NOT EXISTS (SELECT 1 FROM #{ table } boundary WHERE #{ matches } " + + "AND boundary.version_no >= #{ row }.version_no AND boundary.event_type = 'discard')"] clauses += reference_sql(table, row) if references clauses.map { "(#{ _1 })" }.join(' AND ') end @@ -62,8 +61,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes # A scalar lookup avoids MySQL's semijoin rewrite losing the JSON row correlation. "(SELECT 1 FROM JSON_TABLE(COALESCE(#{ document }, JSON_ARRAY()), " + "'$[*]' COLUMNS (reference_id BIGINT PATH '$' NULL ON EMPTY)) reference_entry " + - "JOIN (#{ discarded_keys(table, key) }) blocked " + - "ON reference_entry.reference_id = blocked.#{ key } LIMIT 1) IS NULL" + "JOIN #{ table } blocked ON reference_entry.reference_id = blocked.#{ key } " + + "WHERE blocked.event_type = 'discard' LIMIT 1) IS NULL" end def self.list_reference(table, key, document) diff --git a/backend/spec/requests/post_history_privacy_spec.rb b/backend/spec/requests/post_history_privacy_spec.rb index ff9df89..d0f024b 100644 --- a/backend/spec/requests/post_history_privacy_spec.rb +++ b/backend/spec/requests/post_history_privacy_spec.rb @@ -33,6 +33,9 @@ RSpec.describe 'Post history privacy', type: :request do end PostVersion.create!(post: post_record, version_no: index + 1, event_type: event, title: "version #{ index + 1 }", url: post_record.url, tags: '', + thumbnail_base: "history-#{ index + 1 }", video_ms: (index + 1) * 1000, + original_created_from: origin - 1.year + index.days, + original_created_before: origin - 1.year + (index + 1).days, tags_json: snapshots, parent_post_ids: '', created_at: origin + (index + 1).days) end end @@ -63,7 +66,7 @@ RSpec.describe 'Post history privacy', type: :request do expect(response.parsed_body.fetch('versions').first.fetch('title').fetch('prev')).to be_nil end - ['anonymous', 'member', 'admin'].each do |role| + ['anonymous', 'guest', 'member', 'admin'].each do |role| context "as #{ role }" do before do sign_in_as(create(:user, role.to_sym)) unless role == 'anonymous' @@ -115,6 +118,15 @@ RSpec.describe 'Post history privacy', type: :request do expect(body.fetch('versions').pluck('version_no')).to eq(expected) restored = body.fetch('versions').find { _1.fetch('version_no') == 3 } expect(restored.fetch('title').fetch('prev')).to eq(role == 'admin' ? 'version 2' : nil) + unless role == 'admin' + fields = [ + 'url', 'thumbnail_base', 'video_ms', + 'original_created_from', 'original_created_before'] + fields.each do |field| + expect(restored.fetch(field).fetch('prev')).to be_nil + end + expect(restored.fetch('tags')).to eq([]) + end end it 'uses only an authorised previous version for tag filtering' do @@ -124,6 +136,150 @@ RSpec.describe 'Post history privacy', type: :request do expect(response.parsed_body.fetch('versions').pluck('version_no')).to eq(expected) expect(response.parsed_body.fetch('count')).to eq(expected.length) end + + it 'returns an empty history with an exact count' do + get '/posts/versions', params: { post: other_post.id } + + expect(response).to have_http_status(:ok) + expect(response.parsed_body).to include('versions' => [], 'count' => 0, + 'population_count' => 4) + end + + it 'keeps counts and timestamp ties consistent across history pages' do + rows = 25.times.map do |index| + PostVersion.create!(post: post_record, version_no: index + 5, event_type: 'update', + title: 'page snapshot', url: post_record.url, tags: '', tags_json: [], + parent_post_ids: '', created_at: origin + 5.days) + end + rows << PostVersion.create!(post: other_post, version_no: 1, event_type: 'create', + title: 'another post', url: other_post.url, tags: '', tags_json: [], + parent_post_ids: '', created_at: origin + 5.days) + earlier = role == 'admin' ? [4, 3, 2, 1] : [3] + expected = rows.reverse.map { [_1.post_id, _1.version_no] } + + earlier.map { [post_record.id, _1] } + + expected.each_slice(7).with_index do |page_rows, index| + get '/posts/versions', params: { page: index + 1, limit: 7 } + + expect(response).to have_http_status(:ok) + body = response.parsed_body + expect(body.fetch('count')).to eq(expected.length) + expect(body.fetch('population_count')).to eq(30) + expect(body.fetch('versions').map { [_1.fetch('post_id'), _1.fetch('version_no')] }) + .to eq(page_rows) + end + + get '/posts/versions', params: { page: 10, limit: 7 } + expect(response).to have_http_status(:ok) + expect(response.parsed_body).to include('versions' => [], 'count' => expected.length) + end + + it 'loads the page and its authorised diff in one data query' do + statements = [] + listener = lambda do |_name, _start, _finish, _id, payload| + next if ['SCHEMA', 'TRANSACTION'].include?(payload[:name]) + + statements << payload[:sql] if payload[:sql].match?(/\ASELECT/i) + end + ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do + get '/posts/versions', params: { post: post_record.id, limit: 1 } + end + + expect(response).to have_http_status(:ok) + history_queries = statements.select { _1.include?('post_versions') } + counts, details = history_queries.partition { _1.match?(/\ASELECT COUNT\(/i) } + expect(counts.length).to eq(2) + expect(counts.join(' ')).not_to include('LEFT JOIN post_versions prev') + expect(details.length).to eq(1) + end + + it 'hides references to a discarded parent even after its restore' do + ['discard', 'restore'].each_with_index do |event, index| + PostVersion.create!(post: other_post, version_no: index + 1, event_type: event, + title: 'parent snapshot', url: other_post.url, tags: '', tags_json: [], + parent_post_ids: '', created_at: origin + index.hours) + end + [other_post.id.to_s, ''].each_with_index do |parents, index| + PostVersion.create!(post: post_record, version_no: index + 5, event_type: 'update', + title: 'parent reference', url: post_record.url, tags: '', tags_json: [], + parent_post_ids: parents, created_at: origin + (index + 5).days) + end + + get '/posts/versions', params: { post: post_record.id } + + expect(response).to have_http_status(:ok) + body = response.parsed_body + expected = role == 'admin' ? [6, 5, 4, 3, 2, 1] : [6, 3] + expect(body.fetch('versions').pluck('version_no')).to eq(expected) + expect(body.fetch('count')).to eq(expected.length) + previous = body.fetch('versions').first.fetch('title').fetch('prev') + expect(previous).to eq(role == 'admin' ? 'parent reference' : nil) + end + + it 'keeps restored tag references private' do + TagVersion.create!(tag:, version_no: 3, event_type: 'restore', + name: 'private-history-tag', category: 'general', aliases: '', parent_tag_ids: '', + names: { ja: { name: 'private-history-tag', script_code: 'Jpan', + auto_generated: false, aliases: [] } }, + created_at: origin + 2.hours) + PostVersion.create!(post: post_record, version_no: 5, event_type: 'update', + title: 'restored tag reference', url: post_record.url, tags: '', + tags_json: [{ tag_id: tag.id, version_no: 3, sections: [] }], + parent_post_ids: '', created_at: origin + 5.days) + + get '/posts/versions', params: { post: post_record.id } + + expect(response).to have_http_status(:ok) + expected = role == 'admin' ? [5, 4, 3, 2, 1] : [3] + expect(response.parsed_body.fetch('versions').pluck('version_no')).to eq(expected) + expect(response.parsed_body.fetch('count')).to eq(expected.length) + end + + it 'uses the external linkage recorded at the post snapshot time' do + NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update', + linked_tag_ids: '', created_at: origin + 5.days) + PostVersion.create!(post: post_record, version_no: 5, event_type: 'update', + title: 'public external reference', url: post_record.url, tags: '', + tags_json: [{ external_tag_id: external.id }], parent_post_ids: '', + created_at: origin + 6.days) + + get '/posts/versions', params: { post: post_record.id, external_tag: external.id } + + expect(response).to have_http_status(:ok) + body = response.parsed_body + expected = role == 'admin' ? [5, 4] : [5] + expect(body.fetch('versions').pluck('version_no')).to eq(expected) + expect(body.fetch('count')).to eq(expected.length) + latest = body.fetch('versions').first + previous = latest.fetch('title').fetch('prev') + expect(previous).to eq(role == 'admin' ? 'version 4' : nil) + expect(latest.fetch('tags')).to contain_exactly(a_hash_including( + 'name' => 'nico:external-history-tag', + 'type' => role == 'admin' ? 'context' : 'added')) + end + + it 'hides references to historical external discard events after restore' do + public_external = create(:external_tag) + # Discard/restore events can remain in history despite current event validation. + snapshots = ['create', 'discard', 'restore'].each_with_index.map do |event, index| + { tag_id: public_external.id, version_no: index + 1, event_type: event, + linked_tag_ids: '', created_at: origin + index.days } + end + NicoTagVersion.insert_all!(snapshots) + [5, 6].each do |number| + PostVersion.create!(post: post_record, version_no: number, event_type: 'update', + title: 'external discard reference', url: post_record.url, tags: '', + tags_json: [{ external_tag_id: public_external.id }], parent_post_ids: '', + created_at: origin + number.days) + end + + get '/posts/versions', params: { post: post_record.id, external_tag: public_external.id } + + expect(response).to have_http_status(:ok) + expected = role == 'admin' ? [6, 5] : [] + expect(response.parsed_body.fetch('versions').pluck('version_no')).to eq(expected) + expect(response.parsed_body.fetch('count')).to eq(expected.length) + end end end end diff --git a/frontend/src/lib/prefetchers.test.ts b/frontend/src/lib/prefetchers.test.ts index 16f1e09..232aea3 100644 --- a/frontend/src/lib/prefetchers.test.ts +++ b/frontend/src/lib/prefetchers.test.ts @@ -2,6 +2,7 @@ import { QueryClient } from '@tanstack/react-query' import { beforeEach, describe, expect, it, vi } from 'vitest' import { prefetchForURL } from '@/lib/prefetchers' +import { postsKeys } from '@/lib/queryKeys' const postsApi = vi.hoisted (() => ({ fetchPost: vi.fn (), @@ -88,6 +89,42 @@ describe ('prefetchForURL', () => { expect (postsApi.fetchPost).toHaveBeenCalledWith ('12', 'ja') }) + it.each (['/posts/changes', '/ja/posts/changes']) ( + 'prefetches post history with matching filters and cache key at %s', async path => { + const client = qc () + const params = { post: '12', page: 2, limit: 5 } + const history = { versions: [], count: 7 } + postsApi.fetchPostChanges.mockResolvedValueOnce (history) + + await prefetchForURL (client, `${path}?id=12&page=2&limit=5`) + + expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, 'ja') + expect (client.getQueryData (postsKeys.changes (params, 'ja'))).toEqual (history) + expect (client.getQueryCache ().getAll ()).toHaveLength (1) + }) + + it ('preserves a tag filter when prefetching one post history', async () => { + const client = qc () + const params = { post: '12', tag: '7', page: 1, limit: 20 } + + await prefetchForURL (client, '/ja/posts/changes?id=12&tag=7') + + expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, 'ja') + expect (client.getQueryData (postsKeys.changes (params, 'ja'))) + .toEqual ({ versions: [], count: 0 }) + }) + + it ('prefetches unfiltered post history with its own cache key', async () => { + const client = qc () + const params = { page: 2, limit: 5 } + + await prefetchForURL (client, '/ja/posts/changes?page=2&limit=5') + + expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, 'ja') + expect (client.getQueryData (postsKeys.changes (params, 'ja'))) + .toEqual ({ versions: [], count: 0 }) + }) + it ('prefetches tag indexes from query parameters', async () => { await prefetchForURL ( qc (), diff --git a/frontend/src/lib/prefetchers.ts b/frontend/src/lib/prefetchers.ts index 65dd142..593c7b3 100644 --- a/frontend/src/lib/prefetchers.ts +++ b/frontend/src/lib/prefetchers.ts @@ -214,11 +214,11 @@ const prefetchPostChanges: Prefetcher = async (qc, url, locale) => { } await qc.prefetchQuery ({ - queryKey: postsKeys.changes ({ ...(id && { id }), + queryKey: postsKeys.changes ({ ...(id && { post: id }), ...(tag && { tag }), ...(externalTag && { externalTag }), page, limit }, locale), - queryFn: () => fetchPostChanges ({ ...(id && { id }), + queryFn: () => fetchPostChanges ({ ...(id && { post: id }), ...(tag && { tag }), ...(externalTag && { externalTag }), page, limit }, locale) }) -- 2.53.0 From 9d42fc7f5fec7972398f93a261bf707a8927c178 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Fri, 20 Nov 2026 00:50:34 +0900 Subject: [PATCH 2/7] WIP: unverified Codex job issue-485-z473g006 --- .../controllers/post_versions_controller.rb | 15 ++-- .../requests/post_history_privacy_spec.rb | 78 +++++++++++++++---- frontend/src/lib/prefetchers.test.ts | 21 ++++- 3 files changed, 90 insertions(+), 24 deletions(-) diff --git a/backend/app/controllers/post_versions_controller.rb b/backend/app/controllers/post_versions_controller.rb index d80bee5..7496ef8 100644 --- a/backend/app/controllers/post_versions_controller.rb +++ b/backend/app/controllers/post_versions_controller.rb @@ -16,7 +16,7 @@ class PostVersionsController < ApplicationController q = HistoryAccess.visible(PostVersion.all) q = q.where('post_versions.post_id = ?', post_id) if post_id - q = q.with_previous_version if tag_id || external_tag_id + q = q.merge(version_scope) if tag_id || external_tag_id if external_tag_id || (tag_id && !(Tag.exists?(id: tag_id))) q = q.where('JSON_CONTAINS(post_versions.tags_json,' + "JSON_OBJECT('external_tag_id', #{ external_tag_id || tag_id })) " + @@ -29,11 +29,16 @@ class PostVersionsController < ApplicationController count = q.except(:select, :order, :limit, :offset).count - # Apply visibility and pagination before joining the previous snapshots. + # Reuse the authorised previous snapshot when it is needed for filtering. page_scope = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) - .limit(limit).offset(offset).select('post_versions.*') - versions = version_scope.from(page_scope, :post_versions) - .order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) + .limit(limit).offset(offset) + versions = + if tag_id || external_tag_id + page_scope + else + version_scope.from(page_scope.select('post_versions.*'), :post_versions) + .order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) + end render json: { versions: serialise_versions(versions, locale.language_code), count:, population_count: HistoryAccess.population_count(PostVersion) } diff --git a/backend/spec/requests/post_history_privacy_spec.rb b/backend/spec/requests/post_history_privacy_spec.rb index d0f024b..d17de9b 100644 --- a/backend/spec/requests/post_history_privacy_spec.rb +++ b/backend/spec/requests/post_history_privacy_spec.rb @@ -137,6 +137,50 @@ RSpec.describe 'Post history privacy', type: :request do expect(response.parsed_body.fetch('count')).to eq(expected.length) end + it 'paginates public tag additions and removals using the same exact count' do + public_tag = create(:tag, primary_name: 'public-history-tag') + public_external = create(:external_tag) + TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create', + name: 'public-history-tag', category: 'general', aliases: '', parent_tag_ids: '', + names: { ja: { name: 'public-history-tag', script_code: 'Jpan', + auto_generated: false, aliases: [] } }, + created_at: origin) + NicoTagVersion.create!(external_tag: public_external, version_no: 1, + event_type: 'create', linked_tag_ids: '', created_at: origin) + snapshots = [ + [{ tag_id: public_tag.id, version_no: 1, sections: [] }, + { external_tag_id: public_external.id }], []] + snapshots.each_with_index do |tags, index| + PostVersion.create!(post: post_record, version_no: index + 5, event_type: 'update', + title: "public snapshot #{ index }", url: post_record.url, tags: '', + tags_json: tags, parent_post_ids: '', created_at: origin + (index + 5).days) + end + + { tag: public_tag.id, external_tag: public_external.id }.each do |parameter, id| + [6, 5].each_with_index do |number, index| + get '/posts/versions', params: { + post: post_record.id, parameter => id, page: index + 1, limit: 1 } + + expect(response).to have_http_status(:ok) + body = response.parsed_body + expect(body.fetch('count')).to eq(2) + expect(body.fetch('versions').pluck('version_no')).to eq([number]) + snapshot = body.fetch('versions').first + type = index.zero? ? 'removed' : 'added' + expect(snapshot.fetch('tags')).to include( + a_hash_including('name' => 'public-history-tag', 'type' => type), + a_hash_including('name' => "nico:#{ public_external.name }", 'type' => type)) + previous = + if index.zero? + 'public snapshot 0' + elsif role == 'admin' + 'version 4' + end + expect(snapshot.fetch('title').fetch('prev')).to eq(previous) + end + end + end + it 'returns an empty history with an exact count' do get '/posts/versions', params: { post: other_post.id } @@ -174,23 +218,27 @@ RSpec.describe 'Post history privacy', type: :request do expect(response.parsed_body).to include('versions' => [], 'count' => expected.length) end - it 'loads the page and its authorised diff in one data query' do - statements = [] - listener = lambda do |_name, _start, _finish, _id, payload| - next if ['SCHEMA', 'TRANSACTION'].include?(payload[:name]) + it 'loads each page with one authorised previous-snapshot join' do + [{ }, { tag: tag.id }, { external_tag: external.id }].each do |filters| + statements = [] + listener = lambda do |_name, _started_at, _finished_at, _id, payload| + next if ['SCHEMA', 'TRANSACTION'].include?(payload[:name]) - statements << payload[:sql] if payload[:sql].match?(/\ASELECT/i) - end - ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do - get '/posts/versions', params: { post: post_record.id, limit: 1 } - end + statements << payload[:sql] if payload[:sql].match?(/\ASELECT/i) + end + ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do + get '/posts/versions', params: { post: post_record.id, limit: 1 }.merge(filters) + end - expect(response).to have_http_status(:ok) - history_queries = statements.select { _1.include?('post_versions') } - counts, details = history_queries.partition { _1.match?(/\ASELECT COUNT\(/i) } - expect(counts.length).to eq(2) - expect(counts.join(' ')).not_to include('LEFT JOIN post_versions prev') - expect(details.length).to eq(1) + expect(response).to have_http_status(:ok) + history_queries = statements.select { _1.include?('post_versions') } + counts, details = history_queries.partition { _1.match?(/\ASELECT COUNT\(/i) } + expect(counts.length).to eq(2) + joins = counts.join(' ').scan('LEFT JOIN post_versions prev') + expect(joins.length).to eq(filters.empty? ? 0 : 1) + expect(details.length).to eq(1) + expect(details.first.scan('LEFT JOIN post_versions prev').length).to eq(1) + end end it 'hides references to a discarded parent even after its restore' do diff --git a/frontend/src/lib/prefetchers.test.ts b/frontend/src/lib/prefetchers.test.ts index 232aea3..cc6b3f6 100644 --- a/frontend/src/lib/prefetchers.test.ts +++ b/frontend/src/lib/prefetchers.test.ts @@ -89,8 +89,10 @@ describe ('prefetchForURL', () => { expect (postsApi.fetchPost).toHaveBeenCalledWith ('12', 'ja') }) - it.each (['/posts/changes', '/ja/posts/changes']) ( - 'prefetches post history with matching filters and cache key at %s', async path => { + it.each ([ + ['/posts/changes', 'ja'], ['/ja/posts/changes', 'ja'], + ['/ain-Kana/posts/changes', 'ain-Kana']] as const) ( + 'matches post history filters and cache key at %s', async (path, locale) => { const client = qc () const params = { post: '12', page: 2, limit: 5 } const history = { versions: [], count: 7 } @@ -98,8 +100,8 @@ describe ('prefetchForURL', () => { await prefetchForURL (client, `${path}?id=12&page=2&limit=5`) - expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, 'ja') - expect (client.getQueryData (postsKeys.changes (params, 'ja'))).toEqual (history) + expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, locale) + expect (client.getQueryData (postsKeys.changes (params, locale))).toEqual (history) expect (client.getQueryCache ().getAll ()).toHaveLength (1) }) @@ -114,6 +116,17 @@ describe ('prefetchForURL', () => { .toEqual ({ versions: [], count: 0 }) }) + it ('preserves an external tag filter when prefetching one post history', async () => { + const client = qc () + const params = { post: '12', externalTag: '7', page: 1, limit: 20 } + + await prefetchForURL (client, '/ja/posts/changes?id=12&external_tag=7') + + expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, 'ja') + expect (client.getQueryData (postsKeys.changes (params, 'ja'))) + .toEqual ({ versions: [], count: 0 }) + }) + it ('prefetches unfiltered post history with its own cache key', async () => { const client = qc () const params = { page: 2, limit: 5 } -- 2.53.0 From 1c0cc28dd1d239e28d44307e6b037b28b53e17a8 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sat, 21 Nov 2026 01:11:13 +0900 Subject: [PATCH 3/7] WIP: unverified Codex job issue-485-obzs08at --- .../requests/post_history_privacy_spec.rb | 11 +++++-- frontend/server.ssr.test.mjs | 31 +++++++++++++++++++ frontend/src/lib/prefetchers.test.ts | 12 +++++-- frontend/vite.config.ts | 6 ++-- frontend/vitest.config.ts | 15 +++++---- 5 files changed, 61 insertions(+), 14 deletions(-) diff --git a/backend/spec/requests/post_history_privacy_spec.rb b/backend/spec/requests/post_history_privacy_spec.rb index d17de9b..72ef086 100644 --- a/backend/spec/requests/post_history_privacy_spec.rb +++ b/backend/spec/requests/post_history_privacy_spec.rb @@ -8,7 +8,12 @@ RSpec.describe 'Post history privacy', type: :request do let!(:other_post) do create(:post, created_at: origin, updated_at: origin + 3.days + 1.hour) end - let!(:tag) { create(:tag, primary_name: 'private-history-tag') } + let!(:tag) do + # Locale completion in the tag factory can create its own version 1. + create(:tag, primary_tag_name: nil).tap do |record| + create(:tag_name, tag: record, name: 'private-history-tag') + end + end let!(:external) { create(:external_tag, name: 'external-history-tag') } before do @@ -138,7 +143,9 @@ RSpec.describe 'Post history privacy', type: :request do end it 'paginates public tag additions and removals using the same exact count' do - public_tag = create(:tag, primary_name: 'public-history-tag') + public_tag = create(:tag, primary_tag_name: nil).tap do |record| + create(:tag_name, tag: record, name: 'public-history-tag') + end public_external = create(:external_tag) TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create', name: 'public-history-tag', category: 'general', aliases: '', parent_tag_ids: '', diff --git a/frontend/server.ssr.test.mjs b/frontend/server.ssr.test.mjs index cae7986..873060b 100644 --- a/frontend/server.ssr.test.mjs +++ b/frontend/server.ssr.test.mjs @@ -418,6 +418,37 @@ test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => } }) +test ('post history HTTP requests preserve filters for every role', async t => { + const accounts = [ + { role: 'guest', cookie: null }, + { role: 'member', cookie: await authenticatedCookie ('second-recovery-secret') }, + { role: 'admin', cookie: await authenticatedCookie () }] + for (const account of accounts) { + for (const prefix of ['', '/ja', '/ain-Kana']) { + await t.test (`${account.role} ${prefix || 'no locale prefix'}`, async () => { + for (const query of ['', '?id=1&page=2&limit=5']) { + const start = requests.length + const response = await fetch ( + `${httpOrigin}${prefix}/posts/changes${query}`, { + headers: account.cookie == null ? {} : { Cookie: account.cookie } }) + assert.equal (response.status, 200) + const html = await response.text () + assert.match (html, / reference_version.version_no)' + # Select the recorded version before evaluating its reference privacy. + match += ' AND reference_version.version_no = ' + + "(SELECT MAX(candidate.version_no) FROM #{ table } candidate " + + 'WHERE candidate.tag_id = tag_reference.tag_id ' + + "AND candidate.created_at <= #{ row }.created_at)" else match += ' AND reference_version.version_no = tag_reference.version_no' - latest = '' end "(SELECT 1 FROM #{ source } JOIN #{ table } reference_version ON #{ match } " + - "WHERE NOT (#{ sql(model, 'reference_version') }) #{ latest } LIMIT 1) IS NULL" + "WHERE NOT (#{ sql(model, 'reference_version') }) LIMIT 1) IS NULL" end def self.reference_sql(table, row) diff --git a/backend/spec/requests/post_history_privacy_spec.rb b/backend/spec/requests/post_history_privacy_spec.rb index 72ef086..d08ec30 100644 --- a/backend/spec/requests/post_history_privacy_spec.rb +++ b/backend/spec/requests/post_history_privacy_spec.rb @@ -335,6 +335,31 @@ RSpec.describe 'Post history privacy', type: :request do expect(response.parsed_body.fetch('versions').pluck('version_no')).to eq(expected) expect(response.parsed_body.fetch('count')).to eq(expected.length) end + + it 'selects the highest external version within each post timestamp' do + # Equal and out-of-order timestamps must still use version order. + snapshots = [ + [2, 2.hours, tag.id.to_s], [3, 2.hours, tag.id.to_s], + [4, 1.hour, ''], [5, 8.days, tag.id.to_s]] + snapshots.each do |number, time, linked| + NicoTagVersion.create!(external_tag: external, version_no: number, + event_type: 'update', linked_tag_ids: linked, created_at: origin + time) + end + [6, 9].each_with_index do |days, index| + PostVersion.create!(post: post_record, version_no: index + 5, + event_type: 'update', title: 'external version selection', + url: post_record.url, tags: '', tags_json: [{ external_tag_id: external.id }], + parent_post_ids: '', created_at: origin + days.days) + end + + get '/posts/versions', params: { post: post_record.id, external_tag: external.id } + + expect(response).to have_http_status(:ok) + body = response.parsed_body + expected = role == 'admin' ? [6, 5, 4] : [5, 4] + expect(body.fetch('versions').pluck('version_no')).to eq(expected) + expect(body.fetch('count')).to eq(expected.length) + end end end end diff --git a/docs/issue-485.md b/docs/issue-485.md index 7345635..dfc9804 100644 --- a/docs/issue-485.md +++ b/docs/issue-485.md @@ -1,5 +1,32 @@ # Issue #485: V1 投稿履歴の非 admin アクセス時 HTTP 503 +## PR #489 レビューの遅延ログへの対応 + +レビューで提示されたログでは、履歴本文の SELECT が31249.2ms、API 全体が +64588ms、ActiveRecord が64396msかかっている。従来の変更で障害が解消したとは +言えない。変更前の同条件の計測値がないため、悪化率も算出できない。 +提示範囲には公開件数の count の所要時間がなく、その負荷は別途確認が必要。 + +今回の変更は `HistoryAccess.snapshot_reference` の外部タグ参照だけに限定する。 +従来は投稿時点以前の外部タグ履歴を結合し、各候補の公開判定と、より大きい版番号の +有無を評価する SQL だった。変更後は同じタグ ID・投稿時点の条件で +`MAX(candidate.version_no)` を求め、既存の `(tag_id, version_no)` unique index に +対応する1版へ結合してから公開判定する。最新の版が非公開でも過去の公開版へ +遡らない。時刻順が版番号順と異なる場合や同時刻でも、従来どおり最大版番号を使う。 +除票境界、参照先の公開判定、正確な count、直前版の認可は変更しない。 + +回帰テストには、同時刻・時刻と版番号の順序不一致・投稿より未来の版を組み合わせ、 +anonymous・guest・member・admin の件数と履歴の確認を追加した。 +担当エージェントはテスト・lint・build・DB 操作を実行していない。 + +管理側で `post_history_privacy_spec.rb` と `history_access_spec.rb`、共有認可を使う +Counts・各履歴の回帰を確認する。許可された非本番の同一データで、変更前後の +count と本文 SELECT の実行計画・所要時間を個別に比較する必要がある。 +特に外部タグ参照が複合キーで1版へ絞られるか、過去の各版に対して公開判定を +繰り返さないかを確認し、SSR の10秒 timeout 内で応答できるかも計測する。 +この変更での速度改善量と503解消は未確認であり、他の相関条件や全件 count の +負荷も残る。実行計画未取得のため、本番遅延の根本原因の確定ではない。 + 対象は V1 の `/posts/changes`(locale prefix 付き URL を含む)。 Issue では admin は表示でき、member・guest では HTTP 503 が発生すると報告されている。 本番の根本原因、503 の解消、SQL の性能改善量は未確定。 -- 2.53.0 From bac44a9c22587912b39393ac1793c910a6a8b1b6 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sun, 22 Nov 2026 02:20:10 +0900 Subject: [PATCH 7/7] AI: address review on PR #489 --- frontend/src/components/PrefetchLink.tsx | 11 ++- frontend/src/lib/helpPrefetch.test.tsx | 40 +++++++-- frontend/src/lib/prefetchers.test.ts | 11 +++ frontend/src/lib/prefetchers.ts | 2 +- frontend/src/main.test.tsx | 103 +++++++++++++++++++++++ frontend/src/main.tsx | 17 +++- 6 files changed, 176 insertions(+), 8 deletions(-) create mode 100644 frontend/src/main.test.tsx diff --git a/frontend/src/components/PrefetchLink.tsx b/frontend/src/components/PrefetchLink.tsx index 27aefc7..8d7a98d 100644 --- a/frontend/src/components/PrefetchLink.tsx +++ b/frontend/src/components/PrefetchLink.tsx @@ -110,8 +110,17 @@ export default forwardRef (({ setOverlay (false) }) - if (!(ok) && cancelOnError) + if (!ok) + { + if (!cancelOnError) + { + if (replace) + location.replace (path) + else + location.assign (path) + } return + } navigate (path, { replace, ...(state && { state }) }) } diff --git a/frontend/src/lib/helpPrefetch.test.tsx b/frontend/src/lib/helpPrefetch.test.tsx index 60969be..9e4576d 100644 --- a/frontend/src/lib/helpPrefetch.test.tsx +++ b/frontend/src/lib/helpPrefetch.test.tsx @@ -1,7 +1,7 @@ import { QueryClient } from '@tanstack/react-query' import { fireEvent, screen, waitFor } from '@testing-library/react' import { Route, Routes, useLocation } from 'react-router-dom' -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import PrefetchLink from '@/components/PrefetchLink' import * as prefetchers from '@/lib/prefetchers' @@ -23,6 +23,10 @@ const Location = () => { describe ('Help prefetch integration', () => { + afterEach (() => { + vi.unstubAllGlobals () + }) + beforeEach (() => { helpFixture.reset () settings.linkPreload = 'intent' @@ -115,12 +119,38 @@ describe ('Help prefetch integration', () => { expect (run).toHaveBeenCalledTimes (mode === 'intent' ? 3 : 1) }) - it ('continues navigation after prefetch failure', async () => { + it.each ([false, true]) ('uses document navigation after failure with replace=%s', + async replacement => { + const assign = vi.fn () + const replace = vi.fn () + vi.stubGlobal ('location', { origin: window.location.origin, assign, replace }) + vi.spyOn (console, 'error').mockImplementation (() => {}) + vi.spyOn (prefetchers, 'prefetchForURL').mockRejectedValue (new Error ('offline')) + renderWithProviders (<> + + Help + ) + fireEvent.click (screen.getByRole ('link', { name: 'Help' })) + await waitFor (() => expect (replacement ? replace : assign) + .toHaveBeenCalledWith ('/ja/help/guide')) + expect (replacement ? assign : replace).not.toHaveBeenCalled () + expect (screen.getByTestId ('location')).toHaveTextContent ('/') + }) + + it ('keeps the current page when cancelOnError is requested', async () => { + const assign = vi.fn () + const replace = vi.fn () + vi.stubGlobal ('location', { origin: window.location.origin, assign, replace }) vi.spyOn (console, 'error').mockImplementation (() => {}) vi.spyOn (prefetchers, 'prefetchForURL').mockRejectedValue (new Error ('offline')) - renderWithProviders (<>Help) + renderWithProviders (<> + + Help + ) fireEvent.click (screen.getByRole ('link', { name: 'Help' })) - await waitFor (() => expect (screen.getByTestId ('location')) - .toHaveTextContent ('/help/guide')) + await waitFor (() => expect (console.error).toHaveBeenCalled ()) + expect (assign).not.toHaveBeenCalled () + expect (replace).not.toHaveBeenCalled () + expect (screen.getByTestId ('location')).toHaveTextContent ('/') }) }) diff --git a/frontend/src/lib/prefetchers.test.ts b/frontend/src/lib/prefetchers.test.ts index ce8cc93..dfe47e3 100644 --- a/frontend/src/lib/prefetchers.test.ts +++ b/frontend/src/lib/prefetchers.test.ts @@ -116,6 +116,17 @@ describe ('prefetchForURL', () => { .toEqual ({ versions: [], count: 0 }) }) + it ('propagates history prefetch failure to the navigation caller', async () => { + const client = qc () + const error = new Error ('unavailable') + postsApi.fetchPostChanges.mockRejectedValueOnce (error) + + await expect (prefetchForURL (client, '/ja/posts/changes?id=12')) + .rejects.toBe (error) + expect (client.getQueryData (postsKeys.changes ( + { post: '12', page: 1, limit: 20 }, 'ja'))).toBeUndefined () + }) + it ('preserves an external tag filter when prefetching one post history', async () => { const client = qc () const params = { post: '12', externalTag: '7', page: 1, limit: 20 } diff --git a/frontend/src/lib/prefetchers.ts b/frontend/src/lib/prefetchers.ts index 593c7b3..4ecf6e9 100644 --- a/frontend/src/lib/prefetchers.ts +++ b/frontend/src/lib/prefetchers.ts @@ -213,7 +213,7 @@ const prefetchPostChanges: Prefetcher = async (qc, url, locale) => { queryFn: () => fetchTag (tag, locale) }) } - await qc.prefetchQuery ({ + await qc.fetchQuery ({ queryKey: postsKeys.changes ({ ...(id && { post: id }), ...(tag && { tag }), ...(externalTag && { externalTag }), diff --git a/frontend/src/main.test.tsx b/frontend/src/main.test.tsx new file mode 100644 index 0000000..87a6ed4 --- /dev/null +++ b/frontend/src/main.test.tsx @@ -0,0 +1,103 @@ +import { QueryClient, dehydrate } from '@tanstack/react-query' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' + +import { localesKeys, postsKeys, sessionKeys } from '@/lib/queryKeys' + +const bootstrap = vi.hoisted (() => ({ + hydrateRoot: vi.fn (), createRoot: vi.fn (), session: vi.fn (), + reload: vi.fn (), preload: vi.fn () })) + +vi.mock ('react-dom/client', () => ({ + hydrateRoot: bootstrap.hydrateRoot, createRoot: bootstrap.createRoot })) +vi.mock ('@/App', () => ({ default: () => null, + preloadPageRoute: bootstrap.preload, resolvePageRoute: () => null })) +vi.mock ('@/lib/users', () => ({ initialiseUserSession: bootstrap.session })) +vi.mock ('@/lib/i18n', () => ({ createUII18n: () => ({ }) })) +vi.mock ('@/lib/locales', () => ({ currentViewingLocale: () => 'ja' })) +vi.mock ('@/lib/settings', () => ({ + applyClientAnimationMode: vi.fn (), getClientAnimationMode: () => 'normal' })) + +const user = { id: 1, role: 'guest', name: 'Guest', inheritanceCode: 'code' } +const historyKey = postsKeys.changes ({ page: 1, limit: 20 }, 'ja') +const history = { versions: [], count: 0 } + + +const prepareDocument = (authority: { id: number; role: string } | null) => { + const client = new QueryClient () + client.setQueryData (localesKeys.index, { locales: [{ code: 'ja' }] }) + client.setQueryData (historyKey, history) + if (authority != null) + client.setQueryData (sessionKeys.current, authority) + document.body.innerHTML = '
SSR history
' + + '' + document.getElementById ('ssr-state')!.textContent = JSON.stringify ({ + state: dehydrate (client), status: 200 }) +} + + +describe ('SSR session reconciliation before hydration', () => { + beforeEach (() => { + vi.resetModules () + vi.clearAllMocks () + sessionStorage.clear () + bootstrap.session.mockReset () + bootstrap.session.mockResolvedValue (user) + bootstrap.preload.mockResolvedValue (undefined) + vi.stubGlobal ('window', { + location: { href: 'http://localhost:3000/ja/posts/changes', + reload: bootstrap.reload }, + addEventListener: vi.fn (), removeEventListener: vi.fn () }) + }) + + afterEach (() => { + vi.unstubAllGlobals () + }) + + it.each (['guest', 'member', 'admin']) ( + 'retains SSR history when the confirmed %s identity matches', async role => { + prepareDocument ({ id: user.id, role }) + bootstrap.session.mockResolvedValue ({ ...user, role }) + await import ('@/main') + await vi.waitFor (() => expect (bootstrap.hydrateRoot).toHaveBeenCalledOnce ()) + const client = bootstrap.hydrateRoot.mock.calls[0][1] + .props.children.props.client as QueryClient + expect (client.getQueryData (historyKey)).toEqual (history) + expect (client.getQueryData (sessionKeys.current)).toEqual ({ ...user, role }) + expect (bootstrap.reload).not.toHaveBeenCalled () + expect (bootstrap.createRoot).not.toHaveBeenCalled () + }) + + it.each ([null, { id: 2, role: 'guest' }, { id: 1, role: 'admin' }]) ( + 'requests fresh SSR for a different identity: %s', async authority => { + prepareDocument (authority) + await import ('@/main') + await vi.waitFor (() => expect (bootstrap.reload).toHaveBeenCalledOnce ()) + expect (bootstrap.hydrateRoot).not.toHaveBeenCalled () + expect (bootstrap.createRoot).not.toHaveBeenCalled () + expect (document.getElementById ('root')!.textContent).toBe ('SSR history') + }) + + it ('waits for session confirmation before hydrating', async () => { + prepareDocument (user) + let confirmSession!: (value: typeof user) => void + const session = new Promise (resolve => { confirmSession = resolve }) + bootstrap.session.mockReturnValue (session) + await import ('@/main') + expect (bootstrap.hydrateRoot).not.toHaveBeenCalled () + confirmSession (user) + await vi.waitFor (() => expect (bootstrap.hydrateRoot).toHaveBeenCalledOnce ()) + expect (bootstrap.reload).not.toHaveBeenCalled () + }) + + it ('does not loop when the browser cannot retain the confirmed session', async () => { + prepareDocument (null) + await import ('@/main') + await vi.waitFor (() => expect (bootstrap.reload).toHaveBeenCalledOnce ()) + vi.resetModules () + vi.spyOn (console, 'error').mockImplementation (() => {}) + await import ('@/main') + await vi.waitFor (() => expect (console.error).toHaveBeenCalled ()) + expect (bootstrap.reload).toHaveBeenCalledOnce () + expect (bootstrap.hydrateRoot).not.toHaveBeenCalled () + }) +}) diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index e0a393c..f00c60e 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -7,11 +7,14 @@ import '@/index.css' import App, { preloadPageRoute, resolvePageRoute } from '@/App' import { createUII18n } from '@/lib/i18n' import { currentViewingLocale } from '@/lib/locales' -import { localesKeys } from '@/lib/queryKeys' +import { localesKeys, sessionKeys } from '@/lib/queryKeys' import { applyClientAnimationMode, getClientAnimationMode } from '@/lib/settings' +import { initialiseUserSession } from '@/lib/users' import type { DehydratedState } from '@tanstack/react-query' +import type { User } from '@/types' + const helmetContext = { } const client = new QueryClient ({ @@ -70,6 +73,18 @@ const start = () => { } if (client.getQueryData (localesKeys.index) == null) throw new Error ('Missing SSR locales') + const authority = client.getQueryData (sessionKeys.current) + const user = await initialiseUserSession () + if (user.id !== authority?.id || user.role !== authority?.role) + { + // Re-render under the confirmed Cookie before hydrating another identity's data. + if (sessionStorage.getItem (storageKey) === identity) + throw new Error ('SSR session identity did not converge') + sessionStorage.setItem (storageKey, identity) + window.location.reload () + return + } + client.setQueryData (sessionKeys.current, user) const url = new URL (window.location.href) const match = resolvePageRoute (url.pathname) const prepare = match?.route.handle?.prepare -- 2.53.0