AI: address review on PR #490
このコミットが含まれているのは:
@@ -81,14 +81,10 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
|
|||||||
table = model.table_name
|
table = model.table_name
|
||||||
source = "JSON_TABLE(COALESCE(#{ row }.tags_json, JSON_ARRAY()), '$[*]' COLUMNS (" +
|
source = "JSON_TABLE(COALESCE(#{ row }.tags_json, JSON_ARRAY()), '$[*]' COLUMNS (" +
|
||||||
"tag_id BIGINT PATH '$.#{ key }', version_no INT PATH '$.version_no')) tag_reference"
|
"tag_id BIGINT PATH '$.#{ key }', version_no INT PATH '$.version_no')) tag_reference"
|
||||||
# DISTINCT prevents derived-table merging: evaluate privacy independently of each post row.
|
|
||||||
private_versions = "SELECT DISTINCT reference_version.tag_id, reference_version.version_no, " +
|
|
||||||
"reference_version.created_at FROM #{ table } reference_version " +
|
|
||||||
"WHERE NOT (#{ sql(model, 'reference_version') })"
|
|
||||||
match = 'reference_version.tag_id = tag_reference.tag_id'
|
match = 'reference_version.tag_id = tag_reference.tag_id'
|
||||||
if external
|
if external
|
||||||
match += " AND reference_version.created_at <= #{ row }.created_at"
|
match += " AND reference_version.created_at <= #{ row }.created_at"
|
||||||
latest = "WHERE NOT EXISTS (SELECT 1 FROM #{ table } later_reference " +
|
latest = "AND NOT EXISTS (SELECT 1 FROM #{ table } later_reference " +
|
||||||
'WHERE later_reference.tag_id = reference_version.tag_id ' +
|
'WHERE later_reference.tag_id = reference_version.tag_id ' +
|
||||||
"AND later_reference.created_at <= #{ row }.created_at " +
|
"AND later_reference.created_at <= #{ row }.created_at " +
|
||||||
'AND later_reference.version_no > reference_version.version_no)'
|
'AND later_reference.version_no > reference_version.version_no)'
|
||||||
@@ -96,8 +92,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
|
|||||||
match += ' AND reference_version.version_no = tag_reference.version_no'
|
match += ' AND reference_version.version_no = tag_reference.version_no'
|
||||||
latest = ''
|
latest = ''
|
||||||
end
|
end
|
||||||
"(SELECT 1 FROM #{ source } JOIN (#{ private_versions }) reference_version ON #{ match } " +
|
"(SELECT 1 FROM #{ source } JOIN #{ table } reference_version ON #{ match } " +
|
||||||
"#{ latest } LIMIT 1) IS NULL"
|
"WHERE NOT (#{ sql(model, 'reference_version') }) #{ latest } LIMIT 1) IS NULL"
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.reference_sql(table, row)
|
def self.reference_sql(table, row)
|
||||||
|
|||||||
@@ -127,36 +127,4 @@ RSpec.describe 'Counts artifact policy and external references' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'checks external privacy by snapshot time and version order' do
|
|
||||||
origin = Time.utc(2024)
|
|
||||||
tag = create(:tag, primary_name: 'private linked tag')
|
|
||||||
TagVersion.create!(tag:, version_no: 1, event_type: 'discard',
|
|
||||||
name: 'private linked tag', category: 'general', aliases: '', parent_tag_ids: '',
|
|
||||||
names: { ja: { name: 'private linked tag', script_code: 'Jpan',
|
|
||||||
auto_generated: false, aliases: [] } }, created_at: origin)
|
|
||||||
external = create(:external_tag)
|
|
||||||
references = [
|
|
||||||
[origin, tag.id.to_s], [origin + 1.day, ''],
|
|
||||||
[origin + 1.day, tag.id.to_s], [origin + 2.days, '']]
|
|
||||||
references.each_with_index do |entry, index|
|
|
||||||
timestamp, linked_tag_ids = entry
|
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: index + 1,
|
|
||||||
event_type: index.zero? ? 'create' : 'update', linked_tag_ids:, created_at: timestamp)
|
|
||||||
end
|
|
||||||
post = create(:post)
|
|
||||||
rows = [origin - 1.hour, origin + 1.hour, origin + 1.day, origin + 2.days]
|
|
||||||
.each_with_index.map do |timestamp, index|
|
|
||||||
PostVersion.create!(post:, version_no: index + 1, event_type: 'create',
|
|
||||||
title: 'external snapshot', url: post.url, tags: '', parent_post_ids: '',
|
|
||||||
tags_json: [{ external_tag_id: external.id }], created_at: timestamp)
|
|
||||||
end
|
|
||||||
HistoryAccess.set(user: nil) do
|
|
||||||
expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).pluck(:id))
|
|
||||||
.to match_array([rows.first.id, rows.last.id])
|
|
||||||
end
|
|
||||||
HistoryAccess.set(user: create(:user, :admin)) do
|
|
||||||
expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).count).to eq(4)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする