コミットを比較

..
1 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker a55408dc32 WIP: preserve failed Codex job issue-485-5cicl5k1 2026-11-18 20:58:12 +09:00
70個のファイルの変更、585行の追加、1337行の削除
+3 -6
ファイルの表示
@@ -100,8 +100,7 @@ class MaterialsController < ApplicationController
material = nil material = nil
begin begin
VersionRecorder.record_operation!( Material.transaction do
event_type: 'materials.create', created_by_user: current_user) do
tag = resolve_material_tag!(locale, tag_name_raw) tag = resolve_material_tag!(locale, tag_name_raw)
material = Material.new(tag:, url:, material = Material.new(tag:, url:,
created_by_user: current_user, created_by_user: current_user,
@@ -152,8 +151,7 @@ class MaterialsController < ApplicationController
uploaded_blob = build_uploaded_material_blob!(file, file_sha256) uploaded_blob = build_uploaded_material_blob!(file, file_sha256)
begin begin
VersionRecorder.record_operation!( Material.transaction do
event_type: 'materials.update', created_by_user: current_user) do
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user) MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
tag = resolve_material_tag!(locale, tag_name_raw) tag = resolve_material_tag!(locale, tag_name_raw)
material.assign_attributes(tag:, url:, updated_by_user: current_user) material.assign_attributes(tag:, url:, updated_by_user: current_user)
@@ -187,8 +185,7 @@ class MaterialsController < ApplicationController
material = Material.find_by(id: params[:id]) material = Material.find_by(id: params[:id])
return head :not_found unless material return head :not_found unless material
VersionRecorder.record_operation!( Material.transaction do
event_type: 'materials.destroy', created_by_user: current_user) do
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user) MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
material.discard! material.discard!
MaterialVersionRecorder.record!(material:, event_type: :discard, MaterialVersionRecorder.record!(material:, event_type: :discard,
+1 -2
ファイルの表示
@@ -95,8 +95,7 @@ class NicoTagsController < ApplicationController
linked_tag_names = params[:tags].to_s.split linked_tag_names = params[:tags].to_s.split
linked_tags = nil linked_tags = nil
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'external_tags.update', created_by_user: current_user) do
linked_tags = Tag.normalise_tags!(locale, linked_tag_names, linked_tags = Tag.normalise_tags!(locale, linked_tag_names,
with_tagme: false, with_tagme: false,
with_no_deerjikist: false, with_no_deerjikist: false,
+6 -6
ファイルの表示
@@ -29,14 +29,14 @@ 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')) # Apply visibility and pagination before joining the previous snapshots.
.limit(limit) page_scope = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC'))
.offset(offset) .limit(limit).offset(offset).select('post_versions.*')
.pluck('post_versions.id') versions = version_scope.from(page_scope, :post_versions)
versions = version_scope.merge(q).where(id: ids)
.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC')) .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 end
private private
+1 -2
ファイルの表示
@@ -346,8 +346,7 @@ class PostsController < ApplicationController
post = nil post = nil
conflict_json = nil conflict_json = nil
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'posts.update', created_by_user: current_user) do
post = Post.lock.find(params[:id].to_i) post = Post.lock.find(params[:id].to_i)
base_version = nil base_version = nil
+2 -4
ファイルの表示
@@ -11,8 +11,7 @@ class TagChildrenController < ApplicationController
parent = Tag.find(parent_id) parent = Tag.find(parent_id)
child = Tag.find(child_id) child = Tag.find(child_id)
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tags.update', created_by_user: current_user) do
TagVersioning.ensure_snapshot!(child, created_by_user: current_user) TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
TagImplication.find_or_create_by!(parent_tag: parent, tag: child) TagImplication.find_or_create_by!(parent_tag: parent, tag: child)
@@ -34,8 +33,7 @@ class TagChildrenController < ApplicationController
parent = Tag.find(parent_id) parent = Tag.find(parent_id)
child = Tag.find(child_id) child = Tag.find(child_id)
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tags.update', created_by_user: current_user) do
TagVersioning.ensure_snapshot!(child, created_by_user: current_user) TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
TagImplication.find_by(parent_tag: parent, tag: child)&.destroy! TagImplication.find_by(parent_tag: parent, tag: child)&.destroy!
+2 -4
ファイルの表示
@@ -467,8 +467,7 @@ class TagsController < ApplicationController
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
end end
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tags.update', created_by_user: current_user) do
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user, TagVersioning.ensure_snapshot!(tag, created_by_user: current_user,
language_code: locale.language_code) language_code: locale.language_code)
@@ -519,8 +518,7 @@ class TagsController < ApplicationController
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
end end
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tags.update', created_by_user: current_user) do
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user, TagVersioning.ensure_snapshot!(tag, created_by_user: current_user,
language_code: locale.language_code) language_code: locale.language_code)
+1 -3
ファイルの表示
@@ -246,9 +246,7 @@ class WikiPagesController < ApplicationController
base_revision_id = params[:base_revision_id].presence base_revision_id = params[:base_revision_id].presence
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tag_descriptions.update',
created_by_user: current_user, reason: params[:message].presence) do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
tag.lock! tag.lock!
old_title = tag_name.name old_title = tag_name.name
-10
ファイルの表示
@@ -1,10 +0,0 @@
class Event < ApplicationRecord
has_many :post_versions
has_many :tag_versions
has_many :nico_tag_versions
has_many :material_versions
has_many :tag_description_versions
has_many :tag_group_versions
belongs_to :created_by_user, class_name: 'User', optional: true
end
+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)
+1 -3
ファイルの表示
@@ -23,9 +23,7 @@ class Locale < ApplicationRecord
end end
def save_with_tag_names! def save_with_tag_names!
event_type = new_record? ? 'locales.create' : 'locales.restore' completed = self.class.transaction(requires_new: true) do
completed = VersionRecorder.record_operation!(
event_type:, created_by_user: nil, savepoint_flg: true) do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
saved = yield saved = yield
raise ActiveRecord::RecordNotSaved, 'Locale save was halted' unless saved raise ActiveRecord::RecordNotSaved, 'Locale save was halted' unless saved
+3 -1
ファイルの表示
@@ -11,5 +11,7 @@ class MaterialVersion < ApplicationRecord
belongs_to :parent, class_name: 'Material', optional: true belongs_to :parent, class_name: 'Material', optional: true
belongs_to :updated_by_user, class_name: 'User', optional: true belongs_to :updated_by_user, class_name: 'User', optional: true
def export_paths_hash = export_paths_json || { } def export_paths_hash
export_paths_json || {}
end
end end
+1 -2
ファイルの表示
@@ -290,8 +290,7 @@ class Tag < ApplicationRecord
affected_post_ids = Set.new affected_post_ids = Set.new
VersionRecorder.record_operation!( Tag.transaction do
event_type: 'tags.update', created_by_user:) do
TagVersioning.ensure_snapshot!(target_tag, created_by_user:) TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
Array(source_tags).compact.uniq.each do |source_tag| Array(source_tags).compact.uniq.each do |source_tag|
+25 -28
ファイルの表示
@@ -15,40 +15,37 @@ class TagNameSanitisationRule < ApplicationRecord
end end
def apply! def apply!
VersionRecorder.with_event( Language.find_each do |language|
event_type: 'tag_name_sanitisation_rules.apply', created_by_user: nil) do TagName.where(language:).find_each do |candidate|
Language.find_each do |language| TagName.transaction do
TagName.where(language:).find_each do |candidate| tn = TagName.find_by(id: candidate.id)
TagName.transaction do next unless tn
tn = TagName.find_by(id: candidate.id)
next unless tn
name = sanitise(tn.name) name = sanitise(tn.name)
next if name == tn.name next if name == tn.name
existing_tn = TagName.find_by(language:, name:) existing_tn = TagName.find_by(language:, name:)
source_tag = tn.tag source_tag = tn.tag
target_tag = existing_tn ? existing_tn.tag : source_tag target_tag = existing_tn ? existing_tn.tag : source_tag
[source_tag, target_tag].uniq(&:id).sort_by(&:id).each(&:lock!) [source_tag, target_tag].uniq(&:id).sort_by(&:id).each(&:lock!)
TagVersioning.ensure_snapshot!(source_tag, created_by_user: nil) TagVersioning.ensure_snapshot!(source_tag, created_by_user: nil)
if existing_tn && target_tag != source_tag if existing_tn && target_tag != source_tag
Tag.merge_tags!(target_tag, source_tag) Tag.merge_tags!(target_tag, source_tag)
tn.reload.destroy! tn.reload.destroy!
elsif existing_tn elsif existing_tn
if tn.primary? if tn.primary?
existing_tn.destroy! existing_tn.destroy!
tn.update_columns(name:, updated_at: Time.current)
else
tn.destroy!
end
else
# TagName 側の自動サニタイズを回避
tn.update_columns(name:, updated_at: Time.current) tn.update_columns(name:, updated_at: Time.current)
else
tn.destroy!
end end
else
TagVersioning.record!(target_tag, event_type: :update, created_by_user: nil) # TagName 側の自動サニタイズを回避
tn.update_columns(name:, updated_at: Time.current)
end end
TagVersioning.record!(target_tag, event_type: :update, created_by_user: nil)
end end
end end
end end
-2
ファイルの表示
@@ -19,8 +19,6 @@ module VersionRecord
belongs_to :created_by_user, class_name: 'User', optional: true belongs_to :created_by_user, class_name: 'User', optional: true
belongs_to :event
enum :event_type, event_type_map, prefix: true, validate: true enum :event_type, event_type_map, prefix: true, validate: true
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 } validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
+1 -2
ファイルの表示
@@ -51,8 +51,7 @@ class MaterialSyncImporter
suppression: @import_block) suppression: @import_block)
end end
VersionRecorder.record_operation!( Material.transaction do
event_type: "materials.#{ event_type }", created_by_user: @attributes[:updated_by_user]) do
if material.persisted? if material.persisted?
MaterialVersionRecorder.ensure_snapshot!(material, MaterialVersionRecorder.ensure_snapshot!(material,
created_by_user: @attributes[:updated_by_user]) created_by_user: @attributes[:updated_by_user])
+13 -17
ファイルの表示
@@ -3,16 +3,14 @@ class MaterialSyncRunner
:errors, keyword_init: true) :errors, keyword_init: true)
def self.sync_enabled! def self.sync_enabled!
VersionRecorder.with_event(event_type: 'materials.sync', created_by_user: nil) do results = MaterialSyncSource.enabled.order(:id).map { |source| new(source).sync! }
results = MaterialSyncSource.enabled.order(:id).map { |source| new(source).sync! }
Result.new(imported: results.sum(&:imported), Result.new(imported: results.sum(&:imported),
updated: results.sum(&:updated), updated: results.sum(&:updated),
unchanged: results.sum(&:unchanged), unchanged: results.sum(&:unchanged),
suppressed: results.sum(&:suppressed), suppressed: results.sum(&:suppressed),
failed: results.sum(&:failed), failed: results.sum(&:failed),
errors: results.flat_map(&:errors)) errors: results.flat_map(&:errors))
end
end end
def initialize source def initialize source
@@ -23,15 +21,13 @@ class MaterialSyncRunner
result = Result.new(imported: 0, updated: 0, unchanged: 0, result = Result.new(imported: 0, updated: 0, unchanged: 0,
suppressed: 0, failed: 0, errors: []) suppressed: 0, failed: 0, errors: [])
VersionRecorder.with_event(event_type: 'materials.sync', created_by_user: nil) do if @source.source_kind == 'google_drive_path'
if @source.source_kind == 'google_drive_path' sync_google_drive_path!(result)
sync_google_drive_path!(result) else
else candidates.each do |candidate|
candidates.each do |candidate| next if candidate.blank?
next if candidate.blank?
sync_candidate!(candidate, result) sync_candidate!(candidate, result)
end
end end
end end
+1 -2
ファイルの表示
@@ -11,8 +11,7 @@ class MaterialSyncSuppressionRegistrar
def create! def create!
suppression = nil suppression = nil
VersionRecorder.record_operation!( MaterialSyncSuppression.transaction do
event_type: 'materials.block', created_by_user: @created_by_user) do
suppression = MaterialSyncSuppression.create!( suppression = MaterialSyncSuppression.create!(
@attributes.merge(created_by_user: @created_by_user)) @attributes.merge(created_by_user: @created_by_user))
discard_existing_materials!(suppression) discard_existing_materials!(suppression)
+5 -9
ファイルの表示
@@ -1,24 +1,20 @@
class MaterialVersionRecorder < VersionRecorder class MaterialVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def self.record! material:, event_type:, created_by_user:, event: nil, file_snapshot: nil def self.record! material:, event_type:, created_by_user:, file_snapshot: nil
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record! new(material:, event_type:, created_by_user:, file_snapshot:).record!
end end
def initialize material:, event_type:, created_by_user:, event: nil, file_snapshot: nil def initialize material:, event_type:, created_by_user:, file_snapshot: nil
@file_snapshot = file_snapshot @file_snapshot = file_snapshot
super(record: material, event_type:, event:, created_by_user:) super(record: material, event_type:, created_by_user:)
end end
def self.ensure_snapshot! material, created_by_user: def self.ensure_snapshot! material, created_by_user:
return if material.material_versions.exists? return if material.material_versions.exists?
event = current_event || Event.new( record!(material:, event_type: :create,
event_type: 'materials.create',
created_by_user: material.created_by_user || created_by_user,
created_at: material.created_at)
record!(material:, event_type: :create, event:,
created_by_user: material.created_by_user || created_by_user) created_by_user: material.created_by_user || created_by_user)
end end
+4 -4
ファイルの表示
@@ -1,11 +1,11 @@
class NicoTagVersionRecorder < VersionRecorder class NicoTagVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update'].freeze EVENT_TYPES = ['create', 'update'].freeze
def self.record! external_tag:, event_type:, created_by_user:, event: nil def self.record! external_tag:, event_type:, created_by_user:
new(external_tag:, event_type:, created_by_user:, event:).record! new(external_tag:, event_type:, created_by_user:).record!
end end
def initialize external_tag:, event_type:, created_by_user:, event: nil def initialize external_tag:, event_type:, created_by_user:
super(record: external_tag, event_type:, created_by_user:, event:) super(record: external_tag, event_type:, created_by_user:)
end end
private private
+5 -14
ファイルの表示
@@ -9,8 +9,6 @@ class PostBulkCreator
def run locale def run locale
results = Array.new(@posts.length) results = Array.new(@posts.length)
mutex = Mutex.new mutex = Mutex.new
event_mutex = Mutex.new
event = Event.new(event_type: 'posts.create', created_by_user_id: @actor_id)
next_index = 0 next_index = 0
workers = Array.new(2) do workers = Array.new(2) do
@@ -29,7 +27,7 @@ class PostBulkCreator
break if index >= @posts.length break if index >= @posts.length
attributes = @posts[index] attributes = @posts[index]
results[index] = create_row(locale, actor, attributes, index, event, event_mutex) results[index] = create_row(locale, actor, attributes, index)
rescue StandardError => e rescue StandardError => e
Rails.logger.error( Rails.logger.error(
"post_bulk_creator_worker_failure #{ { error: e.class.name, "post_bulk_creator_worker_failure #{ { error: e.class.name,
@@ -63,7 +61,7 @@ class PostBulkCreator
private private
def create_row locale, actor, attributes, index, event, event_mutex def create_row locale, actor, attributes, index
preflight = preflight =
PostCreatePreflight.new( PostCreatePreflight.new(
attributes: attributes, attributes: attributes,
@@ -76,16 +74,9 @@ class PostBulkCreator
existing_post: preflight[:existing_post] } existing_post: preflight[:existing_post] }
end end
create_post = lambda do post = PostCreator.new(
VersionRecorder.with_event(event_type: 'posts.create', created_by_user: actor, event:) do actor: actor,
PostCreator.new( attributes: normalised_attributes(attributes, preflight, index)).create!(locale)
actor: actor,
attributes: normalised_attributes(attributes, preflight, index)).create!(locale)
end
end
# Wait for the first event transaction before other workers reuse its ID.
committed = event_mutex.synchronize { event.persisted? }
post = committed ? create_post.call : event_mutex.synchronize(&create_post)
result = { result = {
status: 'created', status: 'created',
post: { id: post.id } } post: { id: post.id } }
+1 -2
ファイルの表示
@@ -18,8 +18,7 @@ class PostCreator
original_created_from: @attributes[:original_created_from].presence, original_created_from: @attributes[:original_created_from].presence,
original_created_before: @attributes[:original_created_before].presence) original_created_before: @attributes[:original_created_before].presence)
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'posts.create', created_by_user: @actor) do
post.save! post.save!
post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present? post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
snapshot_tags = planned_snapshot_tags(locale) snapshot_tags = planned_snapshot_tags(locale)
+5 -8
ファイルの表示
@@ -1,19 +1,16 @@
class PostVersionRecorder < VersionRecorder class PostVersionRecorder < VersionRecorder
def self.record! post:, event_type:, created_by_user:, event: nil def self.record! post:, event_type:, created_by_user:
new(post:, event_type:, event:, created_by_user:).record! new(post:, event_type:, created_by_user:).record!
end end
def initialize post:, event_type:, created_by_user:, event: nil def initialize post:, event_type:, created_by_user:
super(record: post, event_type:, event:, created_by_user:) super(record: post, event_type:, created_by_user:)
end end
def self.ensure_snapshot! post, created_by_user: def self.ensure_snapshot! post, created_by_user:
return if post.post_versions.exists? return if post.post_versions.exists?
event = current_event || Event.new(event_type: 'posts.create', record!(post:, event_type: :create, created_by_user:)
created_by_user:,
created_at: post.created_at)
record!(post:, event_type: :create, event:, created_by_user:)
end end
private private
+2 -6
ファイルの表示
@@ -4,8 +4,7 @@ class TagDescriptionOperation
end end
def self.create! locale, tag:, body:, created_by_user:, message: nil def self.create! locale, tag:, body:, created_by_user:, message: nil
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tag_descriptions.create', created_by_user:, reason: message) do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
tag.lock! tag.lock!
raise ActiveRecord::RecordNotUnique if TagDescription.exists?( raise ActiveRecord::RecordNotUnique if TagDescription.exists?(
@@ -20,9 +19,7 @@ class TagDescriptionOperation
end end
def self.update! locale, tag:, body:, updated_by_user:, message: nil, base_revision_id: nil def self.update! locale, tag:, body:, updated_by_user:, message: nil, base_revision_id: nil
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tag_descriptions.update',
created_by_user: updated_by_user, reason: message) do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
tag.lock! tag.lock!
description = TagDescription.lock.find_by!( description = TagDescription.lock.find_by!(
@@ -46,7 +43,6 @@ class TagDescriptionOperation
description.created_by_user_id = user.id if creating description.created_by_user_id = user.id if creating
description.update!(body:, version_no:, updated_by_user_id: user.id) description.update!(body:, version_no:, updated_by_user_id: user.id)
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event: VersionRecorder.current_event,
tag_id: description.tag_id, language_code: description.language_code, tag_id: description.tag_id, language_code: description.language_code,
version_no:, event_type: creating ? 'create' : 'update', body:, version_no:, event_type: creating ? 'create' : 'update', body:,
source_language_code: description.source_language_code, source_language_code: description.source_language_code,
+3 -6
ファイルの表示
@@ -3,8 +3,7 @@ class TagGroupOperation
def self.create!(locale, name:, description:, members:, placements:, actor:, def self.create!(locale, name:, description:, members:, placements:, actor:,
require_compatibility: false) require_compatibility: false)
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tag_groups.create', created_by_user: actor) do
group = TagGroup.new(version_no: 1, created_by_user: actor, group = TagGroup.new(version_no: 1, created_by_user: actor,
updated_by_user: actor) updated_by_user: actor)
attributes = prepare!(locale:, group:, name:, description:, members:, placements:) attributes = prepare!(locale:, group:, name:, description:, members:, placements:)
@@ -20,8 +19,7 @@ class TagGroupOperation
def self.update!(locale, group:, name:, description:, members:, placements:, actor:, def self.update!(locale, group:, name:, description:, members:, placements:, actor:,
require_compatibility: false) require_compatibility: false)
VersionRecorder.record_operation!( ApplicationRecord.transaction do
event_type: 'tag_groups.update', created_by_user: actor) do
group.lock! group.lock!
attributes = prepare!(locale:, group:, name:, description:, members:, placements:) attributes = prepare!(locale:, group:, name:, description:, members:, placements:)
if unchanged?(group, attributes) if unchanged?(group, attributes)
@@ -309,8 +307,7 @@ class TagGroupOperation
private_class_method :persist_placements! private_class_method :persist_placements!
def self.persist_version!(group:, attributes:, actor:, event_type:) def self.persist_version!(group:, attributes:, actor:, event_type:)
TagGroupVersion.create!(event: VersionRecorder.current_event, TagGroupVersion.create!(tag_group: group, version_no: group.version_no,
tag_group: group, version_no: group.version_no,
event_type:, name: group.name, event_type:, name: group.name,
description: group.description, description: group.description,
members: attributes.fetch(:members), members: attributes.fetch(:members),
+4 -4
ファイルの表示
@@ -1,13 +1,13 @@
class TagVersionRecorder < VersionRecorder class TagVersionRecorder < VersionRecorder
def self.record! tag:, event_type:, created_by_user:, event: nil, **_options def self.record! tag:, event_type:, created_by_user:, **_options
Tag.transaction do Tag.transaction do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
new(tag:, event_type:, event:, created_by_user:).record! new(tag:, event_type:, created_by_user:).record!
end end
end end
def initialize tag:, event_type:, created_by_user:, event: nil def initialize tag:, event_type:, created_by_user:
super(record: tag, event_type:, event:, created_by_user:) super(record: tag, event_type:, created_by_user:)
end end
private private
+3 -26
ファイルの表示
@@ -1,29 +1,9 @@
class VersionRecorder class VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def self.current_event def initialize record:, event_type:, created_by_user:
ActiveSupport::IsolatedExecutionState[:version_event]
end
def self.with_event event_type:, created_by_user:, reason: nil, event: nil
previous = current_event
ActiveSupport::IsolatedExecutionState[:version_event] =
previous || event || Event.new(event_type:, created_by_user:, reason:)
yield
ensure
ActiveSupport::IsolatedExecutionState[:version_event] = previous
end
def self.record_operation! event_type:, created_by_user:, reason: nil, savepoint_flg: false
with_event(event_type:, created_by_user:, reason:) do
ApplicationRecord.transaction(requires_new: savepoint_flg) { yield }
end
end
def initialize record:, event_type:, created_by_user:, event: nil
@record = record @record = record
@event_type = event_type.to_s @event_type = event_type.to_s
@event = event
@created_by_user = created_by_user @created_by_user = created_by_user
validate_event_type! validate_event_type!
@@ -62,11 +42,8 @@ class VersionRecorder
def base_attributes latest def base_attributes latest
{ version_no: (latest&.version_no || 0) + 1, { version_no: (latest&.version_no || 0) + 1,
event_type: @event_type, event_type: @event_type,
event: @event || self.class.current_event || Event.new( created_at: Time.current,
event_type: "#{ record_class.table_name }.#{ @event_type }", created_by_user: @created_by_user }
created_by_user: @created_by_user),
created_by_user: @created_by_user,
created_at: Time.current }
end end
def update_record_version_no! version_no def update_record_version_no! version_no
+46 -50
ファイルの表示
@@ -9,14 +9,12 @@ module Youtube
end end
def sync! def sync!
VersionRecorder.with_event(event_type: 'posts.sync', created_by_user: nil) do video_ids = discover_video_ids
video_ids = discover_video_ids return if video_ids.empty?
return if video_ids.empty?
video_ids.each_slice(50) do |ids| video_ids.each_slice(50) do |ids|
@client.videos(ids).fetch('items', []).each do |item| @client.videos(ids).fetch('items', []).each do |item|
sync_video!(VideoItem.new(item)) sync_video!(VideoItem.new(item))
end
end end
end end
end end
@@ -48,61 +46,59 @@ module Youtube
end end
def sync_video! video def sync_video! video
ApplicationRecord.transaction do post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
original_created_from = video.published_at.change(sec: 0) original_created_from = video.published_at.change(sec: 0)
original_created_before = original_created_from + 1.minute original_created_before = original_created_from + 1.minute
post_created = false post_created = false
post_changed = false post_changed = false
if post if post
post.assign_attributes(title: video.title, post.assign_attributes(title: video.title,
original_created_from:, original_created_from:,
original_created_before:, original_created_before:,
thumbnail_base: video.thumbnail_url) thumbnail_base: video.thumbnail_url)
post_changed = post.changed? post_changed = post.changed?
post.save! if post_changed post.save! if post_changed
attach_thumbnail_if_needed!(post, video.thumbnail_url) attach_thumbnail_if_needed!(post, video.thumbnail_url)
else else
post_created = true post_created = true
post = Post.create!( post = Post.create!(
title: video.title, title: video.title,
url: video.url, url: video.url,
thumbnail_base: video.thumbnail_url, thumbnail_base: video.thumbnail_url,
uploaded_user_id: nil, uploaded_user_id: nil,
original_created_from:, original_created_from:,
original_created_before:) original_created_before:)
attach_thumbnail_if_needed!(post, video.thumbnail_url) attach_thumbnail_if_needed!(post, video.thumbnail_url)
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id]) sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id])
end end
kept_tag_ids = post.tags.pluck(:id).to_set kept_tag_ids = post.tags.pluck(:id).to_set
desired_tag_ids = kept_tag_ids.to_a desired_tag_ids = kept_tag_ids.to_a
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id) deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
if deerjikist if deerjikist
desired_tag_ids.delete(Tag.no_deerjikist.id) desired_tag_ids.delete(Tag.no_deerjikist.id)
desired_tag_ids << deerjikist.tag_id desired_tag_ids << deerjikist.tag_id
elsif post.tags.where(category: :deerjikist).none? elsif post.tags.where(category: :deerjikist).none?
desired_tag_ids << Tag.no_deerjikist.id desired_tag_ids << Tag.no_deerjikist.id
end end
desired_tag_ids.uniq! desired_tag_ids.uniq!
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids) sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
if post_created if post_created
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil) PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil) PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil) PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
end
end end
end end
-20
ファイルの表示
@@ -1,20 +0,0 @@
class CreateEvents < ActiveRecord::Migration[8.0]
def change
create_table :events do |t|
t.string :event_type, null: false, index: true
t.text :reason
t.references :reverted_from_event, foreign_key: { to_table: :events }
t.json :metadata
t.binary :ip_address, limit: 16, index: true
t.references :created_by_user, index: true, foreign_key: false
t.datetime :created_at, null: false, index: true
end
add_reference :post_versions, :event, foreign_key: true, after: :original_created_before
add_reference :tag_versions, :event, foreign_key: true, after: :deprecated_at
add_reference :nico_tag_versions, :event, foreign_key: true, after: :event_type
add_reference :material_versions, :event, foreign_key: true
add_reference :tag_description_versions, :event, foreign_key: true, after: :source_version_no
add_reference :tag_group_versions, :event, foreign_key: true, after: :placements
end
end
-239
ファイルの表示
@@ -1,239 +0,0 @@
class BackfillEventsFromExistingVersions < ActiveRecord::Migration[8.0]
class MigrationEvent < ActiveRecord::Base
self.table_name = 'events'
end
class MigrationPostVersion < ActiveRecord::Base
self.table_name = 'post_versions'
end
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationNicoTagVersion < ActiveRecord::Base
self.table_name = 'nico_tag_versions'
end
class MigrationMaterialVersion < ActiveRecord::Base
self.table_name = 'material_versions'
end
class MigrationTagDescriptionVersion < ActiveRecord::Base
self.table_name = 'tag_description_versions'
end
class MigrationTagGroupVersion < ActiveRecord::Base
self.table_name = 'tag_group_versions'
end
class MigrationLocale < ActiveRecord::Base
self.table_name = 'locales'
end
def up
# create → posts.create
# update → posts.update
if MigrationPostVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → materials.create
# update → materials.update
if MigrationMaterialVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → posts.create / posts.update / materials.create / materials.update
# / external_tags.update / tags.update / unknown
# update → tags.update / locales.create
# discard → unknown
if MigrationTagVersion.where.not(event_type: ['create', 'update', 'discard']).exists?
raise
end
# create → posts.create / posts.update / unknown
# update → external_tags.update
if MigrationNicoTagVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → tag_descriptions.create
# update → tag_descriptions.update
if MigrationTagDescriptionVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → tag_groups.create
# update → tag_groups.update
if MigrationTagGroupVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# post_versions の Backfill
MigrationPostVersion.find_each do |pv|
ev = MigrationEvent.create!(event_type: "posts.#{ pv.event_type }",
created_by_user_id: pv.created_by_user_id,
created_at: pv.created_at)
pv.update_columns(event_id: ev.id)
end
# material_versions の Backfill
MigrationMaterialVersion.find_each do |m|
ev = MigrationEvent.create!(event_type: "materials.#{ m.event_type }",
created_by_user_id: m.created_by_user_id,
created_at: m.created_at)
m.update_columns(event_id: ev.id)
end
# ロカール追加に伴ふ該当語言のタグ名称追加異動のみ分離
ids_cause_of_locale_creation = []
MigrationLocale.where('created_at > ?', MigrationLocale.minimum(:created_at)).find_each do |l|
ev = MigrationEvent.create!(event_type: 'locales.create',
created_by_user_id: nil,
created_at: l.created_at)
MigrationTagVersion
.where('created_at > ?', l.created_at)
.where(event_type: 'update', event_id: nil)
.find_each do |t|
next unless t.names.key?(l.language_code)
prev = MigrationTagVersion.find_by(tag_id: t.tag_id, version_no: t.version_no - 1)
next if prev.nil? || prev.names.key?(l.language_code)
t.update_columns(event_id: ev.id)
ids_cause_of_locale_creation << t.id
end
ev.destroy! unless MigrationTagVersion.where(event_id: ev.id).exists?
end
# nico_tag_versions の Backfill
MigrationNicoTagVersion.find_each do |et|
ev =
case et.event_type
when 'create'
post =
MigrationPostVersion
.where('JSON_CONTAINS(tags_json, ?) <> 0', { external_tag_id: et.tag_id }.to_json)
.order(:created_at, :id)
.first
if post
MigrationEvent.find(post.event_id)
else
create_unknown_event!(et)
end
when 'update'
MigrationEvent.create!(event_type: 'external_tags.update',
created_by_user_id: et.created_by_user_id,
created_at: et.created_at)
end
et.update_columns(event_id: ev.id)
end
# tag_versions の Backfill(異動および除票)
MigrationTagVersion
.where(event_type: ['update', 'discard'])
.where.not(id: ids_cause_of_locale_creation)
.find_each do |t|
ev =
case t.event_type
when 'update'
MigrationEvent.create!(event_type: 'tags.update',
created_by_user_id: t.created_by_user_id,
created_at: t.created_at)
when 'discard'
create_unknown_event!(t)
end
t.update_columns(event_id: ev.id)
end
# tag_versions の Backfill(起票のみ)
MigrationTagVersion.where(event_type: 'create').find_each do |t|
post =
MigrationPostVersion
.where('JSON_CONTAINS(tags_json, ?) <> 0', { tag_id: t.tag_id }.to_json)
.order(:created_at, :id)
.first
material = MigrationMaterialVersion.where(tag_id: t.tag_id).order(:created_at, :id).first
external_tag =
MigrationNicoTagVersion
.where(event_type: 'update')
.where("CONCAT(' ', linked_tag_ids, ' ') LIKE ?", "% #{ t.tag_id } %")
.order(:created_at, :id)
.first
tag =
MigrationTagVersion
.where(event_type: 'update')
.where("CONCAT(' ', parent_tag_ids, ' ') LIKE ?", "% #{ t.tag_id } %")
.order(:created_at, :id)
.first
target = nil
if post
target = post
end
if material && (!(target) || material.created_at < target.created_at)
target = material
end
if external_tag && (!(target) || external_tag.created_at < target.created_at)
target = external_tag
end
if tag && (!(target) || tag.created_at < target.created_at)
target = tag
end
ev =
if target
MigrationEvent.find(target.event_id)
else
create_unknown_event!(t)
end
t.update_columns(event_id: ev.id)
end
# tag_description_versions の Backfill
MigrationTagDescriptionVersion.find_each do |td|
ev = MigrationEvent.create!(event_type: "tag_descriptions.#{ td.event_type }",
created_by_user_id: td.created_by_user_id,
created_at: td.created_at)
td.update_columns(event_id: ev.id)
end
# tag_group_versions の Backfill
MigrationTagGroupVersion.find_each do |tg|
ev = MigrationEvent.create!(event_type: "tag_groups.#{ tg.event_type }",
created_by_user_id: tg.created_by_user_id,
created_at: tg.created_at)
tg.update_columns(event_id: ev.id)
end
change_column_null :post_versions, :event_id, false
change_column_null :tag_versions, :event_id, false
change_column_null :nico_tag_versions, :event_id, false
change_column_null :material_versions, :event_id, false
change_column_null :tag_description_versions, :event_id, false
change_column_null :tag_group_versions, :event_id, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
def create_unknown_event! source
MigrationEvent.create!(event_type: 'unknown',
created_by_user_id: source.created_by_user_id,
created_at: source.created_at)
end
end
生成ファイル
+1 -36
ファイルの表示
@@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "name", null: false t.string "name", null: false
t.string "record_type", null: false t.string "record_type", null: false
@@ -48,21 +48,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.index ["tag_id"], name: "index_deerjikists_on_tag_id" t.index ["tag_id"], name: "index_deerjikists_on_tag_id"
end end
create_table "events", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "event_type", null: false
t.text "reason"
t.bigint "reverted_from_event_id"
t.json "metadata"
t.binary "ip_address", limit: 16
t.bigint "created_by_user_id"
t.datetime "created_at", null: false
t.index ["created_at"], name: "index_events_on_created_at"
t.index ["created_by_user_id"], name: "index_events_on_created_by_user_id"
t.index ["event_type"], name: "index_events_on_event_type"
t.index ["ip_address"], name: "index_events_on_ip_address"
t.index ["reverted_from_event_id"], name: "index_events_on_reverted_from_event_id"
end
create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "platform", limit: 16, null: false t.string "platform", limit: 16, null: false
t.string "name", null: false t.string "name", null: false
@@ -265,10 +250,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.string "source_path" t.string "source_path"
t.string "source_file_id" t.string "source_file_id"
t.string "normalized_source_key" t.string "normalized_source_key"
t.bigint "event_id", null: false
t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id" t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id"
t.index ["discarded_at"], name: "index_material_versions_on_discarded_at" t.index ["discarded_at"], name: "index_material_versions_on_discarded_at"
t.index ["event_id"], name: "index_material_versions_on_event_id"
t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id" t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id"
t.index ["material_id", "version_no"], name: "index_material_versions_on_material_id_and_version_no", unique: true t.index ["material_id", "version_no"], name: "index_material_versions_on_material_id_and_version_no", unique: true
t.index ["material_id"], name: "index_material_versions_on_material_id" t.index ["material_id"], name: "index_material_versions_on_material_id"
@@ -318,13 +301,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.bigint "tag_id", null: false t.bigint "tag_id", null: false
t.integer "version_no", null: false t.integer "version_no", null: false
t.string "event_type", null: false t.string "event_type", null: false
t.bigint "event_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.text "linked_tag_ids", null: false t.text "linked_tag_ids", null: false
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at" t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc } t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["event_id"], name: "index_nico_tag_versions_on_event_id"
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc } t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "version_no"], name: "index_nico_tag_versions_on_tag_id_and_version_no", unique: true t.index ["tag_id", "version_no"], name: "index_nico_tag_versions_on_tag_id_and_version_no", unique: true
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive" t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
@@ -398,12 +379,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.text "parent_post_ids", null: false t.text "parent_post_ids", null: false
t.datetime "original_created_from" t.datetime "original_created_from"
t.datetime "original_created_before" t.datetime "original_created_before"
t.bigint "event_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.integer "video_ms" t.integer "video_ms"
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id" t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_post_versions_on_event_id"
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
t.index ["post_id"], name: "index_post_versions_on_post_id" t.index ["post_id"], name: "index_post_versions_on_post_id"
t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id" t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
@@ -468,11 +447,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.text "body", null: false t.text "body", null: false
t.string "source_language_code", limit: 16 t.string "source_language_code", limit: 16
t.integer "source_version_no" t.integer "source_version_no"
t.bigint "event_id", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id" t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_tag_description_versions_on_event_id"
t.index ["tag_id", "language_code", "version_no"], name: "idx_on_tag_id_language_code_version_no_ced77e57e6", unique: true t.index ["tag_id", "language_code", "version_no"], name: "idx_on_tag_id_language_code_version_no_ced77e57e6", unique: true
t.index ["tag_id", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc" t.index ["tag_id", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc"
t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id" t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id"
@@ -555,11 +532,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.text "description" t.text "description"
t.json "members", null: false t.json "members", null: false
t.json "placements", null: false t.json "placements", null: false
t.bigint "event_id", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id" t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_tag_group_versions_on_event_id"
t.index ["tag_group_id", "version_no"], name: "index_tag_group_versions_on_tag_group_id_and_version_no", unique: true t.index ["tag_group_id", "version_no"], name: "index_tag_group_versions_on_tag_group_id_and_version_no", unique: true
t.index ["tag_group_id"], name: "index_tag_group_versions_on_tag_group_id" t.index ["tag_group_id"], name: "index_tag_group_versions_on_tag_group_id"
t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive" t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive"
@@ -635,13 +610,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.text "aliases", null: false t.text "aliases", null: false
t.text "parent_tag_ids", null: false t.text "parent_tag_ids", null: false
t.datetime "deprecated_at" t.datetime "deprecated_at"
t.bigint "event_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.json "names", null: false t.json "names", null: false
t.index ["created_at"], name: "index_tag_versions_on_created_at" t.index ["created_at"], name: "index_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc } t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["event_id"], name: "index_tag_versions_on_event_id"
t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc } t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive" t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
@@ -656,7 +629,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
t.integer "post_count", default: 0, null: false t.integer "post_count", default: 0, null: false
t.integer "version_no", null: false t.integer "version_no", null: false
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at" t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
t.index ["post_count"], name: "index_tags_on_post_count"
t.check_constraint "(`deprecated_at` is null) or (`category` <> _utf8mb4'nico')", name: "chk_tags_deprecated_at_not_nico" t.check_constraint "(`deprecated_at` is null) or (`category` <> _utf8mb4'nico')", name: "chk_tags_deprecated_at_not_nico"
t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive" t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
end end
@@ -798,7 +770,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "events", "events", column: "reverted_from_event_id"
add_foreign_key "gekanator_ai_runs", "gekanator_question_suggestions" add_foreign_key "gekanator_ai_runs", "gekanator_question_suggestions"
add_foreign_key "gekanator_games", "posts", column: "correct_post_id" add_foreign_key "gekanator_games", "posts", column: "correct_post_id"
add_foreign_key "gekanator_games", "posts", column: "guessed_post_id" add_foreign_key "gekanator_games", "posts", column: "guessed_post_id"
@@ -820,7 +791,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "material_sync_sources", "users", column: "created_by_user_id" add_foreign_key "material_sync_sources", "users", column: "created_by_user_id"
add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id" add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id"
add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id" add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id"
add_foreign_key "material_versions", "events"
add_foreign_key "material_versions", "materials" add_foreign_key "material_versions", "materials"
add_foreign_key "material_versions", "materials", column: "parent_id" add_foreign_key "material_versions", "materials", column: "parent_id"
add_foreign_key "material_versions", "users", column: "created_by_user_id" add_foreign_key "material_versions", "users", column: "created_by_user_id"
@@ -831,7 +801,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "materials", "users", column: "updated_by_user_id" add_foreign_key "materials", "users", column: "updated_by_user_id"
add_foreign_key "nico_tag_relations", "external_tags", column: "nico_tag_id" add_foreign_key "nico_tag_relations", "external_tags", column: "nico_tag_id"
add_foreign_key "nico_tag_relations", "tags" add_foreign_key "nico_tag_relations", "tags"
add_foreign_key "nico_tag_versions", "events"
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id" add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
add_foreign_key "post_external_tags", "external_tags" add_foreign_key "post_external_tags", "external_tags"
add_foreign_key "post_external_tags", "posts" add_foreign_key "post_external_tags", "posts"
@@ -843,12 +812,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "post_tags", "posts" add_foreign_key "post_tags", "posts"
add_foreign_key "post_tags", "tags" add_foreign_key "post_tags", "tags"
add_foreign_key "post_tags", "users", column: "created_user_id" add_foreign_key "post_tags", "users", column: "created_user_id"
add_foreign_key "post_versions", "events"
add_foreign_key "post_versions", "posts" add_foreign_key "post_versions", "posts"
add_foreign_key "post_versions", "users", column: "created_by_user_id" add_foreign_key "post_versions", "users", column: "created_by_user_id"
add_foreign_key "posts", "users", column: "uploaded_user_id" add_foreign_key "posts", "users", column: "uploaded_user_id"
add_foreign_key "settings", "users" add_foreign_key "settings", "users"
add_foreign_key "tag_description_versions", "events"
add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"] add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code" add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code"
add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"] add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
@@ -867,7 +834,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "tag_group_tags", "tag_groups" add_foreign_key "tag_group_tags", "tag_groups"
add_foreign_key "tag_group_tags", "tags" add_foreign_key "tag_group_tags", "tags"
add_foreign_key "tag_group_tags", "users", column: "created_by_user_id" add_foreign_key "tag_group_tags", "users", column: "created_by_user_id"
add_foreign_key "tag_group_versions", "events"
add_foreign_key "tag_groups", "users", column: "created_by_user_id" add_foreign_key "tag_groups", "users", column: "created_by_user_id"
add_foreign_key "tag_groups", "users", column: "updated_by_user_id" add_foreign_key "tag_groups", "users", column: "updated_by_user_id"
add_foreign_key "tag_implications", "tags" add_foreign_key "tag_implications", "tags"
@@ -877,7 +843,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
add_foreign_key "tag_names", "tags" add_foreign_key "tag_names", "tags"
add_foreign_key "tag_similarities", "tags" add_foreign_key "tag_similarities", "tags"
add_foreign_key "tag_similarities", "tags", column: "target_tag_id" add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
add_foreign_key "tag_versions", "events"
add_foreign_key "tag_versions", "users", column: "created_by_user_id" add_foreign_key "tag_versions", "users", column: "created_by_user_id"
add_foreign_key "theatre_comments", "theatres" add_foreign_key "theatre_comments", "theatres"
add_foreign_key "theatre_comments", "users" add_foreign_key "theatre_comments", "users"
+116 -120
ファイルの表示
@@ -67,133 +67,129 @@ namespace :nico do
end end
data = JSON.parse(stdout) data = JSON.parse(stdout)
VersionRecorder.with_event(event_type: 'posts.sync', created_by_user: nil) do data.each do |datum|
data.each do |datum| code = datum['code']
ApplicationRecord.transaction do post =
code = datum['code'] Post
post = .where('url REGEXP ?', "nicovideo\\.jp/watch/#{ Regexp.escape(code) }([^0-9]|$)")
Post .first
.where('url REGEXP ?', "nicovideo\\.jp/watch/#{ Regexp.escape(code) }([^0-9]|$)")
.first
title = datum['title'] title = datum['title']
original_created_at = datum['uploaded_at'] && original_created_at = datum['uploaded_at'] &&
Time.strptime(datum['uploaded_at'], '%Y-%m-%d %H:%M:%S') Time.strptime(datum['uploaded_at'], '%Y-%m-%d %H:%M:%S')
original_created_from = original_created_at&.change(sec: 0) original_created_from = original_created_at&.change(sec: 0)
original_created_before = original_created_from&.+(1.minute) original_created_before = original_created_from&.+(1.minute)
post_created = false post_created = false
post_changed = false post_changed = false
if post if post
attrs = { title:, original_created_from:, original_created_before: } attrs = { title:, original_created_from:, original_created_before: }
unless post.thumbnail.attached? unless post.thumbnail.attached?
thumbnail_base = fetch_thumbnail.(post.url) rescue nil thumbnail_base = fetch_thumbnail.(post.url) rescue nil
if thumbnail_base.present? if thumbnail_base.present?
attrs[:thumbnail_base] = thumbnail_base attrs[:thumbnail_base] = thumbnail_base
begin begin
post.attach_thumbnail_from_url!(thumbnail_base) post.attach_thumbnail_from_url!(thumbnail_base)
rescue Post::RemoteThumbnailFetchFailed => e rescue Post::RemoteThumbnailFetchFailed => e
payload = { payload = {
post_id: post.id, post_id: post.id,
thumbnail_base:, thumbnail_base:,
error: e.class.name, error: e.class.name,
message: e.message } message: e.message }
Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }") Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }")
end
end
end end
post.assign_attributes(attrs)
post_changed = post.changed?
if post_changed
post.save!
end
else
post_created = true
url = "https://www.nicovideo.jp/watch/#{ code }"
thumbnail_base = fetch_thumbnail.(url) rescue nil
post = Post.new(title:, url:, thumbnail_base:, uploaded_user: nil,
original_created_from:, original_created_before:)
if thumbnail_base.present?
begin
post.attach_thumbnail_from_url!(thumbnail_base)
rescue Post::RemoteThumbnailFetchFailed => e
payload = {
post_id: nil,
thumbnail_base:,
error: e.class.name,
message: e.message }
Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }")
end
end
post.save!
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.niconico.id, Tag.video.id])
end
# 既存のタグ Id. 集合
kept_tag_ids = post.tags.pluck(:id).to_set
# 既存の外部タグ Id. 集合
kept_external_tag_ids = post.external_tags.nico.pluck(:id).to_set
# 記載すべき外部タグ Id. のリスト
desired_external_tag_ids = []
# 記載すべき内部タグ Id. のリスト
desired_tag_ids = kept_tag_ids.to_a
datum['tags'].each do |raw|
name = TagNameSanitisationRule.sanitise("nico:#{ raw }").delete_prefix('nico:')
tag = ExternalTag.find_or_create_by!(platform: :nico, name:)
unless tag.nico_tag_versions.exists?
NicoTagVersionRecorder.record!(external_tag: tag,
event_type: :create,
created_by_user: nil)
end
desired_external_tag_ids << tag.id
# 新たに記載される外部タグと連携される内部タグを記載
# 連携タグは記載すれども消除せず.
unless tag.id.in?(kept_external_tag_ids)
desired_tag_ids.concat(tag.linked_tags.pluck(:id))
end
end
deerjikist = Deerjikist.find_by(platform: :nico, code: datum['user'])
if deerjikist
desired_tag_ids << deerjikist.tag_id
elsif !(Tag.where(id: kept_tag_ids).where(category: :deerjikist).exists?)
desired_tag_ids << Tag.no_deerjikist.id
end
desired_external_tag_ids.uniq!
desired_tag_ids.uniq!
# 外部タグの記載に際しては “bot 操作” タグを記載しなぃ.
if kept_tag_ids != desired_tag_ids.to_set
desired_tag_ids << Tag.bot.id
desired_tag_ids.uniq!
end
tags_changed =
kept_tag_ids != desired_tag_ids.to_set ||
kept_external_tag_ids != desired_external_tag_ids.to_set
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
sync_post_external_tags!(post, desired_external_tag_ids,
current_external_tag_ids: kept_external_tag_ids)
if post_created
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
elsif post_changed || tags_changed
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
end end
end end
post.assign_attributes(attrs)
post_changed = post.changed?
if post_changed
post.save!
end
else
post_created = true
url = "https://www.nicovideo.jp/watch/#{ code }"
thumbnail_base = fetch_thumbnail.(url) rescue nil
post = Post.new(title:, url:, thumbnail_base:, uploaded_user: nil,
original_created_from:, original_created_before:)
if thumbnail_base.present?
begin
post.attach_thumbnail_from_url!(thumbnail_base)
rescue Post::RemoteThumbnailFetchFailed => e
payload = {
post_id: nil,
thumbnail_base:,
error: e.class.name,
message: e.message }
Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }")
end
end
post.save!
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.niconico.id, Tag.video.id])
end
# 既存のタグ Id. 集合
kept_tag_ids = post.tags.pluck(:id).to_set
# 既存の外部タグ Id. 集合
kept_external_tag_ids = post.external_tags.nico.pluck(:id).to_set
# 記載すべき外部タグ Id. のリスト
desired_external_tag_ids = []
# 記載すべき内部タグ Id. のリスト
desired_tag_ids = kept_tag_ids.to_a
datum['tags'].each do |raw|
name = TagNameSanitisationRule.sanitise("nico:#{ raw }").delete_prefix('nico:')
tag = ExternalTag.find_or_create_by!(platform: :nico, name:)
unless tag.nico_tag_versions.exists?
NicoTagVersionRecorder.record!(external_tag: tag,
event_type: :create,
created_by_user: nil)
end
desired_external_tag_ids << tag.id
# 新たに記載される外部タグと連携される内部タグを記載
# 連携タグは記載すれども消除せず.
unless tag.id.in?(kept_external_tag_ids)
desired_tag_ids.concat(tag.linked_tags.pluck(:id))
end
end
deerjikist = Deerjikist.find_by(platform: :nico, code: datum['user'])
if deerjikist
desired_tag_ids << deerjikist.tag_id
elsif !(Tag.where(id: kept_tag_ids).where(category: :deerjikist).exists?)
desired_tag_ids << Tag.no_deerjikist.id
end
desired_external_tag_ids.uniq!
desired_tag_ids.uniq!
# 外部タグの記載に際しては “bot 操作” タグを記載しなぃ.
if kept_tag_ids != desired_tag_ids.to_set
desired_tag_ids << Tag.bot.id
desired_tag_ids.uniq!
end
tags_changed =
kept_tag_ids != desired_tag_ids.to_set ||
kept_external_tag_ids != desired_external_tag_ids.to_set
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
sync_post_external_tags!(post, desired_external_tag_ids,
current_external_tag_ids: kept_external_tag_ids)
if post_created
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
elsif post_changed || tags_changed
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
end end
end end
end end
-1
ファイルの表示
@@ -102,7 +102,6 @@ RSpec.describe 'Tag group persistence constraints' do
6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] } 6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] }
reject_statement do reject_statement do
insert_group_row('tag_group_versions', { insert_group_row('tag_group_versions', {
event_id: create_event!(event_type: 'unknown').id,
tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認', tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認',
members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json, members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json,
placements: nodes.to_json, created_at: Time.current }) placements: nodes.to_json, created_at: Time.current })
-1
ファイルの表示
@@ -10,7 +10,6 @@ RSpec.describe 'TagVersion names database constraint' do
def insert_snapshot!(snapshot) def insert_snapshot!(snapshot)
TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create', TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
name: 'snapshot_name', category: 'general', name: 'snapshot_name', category: 'general',
aliases: '', parent_tag_ids: '', names: snapshot, aliases: '', parent_tag_ids: '', names: snapshot,
created_at: Time.current }]) created_at: Time.current }])
+7 -23
ファイルの表示
@@ -9,9 +9,7 @@ RSpec.describe HistoryAccess do
locale locale
rows = ['ja', 'ain'].flat_map do |language| rows = ['ja', 'ain'].flat_map do |language|
['create', 'discard', 'restore'].each_with_index.map do |event, index| ['create', 'discard', 'restore'].each_with_index.map do |event, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: tag.id, language_code: language,
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: language,
version_no: index + 1, event_type: language == 'ain' ? 'update' : event, version_no: index + 1, event_type: language == 'ain' ? 'update' : event,
body: "#{ language } #{ index }", created_at: Time.utc(2024)) body: "#{ language } #{ index }", created_at: Time.utc(2024))
end end
@@ -30,9 +28,7 @@ RSpec.describe HistoryAccess do
public_metadata = described_class.set(user: nil) { described_class.authority } public_metadata = described_class.set(user: nil) { described_class.authority }
admin = create(:user, :admin) admin = create(:user, :admin)
admin_metadata = described_class.set(user: admin) { described_class.authority } admin_metadata = described_class.set(user: admin) { described_class.authority }
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'discard', name: 'private',
category: 'general', category: 'general',
names: { ja: { name: 'private', script_code: 'Jpan', names: { ja: { name: 'private', script_code: 'Jpan',
auto_generated: false, aliases: [] } }, auto_generated: false, aliases: [] } },
@@ -56,9 +52,7 @@ RSpec.describe HistoryAccess do
blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png', blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png',
byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png') byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png')
ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:) ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'discard', url: post.url,
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024)) title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation') variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation')
derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png', derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png',
@@ -84,21 +78,16 @@ RSpec.describe 'Counts artifact policy and external references' do
it 'does not expose a private linked tag ID through an external history snapshot' do it 'does not expose a private linked tag ID through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name') tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024), category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
names: { ja: { name: 'private-linked-name', script_code: 'Jpan', names: { ja: { name: 'private-linked-name', script_code: 'Jpan',
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
external = create(:external_tag, name: 'public-external') external = create(:external_tag, name: 'public-external')
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
linked_tag_ids: tag.id.to_s, linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024)) created_at: Time.utc(2024))
post = create(:post) post = create(:post)
snapshot = PostVersion.create!( snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create',
title: 'external reference', url: post.url, tags: '', title: 'external reference', url: post.url, tags: '',
tags_json: [{ external_tag_id: external.id }], parent_post_ids: '', tags_json: [{ external_tag_id: external.id }], parent_post_ids: '',
created_at: Time.utc(2024, 2)) created_at: Time.utc(2024, 2))
@@ -110,7 +99,6 @@ RSpec.describe 'Counts artifact policy and external references' do
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
end end
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update', public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
event_id: create_event!(event_type: 'unknown').id,
linked_tag_ids: '', linked_tag_ids: '',
created_at: Time.utc(2024, 7)) created_at: Time.utc(2024, 7))
HistoryAccess.set(user: nil) do HistoryAccess.set(user: nil) do
@@ -124,17 +112,13 @@ RSpec.describe 'Counts artifact policy and external references' do
child = create(:tag, primary_name: 'referencing child') child = create(:tag, primary_name: 'referencing child')
[[parent, 'discard', '', 'private parent'], [[parent, 'discard', '', 'private parent'],
[child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name| [child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name|
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: event, name:,
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: event, name:,
category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023), category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023),
names: { ja: { name:, script_code: 'Jpan', names: { ja: { name:, script_code: 'Jpan',
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
end end
post = create(:post) post = create(:post)
row = PostVersion.create!( row = PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'snapshot',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create', title: 'snapshot',
url: post.url, tags: '', parent_post_ids: '', url: post.url, tags: '', parent_post_ids: '',
tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }], tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }],
created_at: Time.utc(2024)) created_at: Time.utc(2024))
+1 -24
ファイルの表示
@@ -23,22 +23,9 @@ RSpec.describe 'Locale activation', type: :model do
.and_raise('backfill failed') .and_raise('backfill failed')
end end
it 'groups all tag histories from locale creation into one event' do
previous_ids = TagVersion.pluck(:id)
expect { build_locale.save! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'locales.create', 'created_by_user_id' => nil)
versions = TagVersion.where.not(id: previous_ids)
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'rolls back a newly created locale and the preceding generated names' do it 'rolls back a newly created locale and the preceding generated names' do
locale = build_locale locale = build_locale
fail_second_generation! fail_second_generation!
events = event_rows
expect { locale.save! }.to raise_error('backfill failed') expect { locale.save! }.to raise_error('backfill failed')
@@ -46,7 +33,6 @@ RSpec.describe 'Locale activation', type: :model do
expect(generated_names).to be_empty expect(generated_names).to be_empty
expect(first.reload.name('ja')).to eq('activation_first') expect(first.reload.name('ja')).to eq('activation_first')
expect(second.reload.name('ja')).to eq('activation_second') expect(second.reload.name('ja')).to eq('activation_second')
expect(event_rows).to eq(events)
end end
it 'does not backfill while the locale is inactive' do it 'does not backfill while the locale is inactive' do
@@ -59,14 +45,7 @@ RSpec.describe 'Locale activation', type: :model do
locale = build_locale(deprecated_at: Time.current) locale = build_locale(deprecated_at: Time.current)
locale.save! locale.save!
previous_ids = TagVersion.pluck(:id) locale.update!(deprecated_at: nil)
expect { locale.update!(deprecated_at: nil) }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'locales.restore', 'created_by_user_id' => nil)
versions = TagVersion.where.not(id: previous_ids)
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
expect(generated_names.pluck(:tag_id)).to contain_exactly(first.id, second.id) expect(generated_names.pluck(:tag_id)).to contain_exactly(first.id, second.id)
expect(generated_names).to all(have_attributes( expect(generated_names).to all(have_attributes(
@@ -78,13 +57,11 @@ RSpec.describe 'Locale activation', type: :model do
locale.save! locale.save!
previous_deprecated_at = locale.reload.deprecated_at previous_deprecated_at = locale.reload.deprecated_at
fail_second_generation! fail_second_generation!
events = event_rows
expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed') expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed')
expect(locale.reload.deprecated_at).to eq(previous_deprecated_at) expect(locale.reload.deprecated_at).to eq(previous_deprecated_at)
expect(generated_names).to be_empty expect(generated_names).to be_empty
expect(event_rows).to eq(events)
end end
it 'preserves a human primary through deactivation and repeated activation' do it 'preserves a human primary through deactivation and repeated activation' do
+14 -14
ファイルの表示
@@ -12,20 +12,20 @@ RSpec.describe PostVersion, type: :model do
let!(:post_version) do let!(:post_version) do
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post_record,
post: post_record, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', title: post_record.title,
title: post_record.title, url: post_record.url,
url: post_record.url, thumbnail_base: post_record.thumbnail_base,
thumbnail_base: post_record.thumbnail_base, tags: post_record.snapshot_tag_names.join(' '),
tags: post_record.snapshot_tag_names.join(' '), tags_json: post_record.snapshot_tags_json,
tags_json: post_record.snapshot_tags_json, parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '), original_created_from: post_record.original_created_from,
original_created_from: post_record.original_created_from, original_created_before: post_record.original_created_before,
original_created_before: post_record.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: nil
created_by_user: nil) )
end end
it 'is read only after create' do it 'is read only after create' do
-27
ファイルの表示
@@ -34,31 +34,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo') described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo')
end end
it 'groups renames, merges and affected post histories into one event' do
target = create(:tag, primary_name: 'foobar')
source = create(:tag, primary_name: 'temporary_source')
renamed = create(:tag, primary_name: 'temporary_rename')
source.tag_name('ja').update_columns(name: 'foo_bar')
renamed.tag_name('ja').update_columns(name: 'foo_baz')
post = create(:post)
PostTag.create!(post:, tag: source)
previous_tag_ids = TagVersion.pluck(:id)
previous_post_ids = PostVersion.pluck(:id)
expect { described_class.apply! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_name_sanitisation_rules.apply', 'created_by_user_id' => nil)
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions.pluck(:tag_id).uniq).to contain_exactly(target.id, source.id, renamed.id)
expect(tag_versions.pluck(:event_type)).to include('discard', 'update')
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
post_versions = PostVersion.where.not(id: previous_post_ids)
expect(post_versions.pluck(:post_id).uniq).to eq([post.id])
expect(post_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
[:primary, :alias].each do |source_kind| [:primary, :alias].each do |source_kind|
it "keeps the primary identity when a #{ source_kind } collides within its Tag" do it "keeps the primary identity when a #{ source_kind } collides within its Tag" do
tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar') tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar')
@@ -108,7 +83,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
PostTag.create!(post:, tag: source) PostTag.create!(post:, tag: source)
models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag] models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag]
snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) } snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) }
events = event_rows
expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid) expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid)
@@ -116,7 +90,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
model.order(*Array(model.primary_key)).map(&:attributes) model.order(*Array(model.primary_key)).map(&:attributes)
end end
expect(after_state).to eq(snapshots) expect(after_state).to eq(snapshots)
expect(event_rows).to eq(events)
expect(post.reload.tags).to contain_exactly(source) expect(post.reload.tags).to contain_exactly(source)
expect(target.reload.name('ja')).to eq('foobar') expect(target.reload.name('ja')).to eq('foobar')
end end
+14 -14
ファイルの表示
@@ -665,20 +665,20 @@ RSpec.describe Tag, type: :model do
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil) def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post,
post: post, version_no: version_no,
version_no: version_no, event_type: event_type,
event_type: event_type, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: created_by_user
created_by_user: created_by_user) )
end end
context 'when post versions are enabled' do context 'when post versions are enabled' do
+36 -38
ファイルの表示
@@ -6,18 +6,17 @@ RSpec.describe VersionRecord, type: :model do
it 'makes TagVersion read only after create' do it 'makes TagVersion read only after create' do
version = TagVersion.create!( version = TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id, tag: tag,
tag: tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', name: primary_tag_name_for(tag, 'ja').name,
name: primary_tag_name_for(tag, 'ja').name, category: tag.category,
category: tag.category, aliases: '',
aliases: '', names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
names: { ja: { name: primary_tag_name_for(tag, 'ja').name, script_code: 'Jpan', auto_generated: false, aliases: [] } },
script_code: 'Jpan', auto_generated: false, aliases: [] } }, parent_tag_ids: '',
parent_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil)
created_by_user: nil)
expect { expect {
version.update!(name: 'changed') version.update!(name: 'changed')
@@ -26,18 +25,17 @@ RSpec.describe VersionRecord, type: :model do
it 'prevents TagVersion destroy' do it 'prevents TagVersion destroy' do
version = TagVersion.create!( version = TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id, tag: tag,
tag: tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', name: primary_tag_name_for(tag, 'ja').name,
name: primary_tag_name_for(tag, 'ja').name, category: tag.category,
category: tag.category, aliases: '',
aliases: '', names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
names: { ja: { name: primary_tag_name_for(tag, 'ja').name, script_code: 'Jpan', auto_generated: false, aliases: [] } },
script_code: 'Jpan', auto_generated: false, aliases: [] } }, parent_tag_ids: '',
parent_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil)
created_by_user: nil)
expect { expect {
version.destroy! version.destroy!
@@ -46,13 +44,13 @@ RSpec.describe VersionRecord, type: :model do
it 'makes NicoTagVersion read only after create' do it 'makes NicoTagVersion read only after create' do
version = NicoTagVersion.create!( version = NicoTagVersion.create!(
event_id: create_event!(event_type: 'external_tags.create').id, external_tag: nico_tag,
external_tag: nico_tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', linked_tag_ids: '',
linked_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil
created_by_user: nil) )
expect { expect {
version.update!(linked_tag_ids: '123') version.update!(linked_tag_ids: '123')
@@ -73,13 +71,13 @@ RSpec.describe VersionRecord, type: :model do
it 'prevents NicoTagVersion destroy' do it 'prevents NicoTagVersion destroy' do
version = NicoTagVersion.create!( version = NicoTagVersion.create!(
event_id: create_event!(event_type: 'external_tags.create').id, external_tag: nico_tag,
external_tag: nico_tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', linked_tag_ids: '',
linked_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil
created_by_user: nil) )
expect { expect {
version.destroy! version.destroy!
-1
ファイルの表示
@@ -44,7 +44,6 @@ RSpec.configure do |config|
end end
config.include TestRecords config.include TestRecords
config.include EventRecords
config.include RakeTaskHelper config.include RakeTaskHelper
# FactoryBot の create / create_list を使へるやぅにする # FactoryBot の create / create_list を使へるやぅにする
+1 -3
ファイルの表示
@@ -84,9 +84,7 @@ RSpec.describe 'Counts native GET acknowledgement', type: :request do
expect(response).to have_http_status(:not_found) expect(response).to have_http_status(:not_found)
job, file, attempt = ready_job('json') job, file, attempt = ready_job('json')
record = create(:post) record = create(:post)
PostVersion.create!( PostVersion.create!(post: record, version_no: 1, event_type: 'discard', title: 'private',
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 1, event_type: 'discard', title: 'private',
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024)) url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
get "/counts/export/files/#{ file }", params: { job:, attempt: } get "/counts/export/files/#{ file }", params: { job:, attempt: }
expect(response).to have_http_status(:not_found) expect(response).to have_http_status(:not_found)
+1 -3
ファイルの表示
@@ -8,9 +8,7 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
before do before do
['create', 'discard'].each_with_index do |event, index| ['create', 'discard'].each_with_index do |event, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: tag.id, language_code: 'ja',
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: 'ja',
version_no: index + 1, event_type: event, body: 'private body', version_no: index + 1, event_type: event, body: 'private body',
created_at: Time.utc(2024)) created_at: Time.utc(2024))
end end
+2 -6
ファイルの表示
@@ -10,16 +10,12 @@ RSpec.describe 'Legacy Counts API', type: :request do
category: 'general', sections: [] } category: 'general', sections: [] }
[1, 2, 3].each do |number| [1, 2, 3].each do |number|
time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0) time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0)
PostVersion.create!( PostVersion.create!(post:, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: number,
event_type: number == 1 ? 'create' : 'update', event_type: number == 1 ? 'create' : 'update',
tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '', tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '',
tags_json: number == 1 ? [snapshot] : [], tags_json: number == 1 ? [snapshot] : [],
created_by_user: number == 3 ? nil : actor, created_at: time) created_by_user: number == 3 ? nil : actor, created_at: time)
TagVersion.create!( TagVersion.create!(tag:, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: number,
event_type: number == 1 ? 'create' : 'update', event_type: number == 1 ? 'create' : 'update',
name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '', name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'counts tag', script_code: 'Jpan', names: { ja: { name: 'counts tag', script_code: 'Jpan',
+9 -30
ファイルの表示
@@ -14,22 +14,17 @@ RSpec.describe 'Counts table API', type: :request do
end end
before do before do
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'create', name: 'alpha',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name: 'alpha',
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 1, NicoTagVersion.create!(external_tag: external, version_no: 1,
event_id: create_event!(event_type: 'unknown').id,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023)) event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
snapshots = [ snapshots = [
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] }, { tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }] { external_tag_id: external.id }]
[1, 2, 3].each do |number| [1, 2, 3].each do |number|
PostVersion.create!( PostVersion.create!(post: record, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: number,
event_type: number == 1 ? 'create' : 'update', url: record.url, event_type: number == 1 ? 'create' : 'update', url: record.url,
title: "snapshot #{ number }", tags: '', parent_post_ids: '', title: "snapshot #{ number }", tags: '', parent_post_ids: '',
tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)), tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)),
@@ -62,11 +57,9 @@ RSpec.describe 'Counts table API', type: :request do
before do before do
NicoTagVersion.create!(external_tag: external, version_no: 2, NicoTagVersion.create!(external_tag: external, version_no: 2,
event_id: create_event!(event_type: 'unknown').id,
event_type: 'update', linked_tag_ids: tag.id.to_s, event_type: 'update', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024, 1, 1)) created_at: Time.utc(2024, 1, 1))
NicoTagVersion.create!(external_tag: external, version_no: 3, NicoTagVersion.create!(external_tag: external, version_no: 3,
event_id: create_event!(event_type: 'unknown').id,
event_type: 'update', linked_tag_ids: '', event_type: 'update', linked_tag_ids: '',
created_at: Time.utc(2024, 2, 1)) created_at: Time.utc(2024, 2, 1))
end end
@@ -250,9 +243,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
it 'checks the current latest flag beyond the execution timestamp' do it 'checks the current latest flag beyond the execution timestamp' do
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'update',
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'update',
url: record.url, title: 'after execution', tags: '', tags_json: [], url: record.url, title: 'after execution', tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2025, 2, 1)) parent_post_ids: '', created_at: Time.utc(2025, 2, 1))
result = query result = query
@@ -306,16 +297,12 @@ RSpec.describe 'Counts table API', type: :request do
tag.tag_names.find_by!(language_code: 'ja', primary_flg: true) tag.tag_names.find_by!(language_code: 'ja', primary_flg: true)
.update!(name: 'renamed-alpha') .update!(name: 'renamed-alpha')
create(:tag_name, :alias, tag:, name: 'alpha-alias') create(:tag_name, :alias, tag:, name: 'alpha-alias')
TagVersion.create!( TagVersion.create!(tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
category: 'general', aliases: 'alpha-alias', parent_tag_ids: '', category: 'general', aliases: 'alpha-alias', parent_tag_ids: '',
names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false, names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false,
aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } }, aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } },
created_at: Time.utc(2024, 2, 1)) created_at: Time.utc(2024, 2, 1))
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'update',
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'update',
url: record.url, title: 'after rename', tags: '', parent_post_ids: '', url: record.url, title: 'after rename', tags: '', parent_post_ids: '',
tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha', tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha',
category: 'general', sections: [] }], category: 'general', sections: [] }],
@@ -378,9 +365,7 @@ RSpec.describe 'Counts table API', type: :request do
it 'reports column overflow separately from malformed input' do it 'reports column overflow separately from malformed input' do
101.times do |index| 101.times do |index|
PostVersion.create!( PostVersion.create!(post: record, version_no: index + 4,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: index + 4,
event_type: 'update', url: record.url, title: "column #{ index }", event_type: 'update', url: record.url, title: "column #{ index }",
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3)) tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end end
@@ -424,9 +409,7 @@ RSpec.describe 'Counts table API', type: :request do
sign_in_as(create(:user, role)) if role sign_in_as(create(:user, role)) if role
# Equal timestamps deliberately require version ordering, not a date comparison. # Equal timestamps deliberately require version ordering, not a date comparison.
['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index| ['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index|
PostVersion.create!( PostVersion.create!(post: record, version_no: index + 4, event_type: event,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: index + 4, event_type: event,
url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot', url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot',
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3)) tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end end
@@ -454,9 +437,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
it 'does not resolve private condition names even when the result set is empty' do it 'does not resolve private condition names even when the result set is empty' do
TagVersion.create!( TagVersion.create!(tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2024, 2)) created_at: Time.utc(2024, 2))
@@ -472,9 +453,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
end end
it 'includes private history in the public timeline without an exclusion count' do it 'includes private history in the public timeline without an exclusion count' do
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'discard', url: record.url,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'discard', url: record.url,
title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '', title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.utc(2024, 3)) created_at: Time.utc(2024, 3))
result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type') result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type')
+1 -40
ファイルの表示
@@ -314,7 +314,6 @@ RSpec.describe 'Materials API', type: :request do
.and change(Tag, :count).by(1) .and change(Tag, :count).by(1)
.and change(TagName, :count).by(1) .and change(TagName, :count).by(1)
.and change(MaterialVersion, :count).by(1) .and change(MaterialVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
@@ -326,12 +325,6 @@ RSpec.describe 'Materials API', type: :request do
expect(material.file.attached?).to be(true) expect(material.file.attached?).to be(true)
expect(material.version_no).to eq(1) expect(material.version_no).to eq(1)
expect(material.material_versions.first.event_type).to eq('create') expect(material.material_versions.first.event_type).to eq('create')
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.create',
'created_by_user_id' => member_user.id)
expect(material.material_versions.first.event_id).to eq(event.fetch('id'))
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
expect(material.material_export_items.first.export_path).to eq('伊地知ニジカ/created.png') expect(material.material_export_items.first.export_path).to eq('伊地知ニジカ/created.png')
expect(material.material_versions.first.export_paths_json).to eq( expect(material.material_versions.first.export_paths_json).to eq(
'legacy_drive' => '伊地知ニジカ/created.png' 'legacy_drive' => '伊地知ニジカ/created.png'
@@ -516,7 +509,6 @@ RSpec.describe 'Materials API', type: :request do
export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' } export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' }
} }
end.to change(MaterialVersion, :count).by(2) end.to change(MaterialVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -525,12 +517,6 @@ RSpec.describe 'Materials API', type: :request do
expect(material.tag.category).to eq('material') expect(material.tag.category).to eq('material')
expect(material.url).to eq('https://example.com/updated-source') expect(material.url).to eq('https://example.com/updated-source')
expect(material.updated_by_user).to eq(member_user) expect(material.updated_by_user).to eq(member_user)
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.update',
'created_by_user_id' => member_user.id)
expect(material.material_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
expect(material.file.attached?).to be(true) expect(material.file.attached?).to be(true)
expect(material.file.blob.id).not_to eq(old_blob_id) expect(material.file.blob.id).not_to eq(old_blob_id)
expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true) expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true)
@@ -646,7 +632,6 @@ RSpec.describe 'Materials API', type: :request do
MaterialVersionRecorder.record!(material:, event_type: :create, MaterialVersionRecorder.record!(material:, event_type: :create,
created_by_user: member_user) created_by_user: member_user)
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user) TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
events = event_rows
expect do expect do
put "/materials/#{ material.id }", params: { put "/materials/#{ material.id }", params: {
@@ -658,7 +643,6 @@ RSpec.describe 'Materials API', type: :request do
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(material.reload.version_no).to eq(1) expect(material.reload.version_no).to eq(1)
expect(event_rows).to eq(events)
end end
it 'records update version when only export_path changes' do it 'records update version when only export_path changes' do
@@ -823,12 +807,6 @@ RSpec.describe 'Materials API', type: :request do
it 'creates source suppression as member' do it 'creates source suppression as member' do
sign_in_as(member_user) sign_in_as(member_user)
materials = ['a', 'b'].map do |name|
Material.create!(
source_kind: 'google_drive_file', source_file_id: "blocked-#{ name }",
source_path: "伊地知ニジカ/危険素材/#{ name }.png",
url: "https://example.com/blocked-#{ name }", created_by_user: member_user)
end
expect do expect do
post '/materials/suppressions', params: { post '/materials/suppressions', params: {
@@ -837,7 +815,6 @@ RSpec.describe 'Materials API', type: :request do
reason: 'copyright_high_risk' reason: 'copyright_high_risk'
} }
end.to change(MaterialSyncSuppression, :count).by(1) end.to change(MaterialSyncSuppression, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
expect(json).to include( expect(json).to include(
@@ -845,14 +822,6 @@ RSpec.describe 'Materials API', type: :request do
'drive_path' => '伊地知ニジカ/危険素材', 'drive_path' => '伊地知ニジカ/危険素材',
'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材' 'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材'
) )
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.block', 'created_by_user_id' => member_user.id)
expect(materials.map { _1.reload.discarded? }).to eq([true, true])
versions = MaterialVersion.where(material_id: materials.map(&:id))
expect(versions.where(event_type: 'discard').pluck(:material_id))
.to match_array(materials.map(&:id))
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
end end
@@ -891,19 +860,11 @@ RSpec.describe 'Materials API', type: :request do
end end
it 'discards the material and returns 204' do it 'discards the material and returns 204' do
expect { delete "/materials/#{ material.id }" } delete "/materials/#{ material.id }"
.to change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) expect(response).to have_http_status(:no_content)
expect(Material.find_by(id: material.id)).to be_nil expect(Material.find_by(id: material.id)).to be_nil
expect(Material.with_discarded.find(material.id)).to be_discarded expect(Material.with_discarded.find(material.id)).to be_discarded
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.destroy',
'created_by_user_id' => member_user.id)
versions = MaterialVersion.where(material_id: material.id)
expect(versions.order(:version_no).last.event_type).to eq('discard')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
end end
end end
-6
ファイルの表示
@@ -172,7 +172,6 @@ RSpec.describe 'NicoTags', type: :request do
} }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change(NicoTagVersion, :count).by(1) .and change(NicoTagVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -182,17 +181,12 @@ RSpec.describe 'NicoTags', type: :request do
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id) linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id)
expect(linked_versions.map(&:event_type)).to eq(['create', 'create']) expect(linked_versions.map(&:event_type)).to eq(['create', 'create'])
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id)) expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
event = event_rows.last
expect(event).to include(
'event_type' => 'external_tags.update', 'created_by_user_id' => admin.id)
expect(linked_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
versions = nico_tag.reload.nico_tag_versions.order(:version_no) versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update']) expect(versions.map(&:event_type)).to eq(['create', 'update'])
expect(versions.last.linked_tag_ids.split.map(&:to_i)) expect(versions.last.linked_tag_ids.split.map(&:to_i))
.to match_array([linked_a.id, linked_b.id]) .to match_array([linked_a.id, linked_b.id])
expect(versions.last.created_by_user_id).to eq(admin.id) expect(versions.last.created_by_user_id).to eq(admin.id)
expect(versions.last.event_id).to eq(event.fetch('id'))
end end
it 'clears existing links and records the empty mapping for a member' do it 'clears existing links and records the empty mapping for a member' do
+157 -2
ファイルの表示
@@ -20,7 +20,6 @@ RSpec.describe 'Post history privacy', type: :request do
created_at: origin + index.hours) created_at: origin + index.hours)
end end
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
linked_tag_ids: tag.id.to_s, linked_tag_ids: tag.id.to_s,
created_at: origin) created_at: origin)
['create', 'discard', 'restore', 'update'].each_with_index do |event, index| ['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
@@ -34,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
@@ -64,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'
@@ -116,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
@@ -125,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('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 '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 end
end end
+16 -39
ファイルの表示
@@ -50,8 +50,6 @@ RSpec.describe 'Posts API', type: :request do
post:, post:,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
event_id: create_event!(
event_type: 'posts.create', created_by_user: post.uploaded_user).id,
title: post.title, title: post.title,
url: post.url, url: post.url,
thumbnail_base: post.thumbnail_base, thumbnail_base: post.thumbnail_base,
@@ -1070,7 +1068,7 @@ RSpec.describe 'Posts API', type: :request do
it 'dry-runs without persisting posts or new tags' do it 'dry-runs without persisting posts or new tags' do
sign_in_as(member) sign_in_as(member)
counts = [Post.count, Tag.count, TagName.count, event_rows.length] counts = [Post.count, Tag.count, TagName.count]
post '/posts?dry=1', params: post_write_params( post '/posts?dry=1', params: post_write_params(
title: 'dry-run post', title: 'dry-run post',
@@ -1086,7 +1084,7 @@ RSpec.describe 'Posts API', type: :request do
[{ 'name' => 'new_dry_run_tag', [{ 'name' => 'new_dry_run_tag',
'category' => 'character', 'category' => 'character',
'section_literals' => [] }]) 'section_literals' => [] }])
expect([Post.count, Tag.count, TagName.count, event_rows.length]).to eq(counts) expect([Post.count, Tag.count, TagName.count]).to eq(counts)
end end
it 'dry-runs an existing URL without validating its upload' do it 'dry-runs an existing URL without validating its upload' do
@@ -2261,20 +2259,20 @@ RSpec.describe 'Posts API', type: :request do
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at: def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post:,
post:, version_no:,
version_no:, event_type:,
event_type:, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at:,
created_at:, created_by_user:
created_by_user:) )
end end
let!(:v1) do let!(:v1) do
@@ -2602,7 +2600,6 @@ RSpec.describe 'Posts API', type: :request do
tags: 'spec_tag', tags: 'spec_tag',
thumbnail: dummy_upload) thumbnail: dummy_upload)
end.to change(PostVersion, :count).by(1) end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
@@ -2614,13 +2611,6 @@ RSpec.describe 'Posts API', type: :request do
expect(version.url).to eq('https://example.com/versioned-post') expect(version.url).to eq('https://example.com/versioned-post')
expect(version.created_by_user_id).to eq(member.id) expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(created_post)) expect(version.tags).to eq(snapshot_tags(created_post))
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.create', 'created_by_user_id' => member.id)
expect(version.event_id).to eq(event.fetch('id'))
tag_versions = TagVersion.where(tag_id: created_post.tags.select(:id))
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
it 'creates next version on PUT /posts/:id when snapshot changes' do it 'creates next version on PUT /posts/:id when snapshot changes' do
@@ -2636,7 +2626,6 @@ RSpec.describe 'Posts API', type: :request do
title: 'updated title', title: 'updated title',
tags: 'spec_tag_2') tags: 'spec_tag_2')
end.to change(PostVersion, :count).by(1) end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -2646,12 +2635,6 @@ RSpec.describe 'Posts API', type: :request do
expect(version.title).to eq('updated title') expect(version.title).to eq('updated title')
expect(version.created_by_user_id).to eq(member.id) expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(post_record.reload)) expect(version.tags).to eq(snapshot_tags(post_record.reload))
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.update', 'created_by_user_id' => member.id)
expect(version.event_id).to eq(event.fetch('id'))
tag_version = TagVersion.find_by!(tag_id: tag_name2.reload.tag_id, version_no: 1)
expect(tag_version.event_id).to eq(event.fetch('id'))
end end
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
@@ -2660,7 +2643,6 @@ RSpec.describe 'Posts API', type: :request do
PostTag.create!(post: post_record, tag: Tag.no_deerjikist) PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
base_version = create_post_version_for!(post_record.reload) base_version = create_post_version_for!(post_record.reload)
events = event_rows
expect { expect {
put "/posts/#{post_record.id}", params: post_write_params( put "/posts/#{post_record.id}", params: post_write_params(
base_version_no: base_version.version_no, base_version_no: base_version.version_no,
@@ -2674,12 +2656,10 @@ RSpec.describe 'Posts API', type: :request do
expect(version.version_no).to eq(1) expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post_record)) expect(version.tags).to eq(snapshot_tags(post_record))
expect(event_rows).to eq(events)
end end
it 'does not create a version when POST /posts is invalid' do it 'does not create a version when POST /posts is invalid' do
sign_in_as(member) sign_in_as(member)
events = event_rows
expect do expect do
post '/posts', params: post_write_params( post '/posts', params: post_write_params(
@@ -2690,13 +2670,11 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count) end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end end
it 'does not create a version when PUT /posts/:id is invalid' do it 'does not create a version when PUT /posts/:id is invalid' do
sign_in_as(member) sign_in_as(member)
base_version = create_post_version_for!(post_record) base_version = create_post_version_for!(post_record)
events = event_rows
expect do expect do
put "/posts/#{post_record.id}", params: post_write_params( put "/posts/#{post_record.id}", params: post_write_params(
@@ -2708,7 +2686,6 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count) end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end end
it 'rejects second-bearing original created timestamps on POST /posts' do it 'rejects second-bearing original created timestamps on POST /posts' do
+1 -3
ファイルの表示
@@ -119,9 +119,7 @@ RSpec.describe 'Sitemap entries API', type: :request do
# Legacy empty bodies can exist even though the write service rejects them. # Legacy empty bodies can exist even though the write service rejects them.
empty = TagDescription.create!(tag: empty_tag, language_code: 'ain', empty = TagDescription.create!(tag: empty_tag, language_code: 'ain',
body: '', version_no: 1) body: '', version_no: 1)
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: empty_tag.id, language_code: 'ain',
event_id: create_event!(event_type: 'unknown').id,
tag_id: empty_tag.id, language_code: 'ain',
body: '', version_no: 1, event_type: 'create', body: '', version_no: 1, event_type: 'create',
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
-10
ファイルの表示
@@ -53,13 +53,8 @@ RSpec.describe "TagChildren", type: :request do
expect { do_request } expect { do_request }
.to change { parent.reload.children.ids.include?(child.id) } .to change { parent.reload.children.ids.include?(child.id) }
.from(false).to(true) .from(false).to(true)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) expect(response).to have_http_status(:no_content)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
expect(child.tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
it 'returns 422 and does not create relation when the new link makes a cycle' do it 'returns 422 and does not create relation when the new link makes a cycle' do
@@ -137,7 +132,6 @@ RSpec.describe "TagChildren", type: :request do
expect { expect {
do_request do_request
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) expect(response).to have_http_status(:no_content)
@@ -146,10 +140,6 @@ RSpec.describe "TagChildren", type: :request do
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s) expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
expect(versions.second.parent_tag_ids).to eq('') expect(versions.second.parent_tag_ids).to eq('')
expect(versions.second.created_by_user_id).to eq(admin.id) expect(versions.second.created_by_user_id).to eq(admin.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
end end
-2
ファイルの表示
@@ -8,7 +8,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:versions) do let!(:versions) do
['A', 'A', 'new-version'].each_with_index.map do |body, index| ['A', 'A', 'new-version'].each_with_index.map do |body, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: 'ja', version_no: index + 1, tag_id: tag.id, language_code: 'ja', version_no: index + 1,
event_type: index.zero? ? 'create' : 'update', body:, event_type: index.zero? ? 'create' : 'update', body:,
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
@@ -74,7 +73,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') } let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') }
let!(:other_version) do let!(:other_version) do
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: other_tag.id, language_code: 'ja', version_no: 1, tag_id: other_tag.id, language_code: 'ja', version_no: 1,
event_type: 'create', body: 'other tag history', event_type: 'create', body: 'other tag history',
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
+1 -13
ファイルの表示
@@ -13,7 +13,7 @@ RSpec.describe 'Tag description native API', type: :request do
def stored_state def stored_state
[TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model| [TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model|
model.order(:id).map(&:attributes) model.order(:id).map(&:attributes)
end + [event_rows] end
end end
def fail_save model def fail_save model
@@ -91,8 +91,6 @@ RSpec.describe 'Tag description native API', type: :request do
let!(:version) do let!(:version) do
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1, tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1,
event_id: create_event!(
event_type: 'tag_descriptions.create', created_by_user: author).id,
event_type: 'create', created_by_user_id: author.id, created_at: Time.current) event_type: 'create', created_by_user_id: author.id, created_at: Time.current)
end end
let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" } let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" }
@@ -187,7 +185,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect { native_write(body: 'created natively') } expect { native_write(body: 'created natively') }
.to change(TagDescription, :count).by(1) .to change(TagDescription, :count).by(1)
.and change(TagDescriptionVersion, :count).by(1) .and change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja') description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja')
expect_current(description) expect_current(description)
@@ -195,10 +192,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes( expect(version).to have_attributes(
body: 'created natively', version_no: 1, event_type: 'create', body: 'created natively', version_no: 1, event_type: 'create',
created_by_user_id: editor.id) created_by_user_id: editor.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_descriptions.create', 'created_by_user_id' => editor.id)
expect(version.event_id).to eq(event.fetch('id'))
get "/wiki/#{ description.id }" get "/wiki/#{ description.id }"
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(json).to include('body' => description.body, 'revision_id' => version.id) expect(json).to include('body' => description.body, 'revision_id' => version.id)
@@ -230,7 +223,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(description.version_no).to eq(1) expect(description.version_no).to eq(1)
expect { native_write(body: 'after') } expect { native_write(body: 'after') }
.to change(TagDescriptionVersion, :count).by(1) .to change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(description.reload).to have_attributes( expect(description.reload).to have_attributes(
body: 'after', version_no: 2, body: 'after', version_no: 2,
@@ -242,10 +234,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes( expect(version).to have_attributes(
tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update', tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update',
body: 'after', created_by_user_id: editor.id) body: 'after', created_by_user_id: editor.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_descriptions.update', 'created_by_user_id' => editor.id)
expect(version.event_id).to eq(event.fetch('id'))
expect(revision.body).to eq(version.body) expect(revision.body).to eq(version.body)
expect(description_versions(page).order(:version_no).last.body).to eq(version.body) expect(description_versions(page).order(:version_no).last.body).to eq(version.body)
get "/wiki/#{ description.id }" get "/wiki/#{ description.id }"
+1 -5
ファイルの表示
@@ -121,14 +121,10 @@ RSpec.describe 'Tag group native API', type: :request do
[:create, :update].each do |operation| [:create, :update].each do |operation|
it "#{ operation }s structured data and keeps unplaced membership" do it "#{ operation }s structured data and keeps unplaced membership" do
previous = group_version(group_id, 1) previous = group_version(group_id, 1)
expect { native_write(operation) }.to change { event_rows.length }.by(1) native_write(operation)
expect(response).to have_http_status(operation == :create ? :created : :ok) expect(response).to have_http_status(operation == :create ? :created : :ok)
id = operation == :create ? json.fetch('id') : group_id id = operation == :create ? json.fetch('id') : group_id
number = operation == :create ? 1 : 2 number = operation == :create ? 1 : 2
event = event_rows.last
event_type = operation == :create ? 'tag_groups.create' : 'tag_groups.update'
expect(event).to include('event_type' => event_type, 'created_by_user_id' => user.id)
expect(group_version(id, number).fetch('event_id')).to eq(event.fetch('id'))
expect_group_snapshot( expect_group_snapshot(
id, number:, members: snapshot_members, placements:, description: '全体の説明') id, number:, members: snapshot_members, placements:, description: '全体の説明')
expect(group_version(group_id, 1)).to eq(previous) expect(group_version(group_id, 1)).to eq(previous)
-1
ファイルの表示
@@ -30,7 +30,6 @@ RSpec.describe 'TagVersions API', type: :request do
) )
version = version =
TagVersion.create!( TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag: tag, tag: tag,
version_no: version_no, version_no: version_no,
event_type: event_type, event_type: event_type,
-10
ファイルの表示
@@ -705,7 +705,6 @@ RSpec.describe 'Tags API', type: :request do
expect { expect {
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' } patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -720,10 +719,6 @@ RSpec.describe 'Tags API', type: :request do
expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name') expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name')
expect(versions.second.category).to eq('meme') expect(versions.second.category).to eq('meme')
expect(versions.second.created_by_user_id).to eq(member_user.id) expect(versions.second.created_by_user_id).to eq(member_user.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
it 'updates deprecated state and records it in tag versions' do it 'updates deprecated state and records it in tag versions' do
@@ -1280,7 +1275,6 @@ RSpec.describe 'Tags API', type: :request do
deprecated: '0', deprecated: '0',
} }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -1296,10 +1290,6 @@ RSpec.describe 'Tags API', type: :request do
expect(versions.second.category).to eq('meta') expect(versions.second.category).to eq('meta')
expect(version_alias_names(versions.second, 'ja')).to include('spec_tag') expect(version_alias_names(versions.second, 'ja')).to include('spec_tag')
expect(versions.second.created_by_user_id).to eq(member_user.id) expect(versions.second.created_by_user_id).to eq(member_user.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
it '同じ tag の旧 alias へ戻しても rename できる' do it '同じ tag の旧 alias へ戻しても rename できる' do
+1 -5
ファイルの表示
@@ -32,10 +32,8 @@ RSpec.describe 'Counts export contracts' do
before do before do
NicoTagVersion.create!(external_tag: external, version_no: 1, NicoTagVersion.create!(external_tag: external, version_no: 1,
event_id: create_event!(event_type: 'unknown').id,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023)) event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 2, NicoTagVersion.create!(external_tag: external, version_no: 2,
event_id: create_event!(event_type: 'unknown').id,
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024)) event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
end end
@@ -194,9 +192,7 @@ RSpec.describe 'Counts export contracts' do
expect(CountsExportDownload.find(token, 'owner')).not_to be_nil expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
expect(CountsExportDownload.find(token, 'other')).to be_nil expect(CountsExportDownload.find(token, 'other')).to be_nil
post = create(:post) post = create(:post)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'discard', url: post.url,
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024)) title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
expect(CountsExportDownload.find(token, 'owner')).to be_nil expect(CountsExportDownload.find(token, 'owner')).to be_nil
end end
+7 -21
ファイルの表示
@@ -13,9 +13,7 @@ RSpec.describe 'Counts masked pivot contracts' do
let!(:tags) do let!(:tags) do
['A', 'B', 'C'].map do |name| ['A', 'B', 'C'].map do |name|
tag = create(:tag, primary_name: name) tag = create(:tag, primary_name: name)
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'create', name:,
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name:,
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
@@ -27,16 +25,12 @@ RSpec.describe 'Counts masked pivot contracts' do
[[0, 1], [0], [1, 2]].each_with_index do |indexes, index| [[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
post = create(:post) post = create(:post)
snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } } snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create',
title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot, title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1)) parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
next if index == 2 next if index == 2
PostVersion.create!( PostVersion.create!(post:, version_no: 2, event_type: 'discard',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 2, event_type: 'discard',
title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [], title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2)) parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
end end
@@ -106,16 +100,12 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'uses changed-record membership for totals and hides changes to private predecessors' do it 'uses changed-record membership for totals and hides changes to private predecessors' do
post = PostVersion.order(:id).last.post post = PostVersion.order(:id).last.post
PostVersion.create!( PostVersion.create!(post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
url: post.url, tags: '', url: post.url, tags: '',
tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }], tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
parent_post_ids: '', created_at: Time.utc(2024, 3)) parent_post_ids: '', created_at: Time.utc(2024, 3))
restored = PostVersion.order(:id).first.post restored = PostVersion.order(:id).first.post
PostVersion.create!( PostVersion.create!(post: restored, version_no: 3, event_type: 'restore',
event_id: create_event!(event_type: 'unknown').id,
post: restored, version_no: 3, event_type: 'restore',
title: 'restored-public-title', url: restored.url, tags: '', title: 'restored-public-title', url: restored.url, tags: '',
tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '', tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
created_at: Time.utc(2024, 4)) created_at: Time.utc(2024, 4))
@@ -145,9 +135,7 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'keeps NULL as a public data value rather than treating it as a rollup' do it 'keeps NULL as a public data value rather than treating it as a rollup' do
post = create(:post) post = create(:post)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'public bot',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create', title: 'public bot',
url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5)) url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
page = result(nil, 'rows' => 'user', 'cols' => 'event_type') page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1) expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
@@ -158,9 +146,7 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'sorts public version numbers numerically including formerly hidden records' do it 'sorts public version numbers numerically including formerly hidden records' do
post = PostVersion.order(:id).last.post post = PostVersion.order(:id).last.post
[2, 10].each do |number| [2, 10].each do |number|
PostVersion.create!( PostVersion.create!(post:, version_no: number, event_type: 'update',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: number, event_type: 'update',
title: 'public numeric sort', url: post.url, tags: '', tags_json: [], title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2024, 5)) parent_post_ids: '', created_at: Time.utc(2024, 5))
end end
-2
ファイルの表示
@@ -56,7 +56,6 @@ RSpec.describe MaterialSyncImporter do
profile: 'legacy_drive', profile: 'legacy_drive',
export_path: '素材/a.png', export_path: '素材/a.png',
created_by_user: user) created_by_user: user)
events = event_rows
result = result =
described_class.import!( described_class.import!(
@@ -74,7 +73,6 @@ RSpec.describe MaterialSyncImporter do
expect(result.action).to eq(:unchanged) expect(result.action).to eq(:unchanged)
expect(material.reload.tag).to eq(tag) expect(material.reload.tag).to eq(tag)
expect(material.url).to eq('https://example.com/human') expect(material.url).to eq('https://example.com/human')
expect(event_rows).to eq(events)
end end
it 'suppresses a Google Drive candidate by relative path prefix' do it 'suppresses a Google Drive candidate by relative path prefix' do
-41
ファイルの表示
@@ -14,47 +14,6 @@ RSpec.describe MaterialSyncRunner do
let(:drive_client) { instance_double(GoogleDrive::ApiClient) } let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
describe '#sync!' do describe '#sync!' do
it 'groups created and updated materials across sync sources into one event' do
existing = Material.create!(
source_kind: 'google_drive_file', source_file_id: 'existing-file',
source_path: 'old.png', url: 'https://example.com/existing',
created_by_user: user, updated_by_user: user)
source
MaterialSyncSource.create!(
name: 'Second Drive source', source_kind: 'google_drive_path',
source_file_id: 'folder-456', profile: 'legacy_drive',
created_by_user: user, updated_by_user: user)
allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
id = folder_id == 'folder-123' ? 'existing-file' : 'new-file'
block.call(id:, name: "#{ id }.png", mime_type: 'image/png',
relative_path: "素材/#{ id }.png", sha256_checksum: nil,
web_view_link: "https://drive.google.com/file/d/#{ id }/view")
end
allow(drive_client).to receive(:download_to_tempfile) do |id, **|
Tempfile.new(['sync-event', '.png']).tap do |file|
file.binmode
file.write(id)
file.rewind
end
end
allow(MaterialThumbnailGenerator).to receive(:generate!)
previous_ids = MaterialVersion.pluck(:id)
result = nil
expect { result = described_class.sync_enabled! }
.to change { event_rows.length }.by(1)
expect(result).to have_attributes(imported: 1, updated: 1, failed: 0)
event = event_rows.last
expect(event.fetch('event_type')).to eq('materials.sync')
created = Material.find_by!(source_file_id: 'new-file')
versions = MaterialVersion.where.not(id: previous_ids)
expect(versions.pluck(:material_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'imports google drive path candidates as they are yielded' do it 'imports google drive path candidates as they are yielded' do
first_entry = { id: 'file-1', first_entry = { id: 'file-1',
name: 'a.png', name: 'a.png',
-5
ファイルの表示
@@ -15,9 +15,6 @@ RSpec.describe NicoTagVersionRecorder do
external_tag:, version_no: 1, event_type: 'create', external_tag:, version_no: 1, event_type: 'create',
name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member) name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member)
expect(external_tag.reload.nico_tag_versions).to contain_exactly(version) expect(external_tag.reload.nico_tag_versions).to contain_exactly(version)
expect(version.event).to have_attributes(
event_type: 'external_tags.create', created_by_user: member)
expect(version.event.nico_tag_versions).to contain_exactly(version)
end end
it 'uses the latest history number when the record has no version_no column' do it 'uses the latest history number when the record has no version_no column' do
@@ -29,8 +26,6 @@ RSpec.describe NicoTagVersionRecorder do
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]', expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
linked_tag_ids: tag.id.to_s) linked_tag_ids: tag.id.to_s)
expect(first.reload.name).to eq('nico:raw tag[]') expect(first.reload.name).to eq('nico:raw tag[]')
expect(second.event).to have_attributes(
event_type: 'external_tags.update', created_by_user: member)
expect(external_tag.reload.has_attribute?(:version_no)).to be(false) expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
end end
-83
ファイルの表示
@@ -88,86 +88,3 @@ RSpec.describe PostBulkCreator do
expect(creator).to have_received(:create!).with(locale).once expect(creator).to have_received(:create!).with(locale).once
end end
end end
RSpec.describe 'PostBulkCreator event grouping', type: :model do
self.use_transactional_tests = false
before do
expect(Rails.env.test?).to be(true)
expect(ApplicationRecord.connection.open_transactions).to eq(0)
@prefix = "bulk_event_#{ SecureRandom.hex(8) }"
@actor = create(:user, :member)
allow(PostCreatePreflight).to receive(:new) do |attributes:, **|
specs = [{ name: attributes.fetch(:title), category: :general }]
instance_double(PostCreatePreflight, run: attributes.merge(
existing_post_id: nil, snapshot_tag_specs: specs, post_tag_specs: specs,
normalised_parent_post_ids: [], tag_sections: { }, video_ms: nil))
end
end
after do
if @actor
posts = Post.where(uploaded_user: @actor)
PostTagSection.where(post_id: posts.select(:id)).delete_all
PostTag.where(post_id: posts.select(:id)).delete_all
PostVersion.where(post_id: posts.select(:id)).delete_all
posts.delete_all
tag_ids = TagName.where(name: ["#{ @prefix }_1", "#{ @prefix }_2"]).pluck(:tag_id)
TagVersion.where(tag_id: tag_ids).delete_all
TagName.where(tag_id: tag_ids).delete_all
Tag.where(id: tag_ids).delete_all
EventRecords::EventRow.where(created_by_user_id: @actor.id).delete_all
@actor.delete
end
end
it 'shares one creation event between real workers and their tag histories' do
posts = [1, 2].map do |number|
{ title: "#{ @prefix }_#{ number }",
url: "https://example.com/#{ @prefix }/#{ number }" }
end
result = nil
expect {
result = PostBulkCreator.new(actor: @actor, posts:, thumbnails: { })
.run(Locale.nipponese)
}.to change { event_rows.length }.by(1)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['created', 'created'])
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.create', 'created_by_user_id' => @actor.id)
versions = PostVersion.where(created_by_user_id: @actor.id)
expect(versions.count).to eq(2)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where(created_by_user_id: @actor.id)
expect(tag_versions.count).to eq(2)
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'does not leave an event when every row fails validation' do
preflight = instance_double(PostCreatePreflight)
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
allow(preflight).to receive(:run).and_raise(
PostCreatePreflight::ValidationFailed.new(fields: { url: ['invalid'] }))
events = event_rows
result = PostBulkCreator.new(
actor: @actor, posts: [{ title: 'invalid' }], thumbnails: { }).run(Locale.nipponese)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['failed'])
expect(event_rows).to eq(events)
end
it 'does not leave an event when every row is skipped' do
preflight = instance_double(PostCreatePreflight, run: { existing_post_id: 123 })
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
events = event_rows
result = PostBulkCreator.new(
actor: @actor, posts: [{ title: 'existing' }], thumbnails: { }).run(Locale.nipponese)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['skipped'])
expect(event_rows).to eq(events)
end
end
-10
ファイルの表示
@@ -16,7 +16,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
@tag = create(:tag, primary_name: "#{ @prefix }_owner") @tag = create(:tag, primary_name: "#{ @prefix }_owner")
@group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1) @group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
@tag_ids = Queue.new @tag_ids = Queue.new
@event_ids = Queue.new
@threads = [] @threads = []
@release = Queue.new @release = Queue.new
end end
@@ -43,9 +42,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
ids << @tag.id if @tag ids << @tag.id if @tag
TagName.where(tag_id: ids).delete_all TagName.where(tag_id: ids).delete_all
Tag.where(id: ids).delete_all Tag.where(id: ids).delete_all
event_ids = []
event_ids << @event_ids.pop until @event_ids.empty? if @event_ids
EventRecords::EventRow.where(id: event_ids).delete_all
end end
end end
@@ -76,17 +72,11 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
when :description when :description
TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1) TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
when :description_version when :description_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: event.id,
tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1, tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
when :group_version when :group_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagGroupVersion.create!( TagGroupVersion.create!(
event_id: event.id,
tag_group: @group, name: @group.name, version_no: 1, event_type: 'create', tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
members: [], placements: [], created_at: Time.current) members: [], placements: [], created_at: Time.current)
when :group when :group
-3
ファイルの表示
@@ -15,12 +15,10 @@ RSpec.describe SharedResourceIdAllocator do
TagGroup.new(id:, name: "group #{ number }", version_no: number) TagGroup.new(id:, name: "group #{ number }", version_no: number)
when 'tag_description_versions' when 'tag_description_versions'
TagDescriptionVersion.new( TagDescriptionVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number, id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
when 'tag_group_versions' when 'tag_group_versions'
TagGroupVersion.new( TagGroupVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_group_id: group.id, name: group.name, version_no: number, id:, tag_group_id: group.id, name: group.name, version_no: number,
event_type: 'create', members: [], placements: [], created_at: Time.current) event_type: 'create', members: [], placements: [], created_at: Time.current)
end end
@@ -84,7 +82,6 @@ RSpec.describe SharedResourceIdAllocator do
it 'reserves a Tag ID referenced only by remaining description history' do it 'reserves a Tag ID referenced only by remaining description history' do
high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000 high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: high, language_code: 'ja', version_no: 1, body: 'history', tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
expect(create(:tag).id).to be > high expect(create(:tag).id).to be > high
-108
ファイルの表示
@@ -18,9 +18,6 @@ RSpec.describe VersionRecorder do
expect(version.version_no).to eq(1) expect(version.version_no).to eq(1)
expect(post_record.reload.version_no).to eq(1) expect(post_record.reload.version_no).to eq(1)
expect(version.event).to have_attributes(
event_type: 'posts.create', created_by_user: member)
expect(version.event.created_at).to be_present
end end
it 'updates record version_no when creating the next version' do it 'updates record version_no when creating the next version' do
@@ -39,8 +36,6 @@ RSpec.describe VersionRecorder do
expect(version.version_no).to eq(2) expect(version.version_no).to eq(2)
expect(post_record.reload.version_no).to eq(2) expect(post_record.reload.version_no).to eq(2)
expect(version.event).to have_attributes(
event_type: 'posts.update', created_by_user: member)
end end
it 'does not create a new version or advance version_no when snapshot is unchanged' do it 'does not create a new version or advance version_no when snapshot is unchanged' do
@@ -49,7 +44,6 @@ RSpec.describe VersionRecorder do
post: post_record, post: post_record,
event_type: :create, event_type: :create,
created_by_user: member) created_by_user: member)
events = Event.count
expect { expect {
version = version =
@@ -62,108 +56,6 @@ RSpec.describe VersionRecorder do
}.not_to change(PostVersion, :count) }.not_to change(PostVersion, :count)
expect(post_record.reload.version_no).to eq(1) expect(post_record.reload.version_no).to eq(1)
expect(Event.count).to eq(events)
end
it 'retains an explicitly supplied event' do
event = Event.create!(event_type: 'posts.sync', reason: 'scheduled sync')
expect {
version = PostVersionRecorder.record!(
post: post_record, event_type: :create, created_by_user: nil, event:)
expect(version.event).to eq(event)
}.not_to change(Event, :count)
end
it 'shares an operation event between nested tag and post histories' do
tag = create(:tag, primary_name: 'operation_tag')
version = nil
tag_version = nil
expect {
described_class.record_operation!(
event_type: 'posts.create', created_by_user: member, reason: 'new post') do
described_class.record_operation!(event_type: 'tags.create', created_by_user: nil) do
tag_version = TagVersionRecorder.record!(
tag:, event_type: :create, created_by_user: member)
end
version = PostVersionRecorder.record!(
post: post_record, event_type: :create, created_by_user: member)
end
}.to change(Event, :count).by(1)
expect(version.event_id).to eq(tag_version.event_id)
expect(version.event).to have_attributes(
event_type: 'posts.create', created_by_user: member, reason: 'new post')
expect(described_class.current_event).to be_nil
end
it 'does not persist an event for an unchanged operation' do
PostVersionRecorder.record!(
post: post_record, event_type: :create, created_by_user: member)
expect {
described_class.record_operation!(event_type: 'posts.update', created_by_user: member) do
PostVersionRecorder.record!(
post: post_record.reload, event_type: :update, created_by_user: member)
end
}.not_to change(Event, :count)
end
it 'rolls back histories and their event when an operation fails' do
record = post_record
events = Event.count
versions = PostVersion.count
expect {
described_class.record_operation!(
event_type: 'posts.create', created_by_user: member, savepoint_flg: true) do
PostVersionRecorder.record!(post: record, event_type: :create, created_by_user: member)
raise 'operation failed'
end
}.to raise_error('operation failed')
expect(Event.count).to eq(events)
expect(PostVersion.count).to eq(versions)
expect(record.reload.version_no).to eq(1)
expect(described_class.current_event).to be_nil
version = PostVersionRecorder.record!(post: record, event_type: :create, created_by_user: nil)
expect(version.event).to have_attributes(event_type: 'posts.create', created_by_user: nil)
end
it 'isolates operation context between threads' do
described_class.with_event(event_type: 'posts.sync', created_by_user: nil) do
event = described_class.current_event
expect(Thread.new { described_class.current_event }.value).to be_nil
expect(described_class.current_event).to equal(event)
end
expect(described_class.current_event).to be_nil
end
it 'reuses a batch event after its first transaction rolls back' do
record = post_record
version = nil
expect {
described_class.with_event(event_type: 'posts.sync', created_by_user: nil) do
event = described_class.current_event
described_class.record_operation!(
event_type: 'posts.create', created_by_user: nil, savepoint_flg: true) do
PostVersionRecorder.record!(post: record, event_type: :create, created_by_user: nil)
raise ActiveRecord::Rollback
end
expect(event).to be_new_record
version = PostVersionRecorder.record!(
post: record.reload, event_type: :create, created_by_user: nil)
expect(version.event).to equal(event)
end
}.to change(Event, :count).by(1)
expect(version.event.event_type).to eq('posts.sync')
expect(record.post_versions).to contain_exactly(version)
end end
it 'raises when record version_no is older than the latest version' do it 'raises when record version_no is older than the latest version' do
-35
ファイルの表示
@@ -42,41 +42,6 @@ RSpec.describe Youtube::Sync do
end end
describe '#sync!' do describe '#sync!' do
it 'groups created and updated post histories into one sync event' do
allow(PostVersionRecorder).to receive(:record!).and_call_original
allow(PostVersionRecorder).to receive(:ensure_snapshot!).and_call_original
existing = create(:post, url: 'https://youtu.be/video-1', title: 'old title')
allow(sync).to receive(:query_terms).and_return([])
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
allow(client).to receive(:playlist_items).with(playlist_id: 'PL123', page_token: nil)
.and_return('items' => [
{ 'contentDetails' => { 'videoId' => 'video-1' } },
{ 'contentDetails' => { 'videoId' => 'video-2' } }])
allow(client).to receive(:videos).with(['video-1', 'video-2'])
.and_return('items' => [
youtube_video_item(id: 'video-1', title: 'updated', channel_id: 'UC_NONE'),
youtube_video_item(id: 'video-2', title: 'created', channel_id: 'UC_NONE')])
previous_post_ids = PostVersion.pluck(:id)
previous_tag_ids = TagVersion.pluck(:id)
expect { sync.sync! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
versions = PostVersion.where.not(id: previous_post_ids)
created = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-2')
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
events = event_rows
expect { sync.sync! }.not_to change(PostVersion, :count)
expect(event_rows).to eq(events)
end
it 'returns without fetching video details when no video ids are discovered' do it 'returns without fetching video details when no video ids are discovered' do
allow(sync).to receive(:query_terms).and_return([]) allow(sync).to receive(:query_terms).and_return([])
allow(sync).to receive(:playlist_ids).and_return([]) allow(sync).to receive(:playlist_ids).and_return([])
-15
ファイルの表示
@@ -1,15 +0,0 @@
module EventRecords
# Read the database contract without requiring an application Event model.
class EventRow < ActiveRecord::Base
self.table_name = 'events'
end
def event_rows
EventRow.order(:id).map(&:attributes)
end
def create_event! event_type:, created_by_user: nil
EventRow.create!(event_type:, created_by_user_id: created_by_user&.id,
created_at: Time.current)
end
end
+1 -4
ファイルの表示
@@ -3,13 +3,11 @@ require 'cgi'
# SQL fixtures use the migration contract without inventing application models. # SQL fixtures use the migration contract without inventing application models.
# Include explicitly; these helpers must not affect unrelated examples. # Include explicitly; these helpers must not affect unrelated examples.
module TagGroupRecords module TagGroupRecords
include EventRecords
GROUP_TABLES = [ GROUP_TABLES = [
'tag_groups', 'tag_group_tags', 'tag_group_groups', 'tag_groups', 'tag_group_tags', 'tag_group_groups',
'tag_group_placements', 'tag_group_versions'].freeze 'tag_group_placements', 'tag_group_versions'].freeze
WRITE_TABLES = GROUP_TABLES + [ WRITE_TABLES = GROUP_TABLES + [
'events', 'tag_names', 'tag_description_versions', 'tag_names', 'tag_description_versions',
'tag_descriptions'] 'tag_descriptions']
def group_connection = ApplicationRecord.connection def group_connection = ApplicationRecord.connection
@@ -116,7 +114,6 @@ module TagGroupRecords
group_id = insert_group_row('tag_groups', attributes) group_id = insert_group_row('tag_groups', attributes)
insert_group_row('tag_group_versions', { insert_group_row('tag_group_versions', {
tag_group_id: group_id, version_no: 1, event_type: 'create', tag_group_id: group_id, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'tag_groups.create', created_by_user: user).id,
name:, description:, members: members.to_json, placements: placements.to_json, name:, description:, members: members.to_json, placements: placements.to_json,
created_by_user_id: user.id, created_at: now }) created_by_user_id: user.id, created_at: now })
members.each do |member| members.each do |member|
+14 -43
ファイルの表示
@@ -174,20 +174,20 @@ RSpec.describe 'nico:sync' do
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil) def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post,
post: post, version_no: version_no,
version_no: version_no, event_type: event_type,
event_type: event_type, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: created_by_user
created_by_user: created_by_user) )
end end
it '新規 post 作成時に version 1 を作る' do it '新規 post 作成時に version 1 を作る' do
@@ -209,7 +209,6 @@ RSpec.describe 'nico:sync' do
expect { expect {
run_rake_task('nico:sync') run_rake_task('nico:sync')
}.to change(PostVersion, :count).by(1) }.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9') post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
version = post.post_versions.order(:version_no).last version = post.post_versions.order(:version_no).last
@@ -218,32 +217,6 @@ RSpec.describe 'nico:sync' do
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.created_by_user).to be_nil expect(version.created_by_user).to be_nil
expect(version.tags).to eq(snapshot_tags(post.reload)) expect(version.tags).to eq(snapshot_tags(post.reload))
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
expect(version.event_id).to eq(event.fetch('id'))
end
it 'groups created and updated post histories into one sync event' do
existing = create(:post, title: 'old', url: 'https://www.nicovideo.jp/watch/sm9')
stub_python([
{ 'code' => 'sm9', 'title' => 'updated', 'tags' => [] },
{ 'code' => 'sm10', 'title' => 'created', 'tags' => [] }])
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
previous_post_ids = PostVersion.pluck(:id)
previous_tag_ids = TagVersion.pluck(:id)
expect { run_rake_task('nico:sync') }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
created = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm10')
versions = PostVersion.where.not(id: previous_post_ids)
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end end
it '既存 post の内容または tags が変わったとき update version を作る' do it '既存 post の内容または tags が変わったとき update version を作る' do
@@ -309,7 +282,6 @@ RSpec.describe 'nico:sync' do
}]) }])
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>')) allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
events = event_rows
expect { expect {
run_rake_task('nico:sync') run_rake_task('nico:sync')
@@ -319,7 +291,6 @@ RSpec.describe 'nico:sync' do
expect(version.version_no).to eq(1) expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post.reload)) expect(version.tags).to eq(snapshot_tags(post.reload))
expect(event_rows).to eq(events)
end end
it '新規 nico tag に nico tag version を作る' do it '新規 nico tag に nico tag version を作る' do
+37
ファイルの表示
@@ -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,42 @@ describe ('prefetchForURL', () => {
expect (postsApi.fetchPost).toHaveBeenCalledWith ('12', 'ja') 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 () => { 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) })