コミットを比較

...
2 コミット
5個のファイルの変更、275行の追加、17行の削除
+12 -7
ファイルの表示
@@ -16,7 +16,7 @@ class PostVersionsController < ApplicationController
q = HistoryAccess.visible(PostVersion.all) q = HistoryAccess.visible(PostVersion.all)
q = q.where('post_versions.post_id = ?', post_id) if post_id 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))) if external_tag_id || (tag_id && !(Tag.exists?(id: tag_id)))
q = q.where('JSON_CONTAINS(post_versions.tags_json,' + q = q.where('JSON_CONTAINS(post_versions.tags_json,' +
"JSON_OBJECT('external_tag_id', #{ external_tag_id || tag_id })) " + "JSON_OBJECT('external_tag_id', #{ external_tag_id || tag_id })) " +
@@ -29,14 +29,19 @@ class PostVersionsController < ApplicationController
count = q.except(:select, :order, :limit, :offset).count count = q.except(:select, :order, :limit, :offset).count
ids = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) # Reuse the authorised previous snapshot when it is needed for filtering.
.limit(limit) page_scope = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC'))
.offset(offset) .limit(limit).offset(offset)
.pluck('post_versions.id') versions =
versions = version_scope.merge(q).where(id: ids) 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')) .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) } render json: { versions: serialise_versions(versions, locale.language_code),
count:, population_count: HistoryAccess.population_count(PostVersion) }
end end
private private
+5 -6
ファイルの表示
@@ -41,10 +41,9 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
table = model.table_name table = model.table_name
keys = KEYS.fetch(table) keys = KEYS.fetch(table)
matches = keys.map { "boundary.#{ _1 } = #{ row }.#{ _1 }" }.join(' AND ') matches = keys.map { "boundary.#{ _1 } = #{ row }.#{ _1 }" }.join(' AND ')
boundaries = "SELECT #{ keys.join(', ') }, MAX(version_no) AS version_no FROM #{ table } " + # Any discard at or after this version hides it, including after a restore.
"WHERE event_type = 'discard' GROUP BY #{ keys.join(', ') }" clauses = ["NOT EXISTS (SELECT 1 FROM #{ table } boundary WHERE #{ matches } " +
clauses = ["NOT EXISTS (SELECT 1 FROM (#{ boundaries }) boundary WHERE #{ matches } " + "AND boundary.version_no >= #{ row }.version_no AND boundary.event_type = 'discard')"]
"AND boundary.version_no >= #{ row }.version_no)"]
clauses += reference_sql(table, row) if references clauses += reference_sql(table, row) if references
clauses.map { "(#{ _1 })" }.join(' AND ') clauses.map { "(#{ _1 })" }.join(' AND ')
end end
@@ -62,8 +61,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
# A scalar lookup avoids MySQL's semijoin rewrite losing the JSON row correlation. # A scalar lookup avoids MySQL's semijoin rewrite losing the JSON row correlation.
"(SELECT 1 FROM JSON_TABLE(COALESCE(#{ document }, JSON_ARRAY()), " + "(SELECT 1 FROM JSON_TABLE(COALESCE(#{ document }, JSON_ARRAY()), " +
"'$[*]' COLUMNS (reference_id BIGINT PATH '$' NULL ON EMPTY)) reference_entry " + "'$[*]' COLUMNS (reference_id BIGINT PATH '$' NULL ON EMPTY)) reference_entry " +
"JOIN (#{ discarded_keys(table, key) }) blocked " + "JOIN #{ table } blocked ON reference_entry.reference_id = blocked.#{ key } " +
"ON reference_entry.reference_id = blocked.#{ key } LIMIT 1) IS NULL" "WHERE blocked.event_type = 'discard' LIMIT 1) IS NULL"
end end
def self.list_reference(table, key, document) def self.list_reference(table, key, document)
+205 -1
ファイルの表示
@@ -33,6 +33,9 @@ RSpec.describe 'Post history privacy', type: :request do
end end
PostVersion.create!(post: post_record, version_no: index + 1, event_type: event, PostVersion.create!(post: post_record, version_no: index + 1, event_type: event,
title: "version #{ index + 1 }", url: post_record.url, tags: '', 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) tags_json: snapshots, parent_post_ids: '', created_at: origin + (index + 1).days)
end end
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 expect(response.parsed_body.fetch('versions').first.fetch('title').fetch('prev')).to be_nil
end end
['anonymous', 'member', 'admin'].each do |role| ['anonymous', 'guest', 'member', 'admin'].each do |role|
context "as #{ role }" do context "as #{ role }" do
before do before do
sign_in_as(create(:user, role.to_sym)) unless role == 'anonymous' 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) expect(body.fetch('versions').pluck('version_no')).to eq(expected)
restored = body.fetch('versions').find { _1.fetch('version_no') == 3 } restored = body.fetch('versions').find { _1.fetch('version_no') == 3 }
expect(restored.fetch('title').fetch('prev')).to eq(role == 'admin' ? 'version 2' : nil) 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 end
it 'uses only an authorised previous version for tag filtering' do it 'uses only an authorised previous version for tag filtering' do
@@ -124,6 +136,198 @@ 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('versions').pluck('version_no')).to eq(expected)
expect(response.parsed_body.fetch('count')).to eq(expected.length) expect(response.parsed_body.fetch('count')).to eq(expected.length)
end 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 }
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 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 }.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)
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
['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 end
end end
+50
ファイルの表示
@@ -2,6 +2,7 @@ import { QueryClient } from '@tanstack/react-query'
import { beforeEach, describe, expect, it, vi } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest'
import { prefetchForURL } from '@/lib/prefetchers' import { prefetchForURL } from '@/lib/prefetchers'
import { postsKeys } from '@/lib/queryKeys'
const postsApi = vi.hoisted (() => ({ const postsApi = vi.hoisted (() => ({
fetchPost: vi.fn (), fetchPost: vi.fn (),
@@ -88,6 +89,55 @@ describe ('prefetchForURL', () => {
expect (postsApi.fetchPost).toHaveBeenCalledWith ('12', 'ja') expect (postsApi.fetchPost).toHaveBeenCalledWith ('12', 'ja')
}) })
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 }
postsApi.fetchPostChanges.mockResolvedValueOnce (history)
await prefetchForURL (client, `${path}?id=12&page=2&limit=5`)
expect (postsApi.fetchPostChanges).toHaveBeenCalledExactlyOnceWith (params, locale)
expect (client.getQueryData (postsKeys.changes (params, locale))).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 ('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 }
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 () => { it ('prefetches tag indexes from query parameters', async () => {
await prefetchForURL ( await prefetchForURL (
qc (), qc (),
+2 -2
ファイルの表示
@@ -214,11 +214,11 @@ const prefetchPostChanges: Prefetcher = async (qc, url, locale) => {
} }
await qc.prefetchQuery ({ await qc.prefetchQuery ({
queryKey: postsKeys.changes ({ ...(id && { id }), queryKey: postsKeys.changes ({ ...(id && { post: id }),
...(tag && { tag }), ...(tag && { tag }),
...(externalTag && { externalTag }), ...(externalTag && { externalTag }),
page, limit }, locale), page, limit }, locale),
queryFn: () => fetchPostChanges ({ ...(id && { id }), queryFn: () => fetchPostChanges ({ ...(id && { post: id }),
...(tag && { tag }), ...(tag && { tag }),
...(externalTag && { externalTag }), ...(externalTag && { externalTag }),
page, limit }, locale) }) page, limit }, locale) })