WIP: preserve failed Codex job issue-414-4ki4y15_
このコミットが含まれているのは:
@@ -2,6 +2,13 @@ require 'set'
|
|||||||
|
|
||||||
|
|
||||||
class MaterialsController < ApplicationController
|
class MaterialsController < ApplicationController
|
||||||
|
around_action only: [:create, :update, :destroy] do |controller, action|
|
||||||
|
event_type = controller.action_name == 'destroy' ? 'discard' : controller.action_name
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: "materials.#{ event_type }",
|
||||||
|
created_by_user: controller.current_user, &action)
|
||||||
|
end
|
||||||
|
|
||||||
rescue_from MaterialZipExporter::EmptyExportError, with: :render_zip_empty
|
rescue_from MaterialZipExporter::EmptyExportError, with: :render_zip_empty
|
||||||
rescue_from MaterialZipExporter::DuplicatePathError, with: :render_zip_duplicate_path
|
rescue_from MaterialZipExporter::DuplicatePathError, with: :render_zip_duplicate_path
|
||||||
rescue_from MaterialZipExporter::MissingFileError, with: :render_zip_missing_file
|
rescue_from MaterialZipExporter::MissingFileError, with: :render_zip_missing_file
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
class NicoTagsController < ApplicationController
|
class NicoTagsController < ApplicationController
|
||||||
|
around_action only: [:update] do |controller, action|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'external_tags.update',
|
||||||
|
created_by_user: controller.current_user, &action)
|
||||||
|
end
|
||||||
|
|
||||||
def index
|
def index
|
||||||
locale = resolve_locale!
|
locale = resolve_locale!
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
class PostsController < ApplicationController
|
class PostsController < ApplicationController
|
||||||
|
around_action only: [:update] do |controller, action|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'posts.update',
|
||||||
|
created_by_user: controller.current_user, &action)
|
||||||
|
end
|
||||||
|
|
||||||
Event = Struct.new(:post, :tag, :user, :change_type, :timestamp, keyword_init: true)
|
Event = Struct.new(:post, :tag, :user, :change_type, :timestamp, keyword_init: true)
|
||||||
MAX_BULK_REQUEST_BYTES = 40 * 1024 * 1024
|
MAX_BULK_REQUEST_BYTES = 40 * 1024 * 1024
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
class TagChildrenController < ApplicationController
|
class TagChildrenController < ApplicationController
|
||||||
|
around_action only: [:create, :destroy] do |controller, action|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'tags.update',
|
||||||
|
created_by_user: controller.current_user, &action)
|
||||||
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.admin?
|
return head :forbidden unless current_user.admin?
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ require 'set'
|
|||||||
|
|
||||||
|
|
||||||
class TagsController < ApplicationController
|
class TagsController < ApplicationController
|
||||||
|
around_action only: [:update, :update_all] do |controller, action|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'tags.update',
|
||||||
|
created_by_user: controller.current_user, &action)
|
||||||
|
end
|
||||||
|
|
||||||
def index
|
def index
|
||||||
locale = resolve_locale!
|
locale = resolve_locale!
|
||||||
|
|
||||||
|
|||||||
@@ -246,6 +246,8 @@ class WikiPagesController < ApplicationController
|
|||||||
|
|
||||||
base_revision_id = params[:base_revision_id].presence
|
base_revision_id = params[:base_revision_id].presence
|
||||||
|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'tag_descriptions.update', created_by_user: current_user) do
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||||
tag.lock!
|
tag.lock!
|
||||||
@@ -265,6 +267,7 @@ class WikiPagesController < ApplicationController
|
|||||||
TagVersionRecorder.record!(tag:, event_type: :update, created_by_user: current_user)
|
TagVersionRecorder.record!(tag:, event_type: :update, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
head :ok
|
head :ok
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class Event < ApplicationRecord
|
class Event < ApplicationRecord
|
||||||
has_many :post_versions
|
has_many :post_versions
|
||||||
has_many :tag_versions
|
has_many :tag_versions
|
||||||
|
has_many :nico_tag_versions
|
||||||
has_many :material_versions
|
has_many :material_versions
|
||||||
has_many :tag_description_versions
|
has_many :tag_description_versions
|
||||||
has_many :tag_group_versions
|
has_many :tag_group_versions
|
||||||
|
|||||||
@@ -290,6 +290,7 @@ class Tag < ApplicationRecord
|
|||||||
|
|
||||||
affected_post_ids = Set.new
|
affected_post_ids = Set.new
|
||||||
|
|
||||||
|
VersionRecorder.with_event(event_type: 'tags.update', created_by_user:) do
|
||||||
Tag.transaction do
|
Tag.transaction do
|
||||||
TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
|
TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
|
||||||
|
|
||||||
@@ -332,6 +333,7 @@ class Tag < ApplicationRecord
|
|||||||
# 投稿件数を再集計
|
# 投稿件数を再集計
|
||||||
target_tag.update_columns(post_count: PostTag.where(tag: target_tag).count)
|
target_tag.update_columns(post_count: PostTag.where(tag: target_tag).count)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
target_tag.reload
|
target_tag.reload
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class TagNameSanitisationRule < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def apply!
|
def apply!
|
||||||
|
VersionRecorder.with_event(event_type: 'tags.update', created_by_user: nil) do
|
||||||
Language.find_each do |language|
|
Language.find_each do |language|
|
||||||
TagName.where(language:).find_each do |candidate|
|
TagName.where(language:).find_each do |candidate|
|
||||||
TagName.transaction do
|
TagName.transaction do
|
||||||
@@ -50,6 +51,7 @@ class TagNameSanitisationRule < ApplicationRecord
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,9 @@ class MaterialSyncImporter
|
|||||||
suppression: @import_block)
|
suppression: @import_block)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: "materials.#{ event_type }",
|
||||||
|
created_by_user: @attributes[:updated_by_user]) do
|
||||||
Material.transaction do
|
Material.transaction do
|
||||||
if material.persisted?
|
if material.persisted?
|
||||||
MaterialVersionRecorder.ensure_snapshot!(material,
|
MaterialVersionRecorder.ensure_snapshot!(material,
|
||||||
@@ -65,6 +68,7 @@ class MaterialSyncImporter
|
|||||||
event_type:,
|
event_type:,
|
||||||
created_by_user: @attributes[:updated_by_user])
|
created_by_user: @attributes[:updated_by_user])
|
||||||
end
|
end
|
||||||
|
end
|
||||||
MaterialThumbnailGenerator.generate!(material)
|
MaterialThumbnailGenerator.generate!(material)
|
||||||
|
|
||||||
Result.new(material:,
|
Result.new(material:,
|
||||||
@@ -200,10 +204,10 @@ class MaterialSyncImporter
|
|||||||
end
|
end
|
||||||
|
|
||||||
def same_source_attributes? material, source
|
def same_source_attributes? material, source
|
||||||
material.source_kind == source[:source_kind] \
|
material.source_kind == source[:source_kind] &&
|
||||||
&& material.source_uri == source[:source_uri] \
|
material.source_uri == source[:source_uri] &&
|
||||||
&& material.source_path == source[:source_path] \
|
material.source_path == source[:source_path] &&
|
||||||
&& material.source_file_id == source[:source_file_id]
|
material.source_file_id == source[:source_file_id]
|
||||||
end
|
end
|
||||||
|
|
||||||
def same_export_path? material
|
def same_export_path? material
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ 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),
|
||||||
@@ -12,6 +13,7 @@ class MaterialSyncRunner
|
|||||||
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
|
||||||
@source = source
|
@source = source
|
||||||
@@ -21,6 +23,7 @@ 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
|
||||||
@@ -30,6 +33,7 @@ class MaterialSyncRunner
|
|||||||
sync_candidate!(candidate, result)
|
sync_candidate!(candidate, result)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
@source.update!(last_synced_at: Time.current)
|
@source.update!(last_synced_at: Time.current)
|
||||||
log_result(result)
|
log_result(result)
|
||||||
|
|||||||
@@ -11,11 +11,14 @@ class MaterialSyncSuppressionRegistrar
|
|||||||
def create!
|
def create!
|
||||||
suppression = nil
|
suppression = nil
|
||||||
|
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'materials.discard', created_by_user: @created_by_user) do
|
||||||
MaterialSyncSuppression.transaction do
|
MaterialSyncSuppression.transaction 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)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
suppression
|
suppression
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
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:, 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!
|
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record!
|
||||||
end
|
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
|
@file_snapshot = file_snapshot
|
||||||
|
|
||||||
super(record: material, event_type:, event:, created_by_user:)
|
super(record: material, event_type:, event:, created_by_user:)
|
||||||
@@ -14,10 +14,7 @@ class MaterialVersionRecorder < VersionRecorder
|
|||||||
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 = Event.create!(event_type: 'materials.create',
|
record!(material:, event_type: :create,
|
||||||
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
|
||||||
|
|
||||||
|
|||||||
@@ -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:
|
def self.record! external_tag:, event_type:, created_by_user:, event: nil
|
||||||
new(external_tag:, event_type:, created_by_user:).record!
|
new(external_tag:, event_type:, created_by_user:, event:).record!
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize 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:)
|
super(record: external_tag, event_type:, created_by_user:, event:)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ class PostBulkCreator
|
|||||||
end
|
end
|
||||||
|
|
||||||
def run locale
|
def run locale
|
||||||
|
@event_context = nil
|
||||||
|
@event_mutex = Mutex.new
|
||||||
results = Array.new(@posts.length)
|
results = Array.new(@posts.length)
|
||||||
mutex = Mutex.new
|
mutex = Mutex.new
|
||||||
next_index = 0
|
next_index = 0
|
||||||
@@ -74,9 +76,17 @@ class PostBulkCreator
|
|||||||
existing_post: preflight[:existing_post] }
|
existing_post: preflight[:existing_post] }
|
||||||
end
|
end
|
||||||
|
|
||||||
post = PostCreator.new(
|
# Keep preflight parallel, but publish the shared event with its first
|
||||||
|
# successful post before another worker can reference it.
|
||||||
|
post = @event_mutex.synchronize do
|
||||||
|
@event_context ||= { event_type: 'posts.create', created_by_user: actor }
|
||||||
|
VersionRecorder.with_event(
|
||||||
|
event_type: 'posts.create', created_by_user: actor, context: @event_context) do
|
||||||
|
PostCreator.new(
|
||||||
actor: actor,
|
actor: actor,
|
||||||
attributes: normalised_attributes(attributes, preflight, index)).create!(locale)
|
attributes: normalised_attributes(attributes, preflight, index)).create!(locale)
|
||||||
|
end
|
||||||
|
end
|
||||||
result = {
|
result = {
|
||||||
status: 'created',
|
status: 'created',
|
||||||
post: { id: post.id } }
|
post: { id: post.id } }
|
||||||
|
|||||||
@@ -18,6 +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.with_event(event_type: 'posts.create', created_by_user: @actor) do
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
post.save!
|
post.save!
|
||||||
post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
|
post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
|
||||||
@@ -34,6 +35,7 @@ class PostCreator
|
|||||||
sync_parent_posts!(post, planned_parent_post_ids(locale))
|
sync_parent_posts!(post, planned_parent_post_ids(locale))
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: @actor)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: @actor)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
post
|
post
|
||||||
rescue StandardError
|
rescue StandardError
|
||||||
post&.thumbnail&.purge if post&.thumbnail&.attached?
|
post&.thumbnail&.purge if post&.thumbnail&.attached?
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
class PostVersionRecorder < VersionRecorder
|
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!
|
new(post:, event_type:, event:, created_by_user:).record!
|
||||||
end
|
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:)
|
super(record: post, event_type:, event:, 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 = Event.create!(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
|
||||||
|
|||||||
@@ -42,9 +42,13 @@ class TagDescriptionOperation
|
|||||||
version_no = creating ? 1 : description.version_no + 1
|
version_no = creating ? 1 : description.version_no + 1
|
||||||
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)
|
||||||
|
event_type = creating ? 'create' : 'update'
|
||||||
|
event = VersionRecorder.record_event!(
|
||||||
|
event_type: "tag_descriptions.#{ event_type }", created_by_user: user)
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
|
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:, body:,
|
||||||
source_language_code: description.source_language_code,
|
source_language_code: description.source_language_code,
|
||||||
source_version_no: description.source_version_no,
|
source_version_no: description.source_version_no,
|
||||||
created_by_user_id: user.id, created_at: Time.current)
|
created_by_user_id: user.id, created_at: Time.current)
|
||||||
|
|||||||
@@ -307,7 +307,9 @@ 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!(tag_group: group, version_no: group.version_no,
|
event = VersionRecorder.record_event!(
|
||||||
|
event_type: "tag_groups.#{ event_type }", created_by_user: actor)
|
||||||
|
TagGroupVersion.create!(tag_group: group, version_no: group.version_no, event:,
|
||||||
event_type:, name: group.name,
|
event_type:, name: group.name,
|
||||||
description: group.description,
|
description: group.description,
|
||||||
members: attributes.fetch(:members),
|
members: attributes.fetch(:members),
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class TagNameCompletion
|
class TagNameCompletion
|
||||||
class << self
|
class << self
|
||||||
def for_locale! locale
|
def for_locale! locale
|
||||||
|
VersionRecorder.with_event(event_type: 'locales.create', created_by_user: nil) do
|
||||||
completed = Tag.transaction do
|
completed = Tag.transaction do
|
||||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||||
certified_names =
|
certified_names =
|
||||||
@@ -26,6 +27,7 @@ class TagNameCompletion
|
|||||||
raise ActiveRecord::RecordNotSaved, 'Locale tag completion was rolled back'
|
raise ActiveRecord::RecordNotSaved, 'Locale tag completion was rolled back'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def for_tag! tag, locales: nil, certified_names: { }, created_by_user: nil
|
def for_tag! tag, locales: nil, certified_names: { }, created_by_user: nil
|
||||||
locales ||=
|
locales ||=
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
class TagVersionRecorder < VersionRecorder
|
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
|
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:, event:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
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:)
|
super(record: tag, event_type:, event:, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,26 @@
|
|||||||
class VersionRecorder
|
class VersionRecorder
|
||||||
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
||||||
|
|
||||||
def initialize record:, event_type:, event:, created_by_user:
|
# The scope is lazy: unchanged snapshots do not create an operation log.
|
||||||
|
def self.with_event event_type:, created_by_user:, context: nil
|
||||||
|
previous = ActiveSupport::IsolatedExecutionState[:version_event]
|
||||||
|
ActiveSupport::IsolatedExecutionState[:version_event] =
|
||||||
|
context || previous || { event_type:, created_by_user: }
|
||||||
|
yield
|
||||||
|
ensure
|
||||||
|
ActiveSupport::IsolatedExecutionState[:version_event] = previous
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.record_event! event_type:, created_by_user:
|
||||||
|
context = ActiveSupport::IsolatedExecutionState[:version_event]
|
||||||
|
return Event.create!(event_type:, created_by_user:) unless context
|
||||||
|
return context[:event] if context[:event]&.persisted?
|
||||||
|
|
||||||
|
# Active Record resets persisted? when the creating transaction rolls back.
|
||||||
|
context[:event] = Event.create!(context.slice(:event_type, :created_by_user))
|
||||||
|
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
|
@event = event
|
||||||
@@ -43,7 +62,9 @@ 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,
|
event: @event || self.class.record_event!(
|
||||||
|
event_type: "#{ event_resource }.#{ @event_type }",
|
||||||
|
created_by_user: @created_by_user),
|
||||||
created_by_user: @created_by_user,
|
created_by_user: @created_by_user,
|
||||||
created_at: Time.current }
|
created_at: Time.current }
|
||||||
end
|
end
|
||||||
@@ -90,5 +111,6 @@ class VersionRecorder
|
|||||||
def snapshot_attributes = raise NotImplementedError
|
def snapshot_attributes = raise NotImplementedError
|
||||||
|
|
||||||
def record_class = @record.class
|
def record_class = @record.class
|
||||||
|
def event_resource = record_class.table_name
|
||||||
def event_types = self.class::EVENT_TYPES
|
def event_types = self.class::EVENT_TYPES
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -12,12 +12,14 @@ module Youtube
|
|||||||
video_ids = discover_video_ids
|
video_ids = discover_video_ids
|
||||||
return if video_ids.empty?
|
return if video_ids.empty?
|
||||||
|
|
||||||
|
VersionRecorder.with_event(event_type: 'posts.sync', created_by_user: nil) do
|
||||||
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
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ 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']
|
code = datum['code']
|
||||||
post =
|
post =
|
||||||
@@ -193,4 +194,5 @@ namespace :nico do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ RSpec.describe 'Counts artifact policy and external references' do
|
|||||||
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)
|
||||||
@@ -109,6 +110,7 @@ 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
|
||||||
|
|||||||
@@ -46,13 +46,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: 'unknown').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 +73,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: 'unknown').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!
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ RSpec.describe 'Counts masked search', type: :request do
|
|||||||
before do
|
before do
|
||||||
[1, 2].each do |number|
|
[1, 2].each do |number|
|
||||||
TagVersion.create!(tag:, version_no: number,
|
TagVersion.create!(tag:, version_no: number,
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
event_type: number == 1 ? 'create' : 'discard', name: '秘密のタグ',
|
event_type: number == 1 ? 'create' : 'discard', name: '秘密のタグ',
|
||||||
category: 'general', aliases: '秘密の別名', parent_tag_ids: '',
|
category: 'general', aliases: '秘密の別名', parent_tag_ids: '',
|
||||||
names: { ja: { name: '秘密のタグ', script_code: 'Jpan', auto_generated: false,
|
names: { ja: { name: '秘密のタグ', script_code: 'Jpan', auto_generated: false,
|
||||||
@@ -113,6 +114,7 @@ RSpec.describe 'Counts masked search', type: :request do
|
|||||||
it 'searches public literal markers and treats axis predicates as explicit' do
|
it 'searches public literal markers and treats axis predicates as explicit' do
|
||||||
public_tag = create(:tag, primary_name: '********')
|
public_tag = create(:tag, primary_name: '********')
|
||||||
TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create',
|
TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create',
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
name: '********', category: 'general', aliases: '', parent_tag_ids: '',
|
name: '********', category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name: '********', script_code: 'Jpan', auto_generated: false,
|
names: { ja: { name: '********', script_code: 'Jpan', auto_generated: false,
|
||||||
aliases: [] } }, created_at: Time.utc(2023))
|
aliases: [] } }, created_at: Time.utc(2023))
|
||||||
@@ -177,6 +179,7 @@ RSpec.describe 'Counts masked search', type: :request do
|
|||||||
it 'rejects private names reached through a post tag snapshot' do
|
it 'rejects private names reached through a post tag snapshot' do
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'post',
|
PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'post',
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
url: post.url, tags: '', parent_post_ids: '',
|
url: post.url, tags: '', parent_post_ids: '',
|
||||||
tags_json: [{ tag_id: tag.id, version_no: 1, name: '秘密のタグ',
|
tags_json: [{ tag_id: tag.id, version_no: 1, name: '秘密のタグ',
|
||||||
category: 'general', sections: [] }],
|
category: 'general', sections: [] }],
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
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: [] },
|
||||||
@@ -61,9 +62,11 @@ 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
|
||||||
@@ -487,6 +490,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
|
|
||||||
it 'allows public identity predicates without exposing private snapshot fields' do
|
it 'allows public identity predicates without exposing private snapshot fields' do
|
||||||
PostVersion.create!(post: record, version_no: 4, event_type: 'discard',
|
PostVersion.create!(post: record, version_no: 4, event_type: 'discard',
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
url: record.url, title: 'hidden title', tags: '', tags_json: [],
|
url: record.url, title: 'hidden title', tags: '', tags_json: [],
|
||||||
parent_post_ids: '', created_at: Time.utc(2024, 3))
|
parent_post_ids: '', created_at: Time.utc(2024, 3))
|
||||||
|
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
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
|
event = event_rows.last
|
||||||
expect(event).to include(
|
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')])
|
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)
|
||||||
@@ -192,6 +192,7 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
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
|
||||||
|
|||||||
@@ -14,12 +14,14 @@ RSpec.describe 'Post history privacy', type: :request do
|
|||||||
before do
|
before do
|
||||||
['create', 'discard'].each_with_index do |event, index|
|
['create', 'discard'].each_with_index do |event, index|
|
||||||
TagVersion.create!(tag:, version_no: index + 1, event_type: event,
|
TagVersion.create!(tag:, version_no: index + 1, event_type: event,
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
name: 'private-history-tag', category: 'general', aliases: '', parent_tag_ids: '',
|
name: 'private-history-tag', category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name: 'private-history-tag', script_code: 'Jpan',
|
names: { ja: { name: 'private-history-tag', script_code: 'Jpan',
|
||||||
auto_generated: false, aliases: [] } },
|
auto_generated: false, aliases: [] } },
|
||||||
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|
|
||||||
@@ -32,6 +34,7 @@ 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,
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
title: "version #{ index + 1 }", url: post_record.url, tags: '',
|
title: "version #{ index + 1 }", url: post_record.url, tags: '',
|
||||||
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
|
||||||
@@ -51,6 +54,7 @@ RSpec.describe 'Post history privacy', type: :request do
|
|||||||
it 'keeps every version through a later discard private after another restore' do
|
it 'keeps every version through a later discard private after another restore' do
|
||||||
['discard', 'restore'].each_with_index do |event, index|
|
['discard', 'restore'].each_with_index do |event, index|
|
||||||
PostVersion.create!(post: post_record, version_no: index + 5, event_type: event,
|
PostVersion.create!(post: post_record, version_no: index + 5, event_type: event,
|
||||||
|
event_id: create_event!(event_type: 'unknown').id,
|
||||||
title: 'later snapshot', url: post_record.url, tags: '', tags_json: [],
|
title: 'later snapshot', url: post_record.url, tags: '', tags_json: [],
|
||||||
parent_post_ids: '', created_at: origin + (index + 5).days)
|
parent_post_ids: '', created_at: origin + (index + 5).days)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -32,8 +32,10 @@ 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
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ 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)
|
||||||
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
|
||||||
@@ -25,6 +27,8 @@ 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(second.event).to have_attributes(
|
||||||
|
event_type: 'external_tags.update', created_by_user: member)
|
||||||
expect(first.reload.name).to eq('nico:raw tag[]')
|
expect(first.reload.name).to eq('nico:raw tag[]')
|
||||||
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
|
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -18,6 +18,9 @@ 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, reason: nil)
|
||||||
|
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
|
||||||
@@ -44,6 +47,7 @@ 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_rows
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
version =
|
version =
|
||||||
@@ -56,6 +60,130 @@ 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_rows).to eq(events)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'shares the outer operation between different history types' do
|
||||||
|
tag = create(:tag)
|
||||||
|
external = create(:external_tag)
|
||||||
|
material = Material.create!(url: 'https://example.com/event-material')
|
||||||
|
member
|
||||||
|
post_record
|
||||||
|
versions = []
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.with_event(event_type: 'posts.create', created_by_user: member) do
|
||||||
|
versions << PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member)
|
||||||
|
described_class.with_event(event_type: 'tags.update', created_by_user: nil) do
|
||||||
|
versions << TagVersioning.record_tag_snapshot!(tag, created_by_user: member)
|
||||||
|
versions << NicoTagVersionRecorder.record!(
|
||||||
|
external_tag: external, event_type: :create, created_by_user: member)
|
||||||
|
versions << MaterialVersionRecorder.record!(
|
||||||
|
material:, event_type: :create, created_by_user: member)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
}.to change(Event, :count).by(1)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_id).uniq).to eq([versions.first.event_id])
|
||||||
|
expect(versions.first.event).to have_attributes(
|
||||||
|
event_type: 'posts.create', created_by_user: member)
|
||||||
|
expect(versions.first.event.nico_tag_versions).to contain_exactly(versions[2])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'recreates a rolled-back event before the next successful history' do
|
||||||
|
member
|
||||||
|
post_record
|
||||||
|
events = event_rows
|
||||||
|
version = nil
|
||||||
|
|
||||||
|
described_class.with_event(event_type: 'posts.sync', created_by_user: nil) do
|
||||||
|
ApplicationRecord.transaction(requires_new: true) do
|
||||||
|
PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member)
|
||||||
|
raise ActiveRecord::Rollback
|
||||||
|
end
|
||||||
|
|
||||||
|
expect(event_rows).to eq(events)
|
||||||
|
expect(post_record.reload.post_versions).to be_empty
|
||||||
|
expect(post_record.version_no).to eq(1)
|
||||||
|
version = PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member)
|
||||||
|
end
|
||||||
|
|
||||||
|
expect(Event.count).to eq(events.length + 1)
|
||||||
|
expect(version.event).to have_attributes(event_type: 'posts.sync', created_by_user: nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'clears the operation after an exception' do
|
||||||
|
expect {
|
||||||
|
described_class.with_event(event_type: 'posts.sync', created_by_user: nil) do
|
||||||
|
raise 'operation failed'
|
||||||
|
end
|
||||||
|
}.to raise_error('operation failed')
|
||||||
|
|
||||||
|
version = PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member)
|
||||||
|
|
||||||
|
expect(version.event).to have_attributes(event_type: 'posts.create', created_by_user: member)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not create an event for an empty operation' do
|
||||||
|
expect {
|
||||||
|
described_class.with_event(event_type: 'posts.sync', created_by_user: nil) { nil }
|
||||||
|
}.not_to change(Event, :count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'rolls back the event when its version fails validation' do
|
||||||
|
post_record.update_columns(url: '')
|
||||||
|
member
|
||||||
|
events = event_rows
|
||||||
|
|
||||||
|
expect {
|
||||||
|
ApplicationRecord.transaction(requires_new: true) do
|
||||||
|
PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member)
|
||||||
|
end
|
||||||
|
}.to raise_error(ActiveRecord::RecordInvalid)
|
||||||
|
|
||||||
|
expect(post_record.reload.post_versions).to be_empty
|
||||||
|
expect(event_rows).to eq(events)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'keeps an explicitly supplied event' do
|
||||||
|
event = Event.create!(event_type: 'posts.create', created_by_user: member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
version = PostVersionRecorder.record!(
|
||||||
|
post: post_record, event_type: :create, created_by_user: member, event:)
|
||||||
|
expect(version.event).to eq(event)
|
||||||
|
}.not_to change(Event, :count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'keeps simultaneous operation scopes separate' do
|
||||||
|
ready = Queue.new
|
||||||
|
continuation = Queue.new
|
||||||
|
events = ['posts.sync', 'materials.sync'].to_h do |event_type|
|
||||||
|
event = instance_double(Event, persisted?: true)
|
||||||
|
allow(Event).to receive(:create!).with({ event_type:, created_by_user: nil })
|
||||||
|
.and_return(event)
|
||||||
|
[event_type, event]
|
||||||
|
end
|
||||||
|
workers = events.keys.map do |event_type|
|
||||||
|
Thread.new do
|
||||||
|
described_class.with_event(event_type:, created_by_user: nil) do
|
||||||
|
ready << true
|
||||||
|
continuation.pop
|
||||||
|
described_class.record_event!(event_type: 'tags.create', created_by_user: nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
2.times { ready.pop }
|
||||||
|
2.times { continuation << true }
|
||||||
|
|
||||||
|
expect(workers.map(&:value)).to eq(events.values)
|
||||||
|
ensure
|
||||||
|
workers&.each(&:join)
|
||||||
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
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする