コミットを比較
4
コミット
main
..
acd8046a77
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
acd8046a77 | ||
|
|
b5b5391c8e | ||
|
|
5bb80d1a35 | ||
|
|
c1d9e3638b |
@@ -27,8 +27,9 @@ class PostVersionsController < ApplicationController
|
||||
'prev.original_created_before AS prev_original_created_before')
|
||||
q = q.where('post_versions.post_id = ?', post_id) if post_id
|
||||
if tag_id
|
||||
q = q.where("JSON_CONTAINS(post_versions.tags_json, JSON_OBJECT('id', #{ tag_id })) " +
|
||||
"OR JSON_CONTAINS(prev.tags_json, JSON_OBJECT('id', #{ tag_id }))")
|
||||
q = q.where(("JSON_CONTAINS(post_versions.tags_json, JSON_OBJECT('id', :tag_id)) " +
|
||||
"OR JSON_CONTAINS(prev.tags_json, JSON_OBJECT('id', :tag_id))"),
|
||||
tag_id:)
|
||||
end
|
||||
|
||||
count = q.except(:select, :order, :limit, :offset).count
|
||||
@@ -49,43 +50,9 @@ class PostVersionsController < ApplicationController
|
||||
rows.map do |row|
|
||||
cur_tags =
|
||||
normalise_json(row.tags_json)
|
||||
.sort_by { [(case _1.fetch('category')
|
||||
when 'deerjikist'
|
||||
0
|
||||
when 'meme'
|
||||
1
|
||||
when 'character'
|
||||
2
|
||||
when 'general'
|
||||
3
|
||||
when 'material'
|
||||
4
|
||||
when 'meta'
|
||||
5
|
||||
else
|
||||
6
|
||||
end),
|
||||
_1.fetch('name').downcase] }
|
||||
.map { Post.tag_snapshot_literal(_1) }
|
||||
prev_tags =
|
||||
(normalise_json(row.attributes['prev_tags_json']) || [])
|
||||
.sort_by { [(case _1.fetch('category')
|
||||
when 'deerjikist'
|
||||
0
|
||||
when 'meme'
|
||||
1
|
||||
when 'character'
|
||||
2
|
||||
when 'general'
|
||||
3
|
||||
when 'material'
|
||||
4
|
||||
when 'meta'
|
||||
5
|
||||
else
|
||||
6
|
||||
end),
|
||||
_1.fetch('name').downcase] }
|
||||
.map { Post.tag_snapshot_literal(_1) }
|
||||
|
||||
{ post_id: row.post_id,
|
||||
|
||||
@@ -36,8 +36,8 @@ class PostsController < ApplicationController
|
||||
offset = (page - 1) * limit
|
||||
|
||||
pt_max_sql =
|
||||
PostVersion
|
||||
.select('post_id, MAX(created_at) AS max_updated_at')
|
||||
PostTag
|
||||
.select('post_id, MAX(updated_at) AS max_updated_at')
|
||||
.group('post_id')
|
||||
.to_sql
|
||||
|
||||
@@ -50,8 +50,9 @@ class PostsController < ApplicationController
|
||||
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
||||
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
||||
.preload(:uploaded_user, :parents, :children,
|
||||
post_tags: [:sections, { tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
active_post_tags: [:sections,
|
||||
{ tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
.with_attached_thumbnail
|
||||
|
||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||
@@ -103,8 +104,9 @@ class PostsController < ApplicationController
|
||||
|
||||
def random
|
||||
post = filtered_posts.preload(:uploaded_user, :parents, :children,
|
||||
post_tags: [:sections, { tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
active_post_tags: [:sections,
|
||||
{ tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
.with_attached_thumbnail
|
||||
.order('RAND()')
|
||||
.first
|
||||
@@ -188,8 +190,9 @@ class PostsController < ApplicationController
|
||||
post =
|
||||
Post
|
||||
.includes(:uploaded_user, :parents, :children,
|
||||
post_tags: [:sections, { tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
active_post_tags: [:sections,
|
||||
{ tag: [:deerjikists, :materials,
|
||||
{ tag_name: :wiki_page }] }])
|
||||
.with_attached_thumbnail
|
||||
.find_by(id: params[:id])
|
||||
return head :not_found unless post
|
||||
@@ -381,6 +384,50 @@ class PostsController < ApplicationController
|
||||
render_post_form_record_invalid e.record
|
||||
end
|
||||
|
||||
def changes
|
||||
id = params[:id].presence
|
||||
tag_id = params[:tag].presence
|
||||
page = (params[:page].presence || 1).to_i
|
||||
limit = (params[:limit].presence || 20).to_i
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
pts = PostTag.with_discarded
|
||||
pts = pts.where(post_id: id) if id.present?
|
||||
pts = pts.where(tag_id:) if tag_id.present?
|
||||
pts = pts.includes(:post, :created_user, :deleted_user,
|
||||
tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
||||
|
||||
events = []
|
||||
pts.each do |pt|
|
||||
tag = TagRepr.base(pt.tag)
|
||||
post = pt.post
|
||||
|
||||
events << Event.new(
|
||||
post:,
|
||||
tag:,
|
||||
user: pt.created_user && { id: pt.created_user.id, name: pt.created_user.name },
|
||||
change_type: 'add',
|
||||
timestamp: pt.created_at)
|
||||
|
||||
if pt.discarded_at
|
||||
events << Event.new(
|
||||
post:,
|
||||
tag:,
|
||||
user: pt.deleted_user && { id: pt.deleted_user.id, name: pt.deleted_user.name },
|
||||
change_type: 'remove',
|
||||
timestamp: pt.discarded_at)
|
||||
end
|
||||
end
|
||||
events.sort_by!(&:timestamp)
|
||||
events.reverse!
|
||||
|
||||
render json: { changes: (events.slice(offset, limit) || []).as_json, count: events.size }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def filtered_posts
|
||||
@@ -455,13 +502,13 @@ class PostsController < ApplicationController
|
||||
end
|
||||
end
|
||||
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
|
||||
pt.destroy!
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
||||
pt.discard_by!(current_user)
|
||||
end
|
||||
end
|
||||
|
||||
def build_tag_tree_for post
|
||||
post_tags = post.post_tags.reject { |post_tag| post_tag.tag.deprecated? }
|
||||
post_tags = post.active_post_tags.reject { |post_tag| post_tag.tag.deprecated? }
|
||||
tags = post_tags.map(&:tag)
|
||||
tag_ids = tags.map(&:id)
|
||||
|
||||
@@ -670,6 +717,7 @@ class PostsController < ApplicationController
|
||||
def editable_tag_names_from_post post
|
||||
post
|
||||
.post_tags
|
||||
.kept
|
||||
.joins(tag: :tag_name)
|
||||
.merge(Tag.not_nico)
|
||||
.merge(Tag.where(deprecated_at: nil))
|
||||
|
||||
@@ -200,45 +200,14 @@ class TagsController < ApplicationController
|
||||
.find_by(id: params[:id])
|
||||
return head :not_found unless tag
|
||||
|
||||
rows = normalise_deerjikist_rows(tag)
|
||||
return if performed?
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
tag.lock!
|
||||
|
||||
requested_keys = rows.map { |row| [row[:platform], row[:code]] }.uniq
|
||||
row_indexes_by_key = rows_by_key(rows)
|
||||
locked_deerjikists = lock_deerjikists_for_tag_update(tag.id, requested_keys)
|
||||
current_deerjikists = locked_deerjikists.filter { |deerjikist|
|
||||
deerjikist.tag_id == tag.id
|
||||
}
|
||||
requested_deerjikists = locked_deerjikists.filter { |deerjikist|
|
||||
row_indexes_by_key.key?([deerjikist.platform, deerjikist.code])
|
||||
}
|
||||
|
||||
render_deerjikist_conflicts(requested_deerjikists, row_indexes_by_key, tag)
|
||||
raise ActiveRecord::Rollback if performed?
|
||||
|
||||
requested_keys_set = requested_keys.to_set
|
||||
current_deerjikists.each do |deerjikist|
|
||||
key = [deerjikist.platform, deerjikist.code]
|
||||
deerjikist.destroy! unless requested_keys_set.include?(key)
|
||||
end
|
||||
|
||||
existing_keys = requested_deerjikists.to_h { |deerjikist|
|
||||
[[deerjikist.platform, deerjikist.code], true]
|
||||
}
|
||||
requested_keys.each do |platform, code|
|
||||
next if existing_keys[[platform, code]]
|
||||
|
||||
deerjikist = Deerjikist.new(platform:, code:, tag:)
|
||||
row_index = row_indexes_by_key[[platform, code]].first
|
||||
begin
|
||||
render_deerjikist_form_record_invalid(deerjikist, row_index) unless deerjikist.save
|
||||
rescue ActiveRecord::RecordNotUnique
|
||||
conflicts = lock_deerjikists_for_tag_update(tag.id, [[platform, code]])
|
||||
render_deerjikist_conflicts(conflicts, row_indexes_by_key, tag)
|
||||
end
|
||||
tag.deerjikists = []
|
||||
params[:_json].each.with_index do |item, i|
|
||||
platform = item[:platform]
|
||||
code = normalise_deerjikist_code(platform, item[:code])
|
||||
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
|
||||
deerjikist.tag = tag
|
||||
render_deerjikist_form_record_invalid(deerjikist, i) unless deerjikist.save
|
||||
raise ActiveRecord::Rollback if performed?
|
||||
end
|
||||
end
|
||||
@@ -684,7 +653,6 @@ class TagsController < ApplicationController
|
||||
end
|
||||
|
||||
def normalise_deerjikist_code platform, code
|
||||
code = code.to_s
|
||||
return code if platform != 'youtube' || code[0] != '@'
|
||||
|
||||
url = "https://www.youtube.com/#{ code }"
|
||||
@@ -701,82 +669,6 @@ class TagsController < ApplicationController
|
||||
nil
|
||||
end
|
||||
|
||||
def normalise_deerjikist_rows tag
|
||||
rows = []
|
||||
|
||||
params[:_json].each.with_index do |item, index|
|
||||
platform = item[:platform]
|
||||
unless Deerjikist.platforms.key?(platform)
|
||||
render_deerjikist_platform_invalid(index)
|
||||
return rows
|
||||
end
|
||||
|
||||
code = normalise_deerjikist_code(platform, item[:code])
|
||||
deerjikist = Deerjikist.new(platform:, code:, tag:)
|
||||
unless deerjikist.valid?
|
||||
render_deerjikist_form_record_invalid(deerjikist, index)
|
||||
return rows
|
||||
end
|
||||
|
||||
rows << { index:, platform:, code: }
|
||||
end
|
||||
|
||||
rows
|
||||
end
|
||||
|
||||
def lock_deerjikists_for_tag_update tag_id, keys
|
||||
clauses = ['tag_id = ?']
|
||||
values = [tag_id]
|
||||
|
||||
keys.each do |platform, code|
|
||||
clauses << '(platform = ? AND code = ?)'
|
||||
values << platform << code
|
||||
end
|
||||
|
||||
Deerjikist
|
||||
.where(clauses.join(' OR '), *values)
|
||||
.order(:platform, :code)
|
||||
.lock
|
||||
.to_a
|
||||
end
|
||||
|
||||
def render_deerjikist_conflicts deerjikists, row_indexes_by_key, tag
|
||||
conflicts = deerjikists.filter { |deerjikist| deerjikist.tag_id != tag.id }
|
||||
return if conflicts.empty?
|
||||
|
||||
tag_names_by_id = Tag
|
||||
.joins(:tag_name)
|
||||
.where(id: conflicts.map(&:tag_id).uniq)
|
||||
.pluck('tags.id', 'tag_names.name')
|
||||
.to_h
|
||||
fields = { }
|
||||
|
||||
conflicts.each do |deerjikist|
|
||||
message = "この情報は既に「#{ tag_names_by_id[deerjikist.tag_id] }」に紐づいてゐます."
|
||||
row_indexes_by_key[[deerjikist.platform, deerjikist.code]].each do |index|
|
||||
field = :"deerjikists.#{ index }.code"
|
||||
fields[field] ||= []
|
||||
fields[field] << message
|
||||
end
|
||||
end
|
||||
|
||||
render_validation_error fields:
|
||||
end
|
||||
|
||||
def render_deerjikist_platform_invalid index
|
||||
render_validation_error fields: {
|
||||
:"deerjikists.#{ index }.platform" => ['値が不正です.'],
|
||||
}
|
||||
end
|
||||
|
||||
def rows_by_key rows
|
||||
rows.each_with_object({ }) do |row, result|
|
||||
key = [row[:platform], row[:code]]
|
||||
result[key] ||= []
|
||||
result[key] << row[:index]
|
||||
end
|
||||
end
|
||||
|
||||
def render_deerjikist_form_record_invalid deerjikist, index
|
||||
fields = { }
|
||||
|
||||
|
||||
@@ -55,10 +55,11 @@ class Post < ApplicationRecord
|
||||
belongs_to :uploaded_user, class_name: 'User', optional: true
|
||||
|
||||
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
||||
has_many :tags, through: :post_tags
|
||||
has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :post
|
||||
has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
|
||||
has_many :tags, through: :active_post_tags
|
||||
has_many :active_tags, -> { where(tags: { deprecated_at: nil }) },
|
||||
through: :post_tags,
|
||||
source: :tag
|
||||
through: :active_post_tags, source: :tag
|
||||
|
||||
has_many :user_post_views, dependent: :delete_all
|
||||
has_many :post_similarities, dependent: :delete_all
|
||||
@@ -122,6 +123,7 @@ class Post < ApplicationRecord
|
||||
|
||||
def snapshot_tag_names
|
||||
post_tags
|
||||
.kept
|
||||
.joins(tag: :tag_name)
|
||||
.includes(:sections, tag: :tag_name)
|
||||
.order('tag_names.name')
|
||||
@@ -148,6 +150,7 @@ class Post < ApplicationRecord
|
||||
|
||||
def snapshot_tags_json
|
||||
post_tags
|
||||
.kept
|
||||
.joins(tag: :tag_name)
|
||||
.includes(:sections, tag: :tag_name)
|
||||
.order('tags.id')
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
class PostTag < ApplicationRecord
|
||||
include Discard::Model
|
||||
|
||||
before_destroy do
|
||||
raise ActiveRecord::ReadOnlyRecord, '消さないでください.'
|
||||
end
|
||||
|
||||
belongs_to :post
|
||||
belongs_to :tag, counter_cache: :post_count
|
||||
belongs_to :created_user, class_name: 'User', optional: true
|
||||
belongs_to :deleted_user, class_name: 'User', optional: true
|
||||
|
||||
has_many :sections, -> { order(:begin_ms) }, class_name: 'PostTagSection',
|
||||
foreign_key: [:post_id, :tag_id],
|
||||
@@ -11,5 +18,18 @@ class PostTag < ApplicationRecord
|
||||
|
||||
validates :post_id, presence: true
|
||||
validates :tag_id, presence: true
|
||||
validates :post_id, uniqueness: { scope: :tag_id }
|
||||
validates :post_id, uniqueness: {
|
||||
scope: :tag_id,
|
||||
conditions: -> { where(discarded_at: nil) } }
|
||||
|
||||
def discard_by! deleted_user
|
||||
return self if discarded?
|
||||
|
||||
transaction do
|
||||
update!(discarded_at: Time.current, deleted_user:)
|
||||
Tag.where(id: tag_id).update_all('post_count = GREATEST(post_count - 1, 0)')
|
||||
end
|
||||
|
||||
self
|
||||
end
|
||||
end
|
||||
|
||||
@@ -4,10 +4,10 @@ class PostTagSection < ApplicationRecord
|
||||
belongs_to :post
|
||||
belongs_to :tag
|
||||
|
||||
belongs_to :post_tag, foreign_key: [:post_id, :tag_id],
|
||||
primary_key: [:post_id, :tag_id],
|
||||
inverse_of: :sections,
|
||||
optional: true
|
||||
belongs_to :post_tag, -> { kept }, foreign_key: [:post_id, :tag_id],
|
||||
primary_key: [:post_id, :tag_id],
|
||||
inverse_of: :sections,
|
||||
optional: true
|
||||
|
||||
validates :post_id, presence: true
|
||||
validates :tag_id, presence: true
|
||||
|
||||
@@ -28,7 +28,9 @@ class Tag < ApplicationRecord
|
||||
end
|
||||
|
||||
has_many :post_tags, inverse_of: :tag
|
||||
has_many :posts, through: :post_tags
|
||||
has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
|
||||
has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
|
||||
has_many :posts, through: :active_post_tags
|
||||
|
||||
has_many :nico_tag_relations, foreign_key: :nico_tag_id, dependent: :destroy
|
||||
has_many :linked_tags, through: :nico_tag_relations, source: :tag
|
||||
@@ -257,11 +259,11 @@ class Tag < ApplicationRecord
|
||||
|
||||
TagVersioning.ensure_snapshot!(source_tag, created_by_user:)
|
||||
|
||||
source_tag.post_tags.find_each do |source_pt|
|
||||
source_tag.post_tags.kept.find_each do |source_pt|
|
||||
post_id = source_pt.post_id
|
||||
affected_post_ids << post_id
|
||||
source_pt.destroy!
|
||||
unless PostTag.exists?(post_id:, tag: target_tag)
|
||||
source_pt.discard_by!(created_by_user)
|
||||
unless PostTag.kept.exists?(post_id:, tag: target_tag)
|
||||
PostTag.create!(post_id:, tag: target_tag)
|
||||
end
|
||||
end
|
||||
@@ -291,7 +293,7 @@ class Tag < ApplicationRecord
|
||||
end
|
||||
|
||||
# 投稿件数を再集計
|
||||
target_tag.update_columns(post_count: PostTag.where(tag: target_tag).count)
|
||||
target_tag.update_columns(post_count: PostTag.kept.where(tag: target_tag).count)
|
||||
end
|
||||
|
||||
target_tag.reload
|
||||
|
||||
@@ -88,14 +88,14 @@ module PostRepr
|
||||
|
||||
def tag_json post
|
||||
post
|
||||
.post_tags
|
||||
.active_post_tags
|
||||
.reject { _1.tag.deprecated? }
|
||||
.sort_by { _1.tag.name }
|
||||
.map do |post_tag|
|
||||
.map { |post_tag|
|
||||
TagRepr.inline(post_tag.tag).merge(
|
||||
'children' => [],
|
||||
'sections' => post_tag.sections.as_json(only: [:begin_ms, :end_ms]))
|
||||
end
|
||||
}
|
||||
end
|
||||
|
||||
def thumbnail_url post, host: nil
|
||||
|
||||
@@ -121,11 +121,9 @@ class PostCreator
|
||||
def sync_post_tags! post, desired_tags, sections
|
||||
desired_ids = desired_tags.map(&:id).to_set
|
||||
current_ids = post.tags.pluck(:id).to_set
|
||||
|
||||
Tag.where(id: desired_ids - current_ids).find_each do |tag|
|
||||
PostTag.create_or_find_by!(post:, tag:, created_user: @actor)
|
||||
end
|
||||
|
||||
PostTagSection.where(post_id: post.id).destroy_all
|
||||
sections.each do |tag_id, ranges|
|
||||
ranges.each do |begin_ms, end_ms|
|
||||
@@ -135,9 +133,10 @@ class PostCreator
|
||||
end_ms:)
|
||||
end
|
||||
end
|
||||
|
||||
PostTag.where(post_id: post.id,
|
||||
tag_id: (current_ids - desired_ids).to_a).destroy_all
|
||||
tag_id: (current_ids - desired_ids).to_a).kept.find_each do |post_tag|
|
||||
post_tag.discard_by!(@actor)
|
||||
end
|
||||
end
|
||||
|
||||
def sync_parent_posts! post, ids
|
||||
|
||||
@@ -103,7 +103,7 @@ module Youtube
|
||||
end
|
||||
|
||||
def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
|
||||
current_tag_ids ||= PostTag.where(post_id: post.id).pluck(:tag_id).to_set
|
||||
current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
|
||||
desired_tag_ids = desired_tag_ids.compact.to_set
|
||||
|
||||
to_add = desired_tag_ids - current_tag_ids
|
||||
@@ -117,8 +117,8 @@ module Youtube
|
||||
end
|
||||
end
|
||||
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
|
||||
pt.destroy!
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
||||
pt.discard_by!(nil)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -55,6 +55,7 @@ Rails.application.routes.draw do
|
||||
get :metadata
|
||||
post :bulk
|
||||
get :random
|
||||
get :changes
|
||||
get :versions, to: 'post_versions#index'
|
||||
end
|
||||
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
class DeleteInactiveRecordsFromPostTags < ActiveRecord::Migration[8.0]
|
||||
def up
|
||||
execute <<~SQL
|
||||
DELETE
|
||||
FROM
|
||||
post_tags
|
||||
WHERE
|
||||
discarded_at IS NOT NULL
|
||||
SQL
|
||||
|
||||
remove_index :post_tags, [:tag_id, :discarded_at]
|
||||
remove_index :post_tags, [:post_id, :discarded_at]
|
||||
remove_index :post_tags, name: 'idx_post_tags_active_unique'
|
||||
remove_index :post_tags, :discarded_at
|
||||
|
||||
remove_foreign_key :post_tags, column: :deleted_user_id
|
||||
remove_index :post_tags, :deleted_user_id
|
||||
|
||||
remove_column :post_tags, :active_unique_key
|
||||
remove_column :post_tags, :is_active
|
||||
remove_column :post_tags, :discarded_at
|
||||
remove_column :post_tags, :deleted_user_id
|
||||
remove_column :post_tags, :updated_at
|
||||
|
||||
execute <<~SQL
|
||||
ALTER TABLE
|
||||
post_tags
|
||||
MODIFY COLUMN
|
||||
id BIGINT NOT NULL
|
||||
SQL
|
||||
|
||||
execute <<~SQL
|
||||
ALTER TABLE
|
||||
post_tags
|
||||
DROP PRIMARY KEY
|
||||
SQL
|
||||
|
||||
remove_column :post_tags, :id
|
||||
|
||||
execute <<~SQL
|
||||
ALTER TABLE
|
||||
post_tags
|
||||
ADD PRIMARY KEY
|
||||
(post_id, tag_id)
|
||||
SQL
|
||||
|
||||
remove_index :post_tags, :post_id
|
||||
end
|
||||
|
||||
def down
|
||||
raise ActiveRecord::IrreversibleMigration, '戻せません.'
|
||||
end
|
||||
end
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
class AddForeignKeyOnPostIdAndTagIdInPostTagSections < ActiveRecord::Migration[8.0]
|
||||
def change
|
||||
remove_foreign_key :post_tag_sections, :posts, column: :post_id
|
||||
remove_foreign_key :post_tag_sections, :tags, column: :tag_id
|
||||
|
||||
add_foreign_key :post_tag_sections, :post_tags,
|
||||
column: [:post_id, :tag_id],
|
||||
primary_key: [:post_id, :tag_id],
|
||||
on_delete: :cascade
|
||||
end
|
||||
end
|
||||
生成ファイル
+29
-16
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_07_27_123600) do
|
||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.string "record_type", null: false
|
||||
@@ -311,12 +311,23 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
|
||||
t.check_constraint "`begin_ms` >= 0", name: "chk_post_tag_sections_begin_ms_natural"
|
||||
end
|
||||
|
||||
create_table "post_tags", primary_key: ["post_id", "tag_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
create_table "post_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.bigint "post_id", null: false
|
||||
t.bigint "tag_id", null: false
|
||||
t.bigint "created_user_id"
|
||||
t.bigint "deleted_user_id"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "discarded_at"
|
||||
t.virtual "is_active", type: :boolean, as: "(`discarded_at` is null)", stored: true
|
||||
t.virtual "active_unique_key", type: :string, as: "(case when (`discarded_at` is null) then concat(`post_id`,_utf8mb4':',`tag_id`) else NULL end)", stored: true
|
||||
t.index ["active_unique_key"], name: "idx_post_tags_active_unique", unique: true
|
||||
t.index ["created_user_id"], name: "index_post_tags_on_created_user_id"
|
||||
t.index ["deleted_user_id"], name: "index_post_tags_on_deleted_user_id"
|
||||
t.index ["discarded_at"], name: "index_post_tags_on_discarded_at"
|
||||
t.index ["post_id", "discarded_at"], name: "index_post_tags_on_post_id_and_discarded_at"
|
||||
t.index ["post_id"], name: "index_post_tags_on_post_id"
|
||||
t.index ["tag_id", "discarded_at"], name: "index_post_tags_on_tag_id_and_discarded_at"
|
||||
t.index ["tag_id"], name: "index_post_tags_on_tag_id"
|
||||
end
|
||||
|
||||
@@ -384,6 +395,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
|
||||
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
|
||||
end
|
||||
|
||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.bigint "wiki_page_id", null: false
|
||||
t.integer "no", null: false
|
||||
t.string "alt_text"
|
||||
t.binary "sha256", limit: 32, null: false
|
||||
t.bigint "created_by_user_id", null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
|
||||
t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
|
||||
t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
|
||||
end
|
||||
|
||||
create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.bigint "tag_id", null: false
|
||||
t.bigint "parent_tag_id", null: false
|
||||
@@ -592,19 +616,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
|
||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
||||
end
|
||||
|
||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.bigint "wiki_page_id", null: false
|
||||
t.integer "no", null: false
|
||||
t.string "alt_text"
|
||||
t.binary "sha256", limit: 32, null: false
|
||||
t.bigint "created_by_user_id", null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
|
||||
t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
|
||||
t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
|
||||
end
|
||||
|
||||
create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "sha256", limit: 64, null: false
|
||||
t.text "body", null: false
|
||||
@@ -713,10 +724,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_09_21_010000) do
|
||||
add_foreign_key "post_implications", "posts", column: "parent_post_id"
|
||||
add_foreign_key "post_similarities", "posts"
|
||||
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
||||
add_foreign_key "post_tag_sections", "post_tags", column: ["post_id", "tag_id"], primary_key: ["post_id", "tag_id"], on_delete: :cascade
|
||||
add_foreign_key "post_tag_sections", "posts"
|
||||
add_foreign_key "post_tag_sections", "tags"
|
||||
add_foreign_key "post_tags", "posts"
|
||||
add_foreign_key "post_tags", "tags"
|
||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
||||
add_foreign_key "post_versions", "posts"
|
||||
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
||||
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace :nico do
|
||||
end
|
||||
|
||||
def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
|
||||
current_tag_ids ||= PostTag.where(post_id: post.id).pluck(:tag_id).to_set
|
||||
current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
|
||||
desired_tag_ids = desired_tag_ids.compact.to_set
|
||||
|
||||
to_add = desired_tag_ids - current_tag_ids
|
||||
@@ -30,8 +30,8 @@ namespace :nico do
|
||||
end
|
||||
end
|
||||
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).find_each do |pt|
|
||||
pt.destroy!
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
||||
pt.discard_by!(nil)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,73 +1,5 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe PostTag, type: :model do
|
||||
describe 'uniqueness' do
|
||||
it 'rejects duplicate post and tag pairs but allows either to be reused' do
|
||||
post_tag = create(:post_tag)
|
||||
duplicate = build(:post_tag, post: post_tag.post, tag: post_tag.tag)
|
||||
|
||||
expect(duplicate).not_to be_valid
|
||||
expect(duplicate.errors.of_kind?(:post_id, :taken)).to be(true)
|
||||
expect(build(:post_tag, post: post_tag.post, tag: create(:tag))).to be_valid
|
||||
expect(build(:post_tag, post: create(:post), tag: post_tag.tag)).to be_valid
|
||||
end
|
||||
|
||||
it 'enforces uniqueness in the database when validation is bypassed' do
|
||||
post_tag = create(:post_tag)
|
||||
duplicate = build(:post_tag, post: post_tag.post, tag: post_tag.tag)
|
||||
|
||||
expect { duplicate.save!(validate: false) }
|
||||
.to raise_error(ActiveRecord::RecordNotUnique)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#destroy!' do
|
||||
it 'deletes only the selected pair and its sections and updates the counter' do
|
||||
post_tag = create(:post_tag)
|
||||
same_post = create(:post_tag, post: post_tag.post)
|
||||
same_tag = create(:post_tag, tag: post_tag.tag)
|
||||
sections = [post_tag, same_post, same_tag].map do |link|
|
||||
create(:post_tag_section, post: link.post, tag: link.tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
end
|
||||
|
||||
expect { post_tag.destroy! }.to change(described_class, :count).by(-1)
|
||||
.and change(PostTagSection, :count).by(-1)
|
||||
.and change { post_tag.tag.reload.post_count }.from(2).to(1)
|
||||
|
||||
expect(described_class.exists?(post: post_tag.post, tag: post_tag.tag)).to be(false)
|
||||
expect(same_post.reload).to be_persisted
|
||||
expect(same_tag.reload).to be_persisted
|
||||
expect(PostTagSection.all).to contain_exactly(*sections.drop(1))
|
||||
expect(post_tag.post.reload.tags).to contain_exactly(same_post.tag)
|
||||
expect(post_tag.tag.reload.posts).to contain_exactly(same_tag.post)
|
||||
end
|
||||
|
||||
it 'allows a removed tag to be added again without restoring old sections' do
|
||||
post_tag = create(:post_tag)
|
||||
create(:post_tag_section, post: post_tag.post, tag: post_tag.tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
post_tag.destroy!
|
||||
|
||||
replacement = create(:post_tag, post: post_tag.post, tag: post_tag.tag)
|
||||
|
||||
expect(replacement.reload.sections).to be_empty
|
||||
expect(replacement.tag.reload.post_count).to eq(1)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#sections' do
|
||||
it 'loads the owning post_tag from a section using both keys' do
|
||||
post_tag = create(:post_tag)
|
||||
create(:post_tag, post: post_tag.post)
|
||||
create(:post_tag, tag: post_tag.tag)
|
||||
section = create(:post_tag_section, post: post_tag.post,
|
||||
tag: post_tag.tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
|
||||
expect(section.reload.post_tag).to eq(post_tag)
|
||||
end
|
||||
|
||||
it 'loads sections by post_id and tag_id' do
|
||||
post_tag = create(:post_tag)
|
||||
section = create(:post_tag_section,
|
||||
@@ -80,25 +12,18 @@ RSpec.describe PostTag, type: :model do
|
||||
end
|
||||
|
||||
it 'does not load sections for another tag on the same post' do
|
||||
post_tag = create(:post_tag)
|
||||
post = post_tag.post
|
||||
post = create(:post)
|
||||
tag = create(:tag)
|
||||
other_tag = create(:tag)
|
||||
|
||||
own_section = create(:post_tag_section,
|
||||
post:,
|
||||
tag: post_tag.tag,
|
||||
begin_ms: 1000,
|
||||
end_ms: 2000)
|
||||
|
||||
create(:post_tag, post:, tag: other_tag)
|
||||
|
||||
post_tag = create(:post_tag, post:, tag:)
|
||||
create(:post_tag_section,
|
||||
post:,
|
||||
tag: other_tag,
|
||||
begin_ms: 1000,
|
||||
end_ms: 2000)
|
||||
|
||||
expect(post_tag.reload.sections).to contain_exactly(own_section)
|
||||
expect(post_tag.sections).to be_empty
|
||||
end
|
||||
|
||||
it 'allows open-ended sections' do
|
||||
|
||||
@@ -19,7 +19,6 @@ RSpec.describe PostVersion, type: :model do
|
||||
url: post_record.url,
|
||||
thumbnail_base: post_record.thumbnail_base,
|
||||
tags: post_record.snapshot_tag_names.join(' '),
|
||||
tags_json: post_record.snapshot_tags_json,
|
||||
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
||||
original_created_from: post_record.original_created_from,
|
||||
original_created_before: post_record.original_created_before,
|
||||
|
||||
@@ -185,14 +185,15 @@ RSpec.describe Tag, type: :model do
|
||||
context 'when merging a simple source tag' do
|
||||
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
||||
|
||||
it 'deletes the source link, links the target, and aliases the discarded source tag' do
|
||||
it 'discards the source post_tag, creates an active target post_tag, discards the source tag, and aliases the source tag_name' do
|
||||
described_class.merge_tags!(target_tag, [source_tag])
|
||||
|
||||
target_link = PostTag.find_by(post: post_record, tag: target_tag)
|
||||
source_pt = PostTag.with_discarded.find(source_post_tag.id)
|
||||
active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
|
||||
|
||||
expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
|
||||
expect(target_link).to be_present
|
||||
expect(source_tag.reload.post_count).to eq(0)
|
||||
expect(source_pt.discarded_at).to be_present
|
||||
expect(source_pt.tag_id).to eq(source_tag.id)
|
||||
expect(active_target).to be_present
|
||||
|
||||
expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
|
||||
expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
|
||||
@@ -205,22 +206,16 @@ RSpec.describe Tag, type: :model do
|
||||
let!(:target_post_tag) { PostTag.create!(post: post_record, tag: target_tag) }
|
||||
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
||||
|
||||
it 'deletes the source link and preserves the existing target link' do
|
||||
create(:post_tag_section, post: post_record, tag: source_tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
target_section = create(:post_tag_section, post: post_record,
|
||||
tag: target_tag,
|
||||
begin_ms: 3000, end_ms: nil)
|
||||
|
||||
it 'discards the source post_tag, keeps one active target post_tag, discards the source tag, and aliases the source tag_name' do
|
||||
described_class.merge_tags!(target_tag, [source_tag])
|
||||
|
||||
target_links = PostTag.where(post: post_record, tag: target_tag)
|
||||
source_pt = PostTag.with_discarded.find(source_post_tag.id)
|
||||
active = PostTag.kept.where(post_id: post_record.id, tag_id: target_tag.id)
|
||||
|
||||
expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
|
||||
expect(target_links).to contain_exactly(target_post_tag)
|
||||
expect(source_tag.reload.post_count).to eq(0)
|
||||
expect(PostTagSection.where(post: post_record, tag: source_tag)).to be_empty
|
||||
expect(target_post_tag.reload.sections).to contain_exactly(target_section)
|
||||
expect(source_pt.discarded_at).to be_present
|
||||
expect(source_pt.tag_id).to eq(source_tag.id)
|
||||
expect(active.count).to eq(1)
|
||||
expect(active.first.id).to eq(target_post_tag.id)
|
||||
|
||||
expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
|
||||
expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
|
||||
@@ -235,12 +230,14 @@ RSpec.describe Tag, type: :model do
|
||||
it 'ignores the target in source_tags while still merging the source tag' do
|
||||
described_class.merge_tags!(target_tag, [source_tag, target_tag])
|
||||
|
||||
target_link = PostTag.find_by(post: post_record, tag: target_tag)
|
||||
source_pt = PostTag.with_discarded.find(source_post_tag.id)
|
||||
active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
|
||||
|
||||
expect(Tag.find(target_tag.id)).to be_present
|
||||
expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
|
||||
expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
|
||||
expect(target_link).to be_present
|
||||
expect(source_pt.discarded_at).to be_present
|
||||
expect(source_pt.tag_id).to eq(source_tag.id)
|
||||
expect(active_target).to be_present
|
||||
expect(source_tag_name.reload.canonical_id).to eq(target_tag.tag_name_id)
|
||||
expect(target_tag.reload.post_count).to eq(1)
|
||||
end
|
||||
@@ -266,10 +263,13 @@ RSpec.describe Tag, type: :model do
|
||||
it 'still merges, but discards the source tag_name instead of aliasing it' do
|
||||
described_class.merge_tags!(target_tag, [source_tag])
|
||||
|
||||
target_link = PostTag.find_by(post: post_record, tag: target_tag)
|
||||
source_pt = PostTag.with_discarded.find(source_post_tag.id)
|
||||
active_target = PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)
|
||||
discarded_source_tag_name = TagName.with_discarded.find(source_tag_name.id)
|
||||
|
||||
expect(PostTag.exists?(post: post_record, tag: source_tag)).to be(false)
|
||||
expect(target_link).to be_present
|
||||
expect(source_pt.discarded_at).to be_present
|
||||
expect(source_pt.tag_id).to eq(source_tag.id)
|
||||
expect(active_target).to be_present
|
||||
|
||||
expect(Tag.with_discarded.find(source_tag.id)).to be_discarded
|
||||
expect(target_tag.reload.post_count).to eq(1)
|
||||
@@ -289,20 +289,14 @@ RSpec.describe Tag, type: :model do
|
||||
end
|
||||
|
||||
it 'rolls back the transaction' do
|
||||
source_section = create(:post_tag_section, post: post_record,
|
||||
tag: source_tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
|
||||
expect {
|
||||
described_class.merge_tags!(target_tag, [source_tag])
|
||||
}.to raise_error(ActiveRecord::RecordInvalid)
|
||||
|
||||
expect(Tag.with_discarded.find(source_tag.id)).not_to be_discarded
|
||||
expect(TagName.with_discarded.find(source_tag_name.id)).not_to be_discarded
|
||||
expect(source_post_tag.reload.tag_id).to eq(source_tag.id)
|
||||
expect(source_post_tag.sections).to contain_exactly(source_section)
|
||||
expect(PostTag.find_by(post: post_record, tag: target_tag)).to be_nil
|
||||
expect(source_tag.reload.post_count).to eq(1)
|
||||
expect(PostTag.kept.find(source_post_tag.id).tag_id).to eq(source_tag.id)
|
||||
expect(PostTag.kept.find_by(post_id: post_record.id, tag_id: target_tag.id)).to be_nil
|
||||
expect(source_tag_name.reload.canonical_id).to be_nil
|
||||
expect(target_tag.reload.post_count).to eq(0)
|
||||
end
|
||||
@@ -339,7 +333,6 @@ RSpec.describe Tag, type: :model do
|
||||
url: post.url,
|
||||
thumbnail_base: post.thumbnail_base,
|
||||
tags: snapshot_tags(post),
|
||||
tags_json: post.snapshot_tags_json,
|
||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||
original_created_from: post.original_created_from,
|
||||
original_created_before: post.original_created_before,
|
||||
@@ -371,15 +364,12 @@ RSpec.describe Tag, type: :model do
|
||||
expect(latest.event_type).to eq('update')
|
||||
expect(latest.created_by_user).to be_nil
|
||||
expect(latest.tags).to eq(snapshot_tags(post_record.reload))
|
||||
expect(latest.tags_json.map { |item| item.fetch('id') }).to eq([target_tag.id])
|
||||
expect(affected_versions.first.tags_json.map { |item| item.fetch('id') })
|
||||
.to eq([source_tag.id])
|
||||
|
||||
expect(unaffected_post.reload.post_versions.count).to eq(1)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the source tag has no post_tags' do
|
||||
context 'when the source tag has no active post_tags' do
|
||||
let!(:another_post) do
|
||||
Post.create!(url: 'https://example.com/posts/3', title: 'another post')
|
||||
end
|
||||
|
||||
+110
-140
@@ -55,7 +55,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
thumbnail_base: post.thumbnail_base,
|
||||
video_ms: post.video_ms,
|
||||
tags: post.snapshot_tag_names.join(' '),
|
||||
tags_json: post.snapshot_tags_json,
|
||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||
original_created_from: post.original_created_from,
|
||||
original_created_before: post.original_created_before,
|
||||
@@ -148,15 +147,12 @@ RSpec.describe 'Posts API', type: :request do
|
||||
|
||||
it 'keeps children and sections keys in non-detail tag responses' do
|
||||
PostTagSection.create!(post: hit_post, tag:, begin_ms: 1_000, end_ms: nil)
|
||||
deprecated_tag = create(:tag, deprecated_at: Time.current)
|
||||
create(:post_tag, post: hit_post, tag: deprecated_tag)
|
||||
|
||||
get '/posts'
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
|
||||
hit_json = json.fetch('posts').find { |post| post['id'] == hit_post.id }
|
||||
expect(hit_json.fetch('tags').map { |item| item.fetch('id') }).to eq([tag.id])
|
||||
tag_json = hit_json.fetch('tags').find { |item| item['name'] == 'spec_tag' }
|
||||
|
||||
expect(tag_json.fetch('children')).to eq([])
|
||||
@@ -165,26 +161,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
])
|
||||
end
|
||||
|
||||
it 'preloads tag details and sections as the number of posts grows' do
|
||||
5.times do
|
||||
link = create(:post_tag, post: create(:post, uploaded_user: user))
|
||||
create(:post_tag_section, post: link.post, tag: link.tag,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
end
|
||||
get '/posts', params: { limit: 1 }
|
||||
|
||||
one_post_queries = count_sql_queries do
|
||||
get '/posts', params: { limit: 1 }
|
||||
end
|
||||
many_post_queries = count_sql_queries do
|
||||
get '/posts', params: { limit: 20 }
|
||||
end
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json.fetch('posts').size).to eq(8)
|
||||
expect(many_post_queries).to be <= one_post_queries
|
||||
end
|
||||
|
||||
context 'when q is provided' do
|
||||
it 'filters posts by q (hit case)' do
|
||||
get '/posts', params: { tags: 'spec_tag' }
|
||||
@@ -483,71 +459,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
end
|
||||
end
|
||||
|
||||
context 'when update times include version history' do
|
||||
let(:t0) { Time.zone.parse('2020-01-01 12:00:00') }
|
||||
let(:t1) { t0 + 1.day }
|
||||
let(:t2) { t0 + 2.days }
|
||||
let(:t3) { t0 + 3.days }
|
||||
let!(:history_post) do
|
||||
create(:post, url: 'https://example.com/version-time/history',
|
||||
created_at: t0, updated_at: t0)
|
||||
end
|
||||
let!(:plain_post) do
|
||||
create(:post, url: 'https://example.com/version-time/plain',
|
||||
created_at: t1, updated_at: t1)
|
||||
end
|
||||
let!(:newer_post) do
|
||||
create(:post, url: 'https://example.com/version-time/newer',
|
||||
created_at: t0, updated_at: t3)
|
||||
end
|
||||
|
||||
before do
|
||||
link = create(:post_tag, post: history_post, tag:)
|
||||
travel_to(t0) do
|
||||
PostVersionRecorder.record!(post: history_post,
|
||||
event_type: :create, created_by_user: nil)
|
||||
PostVersionRecorder.record!(post: newer_post,
|
||||
event_type: :create, created_by_user: nil)
|
||||
end
|
||||
travel_to(t2) do
|
||||
link.destroy!
|
||||
PostVersionRecorder.record!(post: history_post,
|
||||
event_type: :update, created_by_user: nil)
|
||||
end
|
||||
create(:post_tag, post: plain_post, tag:, created_at: t3)
|
||||
end
|
||||
|
||||
['asc', 'desc'].each do |direction|
|
||||
it "sorts by the later of post update and latest version time (#{ direction })" do
|
||||
get '/posts', params: { url: '/version-time/', order: "updated_at:#{ direction }" }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expected_ids = [plain_post.id, history_post.id, newer_post.id]
|
||||
expected_ids.reverse! if direction == 'desc'
|
||||
expect(json.fetch('posts').map { |item| item.fetch('id') }).to eq(expected_ids)
|
||||
expect(json.fetch('count')).to eq(3)
|
||||
|
||||
times = json.fetch('posts').to_h do |item|
|
||||
[item.fetch('id'), Time.zone.parse(item.fetch('updated_at'))]
|
||||
end
|
||||
expect(times).to eq({ plain_post.id => t1,
|
||||
history_post.id => t2,
|
||||
newer_post.id => t3 })
|
||||
expect(history_post.reload.updated_at).to eq(t0)
|
||||
end
|
||||
end
|
||||
|
||||
it 'filters inclusively by the latest version time after a tag is deleted' do
|
||||
get '/posts', params: { url: '/version-time/',
|
||||
updated_from: t2.iso8601,
|
||||
updated_to: t2.iso8601 }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json.fetch('posts').map { |item| item.fetch('id') }).to eq([history_post.id])
|
||||
expect(json.fetch('count')).to eq(1)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when original_created_from/original_created_to are provided' do
|
||||
# 注意: controller の現状ロジックに合わせてる
|
||||
# original_created_from は `original_created_before > ?`
|
||||
@@ -1507,11 +1418,9 @@ RSpec.describe 'Posts API', type: :request do
|
||||
|
||||
it '200 and updates title + resync tags when member' do
|
||||
sign_in_as(member)
|
||||
create(:post_tag_section, post: post_record, tag:,
|
||||
begin_ms: 1000, end_ms: 2000)
|
||||
|
||||
tn2 = TagName.create!(name: 'spec_tag_2')
|
||||
replacement_tag = Tag.create!(tag_name: tn2, category: :general)
|
||||
Tag.create!(tag_name: tn2, category: :general)
|
||||
|
||||
put "/posts/#{post_record.id}", params: post_update_params(
|
||||
post_record,
|
||||
@@ -1524,38 +1433,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
|
||||
names = json['tags'].map { |n| n['name'] }
|
||||
expect(names).to include('spec_tag_2')
|
||||
expect(names).not_to include('spec_tag')
|
||||
expect(PostTag.exists?(post: post_record, tag:)).to be(false)
|
||||
expect(PostTagSection.exists?(post: post_record, tag:)).to be(false)
|
||||
expect(tag.reload.post_count).to eq(0)
|
||||
expect(replacement_tag.reload.post_count).to eq(1)
|
||||
|
||||
versions = post_record.post_versions.order(:version_no)
|
||||
expect(versions.first.tags_json).to include(
|
||||
a_hash_including('id' => tag.id,
|
||||
'sections' => [{ 'begin_ms' => 1000, 'end_ms' => 2000 }]))
|
||||
expect(versions.last.tags_json.map { |item| item.fetch('id') })
|
||||
.not_to include(tag.id)
|
||||
end
|
||||
|
||||
it 'can add a removed tag again and records both changes' do
|
||||
sign_in_as(member)
|
||||
|
||||
put "/posts/#{ post_record.id }", params: post_update_params(post_record, tags: '')
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(PostTag.exists?(post: post_record, tag:)).to be(false)
|
||||
|
||||
put "/posts/#{ post_record.id }", params: post_update_params(
|
||||
post_record, tags: 'spec_tag')
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(PostTag.where(post: post_record, tag:).count).to eq(1)
|
||||
expect(PostTag.find_by!(post: post_record, tag:).created_user).to eq(member)
|
||||
expect(tag.reload.post_count).to eq(1)
|
||||
snapshots = post_record.post_versions.order(:version_no).map do |version|
|
||||
version.tags_json.map { |item| item.fetch('id') }
|
||||
end
|
||||
expect(snapshots.map { |ids| ids.include?(tag.id) }).to eq([true, false, true])
|
||||
end
|
||||
|
||||
it 'rejects a deprecated tag specified directly' do
|
||||
@@ -2001,29 +1878,123 @@ RSpec.describe 'Posts API', type: :request do
|
||||
expect(response).to have_http_status(:not_found)
|
||||
end
|
||||
|
||||
it 'returns viewed state and current tags with their sections' do
|
||||
create(:post_tag_section, post: post_record, tag:,
|
||||
begin_ms: 1000, end_ms: nil)
|
||||
deprecated_tag = create(:tag, deprecated_at: Time.current)
|
||||
create(:post_tag, post: post_record, tag: deprecated_tag)
|
||||
|
||||
it '200 and returns viewed boolean' do
|
||||
get '/posts/random'
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json).to have_key('viewed')
|
||||
expect([true, false]).to include(json['viewed'])
|
||||
expect(json.fetch('tags')).to contain_exactly(
|
||||
a_hash_including('id' => tag.id,
|
||||
'children' => [],
|
||||
'sections' => [{ 'begin_ms' => 1000, 'end_ms' => nil }]))
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET /posts/changes' do
|
||||
it 'returns 404 for the retired history endpoint' do
|
||||
get '/posts/changes'
|
||||
let(:member) { create(:user, :member) }
|
||||
|
||||
expect(response).to have_http_status(:not_found)
|
||||
it 'returns add/remove events (history) for a post' do
|
||||
# add
|
||||
tn2 = TagName.create!(name: 'spec_tag2')
|
||||
tag2 = Tag.create!(tag_name: tn2, category: :general)
|
||||
pt = PostTag.create!(post: post_record, tag: tag2, created_user: member)
|
||||
|
||||
# remove (discard)
|
||||
pt.discard_by!(member)
|
||||
|
||||
get '/posts/changes', params: { id: post_record.id }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json).to include('changes', 'count')
|
||||
expect(json['changes']).to be_an(Array)
|
||||
expect(json['count']).to be >= 2
|
||||
|
||||
types = json['changes'].map { |e| e['change_type'] }.uniq
|
||||
expect(types).to include('add')
|
||||
expect(types).to include('remove')
|
||||
end
|
||||
|
||||
it 'filters history by tag' do
|
||||
tn2 = TagName.create!(name: 'history_tag_hit')
|
||||
tag2 = Tag.create!(tag_name: tn2, category: :general)
|
||||
|
||||
tn3 = TagName.create!(name: 'history_tag_miss')
|
||||
tag3 = Tag.create!(tag_name: tn3, category: :general)
|
||||
|
||||
other_post = Post.create!(
|
||||
title: 'other post',
|
||||
url: 'https://example.com/history-other'
|
||||
)
|
||||
|
||||
# hit: add
|
||||
PostTag.create!(post: post_record, tag: tag2, created_user: member)
|
||||
|
||||
# hit: add + remove
|
||||
pt2 = PostTag.create!(post: other_post, tag: tag2, created_user: member)
|
||||
pt2.discard_by!(member)
|
||||
|
||||
# miss: add + remove
|
||||
pt3 = PostTag.create!(post: post_record, tag: tag3, created_user: member)
|
||||
pt3.discard_by!(member)
|
||||
|
||||
get '/posts/changes', params: { tag: tag2.id }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json).to include('changes', 'count')
|
||||
expect(json['count']).to eq(3)
|
||||
|
||||
changes = json.fetch('changes')
|
||||
|
||||
expect(changes.map { |e| e.dig('tag', 'id') }.uniq).to eq([tag2.id])
|
||||
expect(changes.map { |e| e['change_type'] }).to match_array(%w[add add remove])
|
||||
expect(changes.map { |e| e.dig('post', 'id') }).to match_array([
|
||||
post_record.id,
|
||||
other_post.id,
|
||||
other_post.id
|
||||
])
|
||||
end
|
||||
|
||||
it 'filters history by post and tag together' do
|
||||
tn2 = TagName.create!(name: 'history_tag_combo_hit')
|
||||
tag2 = Tag.create!(tag_name: tn2, category: :general)
|
||||
|
||||
tn3 = TagName.create!(name: 'history_tag_combo_miss')
|
||||
tag3 = Tag.create!(tag_name: tn3, category: :general)
|
||||
|
||||
other_post = Post.create!(
|
||||
title: 'other combo post',
|
||||
url: 'https://example.com/history-combo-other'
|
||||
)
|
||||
|
||||
# hit
|
||||
PostTag.create!(post: post_record, tag: tag2, created_user: member)
|
||||
|
||||
# miss by post
|
||||
pt2 = PostTag.create!(post: other_post, tag: tag2, created_user: member)
|
||||
pt2.discard_by!(member)
|
||||
|
||||
# miss by tag
|
||||
pt3 = PostTag.create!(post: post_record, tag: tag3, created_user: member)
|
||||
pt3.discard_by!(member)
|
||||
|
||||
get '/posts/changes', params: { id: post_record.id, tag: tag2.id }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json).to include('changes', 'count')
|
||||
expect(json['count']).to eq(1)
|
||||
|
||||
changes = json.fetch('changes')
|
||||
expect(changes.size).to eq(1)
|
||||
expect(changes[0]['change_type']).to eq('add')
|
||||
expect(changes[0].dig('post', 'id')).to eq(post_record.id)
|
||||
expect(changes[0].dig('tag', 'id')).to eq(tag2.id)
|
||||
end
|
||||
|
||||
it 'returns empty history when tag does not match' do
|
||||
tn2 = TagName.create!(name: 'history_tag_no_hit')
|
||||
tag2 = Tag.create!(tag_name: tn2, category: :general)
|
||||
|
||||
get '/posts/changes', params: { tag: tag2.id }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json.fetch('changes')).to eq([])
|
||||
expect(json.fetch('count')).to eq(0)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2053,7 +2024,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
url: post.url,
|
||||
thumbnail_base: post.thumbnail_base,
|
||||
tags: snapshot_tags(post),
|
||||
tags_json: post.snapshot_tags_json,
|
||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||
original_created_from: post.original_created_from,
|
||||
original_created_before: post.original_created_before,
|
||||
@@ -2075,7 +2045,7 @@ RSpec.describe 'Posts API', type: :request do
|
||||
end
|
||||
|
||||
let!(:v2) do
|
||||
post_record.post_tags.find_by!(tag: tag).destroy!
|
||||
post_record.post_tags.kept.find_by!(tag: tag).discard_by!(member)
|
||||
PostTag.create!(post: post_record, tag: tag2, created_user: member)
|
||||
post_record.update!(
|
||||
title: 'updated spec post',
|
||||
|
||||
@@ -226,14 +226,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
[platform2, code2],
|
||||
)
|
||||
end
|
||||
|
||||
it 'locks the tag before replacing the complete list' do
|
||||
expect_any_instance_of(Tag).to receive(:lock!).and_call_original
|
||||
|
||||
do_request
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when tag already has deerjikists' do
|
||||
@@ -307,81 +299,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
end
|
||||
end
|
||||
|
||||
context 'when platform is outside the enum' do
|
||||
let(:payload) do
|
||||
[
|
||||
{ platform: 'invalid', code: code1 },
|
||||
]
|
||||
end
|
||||
|
||||
it 'returns 422 with an indexed platform error without changing the list' do
|
||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||
|
||||
expect {
|
||||
do_request
|
||||
}.not_to change { Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] } }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(json.fetch('errors')).to include(
|
||||
'deerjikists.0.platform' => [be_present],
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when a requested deerjikist belongs to another tag' do
|
||||
let!(:other_tag) { create(:tag, category: :deerjikist) }
|
||||
let!(:owned_deerjikist) do
|
||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||
end
|
||||
let!(:conflicting_deerjikist) do
|
||||
Deerjikist.create!(platform: platform2, code: code2, tag: other_tag)
|
||||
end
|
||||
let(:payload) do
|
||||
[
|
||||
{ platform: 'nico', code: 'new-code' },
|
||||
{ platform: platform2, code: code2 },
|
||||
]
|
||||
end
|
||||
|
||||
before do
|
||||
other_tag.tag_name.update!(name: 'existing-deerjikist')
|
||||
end
|
||||
|
||||
it 'returns an indexed 422 error and rolls back the complete replacement' do
|
||||
expect {
|
||||
do_request
|
||||
}.not_to change { Deerjikist.order(:platform, :code).pluck(:platform, :code, :tag_id) }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(json.fetch('errors')).to include(
|
||||
'deerjikists.1.code' => [include('existing-deerjikist')],
|
||||
)
|
||||
expect(owned_deerjikist.reload.tag_id).to eq(tag.id)
|
||||
expect(conflicting_deerjikist.reload.tag_id).to eq(other_tag.id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when a requested deerjikist already belongs to the same tag' do
|
||||
let!(:existing_deerjikist) do
|
||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||
end
|
||||
let(:payload) do
|
||||
[
|
||||
{ platform: platform1, code: code1 },
|
||||
]
|
||||
end
|
||||
|
||||
it 'keeps the existing row' do
|
||||
expect {
|
||||
do_request
|
||||
}.not_to change { existing_deerjikist.reload.created_at }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(Deerjikist.where(tag: tag).pluck(:platform, :code))
|
||||
.to eq([[platform1, code1]])
|
||||
end
|
||||
end
|
||||
|
||||
context 'when youtube code is handle' do
|
||||
let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
|
||||
let(:payload) do
|
||||
|
||||
@@ -268,10 +268,6 @@ RSpec.describe Youtube::Sync do
|
||||
expect(tag_ids).to include(deerjikist_tag.id)
|
||||
expect(tag_ids).not_to include(Tag.no_deerjikist.id)
|
||||
|
||||
expect(PostTag.exists?(post:, tag: Tag.no_deerjikist)).to be(false)
|
||||
expect(Tag.no_deerjikist.reload.post_count).to eq(0)
|
||||
expect(deerjikist_tag.reload.post_count).to eq(1)
|
||||
|
||||
expect(PostVersionRecorder).to have_received(:ensure_snapshot!).with(
|
||||
post,
|
||||
created_by_user: nil
|
||||
|
||||
@@ -108,7 +108,7 @@ RSpec.describe 'nico:sync' do
|
||||
expect(calls).to eq(2)
|
||||
end
|
||||
|
||||
it '古い nico tag の関連を物理削除し、変更前後の履歴を version に残す' do
|
||||
it '既存 post にあった古い nico tag は active から外され、履歴として discard される' do
|
||||
post = Post.create!(
|
||||
title: 'old',
|
||||
url: 'https://www.nicovideo.jp/watch/sm9',
|
||||
@@ -117,8 +117,8 @@ RSpec.describe 'nico:sync' do
|
||||
|
||||
# 旧nicoタグ(今回の同期結果に含まれない)
|
||||
old_nico = create_tag!('nico:OLD', category: 'nico')
|
||||
PostTag.create!(post:, tag: old_nico)
|
||||
create_post_version_for!(post)
|
||||
old_pt = PostTag.create!(post: post, tag: old_nico)
|
||||
expect(old_pt.discarded_at).to be_nil
|
||||
|
||||
# 今回は NEW のみ欲しい
|
||||
new_nico = create_tag!('nico:NEW', category: 'nico')
|
||||
@@ -132,17 +132,9 @@ RSpec.describe 'nico:sync' do
|
||||
|
||||
run_rake_task('nico:sync')
|
||||
|
||||
expect(PostTag.exists?(post:, tag: old_nico)).to be(false)
|
||||
expect(old_nico.reload.post_count).to eq(0)
|
||||
expect(new_nico.reload.post_count).to eq(1)
|
||||
|
||||
versions = post.post_versions.order(:version_no)
|
||||
expect(versions.first.tags_json.map { |item| item.fetch('id') })
|
||||
.to include(old_nico.id)
|
||||
expect(versions.last.tags_json.map { |item| item.fetch('id') })
|
||||
.to include(new_nico.id)
|
||||
expect(versions.last.tags_json.map { |item| item.fetch('id') })
|
||||
.not_to include(old_nico.id)
|
||||
# OLD は active から外れる(discarded_at が入る)
|
||||
old_pts = PostTag.where(post_id: post.id, tag_id: old_nico.id).order(:id).to_a
|
||||
expect(old_pts.last.discarded_at).to be_present
|
||||
|
||||
# NEW は active にいる
|
||||
post.reload
|
||||
@@ -164,7 +156,6 @@ RSpec.describe 'nico:sync' do
|
||||
url: post.url,
|
||||
thumbnail_base: post.thumbnail_base,
|
||||
tags: snapshot_tags(post),
|
||||
tags_json: post.snapshot_tags_json,
|
||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||
original_created_from: post.original_created_from,
|
||||
original_created_before: post.original_created_before,
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする