WIP: preserve failed Codex job issue-414-euwzily9
このコミットが含まれているのは:
@@ -100,7 +100,8 @@ class MaterialsController < ApplicationController
|
||||
material = nil
|
||||
|
||||
begin
|
||||
Material.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'materials.create', created_by_user: current_user) do
|
||||
tag = resolve_material_tag!(locale, tag_name_raw)
|
||||
material = Material.new(tag:, url:,
|
||||
created_by_user: current_user,
|
||||
@@ -151,7 +152,8 @@ class MaterialsController < ApplicationController
|
||||
uploaded_blob = build_uploaded_material_blob!(file, file_sha256)
|
||||
|
||||
begin
|
||||
Material.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'materials.update', created_by_user: current_user) do
|
||||
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
|
||||
tag = resolve_material_tag!(locale, tag_name_raw)
|
||||
material.assign_attributes(tag:, url:, updated_by_user: current_user)
|
||||
@@ -185,7 +187,8 @@ class MaterialsController < ApplicationController
|
||||
material = Material.find_by(id: params[:id])
|
||||
return head :not_found unless material
|
||||
|
||||
Material.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'materials.destroy', created_by_user: current_user) do
|
||||
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
|
||||
material.discard!
|
||||
MaterialVersionRecorder.record!(material:, event_type: :discard,
|
||||
|
||||
@@ -95,7 +95,8 @@ class NicoTagsController < ApplicationController
|
||||
linked_tag_names = params[:tags].to_s.split
|
||||
linked_tags = nil
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'external_tags.update', created_by_user: current_user) do
|
||||
linked_tags = Tag.normalise_tags!(locale, linked_tag_names,
|
||||
with_tagme: false,
|
||||
with_no_deerjikist: false,
|
||||
|
||||
@@ -346,7 +346,8 @@ class PostsController < ApplicationController
|
||||
post = nil
|
||||
conflict_json = nil
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'posts.update', created_by_user: current_user) do
|
||||
post = Post.lock.find(params[:id].to_i)
|
||||
|
||||
base_version = nil
|
||||
|
||||
@@ -11,7 +11,8 @@ class TagChildrenController < ApplicationController
|
||||
parent = Tag.find(parent_id)
|
||||
child = Tag.find(child_id)
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tags.update', created_by_user: current_user) do
|
||||
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
||||
|
||||
TagImplication.find_or_create_by!(parent_tag: parent, tag: child)
|
||||
@@ -33,7 +34,8 @@ class TagChildrenController < ApplicationController
|
||||
parent = Tag.find(parent_id)
|
||||
child = Tag.find(child_id)
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tags.update', created_by_user: current_user) do
|
||||
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
||||
|
||||
TagImplication.find_by(parent_tag: parent, tag: child)&.destroy!
|
||||
|
||||
@@ -467,7 +467,8 @@ class TagsController < ApplicationController
|
||||
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
|
||||
end
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tags.update', created_by_user: current_user) do
|
||||
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user,
|
||||
language_code: locale.language_code)
|
||||
|
||||
@@ -518,7 +519,8 @@ class TagsController < ApplicationController
|
||||
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
|
||||
end
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tags.update', created_by_user: current_user) do
|
||||
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user,
|
||||
language_code: locale.language_code)
|
||||
|
||||
|
||||
@@ -246,7 +246,9 @@ class WikiPagesController < ApplicationController
|
||||
|
||||
base_revision_id = params[:base_revision_id].presence
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tag_descriptions.update',
|
||||
created_by_user: current_user, reason: params[:message].presence) do
|
||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||
tag.lock!
|
||||
old_title = tag_name.name
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
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
|
||||
|
||||
@@ -23,7 +23,9 @@ class Locale < ApplicationRecord
|
||||
end
|
||||
|
||||
def save_with_tag_names!
|
||||
completed = self.class.transaction(requires_new: true) do
|
||||
event_type = new_record? ? 'locales.create' : 'locales.restore'
|
||||
completed = VersionRecorder.record_operation!(
|
||||
event_type:, created_by_user: nil, savepoint_flg: true) do
|
||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||
saved = yield
|
||||
raise ActiveRecord::RecordNotSaved, 'Locale save was halted' unless saved
|
||||
|
||||
@@ -290,7 +290,8 @@ class Tag < ApplicationRecord
|
||||
|
||||
affected_post_ids = Set.new
|
||||
|
||||
Tag.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tags.update', created_by_user:) do
|
||||
TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
|
||||
|
||||
Array(source_tags).compact.uniq.each do |source_tag|
|
||||
|
||||
@@ -15,37 +15,40 @@ class TagNameSanitisationRule < ApplicationRecord
|
||||
end
|
||||
|
||||
def apply!
|
||||
Language.find_each do |language|
|
||||
TagName.where(language:).find_each do |candidate|
|
||||
TagName.transaction do
|
||||
tn = TagName.find_by(id: candidate.id)
|
||||
next unless tn
|
||||
VersionRecorder.with_event(
|
||||
event_type: 'tag_name_sanitisation_rules.apply', created_by_user: nil) do
|
||||
Language.find_each do |language|
|
||||
TagName.where(language:).find_each do |candidate|
|
||||
TagName.transaction do
|
||||
tn = TagName.find_by(id: candidate.id)
|
||||
next unless tn
|
||||
|
||||
name = sanitise(tn.name)
|
||||
next if name == tn.name
|
||||
name = sanitise(tn.name)
|
||||
next if name == tn.name
|
||||
|
||||
existing_tn = TagName.find_by(language:, name:)
|
||||
source_tag = tn.tag
|
||||
target_tag = existing_tn ? existing_tn.tag : source_tag
|
||||
[source_tag, target_tag].uniq(&:id).sort_by(&:id).each(&:lock!)
|
||||
TagVersioning.ensure_snapshot!(source_tag, created_by_user: nil)
|
||||
existing_tn = TagName.find_by(language:, name:)
|
||||
source_tag = tn.tag
|
||||
target_tag = existing_tn ? existing_tn.tag : source_tag
|
||||
[source_tag, target_tag].uniq(&:id).sort_by(&:id).each(&:lock!)
|
||||
TagVersioning.ensure_snapshot!(source_tag, created_by_user: nil)
|
||||
|
||||
if existing_tn && target_tag != source_tag
|
||||
Tag.merge_tags!(target_tag, source_tag)
|
||||
tn.reload.destroy!
|
||||
elsif existing_tn
|
||||
if tn.primary?
|
||||
existing_tn.destroy!
|
||||
tn.update_columns(name:, updated_at: Time.current)
|
||||
if existing_tn && target_tag != source_tag
|
||||
Tag.merge_tags!(target_tag, source_tag)
|
||||
tn.reload.destroy!
|
||||
elsif existing_tn
|
||||
if tn.primary?
|
||||
existing_tn.destroy!
|
||||
tn.update_columns(name:, updated_at: Time.current)
|
||||
else
|
||||
tn.destroy!
|
||||
end
|
||||
else
|
||||
tn.destroy!
|
||||
# TagName 側の自動サニタイズを回避
|
||||
tn.update_columns(name:, updated_at: Time.current)
|
||||
end
|
||||
else
|
||||
# TagName 側の自動サニタイズを回避
|
||||
tn.update_columns(name:, updated_at: Time.current)
|
||||
end
|
||||
|
||||
TagVersioning.record!(target_tag, event_type: :update, created_by_user: nil)
|
||||
TagVersioning.record!(target_tag, event_type: :update, created_by_user: nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -51,7 +51,8 @@ class MaterialSyncImporter
|
||||
suppression: @import_block)
|
||||
end
|
||||
|
||||
Material.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: "materials.#{ event_type }", created_by_user: @attributes[:updated_by_user]) do
|
||||
if material.persisted?
|
||||
MaterialVersionRecorder.ensure_snapshot!(material,
|
||||
created_by_user: @attributes[:updated_by_user])
|
||||
|
||||
@@ -3,14 +3,16 @@ class MaterialSyncRunner
|
||||
:errors, keyword_init: true)
|
||||
|
||||
def self.sync_enabled!
|
||||
results = MaterialSyncSource.enabled.order(:id).map { |source| new(source).sync! }
|
||||
VersionRecorder.with_event(event_type: 'materials.sync', created_by_user: nil) do
|
||||
results = MaterialSyncSource.enabled.order(:id).map { |source| new(source).sync! }
|
||||
|
||||
Result.new(imported: results.sum(&:imported),
|
||||
updated: results.sum(&:updated),
|
||||
unchanged: results.sum(&:unchanged),
|
||||
suppressed: results.sum(&:suppressed),
|
||||
failed: results.sum(&:failed),
|
||||
errors: results.flat_map(&:errors))
|
||||
Result.new(imported: results.sum(&:imported),
|
||||
updated: results.sum(&:updated),
|
||||
unchanged: results.sum(&:unchanged),
|
||||
suppressed: results.sum(&:suppressed),
|
||||
failed: results.sum(&:failed),
|
||||
errors: results.flat_map(&:errors))
|
||||
end
|
||||
end
|
||||
|
||||
def initialize source
|
||||
@@ -21,13 +23,15 @@ class MaterialSyncRunner
|
||||
result = Result.new(imported: 0, updated: 0, unchanged: 0,
|
||||
suppressed: 0, failed: 0, errors: [])
|
||||
|
||||
if @source.source_kind == 'google_drive_path'
|
||||
sync_google_drive_path!(result)
|
||||
else
|
||||
candidates.each do |candidate|
|
||||
next if candidate.blank?
|
||||
VersionRecorder.with_event(event_type: 'materials.sync', created_by_user: nil) do
|
||||
if @source.source_kind == 'google_drive_path'
|
||||
sync_google_drive_path!(result)
|
||||
else
|
||||
candidates.each do |candidate|
|
||||
next if candidate.blank?
|
||||
|
||||
sync_candidate!(candidate, result)
|
||||
sync_candidate!(candidate, result)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ class MaterialSyncSuppressionRegistrar
|
||||
def create!
|
||||
suppression = nil
|
||||
|
||||
MaterialSyncSuppression.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'materials.block', created_by_user: @created_by_user) do
|
||||
suppression = MaterialSyncSuppression.create!(
|
||||
@attributes.merge(created_by_user: @created_by_user))
|
||||
discard_existing_materials!(suppression)
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
class MaterialVersionRecorder < VersionRecorder
|
||||
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
||||
|
||||
def self.record! material:, event_type:, event:, created_by_user:, file_snapshot: nil
|
||||
def self.record! material:, event_type:, created_by_user:, event: nil, file_snapshot: nil
|
||||
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record!
|
||||
end
|
||||
|
||||
def initialize material:, event_type:, event:, created_by_user:, file_snapshot: nil
|
||||
def initialize material:, event_type:, created_by_user:, event: nil, file_snapshot: nil
|
||||
@file_snapshot = file_snapshot
|
||||
|
||||
super(record: material, event_type:, event:, created_by_user:)
|
||||
@@ -14,9 +14,10 @@ class MaterialVersionRecorder < VersionRecorder
|
||||
def self.ensure_snapshot! material, created_by_user:
|
||||
return if material.material_versions.exists?
|
||||
|
||||
event = Event.create!(event_type: 'materials.create',
|
||||
created_by_user:,
|
||||
created_at: material.created_at)
|
||||
event = current_event || Event.new(
|
||||
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)
|
||||
end
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
class NicoTagVersionRecorder < VersionRecorder
|
||||
EVENT_TYPES = ['create', 'update'].freeze
|
||||
def self.record! external_tag:, event_type:, created_by_user:
|
||||
new(external_tag:, event_type:, created_by_user:).record!
|
||||
def self.record! external_tag:, event_type:, created_by_user:, event: nil
|
||||
new(external_tag:, event_type:, created_by_user:, event:).record!
|
||||
end
|
||||
|
||||
def initialize external_tag:, event_type:, created_by_user:
|
||||
super(record: external_tag, event_type:, created_by_user:)
|
||||
def initialize external_tag:, event_type:, created_by_user:, event: nil
|
||||
super(record: external_tag, event_type:, created_by_user:, event:)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -9,6 +9,8 @@ class PostBulkCreator
|
||||
def run locale
|
||||
results = Array.new(@posts.length)
|
||||
mutex = Mutex.new
|
||||
event_mutex = Mutex.new
|
||||
event = Event.new(event_type: 'posts.create', created_by_user_id: @actor_id)
|
||||
next_index = 0
|
||||
|
||||
workers = Array.new(2) do
|
||||
@@ -27,7 +29,7 @@ class PostBulkCreator
|
||||
break if index >= @posts.length
|
||||
|
||||
attributes = @posts[index]
|
||||
results[index] = create_row(locale, actor, attributes, index)
|
||||
results[index] = create_row(locale, actor, attributes, index, event, event_mutex)
|
||||
rescue StandardError => e
|
||||
Rails.logger.error(
|
||||
"post_bulk_creator_worker_failure #{ { error: e.class.name,
|
||||
@@ -61,7 +63,7 @@ class PostBulkCreator
|
||||
|
||||
private
|
||||
|
||||
def create_row locale, actor, attributes, index
|
||||
def create_row locale, actor, attributes, index, event, event_mutex
|
||||
preflight =
|
||||
PostCreatePreflight.new(
|
||||
attributes: attributes,
|
||||
@@ -74,9 +76,16 @@ class PostBulkCreator
|
||||
existing_post: preflight[:existing_post] }
|
||||
end
|
||||
|
||||
post = PostCreator.new(
|
||||
actor: actor,
|
||||
attributes: normalised_attributes(attributes, preflight, index)).create!(locale)
|
||||
create_post = lambda do
|
||||
VersionRecorder.with_event(event_type: 'posts.create', created_by_user: actor, event:) do
|
||||
PostCreator.new(
|
||||
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 = {
|
||||
status: 'created',
|
||||
post: { id: post.id } }
|
||||
|
||||
@@ -18,7 +18,8 @@ class PostCreator
|
||||
original_created_from: @attributes[:original_created_from].presence,
|
||||
original_created_before: @attributes[:original_created_before].presence)
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'posts.create', created_by_user: @actor) do
|
||||
post.save!
|
||||
post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
|
||||
snapshot_tags = planned_snapshot_tags(locale)
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
class PostVersionRecorder < VersionRecorder
|
||||
def self.record! post:, event_type:, event:, created_by_user:
|
||||
def self.record! post:, event_type:, created_by_user:, event: nil
|
||||
new(post:, event_type:, event:, created_by_user:).record!
|
||||
end
|
||||
|
||||
def initialize post:, event_type:, event:, created_by_user:
|
||||
def initialize post:, event_type:, created_by_user:, event: nil
|
||||
super(record: post, event_type:, event:, created_by_user:)
|
||||
end
|
||||
|
||||
def self.ensure_snapshot! post, created_by_user:
|
||||
return if post.post_versions.exists?
|
||||
|
||||
event = Event.create!(event_type: 'posts.create',
|
||||
created_by_user:,
|
||||
created_at: post.created_at)
|
||||
event = current_event || Event.new(event_type: 'posts.create',
|
||||
created_by_user:,
|
||||
created_at: post.created_at)
|
||||
record!(post:, event_type: :create, event:, created_by_user:)
|
||||
end
|
||||
|
||||
|
||||
@@ -4,7 +4,8 @@ class TagDescriptionOperation
|
||||
end
|
||||
|
||||
def self.create! locale, tag:, body:, created_by_user:, message: nil
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tag_descriptions.create', created_by_user:, reason: message) do
|
||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||
tag.lock!
|
||||
raise ActiveRecord::RecordNotUnique if TagDescription.exists?(
|
||||
@@ -19,7 +20,9 @@ class TagDescriptionOperation
|
||||
end
|
||||
|
||||
def self.update! locale, tag:, body:, updated_by_user:, message: nil, base_revision_id: nil
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tag_descriptions.update',
|
||||
created_by_user: updated_by_user, reason: message) do
|
||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||
tag.lock!
|
||||
description = TagDescription.lock.find_by!(
|
||||
@@ -43,6 +46,7 @@ class TagDescriptionOperation
|
||||
description.created_by_user_id = user.id if creating
|
||||
description.update!(body:, version_no:, updated_by_user_id: user.id)
|
||||
TagDescriptionVersion.create!(
|
||||
event: VersionRecorder.current_event,
|
||||
tag_id: description.tag_id, language_code: description.language_code,
|
||||
version_no:, event_type: creating ? 'create' : 'update', body:,
|
||||
source_language_code: description.source_language_code,
|
||||
|
||||
@@ -3,7 +3,8 @@ class TagGroupOperation
|
||||
|
||||
def self.create!(locale, name:, description:, members:, placements:, actor:,
|
||||
require_compatibility: false)
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tag_groups.create', created_by_user: actor) do
|
||||
group = TagGroup.new(version_no: 1, created_by_user: actor,
|
||||
updated_by_user: actor)
|
||||
attributes = prepare!(locale:, group:, name:, description:, members:, placements:)
|
||||
@@ -19,7 +20,8 @@ class TagGroupOperation
|
||||
|
||||
def self.update!(locale, group:, name:, description:, members:, placements:, actor:,
|
||||
require_compatibility: false)
|
||||
ApplicationRecord.transaction do
|
||||
VersionRecorder.record_operation!(
|
||||
event_type: 'tag_groups.update', created_by_user: actor) do
|
||||
group.lock!
|
||||
attributes = prepare!(locale:, group:, name:, description:, members:, placements:)
|
||||
if unchanged?(group, attributes)
|
||||
@@ -307,7 +309,8 @@ class TagGroupOperation
|
||||
private_class_method :persist_placements!
|
||||
|
||||
def self.persist_version!(group:, attributes:, actor:, event_type:)
|
||||
TagGroupVersion.create!(tag_group: group, version_no: group.version_no,
|
||||
TagGroupVersion.create!(event: VersionRecorder.current_event,
|
||||
tag_group: group, version_no: group.version_no,
|
||||
event_type:, name: group.name,
|
||||
description: group.description,
|
||||
members: attributes.fetch(:members),
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
class TagVersionRecorder < VersionRecorder
|
||||
def self.record! tag:, event_type:, event:, created_by_user:, **_options
|
||||
def self.record! tag:, event_type:, created_by_user:, event: nil, **_options
|
||||
Tag.transaction do
|
||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||
new(tag:, event_type:, event:, created_by_user:).record!
|
||||
end
|
||||
end
|
||||
|
||||
def initialize tag:, event_type:, event:, created_by_user:
|
||||
def initialize tag:, event_type:, created_by_user:, event: nil
|
||||
super(record: tag, event_type:, event:, created_by_user:)
|
||||
end
|
||||
|
||||
|
||||
@@ -1,7 +1,26 @@
|
||||
class VersionRecorder
|
||||
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
||||
|
||||
def initialize record:, event_type:, event:, created_by_user:
|
||||
def self.current_event
|
||||
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
|
||||
@event_type = event_type.to_s
|
||||
@event = event
|
||||
@@ -43,7 +62,9 @@ class VersionRecorder
|
||||
def base_attributes latest
|
||||
{ version_no: (latest&.version_no || 0) + 1,
|
||||
event_type: @event_type,
|
||||
event: @event,
|
||||
event: @event || self.class.current_event || Event.new(
|
||||
event_type: "#{ record_class.table_name }.#{ @event_type }",
|
||||
created_by_user: @created_by_user),
|
||||
created_by_user: @created_by_user,
|
||||
created_at: Time.current }
|
||||
end
|
||||
|
||||
@@ -9,12 +9,14 @@ module Youtube
|
||||
end
|
||||
|
||||
def sync!
|
||||
video_ids = discover_video_ids
|
||||
return if video_ids.empty?
|
||||
VersionRecorder.with_event(event_type: 'posts.sync', created_by_user: nil) do
|
||||
video_ids = discover_video_ids
|
||||
return if video_ids.empty?
|
||||
|
||||
video_ids.each_slice(50) do |ids|
|
||||
@client.videos(ids).fetch('items', []).each do |item|
|
||||
sync_video!(VideoItem.new(item))
|
||||
video_ids.each_slice(50) do |ids|
|
||||
@client.videos(ids).fetch('items', []).each do |item|
|
||||
sync_video!(VideoItem.new(item))
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -46,59 +48,61 @@ module Youtube
|
||||
end
|
||||
|
||||
def sync_video! video
|
||||
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
|
||||
ApplicationRecord.transaction do
|
||||
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
|
||||
|
||||
original_created_from = video.published_at.change(sec: 0)
|
||||
original_created_before = original_created_from + 1.minute
|
||||
original_created_from = video.published_at.change(sec: 0)
|
||||
original_created_before = original_created_from + 1.minute
|
||||
|
||||
post_created = false
|
||||
post_changed = false
|
||||
post_created = false
|
||||
post_changed = false
|
||||
|
||||
if post
|
||||
post.assign_attributes(title: video.title,
|
||||
original_created_from:,
|
||||
original_created_before:,
|
||||
thumbnail_base: video.thumbnail_url)
|
||||
if post
|
||||
post.assign_attributes(title: video.title,
|
||||
original_created_from:,
|
||||
original_created_before:,
|
||||
thumbnail_base: video.thumbnail_url)
|
||||
|
||||
post_changed = post.changed?
|
||||
post.save! if post_changed
|
||||
post_changed = post.changed?
|
||||
post.save! if post_changed
|
||||
|
||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||
else
|
||||
post_created = true
|
||||
post = Post.create!(
|
||||
title: video.title,
|
||||
url: video.url,
|
||||
thumbnail_base: video.thumbnail_url,
|
||||
uploaded_user_id: nil,
|
||||
original_created_from:,
|
||||
original_created_before:)
|
||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||
else
|
||||
post_created = true
|
||||
post = Post.create!(
|
||||
title: video.title,
|
||||
url: video.url,
|
||||
thumbnail_base: video.thumbnail_url,
|
||||
uploaded_user_id: nil,
|
||||
original_created_from:,
|
||||
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])
|
||||
end
|
||||
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id])
|
||||
end
|
||||
|
||||
kept_tag_ids = post.tags.pluck(:id).to_set
|
||||
desired_tag_ids = kept_tag_ids.to_a
|
||||
kept_tag_ids = post.tags.pluck(:id).to_set
|
||||
desired_tag_ids = kept_tag_ids.to_a
|
||||
|
||||
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
|
||||
if deerjikist
|
||||
desired_tag_ids.delete(Tag.no_deerjikist.id)
|
||||
desired_tag_ids << deerjikist.tag_id
|
||||
elsif post.tags.where(category: :deerjikist).none?
|
||||
desired_tag_ids << Tag.no_deerjikist.id
|
||||
end
|
||||
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
|
||||
if deerjikist
|
||||
desired_tag_ids.delete(Tag.no_deerjikist.id)
|
||||
desired_tag_ids << deerjikist.tag_id
|
||||
elsif post.tags.where(category: :deerjikist).none?
|
||||
desired_tag_ids << Tag.no_deerjikist.id
|
||||
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
|
||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
|
||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||
if post_created
|
||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
|
||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
生成ファイル
+1
@@ -656,6 +656,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_17_010000) do
|
||||
t.integer "post_count", default: 0, null: false
|
||||
t.integer "version_no", null: false
|
||||
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 "`version_no` > 0", name: "chk_tags_version_no_positive"
|
||||
end
|
||||
|
||||
+118
-114
@@ -67,129 +67,133 @@ namespace :nico do
|
||||
end
|
||||
|
||||
data = JSON.parse(stdout)
|
||||
data.each do |datum|
|
||||
code = datum['code']
|
||||
post =
|
||||
Post
|
||||
.where('url REGEXP ?', "nicovideo\\.jp/watch/#{ Regexp.escape(code) }([^0-9]|$)")
|
||||
.first
|
||||
VersionRecorder.with_event(event_type: 'posts.sync', created_by_user: nil) do
|
||||
data.each do |datum|
|
||||
ApplicationRecord.transaction do
|
||||
code = datum['code']
|
||||
post =
|
||||
Post
|
||||
.where('url REGEXP ?', "nicovideo\\.jp/watch/#{ Regexp.escape(code) }([^0-9]|$)")
|
||||
.first
|
||||
|
||||
title = datum['title']
|
||||
original_created_at = datum['uploaded_at'] &&
|
||||
Time.strptime(datum['uploaded_at'], '%Y-%m-%d %H:%M:%S')
|
||||
original_created_from = original_created_at&.change(sec: 0)
|
||||
original_created_before = original_created_from&.+(1.minute)
|
||||
title = datum['title']
|
||||
original_created_at = datum['uploaded_at'] &&
|
||||
Time.strptime(datum['uploaded_at'], '%Y-%m-%d %H:%M:%S')
|
||||
original_created_from = original_created_at&.change(sec: 0)
|
||||
original_created_before = original_created_from&.+(1.minute)
|
||||
|
||||
post_created = false
|
||||
post_changed = false
|
||||
post_created = false
|
||||
post_changed = false
|
||||
|
||||
if post
|
||||
attrs = { title:, original_created_from:, original_created_before: }
|
||||
if post
|
||||
attrs = { title:, original_created_from:, original_created_before: }
|
||||
|
||||
unless post.thumbnail.attached?
|
||||
thumbnail_base = fetch_thumbnail.(post.url) rescue nil
|
||||
if thumbnail_base.present?
|
||||
attrs[:thumbnail_base] = thumbnail_base
|
||||
begin
|
||||
post.attach_thumbnail_from_url!(thumbnail_base)
|
||||
rescue Post::RemoteThumbnailFetchFailed => e
|
||||
payload = {
|
||||
post_id: post.id,
|
||||
thumbnail_base:,
|
||||
error: e.class.name,
|
||||
message: e.message }
|
||||
Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }")
|
||||
unless post.thumbnail.attached?
|
||||
thumbnail_base = fetch_thumbnail.(post.url) rescue nil
|
||||
if thumbnail_base.present?
|
||||
attrs[:thumbnail_base] = thumbnail_base
|
||||
begin
|
||||
post.attach_thumbnail_from_url!(thumbnail_base)
|
||||
rescue Post::RemoteThumbnailFetchFailed => e
|
||||
payload = {
|
||||
post_id: post.id,
|
||||
thumbnail_base:,
|
||||
error: e.class.name,
|
||||
message: e.message }
|
||||
Rails.logger.info("nico_sync_thumbnail_fetch_failed #{ payload.to_json }")
|
||||
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
|
||||
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 }")
|
||||
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
|
||||
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
|
||||
|
||||
@@ -92,6 +92,7 @@ RSpec.describe 'Counts artifact policy and external references' do
|
||||
auto_generated: false, aliases: [] } })
|
||||
external = create(:external_tag, name: 'public-external')
|
||||
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,
|
||||
created_at: Time.utc(2024))
|
||||
post = create(:post)
|
||||
@@ -109,6 +110,7 @@ RSpec.describe 'Counts artifact policy and external references' do
|
||||
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
|
||||
end
|
||||
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
|
||||
event_id: create_event!(event_type: 'unknown').id,
|
||||
linked_tag_ids: '',
|
||||
created_at: Time.utc(2024, 7))
|
||||
HistoryAccess.set(user: nil) do
|
||||
|
||||
@@ -46,13 +46,13 @@ RSpec.describe VersionRecord, type: :model do
|
||||
|
||||
it 'makes NicoTagVersion read only after create' do
|
||||
version = NicoTagVersion.create!(
|
||||
external_tag: nico_tag,
|
||||
version_no: 1,
|
||||
event_type: 'create',
|
||||
linked_tag_ids: '',
|
||||
created_at: Time.current,
|
||||
created_by_user: nil
|
||||
)
|
||||
event_id: create_event!(event_type: 'external_tags.create').id,
|
||||
external_tag: nico_tag,
|
||||
version_no: 1,
|
||||
event_type: 'create',
|
||||
linked_tag_ids: '',
|
||||
created_at: Time.current,
|
||||
created_by_user: nil)
|
||||
|
||||
expect {
|
||||
version.update!(linked_tag_ids: '123')
|
||||
@@ -73,13 +73,13 @@ RSpec.describe VersionRecord, type: :model do
|
||||
|
||||
it 'prevents NicoTagVersion destroy' do
|
||||
version = NicoTagVersion.create!(
|
||||
external_tag: nico_tag,
|
||||
version_no: 1,
|
||||
event_type: 'create',
|
||||
linked_tag_ids: '',
|
||||
created_at: Time.current,
|
||||
created_by_user: nil
|
||||
)
|
||||
event_id: create_event!(event_type: 'external_tags.create').id,
|
||||
external_tag: nico_tag,
|
||||
version_no: 1,
|
||||
event_type: 'create',
|
||||
linked_tag_ids: '',
|
||||
created_at: Time.current,
|
||||
created_by_user: nil)
|
||||
|
||||
expect {
|
||||
version.destroy!
|
||||
|
||||
@@ -21,6 +21,7 @@ RSpec.describe 'Counts table API', type: :request do
|
||||
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||
created_at: Time.utc(2023))
|
||||
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))
|
||||
snapshots = [
|
||||
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
|
||||
@@ -61,9 +62,11 @@ RSpec.describe 'Counts table API', type: :request do
|
||||
|
||||
before do
|
||||
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, 1, 1))
|
||||
NicoTagVersion.create!(external_tag: external, version_no: 3,
|
||||
event_id: create_event!(event_type: 'unknown').id,
|
||||
event_type: 'update', linked_tag_ids: '',
|
||||
created_at: Time.utc(2024, 2, 1))
|
||||
end
|
||||
|
||||
@@ -184,7 +184,7 @@ RSpec.describe 'NicoTags', type: :request do
|
||||
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
|
||||
event = event_rows.last
|
||||
expect(event).to include(
|
||||
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
|
||||
'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)
|
||||
@@ -192,6 +192,7 @@ RSpec.describe 'NicoTags', type: :request do
|
||||
expect(versions.last.linked_tag_ids.split.map(&:to_i))
|
||||
.to match_array([linked_a.id, linked_b.id])
|
||||
expect(versions.last.created_by_user_id).to eq(admin.id)
|
||||
expect(versions.last.event_id).to eq(event.fetch('id'))
|
||||
end
|
||||
|
||||
it 'clears existing links and records the empty mapping for a member' do
|
||||
|
||||
@@ -20,6 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
|
||||
created_at: origin + index.hours)
|
||||
end
|
||||
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,
|
||||
created_at: origin)
|
||||
['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
|
||||
|
||||
@@ -32,8 +32,10 @@ RSpec.describe 'Counts export contracts' do
|
||||
|
||||
before do
|
||||
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))
|
||||
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))
|
||||
end
|
||||
|
||||
|
||||
@@ -15,6 +15,9 @@ RSpec.describe NicoTagVersionRecorder do
|
||||
external_tag:, version_no: 1, event_type: 'create',
|
||||
name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member)
|
||||
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
|
||||
|
||||
it 'uses the latest history number when the record has no version_no column' do
|
||||
@@ -26,6 +29,8 @@ RSpec.describe NicoTagVersionRecorder do
|
||||
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
|
||||
linked_tag_ids: tag.id.to_s)
|
||||
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)
|
||||
end
|
||||
|
||||
|
||||
@@ -18,6 +18,9 @@ RSpec.describe VersionRecorder do
|
||||
|
||||
expect(version.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
|
||||
|
||||
it 'updates record version_no when creating the next version' do
|
||||
@@ -36,6 +39,8 @@ RSpec.describe VersionRecorder do
|
||||
|
||||
expect(version.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
|
||||
|
||||
it 'does not create a new version or advance version_no when snapshot is unchanged' do
|
||||
@@ -44,6 +49,7 @@ RSpec.describe VersionRecorder do
|
||||
post: post_record,
|
||||
event_type: :create,
|
||||
created_by_user: member)
|
||||
events = Event.count
|
||||
|
||||
expect {
|
||||
version =
|
||||
@@ -56,6 +62,108 @@ RSpec.describe VersionRecorder do
|
||||
}.not_to change(PostVersion, :count)
|
||||
|
||||
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
|
||||
|
||||
it 'raises when record version_no is older than the latest version' do
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする