コミットを比較
3
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
a259087840 | ||
|
|
006295dc45 | ||
|
|
c3c6f2bc48 |
@@ -0,0 +1,35 @@
|
|||||||
|
## 背景
|
||||||
|
|
||||||
|
なぜ必要か。
|
||||||
|
|
||||||
|
## 対象範囲
|
||||||
|
|
||||||
|
- backend:
|
||||||
|
- frontend:
|
||||||
|
- docs:
|
||||||
|
- migration:
|
||||||
|
|
||||||
|
## やること
|
||||||
|
|
||||||
|
- [ ]
|
||||||
|
|
||||||
|
## 受け入れ条件
|
||||||
|
|
||||||
|
- [ ]
|
||||||
|
|
||||||
|
## 実行すべき確認
|
||||||
|
|
||||||
|
- [ ] `cd backend && bundle exec rspec`
|
||||||
|
- [ ] `cd frontend && npm run build`
|
||||||
|
- [ ] `cd frontend && npm run lint`
|
||||||
|
|
||||||
|
## 禁止事項
|
||||||
|
|
||||||
|
- unrelated refactor はしない
|
||||||
|
- 既存 API response shape を壊さない
|
||||||
|
- 認証・認可・BAN を弱めない
|
||||||
|
|
||||||
|
## Codex への指示
|
||||||
|
|
||||||
|
この issue を読んで実装してください。
|
||||||
|
不明点があれば、実装前に調査結果と選択肢を提示してください。
|
||||||
@@ -100,9 +100,18 @@ class PostVersionsController < ApplicationController
|
|||||||
|
|
||||||
def external_tag_names_for snapshots
|
def external_tag_names_for snapshots
|
||||||
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
|
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
|
||||||
ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
|
names = ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
|
||||||
[id, "#{ platform }:#{ name }"]
|
[id, "#{ platform }:#{ name }"]
|
||||||
}
|
}
|
||||||
|
missing_ids = ids - names.keys
|
||||||
|
|
||||||
|
HistoryAccess.visible(NicoTagVersion.all)
|
||||||
|
.where(tag_id: missing_ids)
|
||||||
|
.order(:tag_id, version_no: :desc)
|
||||||
|
.pluck(:tag_id, :name)
|
||||||
|
.each { |id, name| names[id] ||= name }
|
||||||
|
|
||||||
|
names
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_tag_literals snapshots, tag_names, external_tag_names
|
def snapshot_tag_literals snapshots, tag_names, external_tag_names
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
class Event < ApplicationRecord
|
|
||||||
has_many :post_versions
|
|
||||||
has_many :tag_versions
|
|
||||||
has_many :material_versions
|
|
||||||
has_many :tag_description_versions
|
|
||||||
has_many :tag_group_versions
|
|
||||||
|
|
||||||
belongs_to :created_by_user, class_name: 'User', optional: true
|
|
||||||
end
|
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
class ExternalTag < ApplicationRecord
|
class ExternalTag < ApplicationRecord
|
||||||
before_create { SharedResourceIdAllocator.assign!(self) }
|
before_create { SharedResourceIdAllocator.assign!(self) }
|
||||||
# Must run before dependent association callbacks.
|
|
||||||
before_destroy :prevent_destroy
|
|
||||||
|
|
||||||
enum :platform, nico: 'nico'
|
enum :platform, nico: 'nico'
|
||||||
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
|
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
|
||||||
validate :immutable_identity, on: :update
|
|
||||||
|
|
||||||
has_many :post_external_tags, dependent: :delete_all
|
has_many :post_external_tags, dependent: :delete_all
|
||||||
has_many :posts, through: :post_external_tags
|
has_many :posts, through: :post_external_tags
|
||||||
@@ -19,21 +16,11 @@ class ExternalTag < ApplicationRecord
|
|||||||
|
|
||||||
has_many :linked_tags, through: :nico_tag_relations, source: :tag
|
has_many :linked_tags, through: :nico_tag_relations, source: :tag
|
||||||
|
|
||||||
def snapshot_linked_tag_ids = linked_tags.distinct.order(:id).pluck(:id)
|
def snapshot_linked_tag_names language_code = 'ja'
|
||||||
|
linked_tags
|
||||||
def delete
|
.joins(:tag_names)
|
||||||
raise ActiveRecord::ReadOnlyRecord, '外部タグは削除できません.'
|
.where(tag_names: { language_code:, primary_flg: true })
|
||||||
end
|
.order('tag_names.name')
|
||||||
|
.pluck('tag_names.name')
|
||||||
private
|
|
||||||
|
|
||||||
def immutable_identity
|
|
||||||
errors.add(:platform, 'は変更できません.') if will_save_change_to_platform?
|
|
||||||
errors.add(:name, 'は変更できません.') if will_save_change_to_name?
|
|
||||||
end
|
|
||||||
|
|
||||||
def prevent_destroy
|
|
||||||
errors.add(:base, '外部タグは削除できません.')
|
|
||||||
throw(:abort)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -106,7 +106,21 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
|
|||||||
snapshot_reference(TagVersion, row),
|
snapshot_reference(TagVersion, row),
|
||||||
snapshot_reference(NicoTagVersion, row, external: true)]
|
snapshot_reference(NicoTagVersion, row, external: true)]
|
||||||
when 'nico_tag_versions'
|
when 'nico_tag_versions'
|
||||||
[list_reference('tag_versions', 'tag_id', "#{ row }.linked_tag_ids")]
|
# Legacy linked_tags snapshots contain names, not IDs. Match recorded names
|
||||||
|
# conservatively; never expose a private linked name through an external tag.
|
||||||
|
names = "JSON_MERGE_PRESERVE(JSON_ARRAY(private_tag.name), " +
|
||||||
|
"COALESCE(JSON_EXTRACT(private_tag.names, '$**.name'), JSON_ARRAY()))"
|
||||||
|
# DISTINCT prevents merging this independent name set into the correlated scan.
|
||||||
|
# Keep byte-distinct names even when the column collation considers them equal.
|
||||||
|
private_names = 'SELECT DISTINCT private_name.name, ' +
|
||||||
|
'CAST(private_name.name AS BINARY) AS name_bytes FROM tag_versions private_tag ' +
|
||||||
|
"JOIN (#{ discarded_keys('tag_versions', 'tag_id') }) blocked " +
|
||||||
|
'ON blocked.tag_id = private_tag.tag_id ' +
|
||||||
|
"JOIN JSON_TABLE(#{ names }, '$[*]' COLUMNS (name TEXT PATH '$')) private_name " +
|
||||||
|
"WHERE private_name.name <> ''"
|
||||||
|
["NOT EXISTS (SELECT 1 FROM (#{ private_names }) private_name WHERE " +
|
||||||
|
"LOCATE(CONCAT(' ', private_name.name, ' '), " +
|
||||||
|
"CONCAT(' ', COALESCE(#{ row }.linked_tags, ''), ' ')) > 0)"]
|
||||||
when 'tag_versions'
|
when 'tag_versions'
|
||||||
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
|
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
|
||||||
when 'tag_description_versions'
|
when 'tag_description_versions'
|
||||||
|
|||||||
@@ -11,5 +11,7 @@ class MaterialVersion < ApplicationRecord
|
|||||||
belongs_to :parent, class_name: 'Material', optional: true
|
belongs_to :parent, class_name: 'Material', optional: true
|
||||||
belongs_to :updated_by_user, class_name: 'User', optional: true
|
belongs_to :updated_by_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
def export_paths_hash = export_paths_json || { }
|
def export_paths_hash
|
||||||
|
export_paths_json || {}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,10 +3,5 @@ class NicoTagVersion < ApplicationRecord
|
|||||||
|
|
||||||
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
|
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
|
||||||
|
|
||||||
validates :event_type, inclusion: { in: ['create', 'update'] }
|
validates :name, presence: true
|
||||||
|
|
||||||
def name
|
|
||||||
tag = external_tag
|
|
||||||
"#{ tag.platform }:#{ tag.name }" if tag
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ module VersionRecord
|
|||||||
|
|
||||||
belongs_to :created_by_user, class_name: 'User', optional: true
|
belongs_to :created_by_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
belongs_to :event
|
|
||||||
|
|
||||||
enum :event_type, event_type_map, prefix: true, validate: true
|
enum :event_type, event_type_map, prefix: true, validate: true
|
||||||
|
|
||||||
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
||||||
|
|||||||
@@ -139,8 +139,6 @@ class CountsVersionRepr
|
|||||||
result = {}
|
result = {}
|
||||||
table = model.table_name
|
table = model.table_name
|
||||||
comparison = @inclusive ? '<=' : '<'
|
comparison = @inclusive ? '<=' : '<'
|
||||||
name = model == NicoTagVersion ?
|
|
||||||
CountsResourceDefinition.new('nico_tags').expression('name', table) : 'name'
|
|
||||||
requests.each_slice(100) do |batch|
|
requests.each_slice(100) do |batch|
|
||||||
queries = batch.map do |id, point|
|
queries = batch.map do |id, point|
|
||||||
scope = HistoryAccess.visible(model.where(tag_id: id))
|
scope = HistoryAccess.visible(model.where(tag_id: id))
|
||||||
@@ -150,8 +148,7 @@ class CountsVersionRepr
|
|||||||
"AND newer.version_no > #{ table }.version_no)", point)
|
"AND newer.version_no > #{ table }.version_no)", point)
|
||||||
quoted = model.connection.quote(point.iso8601(6))
|
quoted = model.connection.quote(point.iso8601(6))
|
||||||
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
|
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
|
||||||
scope.select("tag_id, #{ name } AS name, #{ names }, " +
|
scope.select("tag_id, name, #{ names }, #{ quoted } AS reference_point").to_sql
|
||||||
"#{ quoted } AS reference_point").to_sql
|
|
||||||
end
|
end
|
||||||
next if queries.empty?
|
next if queries.empty?
|
||||||
|
|
||||||
|
|||||||
@@ -28,18 +28,16 @@ class CountsCandidates
|
|||||||
[external, 'external', 'NULL', 'JSON_OBJECT()']]
|
[external, 'external', 'NULL', 'JSON_OBJECT()']]
|
||||||
sources = sources.map do |population, kind, category, names|
|
sources = sources.map do |population, kind, category, names|
|
||||||
scope = population.scope.except(:select)
|
scope = population.scope.except(:select)
|
||||||
name = population.definition.expression('name')
|
|
||||||
if @params['query'].present?
|
if @params['query'].present?
|
||||||
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
|
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
|
||||||
scope = scope.where("(#{ name } LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
|
scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
|
||||||
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
|
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
|
||||||
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
|
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
|
||||||
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
|
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
|
||||||
end
|
end
|
||||||
scope.select(Arel.sql(
|
scope.select(Arel.sql(
|
||||||
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
|
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
|
||||||
"#{ name } AS name, #{ names } AS names, " +
|
"v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
|
||||||
"#{ category } AS category, '#{ kind }' AS kind"))
|
|
||||||
.to_sql
|
.to_sql
|
||||||
end
|
end
|
||||||
clauses = []
|
clauses = []
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ class CountsPopulation
|
|||||||
else
|
else
|
||||||
raise ArgumentError unless definition.axes(history).include?(key)
|
raise ArgumentError unless definition.axes(history).include?(key)
|
||||||
|
|
||||||
scope = scope.where("#{ definition.expression(key) } <=> ?", entry['value'])
|
scope = scope.where(definition.expression(key) => entry['value'])
|
||||||
end
|
end
|
||||||
scope
|
scope
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -105,25 +105,12 @@ class CountsResourceDefinition
|
|||||||
def time_column = 'created_at'
|
def time_column = 'created_at'
|
||||||
def column(key)
|
def column(key)
|
||||||
raise ArgumentError unless fields.key?(key)
|
raise ArgumentError unless fields.key?(key)
|
||||||
# Keep the V1 Counts field name at the API boundary only.
|
|
||||||
return 'linked_tag_ids' if resource == 'nico_tags' && key == 'linked_tags'
|
|
||||||
|
|
||||||
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
|
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
|
||||||
end
|
end
|
||||||
|
|
||||||
def expression(key, row = 'v')
|
def expression(key, row = 'v') = "#{ row }.#{ column(key) }"
|
||||||
if resource == 'nico_tags' && key == 'name'
|
def changes = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
|
||||||
return "(SELECT CONCAT(external_tags.platform, ':', external_tags.name) " +
|
|
||||||
"FROM external_tags WHERE external_tags.id = #{ row }.tag_id)"
|
|
||||||
end
|
|
||||||
|
|
||||||
"#{ row }.#{ column(key) }"
|
|
||||||
end
|
|
||||||
|
|
||||||
def changes
|
|
||||||
columns = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
|
|
||||||
resource == 'nico_tags' ? columns - ['name'] : columns
|
|
||||||
end
|
|
||||||
def axes(history)
|
def axes(history)
|
||||||
fields.reject { |_key, type| type == :json }.keys +
|
fields.reject { |_key, type| type == :json }.keys +
|
||||||
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
|
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
|
||||||
@@ -131,9 +118,7 @@ class CountsResourceDefinition
|
|||||||
|
|
||||||
def metadata
|
def metadata
|
||||||
fields.map do |key, type|
|
fields.map do |key, type|
|
||||||
nullable = (resource == 'nico_tags' && key == 'name') ||
|
{ key:, type:, nullable: model.columns_hash.fetch(column(key)).null,
|
||||||
model.columns_hash.fetch(column(key)).null
|
|
||||||
{ key:, type:, nullable:,
|
|
||||||
operators: OPERATORS.fetch(type, []) }
|
operators: OPERATORS.fetch(type, []) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -201,8 +201,6 @@ class CountsStateQuery
|
|||||||
end
|
end
|
||||||
|
|
||||||
def listing
|
def listing
|
||||||
external_name = CountsResourceDefinition.new('nico_tags')
|
|
||||||
.expression('name', 'external_version')
|
|
||||||
catalog = <<~SQL
|
catalog = <<~SQL
|
||||||
, tag_counts AS (
|
, tag_counts AS (
|
||||||
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
|
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
|
||||||
@@ -211,7 +209,7 @@ class CountsStateQuery
|
|||||||
SELECT 'internal' AS kind, tag_id, name, names,
|
SELECT 'internal' AS kind, tag_id, name, names,
|
||||||
deprecated_at FROM tag_at WHERE event_type <> 'discard'
|
deprecated_at FROM tag_at WHERE event_type <> 'discard'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT tc.kind, tc.tag_id, #{ external_name } AS name, JSON_OBJECT() AS names,
|
SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names,
|
||||||
NULL AS deprecated_at
|
NULL AS deprecated_at
|
||||||
FROM tag_counts tc
|
FROM tag_counts tc
|
||||||
LEFT JOIN tag_at internal_version
|
LEFT JOIN tag_at internal_version
|
||||||
|
|||||||
@@ -182,7 +182,6 @@ class CountsTableQuery
|
|||||||
order = sort_sql { detail_expression(_1) }
|
order = sort_sql { detail_expression(_1) }
|
||||||
query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
|
query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
|
||||||
.limit(limit).offset((page - 1) * limit)
|
.limit(limit).offset((page - 1) * limit)
|
||||||
query = query.preload(:external_tag) if @definition.resource == 'nico_tags'
|
|
||||||
rows = query.to_a
|
rows = query.to_a
|
||||||
if ['posts', 'tags'].include?(@definition.resource)
|
if ['posts', 'tags'].include?(@definition.resource)
|
||||||
point = population.history ? population.at :
|
point = population.history ? population.at :
|
||||||
@@ -487,7 +486,6 @@ class CountsTableQuery
|
|||||||
|
|
||||||
table = model.table_name
|
table = model.table_name
|
||||||
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
|
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
|
||||||
scope = scope.includes(:external_tag) if model == NicoTagVersion
|
|
||||||
bound = @connection.quote(point)
|
bound = @connection.quote(point)
|
||||||
if population.history && @definition.resource == 'posts'
|
if population.history && @definition.resource == 'posts'
|
||||||
key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
|
key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
class MaterialVersionRecorder < VersionRecorder
|
class MaterialVersionRecorder < VersionRecorder
|
||||||
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
||||||
|
|
||||||
def self.record! material:, event_type:, event:, created_by_user:, file_snapshot: nil
|
def self.record! material:, event_type:, created_by_user:, file_snapshot: nil
|
||||||
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record!
|
new(material:, event_type:, created_by_user:, file_snapshot:).record!
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize material:, event_type:, event:, created_by_user:, file_snapshot: nil
|
def initialize material:, event_type:, created_by_user:, file_snapshot: nil
|
||||||
@file_snapshot = file_snapshot
|
@file_snapshot = file_snapshot
|
||||||
|
|
||||||
super(record: material, event_type:, event:, created_by_user:)
|
super(record: material, event_type:, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.ensure_snapshot! material, created_by_user:
|
def self.ensure_snapshot! material, created_by_user:
|
||||||
return if material.material_versions.exists?
|
return if material.material_versions.exists?
|
||||||
|
|
||||||
event = 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,5 +1,4 @@
|
|||||||
class NicoTagVersionRecorder < VersionRecorder
|
class NicoTagVersionRecorder < VersionRecorder
|
||||||
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:
|
||||||
new(external_tag:, event_type:, created_by_user:).record!
|
new(external_tag:, event_type:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
@@ -15,7 +14,8 @@ class NicoTagVersionRecorder < VersionRecorder
|
|||||||
def record_key = :external_tag
|
def record_key = :external_tag
|
||||||
|
|
||||||
def snapshot_attributes
|
def snapshot_attributes
|
||||||
{ linked_tag_ids: @record.snapshot_linked_tag_ids.join(' ') }
|
{ name: "#{ @record.platform }:#{ @record.name }",
|
||||||
|
linked_tags: @record.snapshot_linked_tag_names.join(' ') }
|
||||||
end
|
end
|
||||||
|
|
||||||
def tracks_version_no_on_record? = false
|
def tracks_version_no_on_record? = false
|
||||||
|
|||||||
@@ -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:
|
||||||
new(post:, event_type:, event:, created_by_user:).record!
|
new(post:, event_type:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize post:, event_type:, event:, created_by_user:
|
def initialize post:, event_type:, created_by_user:
|
||||||
super(record: post, event_type:, event:, created_by_user:)
|
super(record: post, event_type:, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.ensure_snapshot! post, created_by_user:
|
def self.ensure_snapshot! post, created_by_user:
|
||||||
return if post.post_versions.exists?
|
return if post.post_versions.exists?
|
||||||
|
|
||||||
event = 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
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
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:, **_options
|
||||||
Tag.transaction do
|
Tag.transaction do
|
||||||
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
|
||||||
new(tag:, event_type:, event:, created_by_user:).record!
|
new(tag:, event_type:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize tag:, event_type:, event:, created_by_user:
|
def initialize tag:, event_type:, created_by_user:
|
||||||
super(record: tag, event_type:, event:, created_by_user:)
|
super(record: tag, event_type:, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
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:
|
def initialize record:, event_type:, created_by_user:
|
||||||
@record = record
|
@record = record
|
||||||
@event_type = event_type.to_s
|
@event_type = event_type.to_s
|
||||||
@event = event
|
|
||||||
@created_by_user = created_by_user
|
@created_by_user = created_by_user
|
||||||
|
|
||||||
validate_event_type!
|
validate_event_type!
|
||||||
@@ -43,9 +42,8 @@ class VersionRecorder
|
|||||||
def base_attributes latest
|
def base_attributes latest
|
||||||
{ version_no: (latest&.version_no || 0) + 1,
|
{ version_no: (latest&.version_no || 0) + 1,
|
||||||
event_type: @event_type,
|
event_type: @event_type,
|
||||||
event: @event,
|
created_at: Time.current,
|
||||||
created_by_user: @created_by_user,
|
created_by_user: @created_by_user }
|
||||||
created_at: Time.current }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_record_version_no! version_no
|
def update_record_version_no! version_no
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
class CreateEvents < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :events do |t|
|
|
||||||
t.string :event_type, null: false, index: true
|
|
||||||
t.text :reason
|
|
||||||
t.references :reverted_from_event, foreign_key: { to_table: :events }
|
|
||||||
t.json :metadata
|
|
||||||
t.binary :ip_address, limit: 16, index: true
|
|
||||||
t.references :created_by_user, index: true, foreign_key: false
|
|
||||||
t.datetime :created_at, null: false, index: true
|
|
||||||
end
|
|
||||||
|
|
||||||
add_reference :post_versions, :event, foreign_key: true, after: :original_created_before
|
|
||||||
add_reference :tag_versions, :event, foreign_key: true, after: :deprecated_at
|
|
||||||
add_reference :material_versions, :event, foreign_key: true
|
|
||||||
add_reference :tag_description_versions, :event, foreign_key: true, after: :source_version_no
|
|
||||||
add_reference :tag_group_versions, :event, foreign_key: true, after: :placements
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
class BackfillEventsFromExistingVersions < ActiveRecord::Migration[8.0]
|
|
||||||
class MigrationEvent < ActiveRecord::Base
|
|
||||||
self.table_name = 'events'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationPostVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'post_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationTagVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationMaterialVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'material_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationTagDescriptionVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_description_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationTagGroupVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_group_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationLocale < ActiveRecord::Base
|
|
||||||
self.table_name = 'locales'
|
|
||||||
end
|
|
||||||
|
|
||||||
def up
|
|
||||||
# create → posts.create
|
|
||||||
# update → posts.update
|
|
||||||
raise if MigrationPostVersion.where.not(event_type: ['create', 'update']).exists?
|
|
||||||
|
|
||||||
# create → materials.create
|
|
||||||
# update → materials.update
|
|
||||||
if MigrationMaterialVersion.where.not(event_type: ['create', 'update']).exists?
|
|
||||||
raise
|
|
||||||
end
|
|
||||||
|
|
||||||
# create → posts.create / posts.update / materials.create / materials.update / unknown
|
|
||||||
# update → tags.update / locales.create
|
|
||||||
# discard → unknown
|
|
||||||
if MigrationTagVersion.where.not(event_type: ['create', 'update', 'discard']).exists?
|
|
||||||
raise
|
|
||||||
end
|
|
||||||
|
|
||||||
# create → tag_descriptions.create
|
|
||||||
# update → tag_descriptions.update
|
|
||||||
if MigrationTagDescriptionVersion.where.not(event_type: ['create', 'update']).exists?
|
|
||||||
raise
|
|
||||||
end
|
|
||||||
|
|
||||||
# create → tag_groups.create
|
|
||||||
# update → tag_groups.update
|
|
||||||
if MigrationTagGroupVersion.where.not(event_type: ['create', 'update']).exists?
|
|
||||||
raise
|
|
||||||
end
|
|
||||||
|
|
||||||
# post_versions の Backfill
|
|
||||||
MigrationPostVersion.find_each do |pv|
|
|
||||||
ev = MigrationEvent.create!(event_type: "posts.#{ pv.event_type }",
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: pv.created_by_user_id,
|
|
||||||
created_at: pv.created_at)
|
|
||||||
pv.update_columns(event_id: ev.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
# material_versions の Backfill
|
|
||||||
MigrationMaterialVersion.find_each do |m|
|
|
||||||
ev = MigrationEvent.create!(event_type: "materials.#{ m.event_type }",
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: m.created_by_user_id,
|
|
||||||
created_at: m.created_at)
|
|
||||||
m.update_columns(event_id: ev.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
# ロカール追加に伴ふ該当語言のタグ名称追加異動のみ分離
|
|
||||||
ids_cause_of_locale_creation = []
|
|
||||||
MigrationLocale.where('created_at > ?', MigrationLocale.minimum(:created_at)).find_each do |l|
|
|
||||||
ev = MigrationEvent.create!(event_type: 'locales.create',
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: nil,
|
|
||||||
created_at: l.created_at)
|
|
||||||
|
|
||||||
MigrationTagVersion
|
|
||||||
.where('created_at > ?', l.created_at)
|
|
||||||
.where(event_type: 'update', event_id: nil)
|
|
||||||
.find_each do |t|
|
|
||||||
next unless t.names.key?(l.language_code)
|
|
||||||
|
|
||||||
prev = MigrationTagVersion.find_by(tag_id: t.tag_id, version_no: t.version_no - 1)
|
|
||||||
next if prev.nil? || prev.names.key?(l.language_code)
|
|
||||||
|
|
||||||
t.update_columns(event_id: ev.id)
|
|
||||||
|
|
||||||
ids_cause_of_locale_creation << t.id
|
|
||||||
end
|
|
||||||
|
|
||||||
ev.destroy! unless MigrationTagVersion.where(event_id: ev.id).exists?
|
|
||||||
end
|
|
||||||
|
|
||||||
# tag_versions の Backfill
|
|
||||||
MigrationTagVersion.where.not(id: ids_cause_of_locale_creation).find_each do |t|
|
|
||||||
ev =
|
|
||||||
case t.event_type
|
|
||||||
when 'create'
|
|
||||||
post =
|
|
||||||
MigrationPostVersion
|
|
||||||
.where('JSON_CONTAINS(tags_json, ?) <> 0', { tag_id: t.tag_id }.to_json)
|
|
||||||
.find_by(created_at: MigrationPostVersion
|
|
||||||
.where('JSON_CONTAINS(tags_json, ?) <> 0',
|
|
||||||
{ tag_id: t.tag_id }.to_json)
|
|
||||||
.minimum(:created_at))
|
|
||||||
material =
|
|
||||||
MigrationMaterialVersion
|
|
||||||
.where(tag_id: t.tag_id)
|
|
||||||
.find_by(created_at: MigrationMaterialVersion
|
|
||||||
.where(tag_id: t.tag_id)
|
|
||||||
.minimum(:created_at))
|
|
||||||
if post
|
|
||||||
if material
|
|
||||||
if post.created_at < material.created_at
|
|
||||||
MigrationEvent.find(post.event_id)
|
|
||||||
else
|
|
||||||
MigrationEvent.find(material.event_id)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
MigrationEvent.find(post.event_id)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
if material
|
|
||||||
MigrationEvent.find(material.event_id)
|
|
||||||
else
|
|
||||||
MigrationEvent.create!(event_type: 'unknown',
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: t.created_by_user_id,
|
|
||||||
created_at: t.created_at)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
when 'update'
|
|
||||||
MigrationEvent.create!(event_type: 'tags.update',
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: t.created_by_user_id,
|
|
||||||
created_at: t.created_at)
|
|
||||||
when 'discard'
|
|
||||||
MigrationEvent.create!(event_type: 'unknown',
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: t.created_by_user_id,
|
|
||||||
created_at: t.created_at)
|
|
||||||
end
|
|
||||||
t.update_columns(event_id: ev.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
# tag_description_versions の Backfill
|
|
||||||
MigrationTagDescriptionVersion.find_each do |td|
|
|
||||||
ev = MigrationEvent.create!(event_type: "tag_descriptions.#{ td.event_type }",
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: td.created_by_user_id,
|
|
||||||
created_at: td.created_at)
|
|
||||||
td.update_columns(event_id: ev.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
# tag_group_versions の Backfill
|
|
||||||
MigrationTagGroupVersion.find_each do |tg|
|
|
||||||
ev = MigrationEvent.create!(event_type: "tag_groups.#{ tg.event_type }",
|
|
||||||
reason: nil,
|
|
||||||
reverted_from_event_id: nil,
|
|
||||||
metadata: nil,
|
|
||||||
ip_address: nil,
|
|
||||||
created_by_user_id: tg.created_by_user_id,
|
|
||||||
created_at: tg.created_at)
|
|
||||||
tg.update_columns(event_id: ev.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
change_column_null :post_versions, :event_id, false
|
|
||||||
change_column_null :tag_versions, :event_id, false
|
|
||||||
change_column_null :material_versions, :event_id, false
|
|
||||||
change_column_null :tag_description_versions, :event_id, false
|
|
||||||
change_column_null :tag_group_versions, :event_id, false
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
raise ActiveRecord::IrreversibleMigration, '戻せません.'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
class AddLinkedTagIdsToNicoTagVersions < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
add_column :nico_tag_versions, :linked_tag_ids, :text
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
class MigrateLinkedTagsInNicoTagVersions < ActiveRecord::Migration[8.0]
|
|
||||||
class MigrationTagVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class MigrationNicoTagVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'nico_tag_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
def up
|
|
||||||
# 除票外部タグの恢復はないので除票履歴があれば全消しでよいはず.
|
|
||||||
execute <<~SQL
|
|
||||||
DELETE
|
|
||||||
t1
|
|
||||||
FROM
|
|
||||||
nico_tag_versions t1
|
|
||||||
INNER JOIN
|
|
||||||
nico_tag_versions t2
|
|
||||||
ON
|
|
||||||
t1.tag_id = t2.tag_id
|
|
||||||
AND t2.event_type = 'discard'
|
|
||||||
SQL
|
|
||||||
|
|
||||||
MigrationNicoTagVersion.find_each do |ntv|
|
|
||||||
linked_tag_ids = ntv.linked_tags.split.map { |name|
|
|
||||||
# 厳密には一意ぢゃないけどめんだぅだからこれでいいや.
|
|
||||||
MigrationTagVersion
|
|
||||||
.order(created_at: :desc, id: :desc)
|
|
||||||
.find_by("names ->> '$.ja.name' = ?", name)
|
|
||||||
&.tag_id
|
|
||||||
}.compact.uniq.sort.join(' ')
|
|
||||||
|
|
||||||
ntv.update_columns(linked_tag_ids:)
|
|
||||||
end
|
|
||||||
|
|
||||||
change_column_null :nico_tag_versions, :linked_tag_ids, false
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
raise ActiveRecord::IrreversibleMigration, '戻せません.'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
class RemoveLinkedTagsFromNicoTagVersions < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
remove_column :nico_tag_versions, :linked_tags
|
|
||||||
remove_column :nico_tag_versions, :name
|
|
||||||
end
|
|
||||||
end
|
|
||||||
生成ファイル
+3
-33
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
|
||||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -48,21 +48,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.index ["tag_id"], name: "index_deerjikists_on_tag_id"
|
t.index ["tag_id"], name: "index_deerjikists_on_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "events", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.string "event_type", null: false
|
|
||||||
t.text "reason"
|
|
||||||
t.bigint "reverted_from_event_id"
|
|
||||||
t.json "metadata"
|
|
||||||
t.binary "ip_address", limit: 16
|
|
||||||
t.bigint "created_by_user_id"
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.index ["created_at"], name: "index_events_on_created_at"
|
|
||||||
t.index ["created_by_user_id"], name: "index_events_on_created_by_user_id"
|
|
||||||
t.index ["event_type"], name: "index_events_on_event_type"
|
|
||||||
t.index ["ip_address"], name: "index_events_on_ip_address"
|
|
||||||
t.index ["reverted_from_event_id"], name: "index_events_on_reverted_from_event_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "platform", limit: 16, null: false
|
t.string "platform", limit: 16, null: false
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
@@ -265,10 +250,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.string "source_path"
|
t.string "source_path"
|
||||||
t.string "source_file_id"
|
t.string "source_file_id"
|
||||||
t.string "normalized_source_key"
|
t.string "normalized_source_key"
|
||||||
t.bigint "event_id", null: false
|
|
||||||
t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id"
|
||||||
t.index ["discarded_at"], name: "index_material_versions_on_discarded_at"
|
t.index ["discarded_at"], name: "index_material_versions_on_discarded_at"
|
||||||
t.index ["event_id"], name: "index_material_versions_on_event_id"
|
|
||||||
t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id"
|
t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id"
|
||||||
t.index ["material_id", "version_no"], name: "index_material_versions_on_material_id_and_version_no", unique: true
|
t.index ["material_id", "version_no"], name: "index_material_versions_on_material_id_and_version_no", unique: true
|
||||||
t.index ["material_id"], name: "index_material_versions_on_material_id"
|
t.index ["material_id"], name: "index_material_versions_on_material_id"
|
||||||
@@ -318,9 +301,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.bigint "tag_id", null: false
|
t.bigint "tag_id", null: false
|
||||||
t.integer "version_no", null: false
|
t.integer "version_no", null: false
|
||||||
t.string "event_type", null: false
|
t.string "event_type", null: false
|
||||||
|
t.string "name", null: false
|
||||||
|
t.text "linked_tags", null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.text "linked_tag_ids", null: false
|
|
||||||
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
|
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
|
||||||
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
||||||
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
||||||
@@ -396,12 +380,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.text "parent_post_ids", null: false
|
t.text "parent_post_ids", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.bigint "event_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.integer "video_ms"
|
t.integer "video_ms"
|
||||||
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
||||||
t.index ["event_id"], name: "index_post_versions_on_event_id"
|
|
||||||
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
||||||
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
||||||
t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
|
t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
|
||||||
@@ -466,11 +448,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.text "body", null: false
|
t.text "body", null: false
|
||||||
t.string "source_language_code", limit: 16
|
t.string "source_language_code", limit: 16
|
||||||
t.integer "source_version_no"
|
t.integer "source_version_no"
|
||||||
t.bigint "event_id", null: false
|
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id"
|
||||||
t.index ["event_id"], name: "index_tag_description_versions_on_event_id"
|
|
||||||
t.index ["tag_id", "language_code", "version_no"], name: "idx_on_tag_id_language_code_version_no_ced77e57e6", unique: true
|
t.index ["tag_id", "language_code", "version_no"], name: "idx_on_tag_id_language_code_version_no_ced77e57e6", unique: true
|
||||||
t.index ["tag_id", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc"
|
t.index ["tag_id", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc"
|
||||||
t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id"
|
t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id"
|
||||||
@@ -553,11 +533,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.text "description"
|
t.text "description"
|
||||||
t.json "members", null: false
|
t.json "members", null: false
|
||||||
t.json "placements", null: false
|
t.json "placements", null: false
|
||||||
t.bigint "event_id", null: false
|
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id"
|
||||||
t.index ["event_id"], name: "index_tag_group_versions_on_event_id"
|
|
||||||
t.index ["tag_group_id", "version_no"], name: "index_tag_group_versions_on_tag_group_id_and_version_no", unique: true
|
t.index ["tag_group_id", "version_no"], name: "index_tag_group_versions_on_tag_group_id_and_version_no", unique: true
|
||||||
t.index ["tag_group_id"], name: "index_tag_group_versions_on_tag_group_id"
|
t.index ["tag_group_id"], name: "index_tag_group_versions_on_tag_group_id"
|
||||||
t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive"
|
t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive"
|
||||||
@@ -633,13 +611,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
t.text "aliases", null: false
|
t.text "aliases", null: false
|
||||||
t.text "parent_tag_ids", null: false
|
t.text "parent_tag_ids", null: false
|
||||||
t.datetime "deprecated_at"
|
t.datetime "deprecated_at"
|
||||||
t.bigint "event_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.json "names", null: false
|
t.json "names", null: false
|
||||||
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
||||||
t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
||||||
t.index ["event_id"], name: "index_tag_versions_on_event_id"
|
|
||||||
t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
||||||
t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
|
t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
|
||||||
t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
|
t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
|
||||||
@@ -795,7 +771,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
|
|
||||||
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "events", "events", column: "reverted_from_event_id"
|
|
||||||
add_foreign_key "gekanator_ai_runs", "gekanator_question_suggestions"
|
add_foreign_key "gekanator_ai_runs", "gekanator_question_suggestions"
|
||||||
add_foreign_key "gekanator_games", "posts", column: "correct_post_id"
|
add_foreign_key "gekanator_games", "posts", column: "correct_post_id"
|
||||||
add_foreign_key "gekanator_games", "posts", column: "guessed_post_id"
|
add_foreign_key "gekanator_games", "posts", column: "guessed_post_id"
|
||||||
@@ -817,7 +792,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
add_foreign_key "material_sync_sources", "users", column: "created_by_user_id"
|
add_foreign_key "material_sync_sources", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id"
|
add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id"
|
||||||
add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id"
|
add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "material_versions", "events"
|
|
||||||
add_foreign_key "material_versions", "materials"
|
add_foreign_key "material_versions", "materials"
|
||||||
add_foreign_key "material_versions", "materials", column: "parent_id"
|
add_foreign_key "material_versions", "materials", column: "parent_id"
|
||||||
add_foreign_key "material_versions", "users", column: "created_by_user_id"
|
add_foreign_key "material_versions", "users", column: "created_by_user_id"
|
||||||
@@ -839,12 +813,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
add_foreign_key "post_tags", "posts"
|
add_foreign_key "post_tags", "posts"
|
||||||
add_foreign_key "post_tags", "tags"
|
add_foreign_key "post_tags", "tags"
|
||||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||||
add_foreign_key "post_versions", "events"
|
|
||||||
add_foreign_key "post_versions", "posts"
|
add_foreign_key "post_versions", "posts"
|
||||||
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
||||||
add_foreign_key "settings", "users"
|
add_foreign_key "settings", "users"
|
||||||
add_foreign_key "tag_description_versions", "events"
|
|
||||||
add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
|
add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
|
||||||
add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code"
|
add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code"
|
||||||
add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
|
add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
|
||||||
@@ -863,7 +835,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
add_foreign_key "tag_group_tags", "tag_groups"
|
add_foreign_key "tag_group_tags", "tag_groups"
|
||||||
add_foreign_key "tag_group_tags", "tags"
|
add_foreign_key "tag_group_tags", "tags"
|
||||||
add_foreign_key "tag_group_tags", "users", column: "created_by_user_id"
|
add_foreign_key "tag_group_tags", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "tag_group_versions", "events"
|
|
||||||
add_foreign_key "tag_groups", "users", column: "created_by_user_id"
|
add_foreign_key "tag_groups", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "tag_groups", "users", column: "updated_by_user_id"
|
add_foreign_key "tag_groups", "users", column: "updated_by_user_id"
|
||||||
add_foreign_key "tag_implications", "tags"
|
add_foreign_key "tag_implications", "tags"
|
||||||
@@ -873,7 +844,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
|
|||||||
add_foreign_key "tag_names", "tags"
|
add_foreign_key "tag_names", "tags"
|
||||||
add_foreign_key "tag_similarities", "tags"
|
add_foreign_key "tag_similarities", "tags"
|
||||||
add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
|
add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
|
||||||
add_foreign_key "tag_versions", "events"
|
|
||||||
add_foreign_key "tag_versions", "users", column: "created_by_user_id"
|
add_foreign_key "tag_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "theatre_comments", "theatres"
|
add_foreign_key "theatre_comments", "theatres"
|
||||||
add_foreign_key "theatre_comments", "users"
|
add_foreign_key "theatre_comments", "users"
|
||||||
|
|||||||
@@ -102,7 +102,6 @@ RSpec.describe 'Tag group persistence constraints' do
|
|||||||
6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] }
|
6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] }
|
||||||
reject_statement do
|
reject_statement do
|
||||||
insert_group_row('tag_group_versions', {
|
insert_group_row('tag_group_versions', {
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認',
|
tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認',
|
||||||
members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json,
|
members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json,
|
||||||
placements: nodes.to_json, created_at: Time.current })
|
placements: nodes.to_json, created_at: Time.current })
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ RSpec.describe 'TagVersion names database constraint' do
|
|||||||
|
|
||||||
def insert_snapshot!(snapshot)
|
def insert_snapshot!(snapshot)
|
||||||
TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create',
|
TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
name: 'snapshot_name', category: 'general',
|
name: 'snapshot_name', category: 'general',
|
||||||
aliases: '', parent_tag_ids: '', names: snapshot,
|
aliases: '', parent_tag_ids: '', names: snapshot,
|
||||||
created_at: Time.current }])
|
created_at: Time.current }])
|
||||||
|
|||||||
@@ -11,63 +11,28 @@ RSpec.describe ExternalTag, type: :model do
|
|||||||
expect(external.reload.name).to eq('raw tag[]')
|
expect(external.reload.name).to eq('raw tag[]')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not allow a persisted external tag to change its platform or name' do
|
it 'deletes post associations without deleting posts or version history' do
|
||||||
external = create(:external_tag, name: 'immutable')
|
|
||||||
|
|
||||||
expect { external.update!(name: 'renamed') }
|
|
||||||
.to raise_error(ActiveRecord::RecordInvalid)
|
|
||||||
expect(external.errors[:name]).to include('は変更できません.')
|
|
||||||
|
|
||||||
external.reload
|
|
||||||
external.platform = nil
|
|
||||||
expect { external.save! }.to raise_error(ActiveRecord::RecordInvalid)
|
|
||||||
expect(external.errors[:platform]).to include('は変更できません.')
|
|
||||||
|
|
||||||
expect(external.reload).to have_attributes(platform: 'nico', name: 'immutable')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects delete, which bypasses destroy callbacks' do
|
|
||||||
external = create(:external_tag)
|
|
||||||
|
|
||||||
expect { external.delete }.to raise_error(ActiveRecord::ReadOnlyRecord)
|
|
||||||
expect(external.reload).to be_persisted
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'increments the counter through post associations without changing identity' do
|
|
||||||
external = create(:external_tag, name: 'counter')
|
|
||||||
post = create(:post)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
PostExternalTag.create!(post:, external_tag: external)
|
|
||||||
}.to change { external.reload.post_count }.by(1)
|
|
||||||
|
|
||||||
expect(external.reload).to have_attributes(platform: 'nico', name: 'counter')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not destroy external tags or their post associations and history' do
|
|
||||||
external = create(:external_tag)
|
external = create(:external_tag)
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
PostExternalTag.create!(post:, external_tag: external)
|
PostExternalTag.create!(post:, external_tag: external)
|
||||||
version = NicoTagVersionRecorder.record!(
|
version = NicoTagVersionRecorder.record!(
|
||||||
external_tag: external, event_type: :create, created_by_user: nil)
|
external_tag: external, event_type: :create, created_by_user: nil)
|
||||||
|
|
||||||
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
|
external.destroy!
|
||||||
|
|
||||||
expect(external.reload).to be_persisted
|
expect(PostExternalTag.where(external_tag_id: external.id)).to be_empty
|
||||||
expect(PostExternalTag.exists?(post:, external_tag: external)).to be(true)
|
expect(post.reload.external_tags).to be_empty
|
||||||
expect(post.reload.external_tags).to contain_exactly(external)
|
|
||||||
expect(version.reload.tag_id).to eq(external.id)
|
expect(version.reload.tag_id).to eq(external.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not destroy an external tag or its links to internal tags' do
|
it 'deletes external links without deleting linked internal tags' do
|
||||||
external = create(:external_tag)
|
external = create(:external_tag)
|
||||||
tag = create(:tag)
|
tag = create(:tag)
|
||||||
relation = NicoTagRelation.create!(nico_tag: external, tag:)
|
NicoTagRelation.create!(nico_tag: external, tag:)
|
||||||
|
|
||||||
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
|
external.destroy!
|
||||||
|
|
||||||
expect(external.reload).to be_persisted
|
expect(NicoTagRelation.where(nico_tag_id: external.id)).to be_empty
|
||||||
expect(relation.reload).to be_persisted
|
|
||||||
expect(Tag.exists?(tag.id)).to be(true)
|
expect(Tag.exists?(tag.id)).to be(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ RSpec.describe HistoryAccess do
|
|||||||
locale
|
locale
|
||||||
rows = ['ja', 'ain'].flat_map do |language|
|
rows = ['ja', 'ain'].flat_map do |language|
|
||||||
['create', 'discard', 'restore'].each_with_index.map do |event, index|
|
['create', 'discard', 'restore'].each_with_index.map do |event, index|
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(tag_id: tag.id, language_code: language,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: tag.id, language_code: language,
|
|
||||||
version_no: index + 1, event_type: language == 'ain' ? 'update' : event,
|
version_no: index + 1, event_type: language == 'ain' ? 'update' : event,
|
||||||
body: "#{ language } #{ index }", created_at: Time.utc(2024))
|
body: "#{ language } #{ index }", created_at: Time.utc(2024))
|
||||||
end
|
end
|
||||||
@@ -30,9 +28,7 @@ RSpec.describe HistoryAccess do
|
|||||||
public_metadata = described_class.set(user: nil) { described_class.authority }
|
public_metadata = described_class.set(user: nil) { described_class.authority }
|
||||||
admin = create(:user, :admin)
|
admin = create(:user, :admin)
|
||||||
admin_metadata = described_class.set(user: admin) { described_class.authority }
|
admin_metadata = described_class.set(user: admin) { described_class.authority }
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 1, event_type: 'discard', name: 'private',
|
|
||||||
category: 'general',
|
category: 'general',
|
||||||
names: { ja: { name: 'private', script_code: 'Jpan',
|
names: { ja: { name: 'private', script_code: 'Jpan',
|
||||||
auto_generated: false, aliases: [] } },
|
auto_generated: false, aliases: [] } },
|
||||||
@@ -56,9 +52,7 @@ RSpec.describe HistoryAccess do
|
|||||||
blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png',
|
blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png',
|
||||||
byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png')
|
byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png')
|
||||||
ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:)
|
ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:)
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'discard', url: post.url,
|
|
||||||
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
||||||
variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation')
|
variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation')
|
||||||
derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png',
|
derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png',
|
||||||
@@ -82,22 +76,18 @@ RSpec.describe 'Counts artifact policy and external references' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not expose a private linked tag ID through an external history snapshot' do
|
it 'does not expose a private linked tag name through an external history snapshot' do
|
||||||
tag = create(:tag, primary_name: 'private-linked-name')
|
tag = create(:tag, primary_name: 'private-linked-name')
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
|
|
||||||
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
|
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
|
||||||
names: { ja: { name: 'private-linked-name', script_code: 'Jpan',
|
names: { ja: { name: 'private-linked-name', script_code: 'Jpan',
|
||||||
auto_generated: false, aliases: [] } })
|
auto_generated: false, aliases: [] } })
|
||||||
external = create(:external_tag, name: 'public-external')
|
external = create(:external_tag, name: 'public-external')
|
||||||
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
|
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
|
||||||
linked_tag_ids: tag.id.to_s,
|
name: 'nico:public-external', linked_tags: 'private-linked-name',
|
||||||
created_at: Time.utc(2024))
|
created_at: Time.utc(2024))
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
snapshot = PostVersion.create!(
|
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'create',
|
|
||||||
title: 'external reference', url: post.url, tags: '',
|
title: 'external reference', url: post.url, tags: '',
|
||||||
tags_json: [{ external_tag_id: external.id }], parent_post_ids: '',
|
tags_json: [{ external_tag_id: external.id }], parent_post_ids: '',
|
||||||
created_at: Time.utc(2024, 2))
|
created_at: Time.utc(2024, 2))
|
||||||
@@ -109,7 +99,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',
|
||||||
linked_tag_ids: '',
|
name: 'nico:public-external', linked_tags: 'private-linked-name-extra',
|
||||||
created_at: Time.utc(2024, 7))
|
created_at: Time.utc(2024, 7))
|
||||||
HistoryAccess.set(user: nil) do
|
HistoryAccess.set(user: nil) do
|
||||||
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
|
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
|
||||||
@@ -122,17 +112,13 @@ RSpec.describe 'Counts artifact policy and external references' do
|
|||||||
child = create(:tag, primary_name: 'referencing child')
|
child = create(:tag, primary_name: 'referencing child')
|
||||||
[[parent, 'discard', '', 'private parent'],
|
[[parent, 'discard', '', 'private parent'],
|
||||||
[child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name|
|
[child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name|
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 1, event_type: event, name:,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 1, event_type: event, name:,
|
|
||||||
category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023),
|
category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023),
|
||||||
names: { ja: { name:, script_code: 'Jpan',
|
names: { ja: { name:, script_code: 'Jpan',
|
||||||
auto_generated: false, aliases: [] } })
|
auto_generated: false, aliases: [] } })
|
||||||
end
|
end
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
row = PostVersion.create!(
|
row = PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'snapshot',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'create', title: 'snapshot',
|
|
||||||
url: post.url, tags: '', parent_post_ids: '',
|
url: post.url, tags: '', parent_post_ids: '',
|
||||||
tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }],
|
tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }],
|
||||||
created_at: Time.utc(2024))
|
created_at: Time.utc(2024))
|
||||||
|
|||||||
@@ -23,22 +23,9 @@ RSpec.describe 'Locale activation', type: :model do
|
|||||||
.and_raise('backfill failed')
|
.and_raise('backfill failed')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'groups all tag histories from locale creation into one event' do
|
|
||||||
previous_ids = TagVersion.pluck(:id)
|
|
||||||
|
|
||||||
expect { build_locale.save! }.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include('event_type' => 'locales.create', 'created_by_user_id' => nil)
|
|
||||||
versions = TagVersion.where.not(id: previous_ids)
|
|
||||||
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rolls back a newly created locale and the preceding generated names' do
|
it 'rolls back a newly created locale and the preceding generated names' do
|
||||||
locale = build_locale
|
locale = build_locale
|
||||||
fail_second_generation!
|
fail_second_generation!
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect { locale.save! }.to raise_error('backfill failed')
|
expect { locale.save! }.to raise_error('backfill failed')
|
||||||
|
|
||||||
@@ -46,7 +33,6 @@ RSpec.describe 'Locale activation', type: :model do
|
|||||||
expect(generated_names).to be_empty
|
expect(generated_names).to be_empty
|
||||||
expect(first.reload.name('ja')).to eq('activation_first')
|
expect(first.reload.name('ja')).to eq('activation_first')
|
||||||
expect(second.reload.name('ja')).to eq('activation_second')
|
expect(second.reload.name('ja')).to eq('activation_second')
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not backfill while the locale is inactive' do
|
it 'does not backfill while the locale is inactive' do
|
||||||
@@ -59,14 +45,7 @@ RSpec.describe 'Locale activation', type: :model do
|
|||||||
locale = build_locale(deprecated_at: Time.current)
|
locale = build_locale(deprecated_at: Time.current)
|
||||||
locale.save!
|
locale.save!
|
||||||
|
|
||||||
previous_ids = TagVersion.pluck(:id)
|
locale.update!(deprecated_at: nil)
|
||||||
expect { locale.update!(deprecated_at: nil) }.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include('event_type' => 'locales.restore', 'created_by_user_id' => nil)
|
|
||||||
versions = TagVersion.where.not(id: previous_ids)
|
|
||||||
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
|
|
||||||
expect(generated_names.pluck(:tag_id)).to contain_exactly(first.id, second.id)
|
expect(generated_names.pluck(:tag_id)).to contain_exactly(first.id, second.id)
|
||||||
expect(generated_names).to all(have_attributes(
|
expect(generated_names).to all(have_attributes(
|
||||||
@@ -78,13 +57,11 @@ RSpec.describe 'Locale activation', type: :model do
|
|||||||
locale.save!
|
locale.save!
|
||||||
previous_deprecated_at = locale.reload.deprecated_at
|
previous_deprecated_at = locale.reload.deprecated_at
|
||||||
fail_second_generation!
|
fail_second_generation!
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed')
|
expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed')
|
||||||
|
|
||||||
expect(locale.reload.deprecated_at).to eq(previous_deprecated_at)
|
expect(locale.reload.deprecated_at).to eq(previous_deprecated_at)
|
||||||
expect(generated_names).to be_empty
|
expect(generated_names).to be_empty
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'preserves a human primary through deactivation and repeated activation' do
|
it 'preserves a human primary through deactivation and repeated activation' do
|
||||||
|
|||||||
@@ -12,20 +12,20 @@ RSpec.describe PostVersion, type: :model do
|
|||||||
|
|
||||||
let!(:post_version) do
|
let!(:post_version) do
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
post: post_record,
|
||||||
post: post_record,
|
version_no: 1,
|
||||||
version_no: 1,
|
event_type: 'create',
|
||||||
event_type: 'create',
|
title: post_record.title,
|
||||||
title: post_record.title,
|
url: post_record.url,
|
||||||
url: post_record.url,
|
thumbnail_base: post_record.thumbnail_base,
|
||||||
thumbnail_base: post_record.thumbnail_base,
|
tags: post_record.snapshot_tag_names.join(' '),
|
||||||
tags: post_record.snapshot_tag_names.join(' '),
|
tags_json: post_record.snapshot_tags_json,
|
||||||
tags_json: post_record.snapshot_tags_json,
|
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
||||||
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
original_created_from: post_record.original_created_from,
|
||||||
original_created_from: post_record.original_created_from,
|
original_created_before: post_record.original_created_before,
|
||||||
original_created_before: post_record.original_created_before,
|
created_at: Time.current,
|
||||||
created_at: Time.current,
|
created_by_user: nil
|
||||||
created_by_user: nil)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'is read only after create' do
|
it 'is read only after create' do
|
||||||
|
|||||||
@@ -10,22 +10,23 @@ RSpec.describe 'Shared Tag and ExternalTag IDs', type: :model do
|
|||||||
expect(next_tag.id).to be > external.id
|
expect(next_tag.id).to be > external.id
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not reuse IDs after internal deletion while external tags remain' do
|
it 'does not reuse physically deleted IDs in either table' do
|
||||||
tag = create(:tag)
|
tag = create(:tag)
|
||||||
external = create(:external_tag)
|
external = create(:external_tag)
|
||||||
TagName.where(tag_id: tag.id).delete_all
|
TagName.where(tag_id: tag.id).delete_all
|
||||||
tag.destroy!
|
tag.destroy!
|
||||||
expect(ExternalTag.exists?(external.id)).to be(true)
|
external.destroy!
|
||||||
|
|
||||||
expect(create(:tag).id).to be > external.id
|
expect(create(:tag).id).to be > external.id
|
||||||
expect(create(:external_tag).id).to be > external.id
|
expect(create(:external_tag).id).to be > external.id
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'retains overlapping IDs after a tag update and a new allocation' do
|
it 'retains existing overlapping IDs without renumbering on update or insert' do
|
||||||
tag = create(:tag)
|
tag = create(:tag)
|
||||||
external = create(:external_tag)
|
external = create(:external_tag)
|
||||||
external.update_columns(id: tag.id)
|
external.update_columns(id: tag.id)
|
||||||
tag.update!(category: :meta)
|
tag.update!(category: :meta)
|
||||||
|
external.update!(name: 'updated_external')
|
||||||
before_tag = tag.reload.attributes
|
before_tag = tag.reload.attributes
|
||||||
before_external = external.reload.attributes
|
before_external = external.reload.attributes
|
||||||
|
|
||||||
|
|||||||
@@ -34,31 +34,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
|
|||||||
described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo')
|
described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'groups renames, merges and affected post histories into one event' do
|
|
||||||
target = create(:tag, primary_name: 'foobar')
|
|
||||||
source = create(:tag, primary_name: 'temporary_source')
|
|
||||||
renamed = create(:tag, primary_name: 'temporary_rename')
|
|
||||||
source.tag_name('ja').update_columns(name: 'foo_bar')
|
|
||||||
renamed.tag_name('ja').update_columns(name: 'foo_baz')
|
|
||||||
post = create(:post)
|
|
||||||
PostTag.create!(post:, tag: source)
|
|
||||||
previous_tag_ids = TagVersion.pluck(:id)
|
|
||||||
previous_post_ids = PostVersion.pluck(:id)
|
|
||||||
|
|
||||||
expect { described_class.apply! }.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tag_name_sanitisation_rules.apply', 'created_by_user_id' => nil)
|
|
||||||
tag_versions = TagVersion.where.not(id: previous_tag_ids)
|
|
||||||
expect(tag_versions.pluck(:tag_id).uniq).to contain_exactly(target.id, source.id, renamed.id)
|
|
||||||
expect(tag_versions.pluck(:event_type)).to include('discard', 'update')
|
|
||||||
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
post_versions = PostVersion.where.not(id: previous_post_ids)
|
|
||||||
expect(post_versions.pluck(:post_id).uniq).to eq([post.id])
|
|
||||||
expect(post_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
|
||||||
|
|
||||||
[:primary, :alias].each do |source_kind|
|
[:primary, :alias].each do |source_kind|
|
||||||
it "keeps the primary identity when a #{ source_kind } collides within its Tag" do
|
it "keeps the primary identity when a #{ source_kind } collides within its Tag" do
|
||||||
tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar')
|
tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar')
|
||||||
@@ -108,7 +83,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
|
|||||||
PostTag.create!(post:, tag: source)
|
PostTag.create!(post:, tag: source)
|
||||||
models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag]
|
models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag]
|
||||||
snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) }
|
snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) }
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid)
|
expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid)
|
||||||
|
|
||||||
@@ -116,7 +90,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
|
|||||||
model.order(*Array(model.primary_key)).map(&:attributes)
|
model.order(*Array(model.primary_key)).map(&:attributes)
|
||||||
end
|
end
|
||||||
expect(after_state).to eq(snapshots)
|
expect(after_state).to eq(snapshots)
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
expect(post.reload.tags).to contain_exactly(source)
|
expect(post.reload.tags).to contain_exactly(source)
|
||||||
expect(target.reload.name('ja')).to eq('foobar')
|
expect(target.reload.name('ja')).to eq('foobar')
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -665,20 +665,20 @@ RSpec.describe Tag, type: :model do
|
|||||||
|
|
||||||
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
post: post,
|
||||||
post: post,
|
version_no: version_no,
|
||||||
version_no: version_no,
|
event_type: event_type,
|
||||||
event_type: event_type,
|
title: post.title,
|
||||||
title: post.title,
|
url: post.url,
|
||||||
url: post.url,
|
thumbnail_base: post.thumbnail_base,
|
||||||
thumbnail_base: post.thumbnail_base,
|
tags: snapshot_tags(post),
|
||||||
tags: snapshot_tags(post),
|
tags_json: post.snapshot_tags_json,
|
||||||
tags_json: post.snapshot_tags_json,
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
original_created_from: post.original_created_from,
|
||||||
original_created_from: post.original_created_from,
|
original_created_before: post.original_created_before,
|
||||||
original_created_before: post.original_created_before,
|
created_at: Time.current,
|
||||||
created_at: Time.current,
|
created_by_user: created_by_user
|
||||||
created_by_user: created_by_user)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post versions are enabled' do
|
context 'when post versions are enabled' do
|
||||||
|
|||||||
@@ -6,18 +6,17 @@ RSpec.describe VersionRecord, type: :model do
|
|||||||
|
|
||||||
it 'makes TagVersion read only after create' do
|
it 'makes TagVersion read only after create' do
|
||||||
version = TagVersion.create!(
|
version = TagVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
tag: tag,
|
||||||
tag: tag,
|
version_no: 1,
|
||||||
version_no: 1,
|
event_type: 'create',
|
||||||
event_type: 'create',
|
name: primary_tag_name_for(tag, 'ja').name,
|
||||||
name: primary_tag_name_for(tag, 'ja').name,
|
category: tag.category,
|
||||||
category: tag.category,
|
aliases: '',
|
||||||
aliases: '',
|
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
|
||||||
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
|
script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||||
script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
parent_tag_ids: '',
|
||||||
parent_tag_ids: '',
|
created_at: Time.current,
|
||||||
created_at: Time.current,
|
created_by_user: nil)
|
||||||
created_by_user: nil)
|
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
version.update!(name: 'changed')
|
version.update!(name: 'changed')
|
||||||
@@ -26,18 +25,17 @@ RSpec.describe VersionRecord, type: :model do
|
|||||||
|
|
||||||
it 'prevents TagVersion destroy' do
|
it 'prevents TagVersion destroy' do
|
||||||
version = TagVersion.create!(
|
version = TagVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
tag: tag,
|
||||||
tag: tag,
|
version_no: 1,
|
||||||
version_no: 1,
|
event_type: 'create',
|
||||||
event_type: 'create',
|
name: primary_tag_name_for(tag, 'ja').name,
|
||||||
name: primary_tag_name_for(tag, 'ja').name,
|
category: tag.category,
|
||||||
category: tag.category,
|
aliases: '',
|
||||||
aliases: '',
|
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
|
||||||
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
|
script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||||
script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
parent_tag_ids: '',
|
||||||
parent_tag_ids: '',
|
created_at: Time.current,
|
||||||
created_at: Time.current,
|
created_by_user: nil)
|
||||||
created_by_user: nil)
|
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
version.destroy!
|
version.destroy!
|
||||||
@@ -49,34 +47,24 @@ RSpec.describe VersionRecord, type: :model do
|
|||||||
external_tag: nico_tag,
|
external_tag: nico_tag,
|
||||||
version_no: 1,
|
version_no: 1,
|
||||||
event_type: 'create',
|
event_type: 'create',
|
||||||
linked_tag_ids: '',
|
name: "nico:#{ nico_tag.name }",
|
||||||
|
linked_tags: '',
|
||||||
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!(name: 'nico:changed')
|
||||||
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
it 'rejects discard and restore versions for external tags' do
|
|
||||||
[:discard, :restore].each do |event_type|
|
|
||||||
version = NicoTagVersion.new(
|
|
||||||
external_tag: nico_tag, version_no: 1, event_type:,
|
|
||||||
linked_tag_ids: '', created_at: Time.current)
|
|
||||||
|
|
||||||
expect(version).not_to be_valid
|
|
||||||
expect(version.errors[:event_type]).not_to be_empty
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'prevents NicoTagVersion destroy' do
|
it 'prevents NicoTagVersion destroy' do
|
||||||
version = NicoTagVersion.create!(
|
version = NicoTagVersion.create!(
|
||||||
external_tag: nico_tag,
|
external_tag: nico_tag,
|
||||||
version_no: 1,
|
version_no: 1,
|
||||||
event_type: 'create',
|
event_type: 'create',
|
||||||
linked_tag_ids: '',
|
name: "nico:#{ nico_tag.name }",
|
||||||
|
linked_tags: '',
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
created_by_user: nil
|
created_by_user: nil
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ RSpec.configure do |config|
|
|||||||
end
|
end
|
||||||
|
|
||||||
config.include TestRecords
|
config.include TestRecords
|
||||||
config.include EventRecords
|
|
||||||
config.include RakeTaskHelper
|
config.include RakeTaskHelper
|
||||||
|
|
||||||
# FactoryBot の create / create_list を使へるやぅにする
|
# FactoryBot の create / create_list を使へるやぅにする
|
||||||
|
|||||||
@@ -84,9 +84,7 @@ RSpec.describe 'Counts native GET acknowledgement', type: :request do
|
|||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
job, file, attempt = ready_job('json')
|
job, file, attempt = ready_job('json')
|
||||||
record = create(:post)
|
record = create(:post)
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: 1, event_type: 'discard', title: 'private',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: 1, event_type: 'discard', title: 'private',
|
|
||||||
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
||||||
get "/counts/export/files/#{ file }", params: { job:, attempt: }
|
get "/counts/export/files/#{ file }", params: { job:, attempt: }
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
['create', 'discard'].each_with_index do |event, index|
|
['create', 'discard'].each_with_index do |event, index|
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(tag_id: tag.id, language_code: 'ja',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: tag.id, language_code: 'ja',
|
|
||||||
version_no: index + 1, event_type: event, body: 'private body',
|
version_no: index + 1, event_type: event, body: 'private body',
|
||||||
created_at: Time.utc(2024))
|
created_at: Time.utc(2024))
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,16 +10,12 @@ RSpec.describe 'Legacy Counts API', type: :request do
|
|||||||
category: 'general', sections: [] }
|
category: 'general', sections: [] }
|
||||||
[1, 2, 3].each do |number|
|
[1, 2, 3].each do |number|
|
||||||
time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0)
|
time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0)
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: number,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: number,
|
|
||||||
event_type: number == 1 ? 'create' : 'update',
|
event_type: number == 1 ? 'create' : 'update',
|
||||||
tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '',
|
tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '',
|
||||||
tags_json: number == 1 ? [snapshot] : [],
|
tags_json: number == 1 ? [snapshot] : [],
|
||||||
created_by_user: number == 3 ? nil : actor, created_at: time)
|
created_by_user: number == 3 ? nil : actor, created_at: time)
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: number,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: number,
|
|
||||||
event_type: number == 1 ? 'create' : 'update',
|
event_type: number == 1 ? 'create' : 'update',
|
||||||
name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '',
|
name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name: 'counts tag', script_code: 'Jpan',
|
names: { ja: { name: 'counts tag', script_code: 'Jpan',
|
||||||
|
|||||||
@@ -14,21 +14,17 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 1, event_type: 'create', name: 'alpha',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 1, event_type: 'create', name: 'alpha',
|
|
||||||
category: 'general', aliases: '', parent_tag_ids: '',
|
category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||||
created_at: Time.utc(2023))
|
created_at: Time.utc(2023))
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: 1,
|
NicoTagVersion.create!(external_tag: external, version_no: 1,
|
||||||
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
|
event_type: 'create', name: 'beta', linked_tags: '', created_at: Time.utc(2023))
|
||||||
snapshots = [
|
snapshots = [
|
||||||
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
|
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
|
||||||
{ external_tag_id: external.id }]
|
{ external_tag_id: external.id }]
|
||||||
[1, 2, 3].each do |number|
|
[1, 2, 3].each do |number|
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: number,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: number,
|
|
||||||
event_type: number == 1 ? 'create' : 'update', url: record.url,
|
event_type: number == 1 ? 'create' : 'update', url: record.url,
|
||||||
title: "snapshot #{ number }", tags: '', parent_post_ids: '',
|
title: "snapshot #{ number }", tags: '', parent_post_ids: '',
|
||||||
tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)),
|
tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)),
|
||||||
@@ -54,115 +50,6 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
|
|
||||||
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
|
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
|
||||||
|
|
||||||
context 'nico link ID snapshots through the V1 field name' do
|
|
||||||
let(:base) do
|
|
||||||
super().merge(resource: 'nico_tags')
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: 2,
|
|
||||||
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_type: 'update', linked_tag_ids: '',
|
|
||||||
created_at: Time.utc(2024, 2, 1))
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns ID values under linked_tags without exposing the physical column key' do
|
|
||||||
result = query
|
|
||||||
expect(versions(result)).to eq([1, 2, 3])
|
|
||||||
expect(result['versions'].map { _1.fetch('linked_tags') }).to eq(['', tag.id.to_s, ''])
|
|
||||||
result['versions'].each do |row|
|
|
||||||
expect(row).not_to have_key('linked_tag_ids')
|
|
||||||
expect(row.fetch('name')).to eq('nico:beta')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'preloads external names separately for aliased link-change details' do
|
|
||||||
statements = []
|
|
||||||
listener = lambda do |_name, _start, _finish, _id, payload|
|
|
||||||
statements << payload[:sql]
|
|
||||||
end
|
|
||||||
ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do
|
|
||||||
result = query(axis('changed_field', 'linked_tags'))
|
|
||||||
expect(versions(result)).to eq([2, 3])
|
|
||||||
expect(result.fetch('versions').map { _1.fetch('name') })
|
|
||||||
.to eq(['nico:beta', 'nico:beta'])
|
|
||||||
end
|
|
||||||
|
|
||||||
details = statements.find { _1.include?('AS counts_latest') }
|
|
||||||
expect(details).not_to be_nil
|
|
||||||
expect(details).not_to include('JOIN `external_tags`')
|
|
||||||
names = statements.select { _1.match?(/SELECT .* FROM `external_tags`/) }
|
|
||||||
expect(names.length).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'advertises the legacy field, label and default columns only' do
|
|
||||||
get '/counts/definitions/nico_tags', params: { locale: 'ja' }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
body = response.parsed_body
|
|
||||||
['fields', 'filter_fields', 'output_fields'].each do |collection|
|
|
||||||
keys = body.fetch(collection).map { _1.fetch('key') }
|
|
||||||
expect(keys).to include('linked_tags')
|
|
||||||
expect(keys).not_to include('linked_tag_ids')
|
|
||||||
end
|
|
||||||
field = body.fetch('output_fields').find { _1['key'] == 'linked_tags' }
|
|
||||||
expect(field.fetch('label')).to eq('counts:attributes.linked_tags')
|
|
||||||
body.fetch('axes').each_value do |keys|
|
|
||||||
expect(keys).to include('linked_tags')
|
|
||||||
expect(keys).not_to include('linked_tag_ids')
|
|
||||||
end
|
|
||||||
body.fetch('defaults').select { _1['mode'] == 'details' }.each do |entry|
|
|
||||||
settings = entry.fetch('params').to_h { [_1.fetch('key'), _1.fetch('value')] }
|
|
||||||
expect(settings.fetch('columns').split).to include('name', 'linked_tags')
|
|
||||||
expect(settings.fetch('columns').split).not_to include('linked_tag_ids')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'filters IDs and legacy drills and compares link changes through linked_tags' do
|
|
||||||
predicate = { conditions: '', 'conditions.0.field' => 'linked_tags',
|
|
||||||
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
|
|
||||||
expect(versions(query(predicate))).to eq([2])
|
|
||||||
expect(versions(query(axis('linked_tags', tag.id.to_s, root: 'drill')))).to eq([2])
|
|
||||||
expect(versions(query(axis('changed_field', 'linked_tags')))).to eq([2, 3])
|
|
||||||
expect(versions(query(predicate.merge('conditions.0.value' => 'alpha')))).to be_empty
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'sorts ID snapshots through the public field in both directions' do
|
|
||||||
expect(versions(query(sort: 'linked_tags:asc version_no:asc'))).to eq([1, 3, 2])
|
|
||||||
expect(versions(query(sort: 'linked_tags:desc version_no:asc'))).to eq([2, 1, 3])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'restores historical link IDs before applying a latest snapshot filter' do
|
|
||||||
predicate = { definition: 'latest', at: '2024-01-15T00:00:00Z',
|
|
||||||
conditions: '', 'conditions.0.field' => 'linked_tags',
|
|
||||||
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
|
|
||||||
expect(versions(query(predicate))).to eq([2])
|
|
||||||
expect(versions(query(predicate.except(:at)))).to be_empty
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'groups by linked_tags ID values and accepts the resulting drill condition' do
|
|
||||||
sign_in_as(create(:user, :admin))
|
|
||||||
result = query(mode: 'summary', rows: 'linked_tags', cols: '', sort: '')
|
|
||||||
expect(result.fetch('cells')).to match_array([
|
|
||||||
{ 'values' => [''], 'count' => 2 },
|
|
||||||
{ 'values' => [tag.id.to_s], 'count' => 1 }])
|
|
||||||
expect(versions(query(axis('linked_tags', tag.id.to_s)))).to eq([2])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects the physical column as a public filter, axis, sort or change field' do
|
|
||||||
sign_in_as(create(:user, :admin))
|
|
||||||
[
|
|
||||||
axis('linked_tag_ids', tag.id.to_s),
|
|
||||||
axis('changed_field', 'linked_tag_ids'),
|
|
||||||
{ mode: 'summary', rows: 'linked_tag_ids', cols: '', sort: '' },
|
|
||||||
{ sort: 'linked_tag_ids:asc' }].each do |invalid|
|
|
||||||
get '/counts/query', params: base.merge(invalid)
|
|
||||||
expect(response).to have_http_status(:bad_request), invalid.inspect
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'identifies a totals timeout without exposing SQL in the error response' do
|
it 'identifies a totals timeout without exposing SQL in the error response' do
|
||||||
allow_any_instance_of(CountsPivotTotals).to receive(:call)
|
allow_any_instance_of(CountsPivotTotals).to receive(:call)
|
||||||
.and_raise(CountsPivotTotals::TimedOut, 'private SQL')
|
.and_raise(CountsPivotTotals::TimedOut, 'private SQL')
|
||||||
@@ -247,9 +134,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'checks the current latest flag beyond the execution timestamp' do
|
it 'checks the current latest flag beyond the execution timestamp' do
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: 4, event_type: 'update',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: 4, event_type: 'update',
|
|
||||||
url: record.url, title: 'after execution', tags: '', tags_json: [],
|
url: record.url, title: 'after execution', tags: '', tags_json: [],
|
||||||
parent_post_ids: '', created_at: Time.utc(2025, 2, 1))
|
parent_post_ids: '', created_at: Time.utc(2025, 2, 1))
|
||||||
result = query
|
result = query
|
||||||
@@ -303,16 +188,12 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
tag.tag_names.find_by!(language_code: 'ja', primary_flg: true)
|
tag.tag_names.find_by!(language_code: 'ja', primary_flg: true)
|
||||||
.update!(name: 'renamed-alpha')
|
.update!(name: 'renamed-alpha')
|
||||||
create(:tag_name, :alias, tag:, name: 'alpha-alias')
|
create(:tag_name, :alias, tag:, name: 'alpha-alias')
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
|
|
||||||
category: 'general', aliases: 'alpha-alias', parent_tag_ids: '',
|
category: 'general', aliases: 'alpha-alias', parent_tag_ids: '',
|
||||||
names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false,
|
names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false,
|
||||||
aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } },
|
aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } },
|
||||||
created_at: Time.utc(2024, 2, 1))
|
created_at: Time.utc(2024, 2, 1))
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: 4, event_type: 'update',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: 4, event_type: 'update',
|
|
||||||
url: record.url, title: 'after rename', tags: '', parent_post_ids: '',
|
url: record.url, title: 'after rename', tags: '', parent_post_ids: '',
|
||||||
tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha',
|
tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha',
|
||||||
category: 'general', sections: [] }],
|
category: 'general', sections: [] }],
|
||||||
@@ -342,10 +223,11 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
|
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'resolves immutable external names across historical snapshots' do
|
it 'resolves external names from current registrations too' do
|
||||||
expect(versions(query(tags: 'nico:beta'))).to eq([1])
|
external.update!(name: 'renamed-beta')
|
||||||
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([])
|
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([1])
|
||||||
expect(versions(query(tags: 'not:nico:beta'))).to eq([2, 3, 4])
|
expect(versions(query(tags: 'nico:beta'))).to eq([])
|
||||||
|
expect(versions(query(tags: 'not:nico:renamed-beta'))).to eq([2, 3, 4])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -375,9 +257,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
|
|
||||||
it 'reports column overflow separately from malformed input' do
|
it 'reports column overflow separately from malformed input' do
|
||||||
101.times do |index|
|
101.times do |index|
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: index + 4,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: index + 4,
|
|
||||||
event_type: 'update', url: record.url, title: "column #{ index }",
|
event_type: 'update', url: record.url, title: "column #{ index }",
|
||||||
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
|
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
|
||||||
end
|
end
|
||||||
@@ -421,9 +301,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
sign_in_as(create(:user, role)) if role
|
sign_in_as(create(:user, role)) if role
|
||||||
# Equal timestamps deliberately require version ordering, not a date comparison.
|
# Equal timestamps deliberately require version ordering, not a date comparison.
|
||||||
['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index|
|
['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index|
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: index + 4, event_type: event,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: index + 4, event_type: event,
|
|
||||||
url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot',
|
url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot',
|
||||||
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
|
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
|
||||||
end
|
end
|
||||||
@@ -451,9 +329,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'does not resolve private condition names even when the result set is empty' do
|
it 'does not resolve private condition names even when the result set is empty' do
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
|
|
||||||
category: 'general', aliases: '', parent_tag_ids: '',
|
category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||||
created_at: Time.utc(2024, 2))
|
created_at: Time.utc(2024, 2))
|
||||||
@@ -469,9 +345,7 @@ RSpec.describe 'Counts table API', type: :request do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
it 'includes private history in the public timeline without an exclusion count' do
|
it 'includes private history in the public timeline without an exclusion count' do
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: record, version_no: 4, event_type: 'discard', url: record.url,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: record, version_no: 4, event_type: 'discard', url: record.url,
|
|
||||||
title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '',
|
title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '',
|
||||||
created_at: Time.utc(2024, 3))
|
created_at: Time.utc(2024, 3))
|
||||||
result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type')
|
result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type')
|
||||||
|
|||||||
@@ -314,7 +314,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
.and change(Tag, :count).by(1)
|
.and change(Tag, :count).by(1)
|
||||||
.and change(TagName, :count).by(1)
|
.and change(TagName, :count).by(1)
|
||||||
.and change(MaterialVersion, :count).by(1)
|
.and change(MaterialVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
@@ -326,12 +325,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
expect(material.file.attached?).to be(true)
|
expect(material.file.attached?).to be(true)
|
||||||
expect(material.version_no).to eq(1)
|
expect(material.version_no).to eq(1)
|
||||||
expect(material.material_versions.first.event_type).to eq('create')
|
expect(material.material_versions.first.event_type).to eq('create')
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'materials.create',
|
|
||||||
'created_by_user_id' => member_user.id)
|
|
||||||
expect(material.material_versions.first.event_id).to eq(event.fetch('id'))
|
|
||||||
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
|
|
||||||
expect(material.material_export_items.first.export_path).to eq('伊地知ニジカ/created.png')
|
expect(material.material_export_items.first.export_path).to eq('伊地知ニジカ/created.png')
|
||||||
expect(material.material_versions.first.export_paths_json).to eq(
|
expect(material.material_versions.first.export_paths_json).to eq(
|
||||||
'legacy_drive' => '伊地知ニジカ/created.png'
|
'legacy_drive' => '伊地知ニジカ/created.png'
|
||||||
@@ -516,7 +509,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' }
|
export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' }
|
||||||
}
|
}
|
||||||
end.to change(MaterialVersion, :count).by(2)
|
end.to change(MaterialVersion, :count).by(2)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -525,12 +517,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
expect(material.tag.category).to eq('material')
|
expect(material.tag.category).to eq('material')
|
||||||
expect(material.url).to eq('https://example.com/updated-source')
|
expect(material.url).to eq('https://example.com/updated-source')
|
||||||
expect(material.updated_by_user).to eq(member_user)
|
expect(material.updated_by_user).to eq(member_user)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'materials.update',
|
|
||||||
'created_by_user_id' => member_user.id)
|
|
||||||
expect(material.material_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
|
|
||||||
expect(material.file.attached?).to be(true)
|
expect(material.file.attached?).to be(true)
|
||||||
expect(material.file.blob.id).not_to eq(old_blob_id)
|
expect(material.file.blob.id).not_to eq(old_blob_id)
|
||||||
expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true)
|
expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true)
|
||||||
@@ -646,7 +632,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
MaterialVersionRecorder.record!(material:, event_type: :create,
|
MaterialVersionRecorder.record!(material:, event_type: :create,
|
||||||
created_by_user: member_user)
|
created_by_user: member_user)
|
||||||
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
|
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/materials/#{ material.id }", params: {
|
put "/materials/#{ material.id }", params: {
|
||||||
@@ -658,7 +643,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(material.reload.version_no).to eq(1)
|
expect(material.reload.version_no).to eq(1)
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'records update version when only export_path changes' do
|
it 'records update version when only export_path changes' do
|
||||||
@@ -823,12 +807,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
|
|
||||||
it 'creates source suppression as member' do
|
it 'creates source suppression as member' do
|
||||||
sign_in_as(member_user)
|
sign_in_as(member_user)
|
||||||
materials = ['a', 'b'].map do |name|
|
|
||||||
Material.create!(
|
|
||||||
source_kind: 'google_drive_file', source_file_id: "blocked-#{ name }",
|
|
||||||
source_path: "伊地知ニジカ/危険素材/#{ name }.png",
|
|
||||||
url: "https://example.com/blocked-#{ name }", created_by_user: member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/materials/suppressions', params: {
|
post '/materials/suppressions', params: {
|
||||||
@@ -837,7 +815,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
reason: 'copyright_high_risk'
|
reason: 'copyright_high_risk'
|
||||||
}
|
}
|
||||||
end.to change(MaterialSyncSuppression, :count).by(1)
|
end.to change(MaterialSyncSuppression, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include(
|
expect(json).to include(
|
||||||
@@ -845,14 +822,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
'drive_path' => '伊地知ニジカ/危険素材',
|
'drive_path' => '伊地知ニジカ/危険素材',
|
||||||
'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材'
|
'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材'
|
||||||
)
|
)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'materials.block', 'created_by_user_id' => member_user.id)
|
|
||||||
expect(materials.map { _1.reload.discarded? }).to eq([true, true])
|
|
||||||
versions = MaterialVersion.where(material_id: materials.map(&:id))
|
|
||||||
expect(versions.where(event_type: 'discard').pluck(:material_id))
|
|
||||||
.to match_array(materials.map(&:id))
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -891,19 +860,11 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'discards the material and returns 204' do
|
it 'discards the material and returns 204' do
|
||||||
expect { delete "/materials/#{ material.id }" }
|
delete "/materials/#{ material.id }"
|
||||||
.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
expect(Material.find_by(id: material.id)).to be_nil
|
expect(Material.find_by(id: material.id)).to be_nil
|
||||||
expect(Material.with_discarded.find(material.id)).to be_discarded
|
expect(Material.with_discarded.find(material.id)).to be_discarded
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'materials.destroy',
|
|
||||||
'created_by_user_id' => member_user.id)
|
|
||||||
versions = MaterialVersion.where(material_id: material.id)
|
|
||||||
expect(versions.order(:version_no).last.event_type).to eq('discard')
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -38,9 +38,12 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'filters by nico tag name, linked tag name, and link status' do
|
it 'filters by nico tag name, linked tag name, and link status' do
|
||||||
linked = create(:external_tag, name: 'search_linked')
|
linked = create(:external_tag)
|
||||||
unlinked = create(:external_tag, name: 'search_unlinked')
|
linked.update!(name: 'search_linked')
|
||||||
other = create(:external_tag, name: 'other')
|
unlinked = create(:external_tag)
|
||||||
|
unlinked.update!(name: 'search_unlinked')
|
||||||
|
other = create(:external_tag)
|
||||||
|
other.update!(name: 'other')
|
||||||
destination = create(:tag, category: :general)
|
destination = create(:tag, category: :general)
|
||||||
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
|
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
|
||||||
NicoTagRelation.create!(nico_tag: linked, tag: destination)
|
NicoTagRelation.create!(nico_tag: linked, tag: destination)
|
||||||
@@ -77,9 +80,11 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'sorts by name and timestamps' do
|
it 'sorts by name and timestamps' do
|
||||||
older = create(:external_tag, name: 'ordered_a')
|
older = create(:external_tag)
|
||||||
|
older.update!(name: 'ordered_a')
|
||||||
older.update_columns(created_at: 2.days.ago)
|
older.update_columns(created_at: 2.days.ago)
|
||||||
newer = create(:external_tag, name: 'ordered_b')
|
newer = create(:external_tag)
|
||||||
|
newer.update!(name: 'ordered_b')
|
||||||
newer.update_columns(created_at: 1.day.ago)
|
newer.update_columns(created_at: 1.day.ago)
|
||||||
older_post_tag =
|
older_post_tag =
|
||||||
PostExternalTag.create!(post: create(:post), external_tag: older)
|
PostExternalTag.create!(post: create(:post), external_tag: older)
|
||||||
@@ -172,7 +177,6 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
}
|
}
|
||||||
}.to change(TagVersion, :count).by(2)
|
}.to change(TagVersion, :count).by(2)
|
||||||
.and change(NicoTagVersion, :count).by(1)
|
.and change(NicoTagVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -182,15 +186,12 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id)
|
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id)
|
||||||
expect(linked_versions.map(&:event_type)).to eq(['create', 'create'])
|
expect(linked_versions.map(&:event_type)).to eq(['create', 'create'])
|
||||||
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
|
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
|
|
||||||
expect(linked_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
|
|
||||||
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
|
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
|
||||||
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
expect(versions.last.linked_tag_ids.split.map(&:to_i))
|
expect(versions.last.linked_tags.split).to match_array([
|
||||||
.to match_array([linked_a.id, linked_b.id])
|
'nico_linked_a',
|
||||||
|
'nico_linked_b'])
|
||||||
expect(versions.last.created_by_user_id).to eq(admin.id)
|
expect(versions.last.created_by_user_id).to eq(admin.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -209,7 +210,7 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
expect(json).to eq([])
|
expect(json).to eq([])
|
||||||
expect(nico_tag.reload.linked_tags).to be_empty
|
expect(nico_tag.reload.linked_tags).to be_empty
|
||||||
expect(nico_tag.nico_tag_versions.order(:version_no).last)
|
expect(nico_tag.nico_tag_versions.order(:version_no).last)
|
||||||
.to have_attributes(linked_tag_ids: '', created_by_user: member)
|
.to have_attributes(linked_tags: '', created_by_user: member)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns the tags field error when a nico tag is specified directly' do
|
it 'returns the tags field error when a nico tag is specified directly' do
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
|
|||||||
created_at: origin + index.hours)
|
created_at: origin + index.hours)
|
||||||
end
|
end
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
|
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
|
||||||
linked_tag_ids: tag.id.to_s,
|
name: 'nico:external-history-tag', linked_tags: 'private-history-tag',
|
||||||
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|
|
||||||
snapshots =
|
snapshots =
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post:,
|
post:,
|
||||||
version_no: 1,
|
version_no: 1,
|
||||||
event_type: 'create',
|
event_type: 'create',
|
||||||
event_id: create_event!(
|
|
||||||
event_type: 'posts.create', created_by_user: post.uploaded_user).id,
|
|
||||||
title: post.title,
|
title: post.title,
|
||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
@@ -1070,7 +1068,7 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it 'dry-runs without persisting posts or new tags' do
|
it 'dry-runs without persisting posts or new tags' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
counts = [Post.count, Tag.count, TagName.count, event_rows.length]
|
counts = [Post.count, Tag.count, TagName.count]
|
||||||
|
|
||||||
post '/posts?dry=1', params: post_write_params(
|
post '/posts?dry=1', params: post_write_params(
|
||||||
title: 'dry-run post',
|
title: 'dry-run post',
|
||||||
@@ -1086,7 +1084,7 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
[{ 'name' => 'new_dry_run_tag',
|
[{ 'name' => 'new_dry_run_tag',
|
||||||
'category' => 'character',
|
'category' => 'character',
|
||||||
'section_literals' => [] }])
|
'section_literals' => [] }])
|
||||||
expect([Post.count, Tag.count, TagName.count, event_rows.length]).to eq(counts)
|
expect([Post.count, Tag.count, TagName.count]).to eq(counts)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'dry-runs an existing URL without validating its upload' do
|
it 'dry-runs an existing URL without validating its upload' do
|
||||||
@@ -2261,20 +2259,20 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
|
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
post:,
|
||||||
post:,
|
version_no:,
|
||||||
version_no:,
|
event_type:,
|
||||||
event_type:,
|
title: post.title,
|
||||||
title: post.title,
|
url: post.url,
|
||||||
url: post.url,
|
thumbnail_base: post.thumbnail_base,
|
||||||
thumbnail_base: post.thumbnail_base,
|
tags: snapshot_tags(post),
|
||||||
tags: snapshot_tags(post),
|
tags_json: post.snapshot_tags_json,
|
||||||
tags_json: post.snapshot_tags_json,
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
original_created_from: post.original_created_from,
|
||||||
original_created_from: post.original_created_from,
|
original_created_before: post.original_created_before,
|
||||||
original_created_before: post.original_created_before,
|
created_at:,
|
||||||
created_at:,
|
created_by_user:
|
||||||
created_by_user:)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
let!(:v1) do
|
let!(:v1) do
|
||||||
@@ -2602,7 +2600,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload)
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
@@ -2614,13 +2611,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(version.url).to eq('https://example.com/versioned-post')
|
expect(version.url).to eq('https://example.com/versioned-post')
|
||||||
expect(version.created_by_user_id).to eq(member.id)
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
expect(version.tags).to eq(snapshot_tags(created_post))
|
expect(version.tags).to eq(snapshot_tags(created_post))
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'posts.create', 'created_by_user_id' => member.id)
|
|
||||||
expect(version.event_id).to eq(event.fetch('id'))
|
|
||||||
tag_versions = TagVersion.where(tag_id: created_post.tags.select(:id))
|
|
||||||
expect(tag_versions).not_to be_empty
|
|
||||||
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates next version on PUT /posts/:id when snapshot changes' do
|
it 'creates next version on PUT /posts/:id when snapshot changes' do
|
||||||
@@ -2636,7 +2626,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2')
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -2646,12 +2635,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(version.title).to eq('updated title')
|
expect(version.title).to eq('updated title')
|
||||||
expect(version.created_by_user_id).to eq(member.id)
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
expect(version.tags).to eq(snapshot_tags(post_record.reload))
|
expect(version.tags).to eq(snapshot_tags(post_record.reload))
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'posts.update', 'created_by_user_id' => member.id)
|
|
||||||
expect(version.event_id).to eq(event.fetch('id'))
|
|
||||||
tag_version = TagVersion.find_by!(tag_id: tag_name2.reload.tag_id, version_no: 1)
|
|
||||||
expect(tag_version.event_id).to eq(event.fetch('id'))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
|
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
|
||||||
@@ -2660,7 +2643,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
|
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
base_version = create_post_version_for!(post_record.reload)
|
||||||
|
|
||||||
events = event_rows
|
|
||||||
expect {
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
base_version_no: base_version.version_no,
|
base_version_no: base_version.version_no,
|
||||||
@@ -2674,12 +2656,10 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(version.version_no).to eq(1)
|
expect(version.version_no).to eq(1)
|
||||||
expect(version.event_type).to eq('create')
|
expect(version.event_type).to eq('create')
|
||||||
expect(version.tags).to eq(snapshot_tags(post_record))
|
expect(version.tags).to eq(snapshot_tags(post_record))
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not create a version when POST /posts is invalid' do
|
it 'does not create a version when POST /posts is invalid' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: post_write_params(
|
||||||
@@ -2690,13 +2670,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not create a version when PUT /posts/:id is invalid' do
|
it 'does not create a version when PUT /posts/:id is invalid' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
base_version = create_post_version_for!(post_record)
|
base_version = create_post_version_for!(post_record)
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
@@ -2708,7 +2686,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'rejects second-bearing original created timestamps on POST /posts' do
|
it 'rejects second-bearing original created timestamps on POST /posts' do
|
||||||
|
|||||||
@@ -119,9 +119,7 @@ RSpec.describe 'Sitemap entries API', type: :request do
|
|||||||
# Legacy empty bodies can exist even though the write service rejects them.
|
# Legacy empty bodies can exist even though the write service rejects them.
|
||||||
empty = TagDescription.create!(tag: empty_tag, language_code: 'ain',
|
empty = TagDescription.create!(tag: empty_tag, language_code: 'ain',
|
||||||
body: '', version_no: 1)
|
body: '', version_no: 1)
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(tag_id: empty_tag.id, language_code: 'ain',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: empty_tag.id, language_code: 'ain',
|
|
||||||
body: '', version_no: 1, event_type: 'create',
|
body: '', version_no: 1, event_type: 'create',
|
||||||
created_by_user_id: user.id, created_at: Time.current)
|
created_by_user_id: user.id, created_at: Time.current)
|
||||||
|
|
||||||
|
|||||||
@@ -53,13 +53,8 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
expect { do_request }
|
expect { do_request }
|
||||||
.to change { parent.reload.children.ids.include?(child.id) }
|
.to change { parent.reload.children.ids.include?(child.id) }
|
||||||
.from(false).to(true)
|
.from(false).to(true)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
|
|
||||||
expect(child.tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 422 and does not create relation when the new link makes a cycle' do
|
it 'returns 422 and does not create relation when the new link makes a cycle' do
|
||||||
@@ -137,7 +132,6 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
expect {
|
expect {
|
||||||
do_request
|
do_request
|
||||||
}.to change(TagVersion, :count).by(2)
|
}.to change(TagVersion, :count).by(2)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
|
|
||||||
@@ -146,10 +140,6 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
|
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
|
||||||
expect(versions.second.parent_tag_ids).to eq('')
|
expect(versions.second.parent_tag_ids).to eq('')
|
||||||
expect(versions.second.created_by_user_id).to eq(admin.id)
|
expect(versions.second.created_by_user_id).to eq(admin.id)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
|
|||||||
let!(:versions) do
|
let!(:versions) do
|
||||||
['A', 'A', 'new-version'].each_with_index.map do |body, index|
|
['A', 'A', 'new-version'].each_with_index.map do |body, index|
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: tag.id, language_code: 'ja', version_no: index + 1,
|
tag_id: tag.id, language_code: 'ja', version_no: index + 1,
|
||||||
event_type: index.zero? ? 'create' : 'update', body:,
|
event_type: index.zero? ? 'create' : 'update', body:,
|
||||||
created_by_user_id: user.id, created_at: Time.current)
|
created_by_user_id: user.id, created_at: Time.current)
|
||||||
@@ -74,7 +73,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
|
|||||||
let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') }
|
let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') }
|
||||||
let!(:other_version) do
|
let!(:other_version) do
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: other_tag.id, language_code: 'ja', version_no: 1,
|
tag_id: other_tag.id, language_code: 'ja', version_no: 1,
|
||||||
event_type: 'create', body: 'other tag history',
|
event_type: 'create', body: 'other tag history',
|
||||||
created_by_user_id: user.id, created_at: Time.current)
|
created_by_user_id: user.id, created_at: Time.current)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
def stored_state
|
def stored_state
|
||||||
[TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model|
|
[TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model|
|
||||||
model.order(:id).map(&:attributes)
|
model.order(:id).map(&:attributes)
|
||||||
end + [event_rows]
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def fail_save model
|
def fail_save model
|
||||||
@@ -91,8 +91,6 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
let!(:version) do
|
let!(:version) do
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1,
|
tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1,
|
||||||
event_id: create_event!(
|
|
||||||
event_type: 'tag_descriptions.create', created_by_user: author).id,
|
|
||||||
event_type: 'create', created_by_user_id: author.id, created_at: Time.current)
|
event_type: 'create', created_by_user_id: author.id, created_at: Time.current)
|
||||||
end
|
end
|
||||||
let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" }
|
let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" }
|
||||||
@@ -187,7 +185,6 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
expect { native_write(body: 'created natively') }
|
expect { native_write(body: 'created natively') }
|
||||||
.to change(TagDescription, :count).by(1)
|
.to change(TagDescription, :count).by(1)
|
||||||
.and change(TagDescriptionVersion, :count).by(1)
|
.and change(TagDescriptionVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja')
|
description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja')
|
||||||
expect_current(description)
|
expect_current(description)
|
||||||
@@ -195,10 +192,6 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
expect(version).to have_attributes(
|
expect(version).to have_attributes(
|
||||||
body: 'created natively', version_no: 1, event_type: 'create',
|
body: 'created natively', version_no: 1, event_type: 'create',
|
||||||
created_by_user_id: editor.id)
|
created_by_user_id: editor.id)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tag_descriptions.create', 'created_by_user_id' => editor.id)
|
|
||||||
expect(version.event_id).to eq(event.fetch('id'))
|
|
||||||
get "/wiki/#{ description.id }"
|
get "/wiki/#{ description.id }"
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json).to include('body' => description.body, 'revision_id' => version.id)
|
expect(json).to include('body' => description.body, 'revision_id' => version.id)
|
||||||
@@ -230,7 +223,6 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
expect(description.version_no).to eq(1)
|
expect(description.version_no).to eq(1)
|
||||||
expect { native_write(body: 'after') }
|
expect { native_write(body: 'after') }
|
||||||
.to change(TagDescriptionVersion, :count).by(1)
|
.to change(TagDescriptionVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(description.reload).to have_attributes(
|
expect(description.reload).to have_attributes(
|
||||||
body: 'after', version_no: 2,
|
body: 'after', version_no: 2,
|
||||||
@@ -242,10 +234,6 @@ RSpec.describe 'Tag description native API', type: :request do
|
|||||||
expect(version).to have_attributes(
|
expect(version).to have_attributes(
|
||||||
tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update',
|
tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update',
|
||||||
body: 'after', created_by_user_id: editor.id)
|
body: 'after', created_by_user_id: editor.id)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tag_descriptions.update', 'created_by_user_id' => editor.id)
|
|
||||||
expect(version.event_id).to eq(event.fetch('id'))
|
|
||||||
expect(revision.body).to eq(version.body)
|
expect(revision.body).to eq(version.body)
|
||||||
expect(description_versions(page).order(:version_no).last.body).to eq(version.body)
|
expect(description_versions(page).order(:version_no).last.body).to eq(version.body)
|
||||||
get "/wiki/#{ description.id }"
|
get "/wiki/#{ description.id }"
|
||||||
|
|||||||
@@ -121,14 +121,10 @@ RSpec.describe 'Tag group native API', type: :request do
|
|||||||
[:create, :update].each do |operation|
|
[:create, :update].each do |operation|
|
||||||
it "#{ operation }s structured data and keeps unplaced membership" do
|
it "#{ operation }s structured data and keeps unplaced membership" do
|
||||||
previous = group_version(group_id, 1)
|
previous = group_version(group_id, 1)
|
||||||
expect { native_write(operation) }.to change { event_rows.length }.by(1)
|
native_write(operation)
|
||||||
expect(response).to have_http_status(operation == :create ? :created : :ok)
|
expect(response).to have_http_status(operation == :create ? :created : :ok)
|
||||||
id = operation == :create ? json.fetch('id') : group_id
|
id = operation == :create ? json.fetch('id') : group_id
|
||||||
number = operation == :create ? 1 : 2
|
number = operation == :create ? 1 : 2
|
||||||
event = event_rows.last
|
|
||||||
event_type = operation == :create ? 'tag_groups.create' : 'tag_groups.update'
|
|
||||||
expect(event).to include('event_type' => event_type, 'created_by_user_id' => user.id)
|
|
||||||
expect(group_version(id, number).fetch('event_id')).to eq(event.fetch('id'))
|
|
||||||
expect_group_snapshot(
|
expect_group_snapshot(
|
||||||
id, number:, members: snapshot_members, placements:, description: '全体の説明')
|
id, number:, members: snapshot_members, placements:, description: '全体の説明')
|
||||||
expect(group_version(group_id, 1)).to eq(previous)
|
expect(group_version(group_id, 1)).to eq(previous)
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ RSpec.describe 'TagVersions API', type: :request do
|
|||||||
)
|
)
|
||||||
version =
|
version =
|
||||||
TagVersion.create!(
|
TagVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag: tag,
|
tag: tag,
|
||||||
version_no: version_no,
|
version_no: version_no,
|
||||||
event_type: event_type,
|
event_type: event_type,
|
||||||
|
|||||||
@@ -705,7 +705,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect {
|
expect {
|
||||||
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
|
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
|
||||||
}.to change(TagVersion, :count).by(2)
|
}.to change(TagVersion, :count).by(2)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -720,10 +719,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name')
|
expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name')
|
||||||
expect(versions.second.category).to eq('meme')
|
expect(versions.second.category).to eq('meme')
|
||||||
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'updates deprecated state and records it in tag versions' do
|
it 'updates deprecated state and records it in tag versions' do
|
||||||
@@ -1280,7 +1275,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
deprecated: '0',
|
deprecated: '0',
|
||||||
}
|
}
|
||||||
}.to change(TagVersion, :count).by(2)
|
}.to change(TagVersion, :count).by(2)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -1296,10 +1290,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(versions.second.category).to eq('meta')
|
expect(versions.second.category).to eq('meta')
|
||||||
expect(version_alias_names(versions.second, 'ja')).to include('spec_tag')
|
expect(version_alias_names(versions.second, 'ja')).to include('spec_tag')
|
||||||
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it '同じ tag の旧 alias へ戻しても rename できる' do
|
it '同じ tag の旧 alias へ戻しても rename できる' do
|
||||||
|
|||||||
@@ -22,55 +22,6 @@ RSpec.describe 'Counts export contracts' do
|
|||||||
.and_return(@counts_export_dir)
|
.and_return(@counts_export_dir)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'nico link IDs with the V1 export field name' do
|
|
||||||
let(:tag) { create(:tag, primary_name: 'linked export tag') }
|
|
||||||
let(:external) { create(:external_tag, name: 'external export tag') }
|
|
||||||
let(:payload) do
|
|
||||||
super().merge('resource' => 'nico_tags', 'columns' => 'linked_tags',
|
|
||||||
'headers' => '["linked_tags"]')
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: 1,
|
|
||||||
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
|
|
||||||
NicoTagVersion.create!(external_tag: external, version_no: 2,
|
|
||||||
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'exports recorded IDs with the legacy JSON key and metadata' do
|
|
||||||
result = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
|
|
||||||
expect(result.fetch('data')).to eq([
|
|
||||||
{ 'linked_tags' => '' }, { 'linked_tags' => tag.id.to_s }])
|
|
||||||
expect(result.fetch('metadata').fetch('columns')).to eq(['linked_tags'])
|
|
||||||
keys = result.fetch('metadata').fetch('fields').map { _1.fetch('key') }
|
|
||||||
expect(keys).to include('linked_tags')
|
|
||||||
expect(keys).not_to include('linked_tag_ids')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'exports the selected legacy CSV header and ID values' do
|
|
||||||
body = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
|
|
||||||
expect(CSV.parse(body.delete_prefix("\uFEFF")))
|
|
||||||
.to eq([['linked_tags'], [''], [tag.id.to_s]])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'keeps the legacy link column in default JSON exports' do
|
|
||||||
options = payload.except('columns', 'headers')
|
|
||||||
result = JSON.parse(CountsTableExport.new(options).body.to_a.join)
|
|
||||||
expect(result.fetch('metadata').fetch('columns')).to include('linked_tags')
|
|
||||||
result.fetch('data').each do |row|
|
|
||||||
expect(row).to have_key('linked_tags')
|
|
||||||
expect(row).not_to have_key('linked_tag_ids')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects the physical column as a selected CSV or JSON field' do
|
|
||||||
['csv', 'json'].each do |format|
|
|
||||||
options = payload.merge('format' => format, 'columns' => 'linked_tag_ids')
|
|
||||||
expect { CountsTableExport.new(options) }.to raise_error(ArgumentError)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'serialization after the authorised query' do
|
context 'serialization after the authorised query' do
|
||||||
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
|
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
|
||||||
let(:page) do
|
let(:page) do
|
||||||
@@ -192,9 +143,7 @@ RSpec.describe 'Counts export contracts' do
|
|||||||
expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
|
expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
|
||||||
expect(CountsExportDownload.find(token, 'other')).to be_nil
|
expect(CountsExportDownload.find(token, 'other')).to be_nil
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'discard', url: post.url,
|
|
||||||
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
|
||||||
expect(CountsExportDownload.find(token, 'owner')).to be_nil
|
expect(CountsExportDownload.find(token, 'owner')).to be_nil
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,9 +13,7 @@ RSpec.describe 'Counts masked pivot contracts' do
|
|||||||
let!(:tags) do
|
let!(:tags) do
|
||||||
['A', 'B', 'C'].map do |name|
|
['A', 'B', 'C'].map do |name|
|
||||||
tag = create(:tag, primary_name: name)
|
tag = create(:tag, primary_name: name)
|
||||||
TagVersion.create!(
|
TagVersion.create!(tag:, version_no: 1, event_type: 'create', name:,
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag:, version_no: 1, event_type: 'create', name:,
|
|
||||||
category: 'general', aliases: '', parent_tag_ids: '',
|
category: 'general', aliases: '', parent_tag_ids: '',
|
||||||
names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
|
||||||
created_at: Time.utc(2023))
|
created_at: Time.utc(2023))
|
||||||
@@ -27,16 +25,12 @@ RSpec.describe 'Counts masked pivot contracts' do
|
|||||||
[[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
|
[[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
|
snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 1, event_type: 'create',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'create',
|
|
||||||
title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
|
title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
|
||||||
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
|
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
|
||||||
next if index == 2
|
next if index == 2
|
||||||
|
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 2, event_type: 'discard',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 2, event_type: 'discard',
|
|
||||||
title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
|
title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
|
||||||
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
|
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
|
||||||
end
|
end
|
||||||
@@ -106,16 +100,12 @@ RSpec.describe 'Counts masked pivot contracts' do
|
|||||||
|
|
||||||
it 'uses changed-record membership for totals and hides changes to private predecessors' do
|
it 'uses changed-record membership for totals and hides changes to private predecessors' do
|
||||||
post = PostVersion.order(:id).last.post
|
post = PostVersion.order(:id).last.post
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
|
|
||||||
url: post.url, tags: '',
|
url: post.url, tags: '',
|
||||||
tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
|
tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
|
||||||
parent_post_ids: '', created_at: Time.utc(2024, 3))
|
parent_post_ids: '', created_at: Time.utc(2024, 3))
|
||||||
restored = PostVersion.order(:id).first.post
|
restored = PostVersion.order(:id).first.post
|
||||||
PostVersion.create!(
|
PostVersion.create!(post: restored, version_no: 3, event_type: 'restore',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post: restored, version_no: 3, event_type: 'restore',
|
|
||||||
title: 'restored-public-title', url: restored.url, tags: '',
|
title: 'restored-public-title', url: restored.url, tags: '',
|
||||||
tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
|
tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
|
||||||
created_at: Time.utc(2024, 4))
|
created_at: Time.utc(2024, 4))
|
||||||
@@ -145,9 +135,7 @@ RSpec.describe 'Counts masked pivot contracts' do
|
|||||||
|
|
||||||
it 'keeps NULL as a public data value rather than treating it as a rollup' do
|
it 'keeps NULL as a public data value rather than treating it as a rollup' do
|
||||||
post = create(:post)
|
post = create(:post)
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'public bot',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: 1, event_type: 'create', title: 'public bot',
|
|
||||||
url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
|
url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
|
||||||
page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
|
page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
|
||||||
expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
|
expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
|
||||||
@@ -158,9 +146,7 @@ RSpec.describe 'Counts masked pivot contracts' do
|
|||||||
it 'sorts public version numbers numerically including formerly hidden records' do
|
it 'sorts public version numbers numerically including formerly hidden records' do
|
||||||
post = PostVersion.order(:id).last.post
|
post = PostVersion.order(:id).last.post
|
||||||
[2, 10].each do |number|
|
[2, 10].each do |number|
|
||||||
PostVersion.create!(
|
PostVersion.create!(post:, version_no: number, event_type: 'update',
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
post:, version_no: number, event_type: 'update',
|
|
||||||
title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
|
title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
|
||||||
parent_post_ids: '', created_at: Time.utc(2024, 5))
|
parent_post_ids: '', created_at: Time.utc(2024, 5))
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ RSpec.describe MaterialSyncImporter do
|
|||||||
profile: 'legacy_drive',
|
profile: 'legacy_drive',
|
||||||
export_path: '素材/a.png',
|
export_path: '素材/a.png',
|
||||||
created_by_user: user)
|
created_by_user: user)
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
result =
|
result =
|
||||||
described_class.import!(
|
described_class.import!(
|
||||||
@@ -74,7 +73,6 @@ RSpec.describe MaterialSyncImporter do
|
|||||||
expect(result.action).to eq(:unchanged)
|
expect(result.action).to eq(:unchanged)
|
||||||
expect(material.reload.tag).to eq(tag)
|
expect(material.reload.tag).to eq(tag)
|
||||||
expect(material.url).to eq('https://example.com/human')
|
expect(material.url).to eq('https://example.com/human')
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'suppresses a Google Drive candidate by relative path prefix' do
|
it 'suppresses a Google Drive candidate by relative path prefix' do
|
||||||
|
|||||||
@@ -14,47 +14,6 @@ RSpec.describe MaterialSyncRunner do
|
|||||||
let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
|
let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
|
||||||
|
|
||||||
describe '#sync!' do
|
describe '#sync!' do
|
||||||
it 'groups created and updated materials across sync sources into one event' do
|
|
||||||
existing = Material.create!(
|
|
||||||
source_kind: 'google_drive_file', source_file_id: 'existing-file',
|
|
||||||
source_path: 'old.png', url: 'https://example.com/existing',
|
|
||||||
created_by_user: user, updated_by_user: user)
|
|
||||||
source
|
|
||||||
MaterialSyncSource.create!(
|
|
||||||
name: 'Second Drive source', source_kind: 'google_drive_path',
|
|
||||||
source_file_id: 'folder-456', profile: 'legacy_drive',
|
|
||||||
created_by_user: user, updated_by_user: user)
|
|
||||||
allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
|
|
||||||
allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
|
|
||||||
id = folder_id == 'folder-123' ? 'existing-file' : 'new-file'
|
|
||||||
block.call(id:, name: "#{ id }.png", mime_type: 'image/png',
|
|
||||||
relative_path: "素材/#{ id }.png", sha256_checksum: nil,
|
|
||||||
web_view_link: "https://drive.google.com/file/d/#{ id }/view")
|
|
||||||
end
|
|
||||||
allow(drive_client).to receive(:download_to_tempfile) do |id, **|
|
|
||||||
Tempfile.new(['sync-event', '.png']).tap do |file|
|
|
||||||
file.binmode
|
|
||||||
file.write(id)
|
|
||||||
file.rewind
|
|
||||||
end
|
|
||||||
end
|
|
||||||
allow(MaterialThumbnailGenerator).to receive(:generate!)
|
|
||||||
previous_ids = MaterialVersion.pluck(:id)
|
|
||||||
|
|
||||||
result = nil
|
|
||||||
expect { result = described_class.sync_enabled! }
|
|
||||||
.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(result).to have_attributes(imported: 1, updated: 1, failed: 0)
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event.fetch('event_type')).to eq('materials.sync')
|
|
||||||
created = Material.find_by!(source_file_id: 'new-file')
|
|
||||||
versions = MaterialVersion.where.not(id: previous_ids)
|
|
||||||
expect(versions.pluck(:material_id).uniq).to contain_exactly(existing.id, created.id)
|
|
||||||
expect(versions.pluck(:event_type)).to include('create', 'update')
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'imports google drive path candidates as they are yielded' do
|
it 'imports google drive path candidates as they are yielded' do
|
||||||
first_entry = { id: 'file-1',
|
first_entry = { id: 'file-1',
|
||||||
name: 'a.png',
|
name: 'a.png',
|
||||||
|
|||||||
@@ -8,23 +8,21 @@ RSpec.describe NicoTagVersionRecorder do
|
|||||||
described_class.record!(external_tag:, event_type:, created_by_user: member)
|
described_class.record!(external_tag:, event_type:, created_by_user: member)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'records the external association and derives the platform-qualified name' do
|
it 'records the external association and platform-qualified name' do
|
||||||
version = record(:create)
|
version = record(:create)
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
expect(version).to have_attributes(
|
||||||
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_tags: '', 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)
|
||||||
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
|
||||||
first = record(:create)
|
first = record(:create)
|
||||||
tag = create(:tag)
|
external_tag.update!(name: 'changed')
|
||||||
NicoTagRelation.create!(nico_tag: external_tag, tag:)
|
|
||||||
second = record(:update)
|
second = record(:update)
|
||||||
|
|
||||||
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
|
expect(second).to have_attributes(version_no: 2, name: 'nico:changed')
|
||||||
linked_tag_ids: tag.id.to_s)
|
|
||||||
expect(first.reload.name).to eq('nico:raw tag[]')
|
expect(first.reload.name).to eq('nico:raw tag[]')
|
||||||
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
|
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
|
||||||
end
|
end
|
||||||
@@ -42,7 +40,7 @@ RSpec.describe NicoTagVersionRecorder do
|
|||||||
|
|
||||||
expect(version).to have_attributes(
|
expect(version).to have_attributes(
|
||||||
external_tag: external, name: 'registered_external:foo', version_no: 1,
|
external_tag: external, name: 'registered_external:foo', version_no: 1,
|
||||||
event_type: 'create', linked_tag_ids: '', created_by_user: member)
|
event_type: 'create', linked_tags: '', created_by_user: member)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns the latest version without appending an unchanged snapshot' do
|
it 'returns the latest version without appending an unchanged snapshot' do
|
||||||
@@ -66,21 +64,13 @@ RSpec.describe NicoTagVersionRecorder do
|
|||||||
expect(external_tag.nico_tag_versions).to contain_exactly(first)
|
expect(external_tag.nico_tag_versions).to contain_exactly(first)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'records sorted linked internal names and later link removal' do
|
||||||
it 'rejects discard and restore events for external tags' do
|
|
||||||
[:discard, :restore].each do |event_type|
|
|
||||||
expect { record(event_type) }
|
|
||||||
.to raise_error(ArgumentError, "Invalid event_type: #{ event_type }")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records sorted linked internal IDs and later link removal' do
|
|
||||||
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
|
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
|
||||||
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
|
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
|
||||||
|
|
||||||
expect(record(:create).linked_tag_ids).to eq(tags.map(&:id).sort.join(' '))
|
expect(record(:create).linked_tags).to eq('a_link z_link')
|
||||||
external_tag.linked_tags = [tags.first]
|
external_tag.linked_tags = [tags.first]
|
||||||
|
|
||||||
expect(record(:update)).to have_attributes(version_no: 2, linked_tag_ids: tags.first.id.to_s)
|
expect(record(:update)).to have_attributes(version_no: 2, linked_tags: 'z_link')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -88,86 +88,3 @@ RSpec.describe PostBulkCreator do
|
|||||||
expect(creator).to have_received(:create!).with(locale).once
|
expect(creator).to have_received(:create!).with(locale).once
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
RSpec.describe 'PostBulkCreator event grouping', type: :model do
|
|
||||||
self.use_transactional_tests = false
|
|
||||||
|
|
||||||
before do
|
|
||||||
expect(Rails.env.test?).to be(true)
|
|
||||||
expect(ApplicationRecord.connection.open_transactions).to eq(0)
|
|
||||||
@prefix = "bulk_event_#{ SecureRandom.hex(8) }"
|
|
||||||
@actor = create(:user, :member)
|
|
||||||
allow(PostCreatePreflight).to receive(:new) do |attributes:, **|
|
|
||||||
specs = [{ name: attributes.fetch(:title), category: :general }]
|
|
||||||
instance_double(PostCreatePreflight, run: attributes.merge(
|
|
||||||
existing_post_id: nil, snapshot_tag_specs: specs, post_tag_specs: specs,
|
|
||||||
normalised_parent_post_ids: [], tag_sections: { }, video_ms: nil))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
after do
|
|
||||||
if @actor
|
|
||||||
posts = Post.where(uploaded_user: @actor)
|
|
||||||
PostTagSection.where(post_id: posts.select(:id)).delete_all
|
|
||||||
PostTag.where(post_id: posts.select(:id)).delete_all
|
|
||||||
PostVersion.where(post_id: posts.select(:id)).delete_all
|
|
||||||
posts.delete_all
|
|
||||||
tag_ids = TagName.where(name: ["#{ @prefix }_1", "#{ @prefix }_2"]).pluck(:tag_id)
|
|
||||||
TagVersion.where(tag_id: tag_ids).delete_all
|
|
||||||
TagName.where(tag_id: tag_ids).delete_all
|
|
||||||
Tag.where(id: tag_ids).delete_all
|
|
||||||
EventRecords::EventRow.where(created_by_user_id: @actor.id).delete_all
|
|
||||||
@actor.delete
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'shares one creation event between real workers and their tag histories' do
|
|
||||||
posts = [1, 2].map do |number|
|
|
||||||
{ title: "#{ @prefix }_#{ number }",
|
|
||||||
url: "https://example.com/#{ @prefix }/#{ number }" }
|
|
||||||
end
|
|
||||||
|
|
||||||
result = nil
|
|
||||||
expect {
|
|
||||||
result = PostBulkCreator.new(actor: @actor, posts:, thumbnails: { })
|
|
||||||
.run(Locale.nipponese)
|
|
||||||
}.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['created', 'created'])
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include(
|
|
||||||
'event_type' => 'posts.create', 'created_by_user_id' => @actor.id)
|
|
||||||
versions = PostVersion.where(created_by_user_id: @actor.id)
|
|
||||||
expect(versions.count).to eq(2)
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
tag_versions = TagVersion.where(created_by_user_id: @actor.id)
|
|
||||||
expect(tag_versions.count).to eq(2)
|
|
||||||
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not leave an event when every row fails validation' do
|
|
||||||
preflight = instance_double(PostCreatePreflight)
|
|
||||||
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
|
|
||||||
allow(preflight).to receive(:run).and_raise(
|
|
||||||
PostCreatePreflight::ValidationFailed.new(fields: { url: ['invalid'] }))
|
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
result = PostBulkCreator.new(
|
|
||||||
actor: @actor, posts: [{ title: 'invalid' }], thumbnails: { }).run(Locale.nipponese)
|
|
||||||
|
|
||||||
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['failed'])
|
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not leave an event when every row is skipped' do
|
|
||||||
preflight = instance_double(PostCreatePreflight, run: { existing_post_id: 123 })
|
|
||||||
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
|
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
result = PostBulkCreator.new(
|
|
||||||
actor: @actor, posts: [{ title: 'existing' }], thumbnails: { }).run(Locale.nipponese)
|
|
||||||
|
|
||||||
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['skipped'])
|
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
|
|||||||
@tag = create(:tag, primary_name: "#{ @prefix }_owner")
|
@tag = create(:tag, primary_name: "#{ @prefix }_owner")
|
||||||
@group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
|
@group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
|
||||||
@tag_ids = Queue.new
|
@tag_ids = Queue.new
|
||||||
@event_ids = Queue.new
|
|
||||||
@threads = []
|
@threads = []
|
||||||
@release = Queue.new
|
@release = Queue.new
|
||||||
end
|
end
|
||||||
@@ -43,9 +42,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
|
|||||||
ids << @tag.id if @tag
|
ids << @tag.id if @tag
|
||||||
TagName.where(tag_id: ids).delete_all
|
TagName.where(tag_id: ids).delete_all
|
||||||
Tag.where(id: ids).delete_all
|
Tag.where(id: ids).delete_all
|
||||||
event_ids = []
|
|
||||||
event_ids << @event_ids.pop until @event_ids.empty? if @event_ids
|
|
||||||
EventRecords::EventRow.where(id: event_ids).delete_all
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -76,17 +72,11 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
|
|||||||
when :description
|
when :description
|
||||||
TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
|
TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
|
||||||
when :description_version
|
when :description_version
|
||||||
event = create_event!(event_type: 'unknown')
|
|
||||||
@event_ids << event.id
|
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
event_id: event.id,
|
|
||||||
tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
|
tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
|
||||||
event_type: 'create', created_at: Time.current)
|
event_type: 'create', created_at: Time.current)
|
||||||
when :group_version
|
when :group_version
|
||||||
event = create_event!(event_type: 'unknown')
|
|
||||||
@event_ids << event.id
|
|
||||||
TagGroupVersion.create!(
|
TagGroupVersion.create!(
|
||||||
event_id: event.id,
|
|
||||||
tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
|
tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
|
||||||
members: [], placements: [], created_at: Time.current)
|
members: [], placements: [], created_at: Time.current)
|
||||||
when :group
|
when :group
|
||||||
|
|||||||
@@ -15,12 +15,10 @@ RSpec.describe SharedResourceIdAllocator do
|
|||||||
TagGroup.new(id:, name: "group #{ number }", version_no: number)
|
TagGroup.new(id:, name: "group #{ number }", version_no: number)
|
||||||
when 'tag_description_versions'
|
when 'tag_description_versions'
|
||||||
TagDescriptionVersion.new(
|
TagDescriptionVersion.new(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
|
id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
|
||||||
event_type: 'create', created_at: Time.current)
|
event_type: 'create', created_at: Time.current)
|
||||||
when 'tag_group_versions'
|
when 'tag_group_versions'
|
||||||
TagGroupVersion.new(
|
TagGroupVersion.new(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
id:, tag_group_id: group.id, name: group.name, version_no: number,
|
id:, tag_group_id: group.id, name: group.name, version_no: number,
|
||||||
event_type: 'create', members: [], placements: [], created_at: Time.current)
|
event_type: 'create', members: [], placements: [], created_at: Time.current)
|
||||||
end
|
end
|
||||||
@@ -84,7 +82,6 @@ RSpec.describe SharedResourceIdAllocator do
|
|||||||
it 'reserves a Tag ID referenced only by remaining description history' do
|
it 'reserves a Tag ID referenced only by remaining description history' do
|
||||||
high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
|
high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
|
||||||
TagDescriptionVersion.create!(
|
TagDescriptionVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
|
||||||
tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
|
tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
|
||||||
event_type: 'create', created_at: Time.current)
|
event_type: 'create', created_at: Time.current)
|
||||||
expect(create(:tag).id).to be > high
|
expect(create(:tag).id).to be > high
|
||||||
|
|||||||
@@ -42,41 +42,6 @@ RSpec.describe Youtube::Sync do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe '#sync!' do
|
describe '#sync!' do
|
||||||
it 'groups created and updated post histories into one sync event' do
|
|
||||||
allow(PostVersionRecorder).to receive(:record!).and_call_original
|
|
||||||
allow(PostVersionRecorder).to receive(:ensure_snapshot!).and_call_original
|
|
||||||
existing = create(:post, url: 'https://youtu.be/video-1', title: 'old title')
|
|
||||||
allow(sync).to receive(:query_terms).and_return([])
|
|
||||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
|
||||||
allow(client).to receive(:playlist_items).with(playlist_id: 'PL123', page_token: nil)
|
|
||||||
.and_return('items' => [
|
|
||||||
{ 'contentDetails' => { 'videoId' => 'video-1' } },
|
|
||||||
{ 'contentDetails' => { 'videoId' => 'video-2' } }])
|
|
||||||
allow(client).to receive(:videos).with(['video-1', 'video-2'])
|
|
||||||
.and_return('items' => [
|
|
||||||
youtube_video_item(id: 'video-1', title: 'updated', channel_id: 'UC_NONE'),
|
|
||||||
youtube_video_item(id: 'video-2', title: 'created', channel_id: 'UC_NONE')])
|
|
||||||
previous_post_ids = PostVersion.pluck(:id)
|
|
||||||
previous_tag_ids = TagVersion.pluck(:id)
|
|
||||||
|
|
||||||
expect { sync.sync! }.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
|
|
||||||
versions = PostVersion.where.not(id: previous_post_ids)
|
|
||||||
created = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-2')
|
|
||||||
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
|
|
||||||
expect(versions.pluck(:event_type)).to include('create', 'update')
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
tag_versions = TagVersion.where.not(id: previous_tag_ids)
|
|
||||||
expect(tag_versions).not_to be_empty
|
|
||||||
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
|
|
||||||
events = event_rows
|
|
||||||
expect { sync.sync! }.not_to change(PostVersion, :count)
|
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns without fetching video details when no video ids are discovered' do
|
it 'returns without fetching video details when no video ids are discovered' do
|
||||||
allow(sync).to receive(:query_terms).and_return([])
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
allow(sync).to receive(:playlist_ids).and_return([])
|
allow(sync).to receive(:playlist_ids).and_return([])
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
module EventRecords
|
|
||||||
# Read the database contract without requiring an application Event model.
|
|
||||||
class EventRow < ActiveRecord::Base
|
|
||||||
self.table_name = 'events'
|
|
||||||
end
|
|
||||||
|
|
||||||
def event_rows
|
|
||||||
EventRow.order(:id).map(&:attributes)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_event! event_type:, created_by_user: nil
|
|
||||||
EventRow.create!(event_type:, created_by_user_id: created_by_user&.id,
|
|
||||||
created_at: Time.current)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -3,13 +3,11 @@ require 'cgi'
|
|||||||
# SQL fixtures use the migration contract without inventing application models.
|
# SQL fixtures use the migration contract without inventing application models.
|
||||||
# Include explicitly; these helpers must not affect unrelated examples.
|
# Include explicitly; these helpers must not affect unrelated examples.
|
||||||
module TagGroupRecords
|
module TagGroupRecords
|
||||||
include EventRecords
|
|
||||||
|
|
||||||
GROUP_TABLES = [
|
GROUP_TABLES = [
|
||||||
'tag_groups', 'tag_group_tags', 'tag_group_groups',
|
'tag_groups', 'tag_group_tags', 'tag_group_groups',
|
||||||
'tag_group_placements', 'tag_group_versions'].freeze
|
'tag_group_placements', 'tag_group_versions'].freeze
|
||||||
WRITE_TABLES = GROUP_TABLES + [
|
WRITE_TABLES = GROUP_TABLES + [
|
||||||
'events', 'tag_names', 'tag_description_versions',
|
'tag_names', 'tag_description_versions',
|
||||||
'tag_descriptions']
|
'tag_descriptions']
|
||||||
|
|
||||||
def group_connection = ApplicationRecord.connection
|
def group_connection = ApplicationRecord.connection
|
||||||
@@ -116,7 +114,6 @@ module TagGroupRecords
|
|||||||
group_id = insert_group_row('tag_groups', attributes)
|
group_id = insert_group_row('tag_groups', attributes)
|
||||||
insert_group_row('tag_group_versions', {
|
insert_group_row('tag_group_versions', {
|
||||||
tag_group_id: group_id, version_no: 1, event_type: 'create',
|
tag_group_id: group_id, version_no: 1, event_type: 'create',
|
||||||
event_id: create_event!(event_type: 'tag_groups.create', created_by_user: user).id,
|
|
||||||
name:, description:, members: members.to_json, placements: placements.to_json,
|
name:, description:, members: members.to_json, placements: placements.to_json,
|
||||||
created_by_user_id: user.id, created_at: now })
|
created_by_user_id: user.id, created_at: now })
|
||||||
members.each do |member|
|
members.each do |member|
|
||||||
|
|||||||
@@ -174,20 +174,20 @@ RSpec.describe 'nico:sync' do
|
|||||||
|
|
||||||
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
event_id: create_event!(event_type: 'unknown').id,
|
post: post,
|
||||||
post: post,
|
version_no: version_no,
|
||||||
version_no: version_no,
|
event_type: event_type,
|
||||||
event_type: event_type,
|
title: post.title,
|
||||||
title: post.title,
|
url: post.url,
|
||||||
url: post.url,
|
thumbnail_base: post.thumbnail_base,
|
||||||
thumbnail_base: post.thumbnail_base,
|
tags: snapshot_tags(post),
|
||||||
tags: snapshot_tags(post),
|
tags_json: post.snapshot_tags_json,
|
||||||
tags_json: post.snapshot_tags_json,
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
original_created_from: post.original_created_from,
|
||||||
original_created_from: post.original_created_from,
|
original_created_before: post.original_created_before,
|
||||||
original_created_before: post.original_created_before,
|
created_at: Time.current,
|
||||||
created_at: Time.current,
|
created_by_user: created_by_user
|
||||||
created_by_user: created_by_user)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '新規 post 作成時に version 1 を作る' do
|
it '新規 post 作成時に version 1 を作る' do
|
||||||
@@ -209,7 +209,6 @@ RSpec.describe 'nico:sync' do
|
|||||||
expect {
|
expect {
|
||||||
run_rake_task('nico:sync')
|
run_rake_task('nico:sync')
|
||||||
}.to change(PostVersion, :count).by(1)
|
}.to change(PostVersion, :count).by(1)
|
||||||
.and change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
|
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
|
||||||
version = post.post_versions.order(:version_no).last
|
version = post.post_versions.order(:version_no).last
|
||||||
@@ -218,32 +217,6 @@ RSpec.describe 'nico:sync' do
|
|||||||
expect(version.event_type).to eq('create')
|
expect(version.event_type).to eq('create')
|
||||||
expect(version.created_by_user).to be_nil
|
expect(version.created_by_user).to be_nil
|
||||||
expect(version.tags).to eq(snapshot_tags(post.reload))
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
|
|
||||||
expect(version.event_id).to eq(event.fetch('id'))
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'groups created and updated post histories into one sync event' do
|
|
||||||
existing = create(:post, title: 'old', url: 'https://www.nicovideo.jp/watch/sm9')
|
|
||||||
stub_python([
|
|
||||||
{ 'code' => 'sm9', 'title' => 'updated', 'tags' => [] },
|
|
||||||
{ 'code' => 'sm10', 'title' => 'created', 'tags' => [] }])
|
|
||||||
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
|
||||||
previous_post_ids = PostVersion.pluck(:id)
|
|
||||||
previous_tag_ids = TagVersion.pluck(:id)
|
|
||||||
|
|
||||||
expect { run_rake_task('nico:sync') }.to change { event_rows.length }.by(1)
|
|
||||||
|
|
||||||
event = event_rows.last
|
|
||||||
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
|
|
||||||
created = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm10')
|
|
||||||
versions = PostVersion.where.not(id: previous_post_ids)
|
|
||||||
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
|
|
||||||
expect(versions.pluck(:event_type)).to include('create', 'update')
|
|
||||||
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
tag_versions = TagVersion.where.not(id: previous_tag_ids)
|
|
||||||
expect(tag_versions).not_to be_empty
|
|
||||||
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it '既存 post の内容または tags が変わったとき update version を作る' do
|
it '既存 post の内容または tags が変わったとき update version を作る' do
|
||||||
@@ -309,7 +282,6 @@ RSpec.describe 'nico:sync' do
|
|||||||
}])
|
}])
|
||||||
|
|
||||||
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
events = event_rows
|
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
run_rake_task('nico:sync')
|
run_rake_task('nico:sync')
|
||||||
@@ -319,7 +291,6 @@ RSpec.describe 'nico:sync' do
|
|||||||
expect(version.version_no).to eq(1)
|
expect(version.version_no).to eq(1)
|
||||||
expect(version.event_type).to eq('create')
|
expect(version.event_type).to eq('create')
|
||||||
expect(version.tags).to eq(snapshot_tags(post.reload))
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
expect(event_rows).to eq(events)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it '新規 nico tag に nico tag version を作る' do
|
it '新規 nico tag に nico tag version を作る' do
|
||||||
|
|||||||
-3366
ファイル差分が大きすぎるため省略します
差分を読み込み
+4
-12
@@ -158,15 +158,7 @@ private ID の正誤に応じて許可可否を変えないため、条件の一
|
|||||||
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
|
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
|
||||||
公開列の値を使うソートは引き続き利用できる。
|
公開列の値を使うソートは引き続き利用できる。
|
||||||
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
|
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
|
||||||
外部タグ履歴の linked_tag_ids は、連携する内部タグの ID を半角スペース区切りで
|
外部タグ履歴の linked_tags は名前しか記録していないため、非公開タグの記録名を含む
|
||||||
記録する。除票履歴のある内部タグの ID を含むスナップショットを非管理者へ公開しない。
|
スナップショットを保守的に非公開とする。名前全体を空白区切りの境界で照合する。
|
||||||
名前や UI ロカールを参照 ID の判定に使わない。
|
区切りが曖昧な旧データでは過剰な秘匿の可能性はあるが、参照 ID がない旧形式から
|
||||||
外部タグ名は履歴に保存せず、external_tags の platform と name を参照する。
|
名前の公開可否を楽観的に推定しない。
|
||||||
|
|
||||||
V1 Counts の公開フィールド名は linked_tags を維持し、DB の linked_tag_ids へ対応付ける。
|
|
||||||
明細・フィルタ・集計軸・変更項目・ソート・CSV / JSON 出力で同じ対応付けを使う。
|
|
||||||
既定列と既存の表示ラベルも linked_tags のままとし、値は ID のスペース区切りとする。
|
|
||||||
linked_tag_ids は物理カラム名であり、Counts の公開フィールドとしては受け付けない。
|
|
||||||
旧 URL や保存済み設定のフィールド指定は維持できるが、値にタグ名を指定した検索条件や
|
|
||||||
ドリル条件は ID 値への見直しが必要となる。旧履歴の名称は移行後の ID 列から復元できず、
|
|
||||||
現在の名称からの推定変換も行わない。
|
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import { textContentOf } from '@/test/text'
|
import { textContentOf } from '@/test/text'
|
||||||
import PostEditForm from '@/components/PostEditForm'
|
import PostEditForm from '@/components/PostEditForm'
|
||||||
import { buildPost, buildTag } from '@/test/factories'
|
import { buildPost, buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders as render } from '@/test/render'
|
import { renderWithProviders as render } from '@/test/render'
|
||||||
|
|
||||||
|
import type { DialogueAPI } from '@/lib/dialogues/useDialogue'
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
updatePost: vi.fn (),
|
updatePost: vi.fn (),
|
||||||
}))
|
}))
|
||||||
@@ -18,18 +20,27 @@ const toastApi = vi.hoisted (() => ({
|
|||||||
toast: vi.fn (),
|
toast: vi.fn (),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const dialogue = vi.hoisted (() => ({
|
||||||
|
confirm: vi.fn<DialogueAPI['confirm']> (),
|
||||||
|
choice: vi.fn () }))
|
||||||
|
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
vi.mock ('@/lib/posts', () => postsApi)
|
||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
||||||
vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
||||||
...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
|
...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
|
||||||
default: () => ({
|
default: () => dialogue }))
|
||||||
choice: vi.fn (),
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('PostEditForm', () => {
|
describe ('PostEditForm', () => {
|
||||||
|
beforeEach (() => {
|
||||||
|
vi.resetAllMocks ()
|
||||||
|
})
|
||||||
|
|
||||||
it ('submits edited post fields with the current base version', async () => {
|
it ('submits edited post fields with the current base version', async () => {
|
||||||
|
const confirm = vi.fn<(value: boolean) => void> ()
|
||||||
|
dialogue.confirm.mockReturnValueOnce (new Promise<boolean> (resolve => {
|
||||||
|
confirm.mockImplementation (resolve)
|
||||||
|
}))
|
||||||
const onSave = vi.fn ()
|
const onSave = vi.fn ()
|
||||||
const post = buildPost ({
|
const post = buildPost ({
|
||||||
id: 8,
|
id: 8,
|
||||||
@@ -55,6 +66,16 @@ describe ('PostEditForm', () => {
|
|||||||
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
||||||
|
|
||||||
|
expect (postsApi.updatePost).not.toHaveBeenCalled ()
|
||||||
|
expect (dialogue.confirm).toHaveBeenCalledTimes (1)
|
||||||
|
const difference = textContentOf (
|
||||||
|
dialogue.confirm.mock.calls[0][0].description)
|
||||||
|
expect (difference).toContain ('oldnew')
|
||||||
|
expect (difference).toContain ('23 4')
|
||||||
|
expect (difference).not.toContain ('general-tag')
|
||||||
|
|
||||||
|
await act (async () => { confirm (true) })
|
||||||
|
|
||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
||||||
expect.objectContaining ({
|
expect.objectContaining ({
|
||||||
@@ -71,6 +92,28 @@ describe ('PostEditForm', () => {
|
|||||||
expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました.')
|
expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました.')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it ('keeps edited fields without submitting when confirmation is cancelled', async () => {
|
||||||
|
const onSave = vi.fn ()
|
||||||
|
dialogue.confirm.mockResolvedValueOnce (false)
|
||||||
|
render (<PostEditForm post={buildPost ()} onSave={onSave}/>)
|
||||||
|
|
||||||
|
const [title, parentIds] = screen.getAllByRole ('textbox')
|
||||||
|
fireEvent.change (title, { target: { value: 'new' } })
|
||||||
|
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
||||||
|
const button = screen.getByRole ('button', { name: '更新' })
|
||||||
|
fireEvent.submit (button.closest ('form')!)
|
||||||
|
|
||||||
|
await waitFor (() => {
|
||||||
|
expect (button).toBeEnabled ()
|
||||||
|
})
|
||||||
|
expect (dialogue.confirm).toHaveBeenCalledTimes (1)
|
||||||
|
expect (postsApi.updatePost).not.toHaveBeenCalled ()
|
||||||
|
expect (onSave).not.toHaveBeenCalled ()
|
||||||
|
expect (toastApi.toast).not.toHaveBeenCalled ()
|
||||||
|
expect (title).toHaveValue ('new')
|
||||||
|
expect (parentIds).toHaveValue ('3 4')
|
||||||
|
})
|
||||||
|
|
||||||
it ('preserves duration while the video tag is temporarily removed', () => {
|
it ('preserves duration while the video tag is temporarily removed', () => {
|
||||||
const post = buildPost ({
|
const post = buildPost ({
|
||||||
videoMs: 180_500,
|
videoMs: 180_500,
|
||||||
@@ -100,6 +143,7 @@ describe ('PostEditForm', () => {
|
|||||||
'shows deduplicated original-created endpoint errors on the shared datetime field',
|
'shows deduplicated original-created endpoint errors on the shared datetime field',
|
||||||
async () => {
|
async () => {
|
||||||
const post = buildPost ()
|
const post = buildPost ()
|
||||||
|
dialogue.confirm.mockResolvedValueOnce (true)
|
||||||
api.isApiError.mockReturnValue (true)
|
api.isApiError.mockReturnValue (true)
|
||||||
postsApi.updatePost.mockRejectedValueOnce ({
|
postsApi.updatePost.mockRejectedValueOnce ({
|
||||||
response: {
|
response: {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
|
|||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||||
import { useUITranslation } from '@/lib/useUITranslation'
|
import { useUITranslation } from '@/lib/useUITranslation'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent, ReactNode } from 'react'
|
||||||
|
|
||||||
import type { Post, TagWithSections } from '@/types'
|
import type { Post, TagWithSections } from '@/types'
|
||||||
|
|
||||||
@@ -23,6 +23,8 @@ type PostFormField =
|
|||||||
'parentPostIds' | 'tags' | 'videoMs'
|
'parentPostIds' | 'tags' | 'videoMs'
|
||||||
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
||||||
|
|
||||||
|
type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
|
||||||
|
|
||||||
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
||||||
[...new Set (values.flatMap (value => value ?? []))]
|
[...new Set (values.flatMap (value => value ?? []))]
|
||||||
|
|
||||||
@@ -150,12 +152,63 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
const handleSubmit = async (e: FormEvent) => {
|
const handleSubmit = async (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
|
||||||
|
if (disabled) return
|
||||||
|
|
||||||
setDisabled (true)
|
setDisabled (true)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await update ({ id: post.id, title, tags, parentPostIds,
|
const current: PostEditData = {
|
||||||
duration: videoFlg ? duration : null,
|
title, tags, parentPostIds,
|
||||||
originalCreatedFrom, originalCreatedBefore },
|
duration: videoFlg ? duration : null,
|
||||||
|
originalCreatedFrom, originalCreatedBefore }
|
||||||
|
const fields: {
|
||||||
|
[Key in keyof PostEditData]-?: {
|
||||||
|
name: ReactNode
|
||||||
|
prev: PostEditData[Key] } } = {
|
||||||
|
title: { name: label ('shared:labels.title'), prev: post.title },
|
||||||
|
parentPostIds: {
|
||||||
|
name: label ('shared:labels.parentPosts'),
|
||||||
|
prev: (post.parentPosts ?? []).map (parent => parent.id).join (' ') },
|
||||||
|
tags: { name: label ('tags:title'), prev: tagsToStr (post.tags) },
|
||||||
|
duration: {
|
||||||
|
name: label ('shared:labels.duration'),
|
||||||
|
prev: videoMsToDurationValue (post.videoMs) },
|
||||||
|
originalCreatedFrom: {
|
||||||
|
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||||
|
{label ('shared:labels.since')}</>,
|
||||||
|
prev: post.originalCreatedFrom },
|
||||||
|
originalCreatedBefore: {
|
||||||
|
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||||
|
{label ('shared:labels.before')}</>,
|
||||||
|
prev: post.originalCreatedBefore } }
|
||||||
|
const differences = (Object.keys (fields) as (keyof PostEditData)[])
|
||||||
|
.map (key => ({ key, name: fields[key].name,
|
||||||
|
prev: fields[key].prev ?? '', current: current[key] ?? '' }))
|
||||||
|
.filter (row => row.prev !== row.current)
|
||||||
|
|
||||||
|
if (!(await dialogue.confirm ({
|
||||||
|
title: label ('shared:actions.diff'),
|
||||||
|
confirmText: label ('shared:actions.update'),
|
||||||
|
description: (
|
||||||
|
<dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
|
||||||
|
{differences.map (row => (
|
||||||
|
<div key={row.key}>
|
||||||
|
<dt className="font-semibold">{row.name}</dt>
|
||||||
|
<dd className="whitespace-pre-wrap break-words">
|
||||||
|
{row.prev && (
|
||||||
|
<del className="block text-red-600 dark:text-red-400">
|
||||||
|
{row.prev}
|
||||||
|
</del>)}
|
||||||
|
{row.current && (
|
||||||
|
<ins className="block text-green-700 dark:text-green-400">
|
||||||
|
{row.current}
|
||||||
|
</ins>)}
|
||||||
|
</dd>
|
||||||
|
</div>))}
|
||||||
|
</dl>) })))
|
||||||
|
return
|
||||||
|
|
||||||
|
await update ({ id: post.id, ...current },
|
||||||
{ baseVersionNo: post.versionNo })
|
{ baseVersionNo: post.versionNo })
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
|||||||
@@ -70,16 +70,6 @@ describe ('SidebarComponent', () => {
|
|||||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
|
|
||||||
renderSidebar ()
|
|
||||||
|
|
||||||
// jsdom has no layout; guard the responsive classes responsible for clipping.
|
|
||||||
const sidebar = screen.getByText ('Sidebar body')
|
|
||||||
|
|
||||||
expect (sidebar).not.toHaveClass ('overflow-y-auto')
|
|
||||||
expect (sidebar).toHaveClass ('md:overflow-y-auto')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||||
const onWidthChange = vi.fn ()
|
const onWidthChange = vi.fn ()
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
<div className="h-full overflow-y-auto p-4 sidebar">
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -35,10 +35,6 @@ const renderPage = () =>
|
|||||||
describe ('TagDetailPage', () => {
|
describe ('TagDetailPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
tagsApi.fetchTag.mockReset ()
|
|
||||||
api.apiPut.mockReset ()
|
|
||||||
api.isApiError.mockReset ()
|
|
||||||
toastApi.toast.mockReset ()
|
|
||||||
api.isApiError.mockReturnValue (false)
|
api.isApiError.mockReturnValue (false)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -55,11 +51,8 @@ describe ('TagDetailPage', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it ('submits edited tag fields', async () => {
|
it ('submits edited tag fields', async () => {
|
||||||
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||||
tagsApi.fetchTag
|
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
||||||
.mockResolvedValue (updatedTag)
|
|
||||||
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
|
||||||
api.apiPut.mockResolvedValueOnce (updatedTag)
|
|
||||||
|
|
||||||
renderPage ()
|
renderPage ()
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする