From d465fb89879e37dd88ca7962e5660497cdb9554b Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sun, 22 Nov 2026 02:07:34 +0900 Subject: [PATCH] AI: address review on PR #490 --- backend/app/models/history_access.rb | 10 +++++-- backend/spec/models/history_access_spec.rb | 32 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/backend/app/models/history_access.rb b/backend/app/models/history_access.rb index 3500f50..8665b48 100644 --- a/backend/app/models/history_access.rb +++ b/backend/app/models/history_access.rb @@ -81,10 +81,14 @@ class HistoryAccess < ActiveSupport::CurrentAttributes table = model.table_name source = "JSON_TABLE(COALESCE(#{ row }.tags_json, JSON_ARRAY()), '$[*]' COLUMNS (" + "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' if external match += " AND reference_version.created_at <= #{ row }.created_at" - latest = "AND NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + + latest = "WHERE NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + 'WHERE later_reference.tag_id = reference_version.tag_id ' + "AND later_reference.created_at <= #{ row }.created_at " + 'AND later_reference.version_no > reference_version.version_no)' @@ -92,8 +96,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes 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" + "(SELECT 1 FROM #{ source } JOIN (#{ private_versions }) reference_version ON #{ match } " + + "#{ latest } LIMIT 1) IS NULL" end def self.reference_sql(table, row) diff --git a/backend/spec/models/history_access_spec.rb b/backend/spec/models/history_access_spec.rb index 385e5cd..99fa68a 100644 --- a/backend/spec/models/history_access_spec.rb +++ b/backend/spec/models/history_access_spec.rb @@ -127,4 +127,36 @@ RSpec.describe 'Counts artifact policy and external references' do 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