コミットを比較
7 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| 72e3b10b3c | |||
| f51e06eaf9 | |||
| 0bc5d3135b | |||
| ee679a6436 | |||
| 486ee7e00a | |||
| 625507abf6 | |||
| b2d72ffcb0 |
@@ -1,35 +0,0 @@
|
|||||||
## 背景
|
|
||||||
|
|
||||||
なぜ必要か。
|
|
||||||
|
|
||||||
## 対象範囲
|
|
||||||
|
|
||||||
- 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 を読んで実装してください。
|
|
||||||
不明点があれば、実装前に調査結果と選択肢を提示してください。
|
|
||||||
@@ -1,228 +0,0 @@
|
|||||||
# AGENTS.md
|
|
||||||
|
|
||||||
## Project overview
|
|
||||||
|
|
||||||
BTRC Hub / タグ広場 is a split Rails API and React frontend repository.
|
|
||||||
|
|
||||||
- Backend: Rails API under `backend/`.
|
|
||||||
- Frontend: React + TypeScript + Vite under `frontend/`.
|
|
||||||
- Docs: lightweight command notes under `docs/`.
|
|
||||||
- There is no README or Makefile at the repository root as of this inspection.
|
|
||||||
|
|
||||||
## Stack
|
|
||||||
|
|
||||||
- Backend: Ruby `3.2.2` from `backend/.ruby-version`, Rails `~> 8.0.2`.
|
|
||||||
- Backend dependencies include `mysql2`, `sqlite3`, `rspec-rails`,
|
|
||||||
`factory_bot_rails`, `rack-cors`, `jwt`, `discard`, `gollum`, `whenever`,
|
|
||||||
`aws-sdk-s3`, `brakeman`, and `rubocop-rails-omakase`.
|
|
||||||
- Frontend: React `^19.1.0`, TypeScript `~5.8.3`, Vite `^6.3.5`.
|
|
||||||
- Frontend data/UI dependencies include Axios, TanStack Query, Tailwind CSS,
|
|
||||||
Framer Motion, Radix UI components, lucide-react, MDX/Markdown tooling, and
|
|
||||||
Zustand.
|
|
||||||
|
|
||||||
## Main directories
|
|
||||||
|
|
||||||
- `backend/app/controllers`: Rails API controllers.
|
|
||||||
- `backend/app/models`: Active Record models.
|
|
||||||
- `backend/app/representations`: API response representation classes.
|
|
||||||
- `backend/app/services`: domain services such as version recording,
|
|
||||||
wiki commit, YouTube sync, and similarity calculation.
|
|
||||||
- `backend/config/routes.rb`: API routes.
|
|
||||||
- `backend/db/migrate`: migrations.
|
|
||||||
- `backend/db/schema.rb`: current schema snapshot.
|
|
||||||
- `backend/lib/tasks`: custom Rake tasks.
|
|
||||||
- `backend/spec`: RSpec tests.
|
|
||||||
- `backend/test`: Rails minitest files that still exist in the tree.
|
|
||||||
- `frontend/src/App.tsx`: frontend route definitions and initial user setup.
|
|
||||||
- `frontend/src/pages`: page-level React components.
|
|
||||||
- `frontend/src/components`: shared and feature components.
|
|
||||||
- `frontend/src/lib`: API client helpers, query keys, prefetchers, and domain helpers.
|
|
||||||
- `frontend/src/stores`: Zustand stores.
|
|
||||||
- `docs/commands.md`: command notes.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
Only list commands that are backed by files inspected in this repository.
|
|
||||||
|
|
||||||
### Backend
|
|
||||||
|
|
||||||
The following binstubs exist under `backend/bin`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bin/setup
|
|
||||||
bin/dev
|
|
||||||
bin/rails
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
bin/kamal
|
|
||||||
bin/thrust
|
|
||||||
```
|
|
||||||
|
|
||||||
Common Rails/Rake usage through existing binstubs:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bin/rails db:prepare
|
|
||||||
bin/rails db:migrate
|
|
||||||
bin/rails routes
|
|
||||||
bin/rails server
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
```
|
|
||||||
|
|
||||||
RSpec is present in `Gemfile` and `.rspec` exists:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
### Frontend
|
|
||||||
|
|
||||||
The following npm scripts exist in `frontend/package.json`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd frontend
|
|
||||||
npm run dev
|
|
||||||
npm run build
|
|
||||||
npm run lint
|
|
||||||
npm run test
|
|
||||||
npm run test:run
|
|
||||||
npm run preview
|
|
||||||
```
|
|
||||||
|
|
||||||
`npm run build` runs `tsc -b && vite build`, then `postbuild` runs
|
|
||||||
`node scripts/generate-sitemap.js`.
|
|
||||||
|
|
||||||
`npm run test` runs Vitest in watch mode. Use `npm run test:run` for a non-watch frontend test run.
|
|
||||||
|
|
||||||
## Coding style
|
|
||||||
|
|
||||||
- Prefer precise, minimal changes.
|
|
||||||
- Do not flatter or over-explain.
|
|
||||||
- Explain risks directly.
|
|
||||||
- Prefer single quotes for strings unless interpolation or escaping makes
|
|
||||||
double quotes better.
|
|
||||||
- Ruby: never put a space before method-call parentheses.
|
|
||||||
- Ruby: never put a line break immediately before `)`.
|
|
||||||
- Ruby: do not use `%w` or `%i`.
|
|
||||||
- Ruby hashes are not blocks; keep `}` on the same line as the final pair.
|
|
||||||
- Ruby hashes keep the first pair on the same line as `{` unless line length
|
|
||||||
requires a break.
|
|
||||||
- Ruby blocks use separate `{ ... }` rules from hashes, with 2-space body
|
|
||||||
indentation.
|
|
||||||
- For arrays, never put whitespace or a line break immediately before `]`.
|
|
||||||
- Keep the first element on the same line as `[` by default.
|
|
||||||
- If an array would exceed the line limit, break after `[` and indent
|
|
||||||
elements by 4 spaces.
|
|
||||||
- TypeScript and Python: use GNU-style spacing before parentheses where
|
|
||||||
syntactically valid.
|
|
||||||
- Never write Ruby, TypeScript, or TSX lines longer than 99 characters.
|
|
||||||
- Aim to keep Ruby, TypeScript, and TSX lines within 79 characters where practical.
|
|
||||||
- TypeScript and TSX use 4-space logical indentation.
|
|
||||||
- In TypeScript and TSX only, replace every leading run of 8 spaces with a tab.
|
|
||||||
- Tabs are only for leading indentation, never for spaces after non-space text.
|
|
||||||
- Do not add production dependencies without explicit approval.
|
|
||||||
|
|
||||||
## Backend rules
|
|
||||||
|
|
||||||
- Inspect existing routes, controllers, models, services, and specs before
|
|
||||||
editing backend behavior.
|
|
||||||
- For API behavior changes, add or update request specs under `backend/spec/requests`.
|
|
||||||
- Prefer RSpec for new backend tests; existing minitest files under
|
|
||||||
`backend/test` do not make minitest the default for new coverage.
|
|
||||||
- Do not weaken authentication, BAN user checks, or IP BAN checks.
|
|
||||||
- Preserve the `X-Transfer-Code` user identification flow unless the task
|
|
||||||
explicitly changes authentication.
|
|
||||||
- Be careful with version tables, `version_no`, optimistic concurrency,
|
|
||||||
wiki revisions, and restore/diff behavior.
|
|
||||||
- Be careful with tag names, tag normalization, implications, similarities, and discard behavior.
|
|
||||||
- Be sensitive to N+1 queries; avoid introducing them and proactively fix
|
|
||||||
existing N+1 issues in the code path being edited.
|
|
||||||
- Keep migration files and `backend/db/schema.rb` consistent when changing schema.
|
|
||||||
|
|
||||||
## Frontend rules
|
|
||||||
|
|
||||||
- Use `frontend/src/lib/api.ts` for API calls so headers and camelCase conversion stay consistent.
|
|
||||||
- Add or reuse TanStack Query keys through `frontend/src/lib/queryKeys.ts`;
|
|
||||||
avoid ad hoc query key arrays.
|
|
||||||
- Encode URL path-segment values with `encodeURIComponent`.
|
|
||||||
- React hooks must be called unconditionally.
|
|
||||||
- Keep page-level code under `frontend/src/pages` and shared UI/feature code
|
|
||||||
under `frontend/src/components` unless existing patterns point elsewhere.
|
|
||||||
- Match existing Tailwind, component, and import alias conventions.
|
|
||||||
|
|
||||||
### Frontend TSX style
|
|
||||||
|
|
||||||
- Preserve the local TSX formatting style.
|
|
||||||
- Do not normalize TSX to common Prettier-style React formatting unless
|
|
||||||
explicitly asked.
|
|
||||||
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
|
||||||
- Put two blank lines before and after top-level `const` function
|
|
||||||
declarations, unless imports, exports, or file boundaries make that awkward.
|
|
||||||
- In TSX, indent with 4-space logical indentation.
|
|
||||||
- A leading tab is exactly equivalent to 8 leading spaces.
|
|
||||||
- Keep a tag's closing marker on the same line as the final prop when the tag
|
|
||||||
spans multiple lines.
|
|
||||||
- Do not put `/>` or `>` on its own line unless the existing surrounding code
|
|
||||||
does so.
|
|
||||||
- Keep JSX closing parentheses in the existing compact style, for example
|
|
||||||
`</div>)` rather than moving `)` onto a separate line.
|
|
||||||
- Do not add braces around `if`, `else`, or `for` bodies when the body is a
|
|
||||||
single physical line.
|
|
||||||
- Always add braces around `if`, `else`, or `for` bodies when the body spans
|
|
||||||
two or more physical lines, even if it is one statement.
|
|
||||||
|
|
||||||
Preferred:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
|
||||||
return (
|
|
||||||
<TextArea
|
|
||||||
{...rest}
|
|
||||||
ref={ref}
|
|
||||||
value={tags}
|
|
||||||
invalid={errors && errors.length > 0}
|
|
||||||
onChange={ev => setTags (ev.target.value)}/>)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Avoid:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
function PostFormTagsArea ({ tags, setTags }: Props) {
|
|
||||||
return (
|
|
||||||
<TextArea
|
|
||||||
value={tags}
|
|
||||||
onChange={ev => setTags (ev.target.value)}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Codex workflow
|
|
||||||
|
|
||||||
- First inspect existing patterns; do not invent new architecture when a local convention exists.
|
|
||||||
- Keep changes scoped to the requested issue.
|
|
||||||
- Do not scan or summarize dependency/generated/runtime directories such as
|
|
||||||
`node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
|
||||||
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication
|
|
||||||
behavior, inspect the related request specs and service objects.
|
|
||||||
- If frontend code changes, run the existing frontend verification commands
|
|
||||||
that apply: `npm run build`, `npm run lint`, and `npm run test:run`.
|
|
||||||
- If backend code changes, run the relevant RSpec command; for broad backend
|
|
||||||
changes, run `bundle exec rspec`.
|
|
||||||
- If a verification command cannot be run or fails, report the exact command and failure.
|
|
||||||
|
|
||||||
## Completion criteria
|
|
||||||
|
|
||||||
A task is complete only when:
|
|
||||||
|
|
||||||
- implementation is complete,
|
|
||||||
- relevant verification commands pass, or failures are clearly explained,
|
|
||||||
- unrelated files are not changed,
|
|
||||||
- migrations and schema are consistent when schema changes are made,
|
|
||||||
- user-facing behavior is documented when needed.
|
|
||||||
-212
@@ -1,212 +0,0 @@
|
|||||||
# backend/AGENTS.md
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
These rules apply to work under `backend/`.
|
|
||||||
|
|
||||||
This is a Rails API app using Active Record, RSpec, request specs,
|
|
||||||
service objects, representation classes, and version tables for post/tag/wiki
|
|
||||||
history.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
Use commands backed by files and dependencies in this directory:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bin/setup
|
|
||||||
bin/dev
|
|
||||||
bin/rails
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
Common checks:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bundle exec rspec
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
```
|
|
||||||
|
|
||||||
Common Rails commands:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bin/rails db:prepare
|
|
||||||
bin/rails db:migrate
|
|
||||||
bin/rails routes
|
|
||||||
bin/rails server
|
|
||||||
```
|
|
||||||
|
|
||||||
After backend behavior changes, run the relevant RSpec files. For broad backend changes, run:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
If a command cannot be run or fails, report the exact command and failure.
|
|
||||||
|
|
||||||
## Rails structure
|
|
||||||
|
|
||||||
- `app/controllers`: API controllers.
|
|
||||||
- `app/models`: Active Record models and concerns.
|
|
||||||
- `app/representations`: JSON response shaping.
|
|
||||||
- `app/services`: domain services such as version recorders, wiki commit,
|
|
||||||
YouTube sync, and similarity calculation.
|
|
||||||
- `config/routes.rb`: public API routes.
|
|
||||||
- `db/migrate`: migrations.
|
|
||||||
- `db/schema.rb`: schema snapshot.
|
|
||||||
- `lib/tasks`: custom Rake tasks.
|
|
||||||
- `spec`: RSpec tests.
|
|
||||||
|
|
||||||
Before changing behavior, inspect the matching route, controller, model,
|
|
||||||
service, representation, and spec.
|
|
||||||
|
|
||||||
## Ruby style
|
|
||||||
|
|
||||||
- Prefer precise, minimal changes.
|
|
||||||
- Use single quotes unless interpolation or escaping makes double quotes better.
|
|
||||||
- Do not put a space before Ruby method-call parentheses.
|
|
||||||
- Never put a line break immediately before `)` in Ruby.
|
|
||||||
- Do not use `%w` or `%i` in new Ruby code.
|
|
||||||
- Never write a Ruby line longer than 99 characters.
|
|
||||||
- Aim to keep Ruby lines within 79 characters where practical.
|
|
||||||
- For small Ruby method definitions that take keyword arguments, match the
|
|
||||||
local no-parentheses style when nearby code uses it.
|
|
||||||
- Treat Ruby hash `{ ... }` style and Ruby block `{ ... }` style as separate
|
|
||||||
rules.
|
|
||||||
- Do not format Ruby hashes like Ruby blocks.
|
|
||||||
- For Ruby hashes, keep the closing `}` on the same line as the final pair.
|
|
||||||
- Keep the first pair on the same line as `{` by default.
|
|
||||||
- If the hash would exceed the line limit, break after `{` and indent pairs
|
|
||||||
by 4 spaces.
|
|
||||||
- Put one logical pair per line when the expression would otherwise become
|
|
||||||
dense.
|
|
||||||
- For Ruby arrays, never put whitespace or a line break immediately before `]`.
|
|
||||||
- Keep the first element on the same line as `[` by default.
|
|
||||||
- If an array would exceed the line limit, break after `[` and indent
|
|
||||||
elements by 4 spaces.
|
|
||||||
- For Ruby blocks, use 2-space indentation for the block body.
|
|
||||||
- Keep comments short and useful; avoid narrating obvious code.
|
|
||||||
- Do not add production dependencies without approval.
|
|
||||||
|
|
||||||
## Authentication and authorization
|
|
||||||
|
|
||||||
- Authentication is handled through the `X-Transfer-Code` header in
|
|
||||||
`ApplicationController#authenticate_user`.
|
|
||||||
- `current_user` is set by looking up `User.inheritance_code`.
|
|
||||||
- Do not bypass or weaken the `X-Transfer-Code` flow unless the task
|
|
||||||
explicitly changes authentication.
|
|
||||||
- Unauthenticated write actions should return `:unauthorized` consistently
|
|
||||||
with existing controllers.
|
|
||||||
- Role checks use `User` enum roles: `guest`, `member`, and `admin`.
|
|
||||||
- Use `current_user.gte_member?` for member-or-admin write permissions where
|
|
||||||
existing controllers do so.
|
|
||||||
- Use `current_user.admin?` only for admin-only paths, such as tag child relationship changes.
|
|
||||||
- Do not replace role checks with looser presence checks.
|
|
||||||
|
|
||||||
## BAN and IP BAN
|
|
||||||
|
|
||||||
- `ApplicationController` runs these before actions in order:
|
|
||||||
- `reject_banned_ip_address!`
|
|
||||||
- `authenticate_user`
|
|
||||||
- `reject_banned_user!`
|
|
||||||
- User and IP bans use `banned_at`, not a boolean `banned` column.
|
|
||||||
- `User#banned?` and `IpAddress#banned?` check `banned_at.present?`.
|
|
||||||
- Do not weaken BAN or IP BAN behavior.
|
|
||||||
- If changing request authentication or controller before actions, add or
|
|
||||||
update request specs covering banned users and banned IP addresses.
|
|
||||||
|
|
||||||
## RSpec
|
|
||||||
|
|
||||||
- Prefer RSpec for new backend tests.
|
|
||||||
- Put API behavior coverage under `spec/requests`.
|
|
||||||
- Put model behavior under `spec/models`.
|
|
||||||
- Put service behavior under `spec/services`.
|
|
||||||
- Put Rake task coverage under `spec/tasks`.
|
|
||||||
- `spec/rails_helper.rb` loads `spec/support/**/*.rb`.
|
|
||||||
- Request specs include `AuthHelper` and `JsonHelper`.
|
|
||||||
- `AuthHelper#sign_in_as(user)` stubs
|
|
||||||
`ApplicationController#current_user`; use it when matching existing
|
|
||||||
request spec style.
|
|
||||||
- Add or update request specs for API behavior changes, especially status
|
|
||||||
codes, permissions, response shape, and version conflict behavior.
|
|
||||||
|
|
||||||
## Migrations
|
|
||||||
|
|
||||||
- Keep migrations and `db/schema.rb` consistent.
|
|
||||||
- Use reversible migrations where practical; otherwise define explicit `up` and `down`.
|
|
||||||
- For data backfills inside migrations, follow the existing pattern of
|
|
||||||
defining migration-local `ActiveRecord::Base` classes with
|
|
||||||
`self.table_name`.
|
|
||||||
- Preserve existing indexes, foreign keys, check constraints, and null constraints.
|
|
||||||
- Be careful with MySQL-specific options already present in migrations, such as `after:`.
|
|
||||||
- Do not edit old migrations just to change current behavior unless
|
|
||||||
explicitly requested; add a new migration.
|
|
||||||
|
|
||||||
## Version tables
|
|
||||||
|
|
||||||
- Versioned records include posts, tags, nico tags, and wiki pages.
|
|
||||||
- Current records have `version_no`; version tables have positive
|
|
||||||
`version_no` with unique indexes scoped to the parent record.
|
|
||||||
- Version event types are `create`, `update`, `discard`, and `restore`.
|
|
||||||
- Version rows are readonly through the `VersionRecord` concern.
|
|
||||||
- Use the existing recorder services instead of manually inserting version
|
|
||||||
rows in application code:
|
|
||||||
- `PostVersionRecorder`
|
|
||||||
- `TagVersionRecorder`
|
|
||||||
- `NicoTagVersionRecorder`
|
|
||||||
- `WikiVersionRecorder`
|
|
||||||
- `TagVersioning`
|
|
||||||
- `VersionRecorder` locks the current record, validates sequence consistency,
|
|
||||||
skips unchanged update snapshots, creates the next version row, and updates
|
|
||||||
the record `version_no`.
|
|
||||||
- Do not update versioned records without considering whether a version snapshot must be created.
|
|
||||||
- For optimistic concurrency paths, preserve `base_version_no`, `force`, and
|
|
||||||
`merge` semantics and cover conflicts in request specs.
|
|
||||||
|
|
||||||
## Domain cautions
|
|
||||||
|
|
||||||
- Posts have tag snapshots, parent post implications, original-created ranges,
|
|
||||||
viewed state, and version conflict behavior.
|
|
||||||
- Tags have canonical names, aliases through `TagName`, categories, parent
|
|
||||||
implications, discard behavior, and version snapshots.
|
|
||||||
- Nico tags have separate relation/version behavior; do not treat them like
|
|
||||||
normal editable tags without checking existing code.
|
|
||||||
- Wiki pages involve page content, revisions/history, version rows,
|
|
||||||
title/tag-name behavior, and diff/restore paths.
|
|
||||||
- Materials, theatres, and comments have user and permission checks; inspect
|
|
||||||
the controller before changing them.
|
|
||||||
|
|
||||||
## API responses
|
|
||||||
|
|
||||||
- Use representation classes under `app/representations` when existing endpoints do.
|
|
||||||
- Keep response keys consistent with existing JSON contracts.
|
|
||||||
- Frontend code expects camelCase conversion client-side, while Rails params
|
|
||||||
and JSON keys are generally snake_case.
|
|
||||||
- Preserve existing HTTP status conventions:
|
|
||||||
`:unauthorized` for no user, `:forbidden` for insufficient role or banned
|
|
||||||
user, `:not_found` for missing records, and `:unprocessable_entity` for
|
|
||||||
validation failures.
|
|
||||||
- For diagnostic or internal helper JSON, prefer a deliberately light response
|
|
||||||
shape over full representation classes when callers only need identifiers,
|
|
||||||
labels, URLs, or weights.
|
|
||||||
|
|
||||||
## Active Record performance
|
|
||||||
|
|
||||||
- When a controller action serializes nested associations, preload the
|
|
||||||
associations it will touch instead of allowing N+1 queries.
|
|
||||||
- Be sensitive to N+1 queries in all backend work.
|
|
||||||
- Avoid introducing N+1 queries, and proactively fix existing N+1 issues when
|
|
||||||
you find them in the code path you are editing.
|
|
||||||
- When an association may already be preloaded, prefer loaded-association
|
|
||||||
checks that reuse the preloaded data without losing the efficient database
|
|
||||||
path.
|
|
||||||
|
|
||||||
## Files to avoid in routine work
|
|
||||||
|
|
||||||
- Do not inspect or edit `tmp/`, `log/`, `storage/`, `vendor/`, or dependency
|
|
||||||
directories unless explicitly needed.
|
|
||||||
- Do not modify generated schema or migration output without the corresponding
|
|
||||||
migration when schema changes are made.
|
|
||||||
@@ -69,5 +69,3 @@ gem 'discard'
|
|||||||
gem "rspec-rails", "~> 8.0", :groups => [:development, :test]
|
gem "rspec-rails", "~> 8.0", :groups => [:development, :test]
|
||||||
|
|
||||||
gem 'aws-sdk-s3', require: false
|
gem 'aws-sdk-s3', require: false
|
||||||
|
|
||||||
gem 'rails-i18n', '~> 8.0.0'
|
|
||||||
|
|||||||
@@ -306,9 +306,6 @@ GEM
|
|||||||
rails-html-sanitizer (1.6.2)
|
rails-html-sanitizer (1.6.2)
|
||||||
loofah (~> 2.21)
|
loofah (~> 2.21)
|
||||||
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
||||||
rails-i18n (8.0.2)
|
|
||||||
i18n (>= 0.7, < 2)
|
|
||||||
railties (>= 8.0.0, < 9)
|
|
||||||
railties (8.0.2)
|
railties (8.0.2)
|
||||||
actionpack (= 8.0.2)
|
actionpack (= 8.0.2)
|
||||||
activesupport (= 8.0.2)
|
activesupport (= 8.0.2)
|
||||||
@@ -480,7 +477,6 @@ DEPENDENCIES
|
|||||||
puma (>= 5.0)
|
puma (>= 5.0)
|
||||||
rack-cors
|
rack-cors
|
||||||
rails (~> 8.0.2)
|
rails (~> 8.0.2)
|
||||||
rails-i18n (~> 8.0.0)
|
|
||||||
rspec-rails (~> 8.0)
|
rspec-rails (~> 8.0)
|
||||||
rubocop-rails-omakase
|
rubocop-rails-omakase
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
|
|||||||
@@ -1,19 +1,14 @@
|
|||||||
class ApplicationController < ActionController::API
|
class ApplicationController < ActionController::API
|
||||||
rescue_from ActiveRecord::RecordInvalid, with: :render_record_invalid
|
|
||||||
rescue_from ActiveRecord::RecordNotUnique, with: :render_record_not_unique
|
|
||||||
|
|
||||||
before_action :reject_banned_ip_address!
|
|
||||||
before_action :authenticate_user
|
before_action :authenticate_user
|
||||||
before_action :reject_banned_user!
|
|
||||||
|
|
||||||
def current_user = @current_user
|
def current_user
|
||||||
|
@current_user
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def authenticate_user
|
def authenticate_user
|
||||||
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
||||||
return if code.blank?
|
|
||||||
|
|
||||||
@current_user = User.find_by(inheritance_code: code)
|
@current_user = User.find_by(inheritance_code: code)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -27,62 +22,4 @@ class ApplicationController < ActionController::API
|
|||||||
s.in?(['', '1', 'true', 'on', 'yes'])
|
s.in?(['', '1', 'true', 'on', 'yes'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_bad_request message = 'リクエストが不正です.'
|
|
||||||
render json: { type: 'bad_request',
|
|
||||||
message:,
|
|
||||||
errors: { },
|
|
||||||
base_errors: [message] },
|
|
||||||
status: :bad_request
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_unprocessable_entity message = '入力を確認してください.', field: nil
|
|
||||||
render_validation_error(fields: field ? { field => [message] } : { },
|
|
||||||
base: field ? [] : [message])
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_record_invalid error
|
|
||||||
render_validation_error error.record
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_record_not_unique _error = nil
|
|
||||||
render_validation_error base: ['すでに存在してゐます.']
|
|
||||||
end
|
|
||||||
|
|
||||||
def reject_banned_ip_address!
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(request.remote_ip).hton)
|
|
||||||
return unless ip_address&.banned?
|
|
||||||
|
|
||||||
head :forbidden
|
|
||||||
end
|
|
||||||
|
|
||||||
def reject_banned_user!
|
|
||||||
return unless current_user&.banned?
|
|
||||||
|
|
||||||
head :forbidden
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_entity
|
|
||||||
errors = { }
|
|
||||||
|
|
||||||
if record
|
|
||||||
record.errors.each do |error|
|
|
||||||
errors[error.attribute] ||= []
|
|
||||||
errors[error.attribute] << error.message
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
fields.each do |attr, messages|
|
|
||||||
errors[attr.to_sym] ||= []
|
|
||||||
errors[attr.to_sym].concat(Array(messages))
|
|
||||||
end
|
|
||||||
|
|
||||||
base_errors = Array(base) + Array(errors.delete(:base))
|
|
||||||
|
|
||||||
render json: { type: 'validation_error',
|
|
||||||
message: '入力内容を確認してください.',
|
|
||||||
errors:,
|
|
||||||
base_errors: },
|
|
||||||
status:
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ class DeerjikistsController < ApplicationController
|
|||||||
def show
|
def show
|
||||||
platform = params[:platform].to_s.strip
|
platform = params[:platform].to_s.strip
|
||||||
code = params[:code].to_s.strip
|
code = params[:code].to_s.strip
|
||||||
return render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank?
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
|
|
||||||
deerjikist = Deerjikist
|
deerjikist = Deerjikist
|
||||||
.joins(:tag)
|
.joins(:tag)
|
||||||
@@ -23,9 +22,7 @@ class DeerjikistsController < ApplicationController
|
|||||||
platform = params[:platform].to_s.strip
|
platform = params[:platform].to_s.strip
|
||||||
code = params[:code].to_s.strip
|
code = params[:code].to_s.strip
|
||||||
tag_id = params[:tag_id].to_i
|
tag_id = params[:tag_id].to_i
|
||||||
return render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank? || tag_id <= 0
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
return render_bad_request('tag_id が不正です.') if tag_id <= 0
|
|
||||||
|
|
||||||
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:).tap do |d|
|
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:).tap do |d|
|
||||||
d.tag_id = tag_id
|
d.tag_id = tag_id
|
||||||
@@ -41,8 +38,7 @@ class DeerjikistsController < ApplicationController
|
|||||||
|
|
||||||
platform = params[:platform].to_s.strip
|
platform = params[:platform].to_s.strip
|
||||||
code = params[:code].to_s.strip
|
code = params[:code].to_s.strip
|
||||||
return render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank?
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
|
|
||||||
Deerjikist.find([platform, code]).destroy!
|
Deerjikist.find([platform, code]).destroy!
|
||||||
|
|
||||||
|
|||||||
@@ -40,11 +40,7 @@ class MaterialsController < ApplicationController
|
|||||||
tag_name_raw = params[:tag].to_s.strip
|
tag_name_raw = params[:tag].to_s.strip
|
||||||
file = params[:file]
|
file = params[:file]
|
||||||
url = params[:url].to_s.strip.presence
|
url = params[:url].to_s.strip.presence
|
||||||
return render_unprocessable_entity('タグは必須です.', field: :tag) if tag_name_raw.blank?
|
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
|
||||||
if file.blank? && url.blank?
|
|
||||||
return render_validation_error fields: { file: ['ファイルまたは URL は必須です.'],
|
|
||||||
url: ['ファイルまたは URL は必須です.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
||||||
tag = tag_name.tag
|
tag = tag_name.tag
|
||||||
@@ -58,7 +54,7 @@ class MaterialsController < ApplicationController
|
|||||||
if material.save
|
if material.save
|
||||||
render json: MaterialRepr.base(material, host: request.base_url), status: :created
|
render json: MaterialRepr.base(material, host: request.base_url), status: :created
|
||||||
else
|
else
|
||||||
render_validation_error material
|
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -72,11 +68,7 @@ class MaterialsController < ApplicationController
|
|||||||
tag_name_raw = params[:tag].to_s.strip
|
tag_name_raw = params[:tag].to_s.strip
|
||||||
file = params[:file]
|
file = params[:file]
|
||||||
url = params[:url].to_s.strip.presence
|
url = params[:url].to_s.strip.presence
|
||||||
return render_unprocessable_entity('タグは必須です.', field: :tag) if tag_name_raw.blank?
|
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
|
||||||
if file.blank? && url.blank?
|
|
||||||
return render_validation_error fields: { file: ['ファイルまたは URL は必須です.'],
|
|
||||||
url: ['ファイルまたは URL は必須です.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
||||||
tag = tag_name.tag
|
tag = tag_name.tag
|
||||||
@@ -92,7 +84,7 @@ class MaterialsController < ApplicationController
|
|||||||
if material.save
|
if material.save
|
||||||
render json: MaterialRepr.base(material, host: request.base_url)
|
render json: MaterialRepr.base(material, host: request.base_url)
|
||||||
else
|
else
|
||||||
render_validation_error material
|
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,69 +1,26 @@
|
|||||||
class NicoTagsController < ApplicationController
|
class NicoTagsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
name = params[:name].presence
|
limit = (params[:limit] || 20).to_i
|
||||||
linked_tag = params[:linked_tag].presence
|
cursor = params[:cursor].presence
|
||||||
link_status = params[:link_status].presence
|
|
||||||
order = params[:order].to_s.split(':', 2).map(&:strip)
|
|
||||||
order[0] = 'updated_at' unless order[0].in?(['name', 'created_at', 'updated_at'])
|
|
||||||
unless order[1].in?(['asc', 'desc'])
|
|
||||||
order[1] = order[0] == 'name' ? 'asc' : 'desc'
|
|
||||||
end
|
|
||||||
page = (params[:page].presence || 1).to_i
|
|
||||||
limit = (params[:limit].presence || 20).to_i
|
|
||||||
|
|
||||||
page = 1 if page < 1
|
|
||||||
limit = 1 if limit < 1
|
|
||||||
|
|
||||||
post_tag_max_sql =
|
|
||||||
PostTag
|
|
||||||
.select('tag_id, MAX(created_at) AS max_created_at')
|
|
||||||
.group('tag_id')
|
|
||||||
.to_sql
|
|
||||||
|
|
||||||
q = Tag.nico_tags
|
q = Tag.nico_tags
|
||||||
.joins(:tag_name)
|
|
||||||
.joins("LEFT JOIN (#{ post_tag_max_sql }) post_tag_max " \
|
|
||||||
'ON post_tag_max.tag_id = tags.id')
|
|
||||||
.includes(:tag_name, tag_name: :wiki_page, linked_tags: { tag_name: :wiki_page })
|
.includes(:tag_name, tag_name: :wiki_page, linked_tags: { tag_name: :wiki_page })
|
||||||
q = q.where('tag_names.name LIKE ?', "%#{ name }%") if name
|
.order(updated_at: :desc)
|
||||||
if linked_tag
|
q = q.where('tags.updated_at < ?', Time.iso8601(cursor)) if cursor
|
||||||
linked_tag_ids =
|
|
||||||
Tag
|
|
||||||
.joins(:tag_name)
|
|
||||||
.where('tag_names.name LIKE ?', "%#{ linked_tag }%")
|
|
||||||
.pluck(:id)
|
|
||||||
linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id)
|
|
||||||
q = q.where(id: linked_nico_tag_ids)
|
|
||||||
end
|
|
||||||
if link_status.in?(['linked', 'unlinked'])
|
|
||||||
exists_sql =
|
|
||||||
'EXISTS (SELECT 1 FROM nico_tag_relations ' \
|
|
||||||
'WHERE nico_tag_relations.nico_tag_id = tags.id)'
|
|
||||||
q = link_status == 'linked' ? q.where(exists_sql) : q.where("NOT #{ exists_sql }")
|
|
||||||
end
|
|
||||||
|
|
||||||
count = q.count
|
tags = q.limit(limit + 1).to_a
|
||||||
sort_sql =
|
|
||||||
case order[0]
|
next_cursor = nil
|
||||||
when 'name'
|
if tags.size > limit
|
||||||
'tag_names.name'
|
next_cursor = tags.last.updated_at.iso8601(6)
|
||||||
when 'updated_at'
|
tags = tags.first(limit)
|
||||||
'post_tag_max.max_created_at'
|
|
||||||
else
|
|
||||||
"tags.#{ order[0] }"
|
|
||||||
end
|
end
|
||||||
tags = q.reselect('tags.*',
|
|
||||||
Arel.sql('post_tag_max.max_created_at AS recent_post_tag_created_at'))
|
|
||||||
.order(Arel.sql("#{ sort_sql } #{ order[1] }, tags.id #{ order[1] }"))
|
|
||||||
.limit(limit)
|
|
||||||
.offset((page - 1) * limit)
|
|
||||||
.to_a
|
|
||||||
|
|
||||||
render json: { tags: tags.map { |tag|
|
render json: { tags: tags.map { |tag|
|
||||||
TagRepr.base(tag).merge(
|
TagRepr.base(tag).merge(linked_tags: tag.linked_tags.map { |lt|
|
||||||
recent_post_tag_created_at: tag.recent_post_tag_created_at,
|
TagRepr.base(lt)
|
||||||
linked_tags: tag.linked_tags.map { |lt| TagRepr.base(lt) })
|
})
|
||||||
}, count: }
|
}, next_cursor: }
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@@ -73,42 +30,15 @@ class NicoTagsController < ApplicationController
|
|||||||
id = params[:id].to_i
|
id = params[:id].to_i
|
||||||
|
|
||||||
tag = Tag.find(id)
|
tag = Tag.find(id)
|
||||||
return render_bad_request('ニコニコ・タグを指定してください.') unless tag.nico?
|
return head :bad_request if tag.category != 'nico'
|
||||||
|
|
||||||
linked_tag_names = params[:tags].to_s.split
|
linked_tag_names = params[:tags].to_s.split(' ')
|
||||||
linked_tags = nil
|
linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false)
|
||||||
|
return head :bad_request if linked_tags.any? { |t| t.category == 'nico' }
|
||||||
ApplicationRecord.transaction do
|
|
||||||
linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false,
|
|
||||||
with_no_deerjikist: false)
|
|
||||||
if linked_tags.any? { |t| t.nico? }
|
|
||||||
raise Tag::NicoTagNormalisationError
|
|
||||||
end
|
|
||||||
|
|
||||||
TagVersioning.record_tag_snapshots!(linked_tags, created_by_user: current_user)
|
|
||||||
|
|
||||||
tag.linked_tags = linked_tags
|
tag.linked_tags = linked_tags
|
||||||
tag.save!
|
tag.save!
|
||||||
|
|
||||||
NicoTagVersionRecorder.record!(tag:, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
render json: tag.linked_tags.map { |t| TagRepr.base(t) }, status: :ok
|
render json: tag.linked_tags.map { |t| TagRepr.base(t) }, status: :ok
|
||||||
rescue Tag::NicoTagNormalisationError
|
|
||||||
render_validation_error fields: { tags: ['ニコニコ・タグ同士は連携できません.'] }
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render_nico_tag_form_record_invalid e.record
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def render_nico_tag_form_record_invalid record
|
|
||||||
if record.is_a?(TagName) || record.is_a?(Tag)
|
|
||||||
render_validation_error fields: { tags: record.errors.full_messages.map { |message|
|
|
||||||
"タグ名 “#{ record.name }”: #{ message }"
|
|
||||||
} }
|
|
||||||
else
|
|
||||||
render_validation_error record
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,119 +0,0 @@
|
|||||||
class PostVersionsController < ApplicationController
|
|
||||||
def index
|
|
||||||
post_id = params[:post].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
|
|
||||||
|
|
||||||
tag_name =
|
|
||||||
if tag_id
|
|
||||||
TagName.joins(:tag).find_by(tag: { id: tag_id })
|
|
||||||
end
|
|
||||||
return render json: { versions: [], count: 0 } if tag_id && tag_name.blank?
|
|
||||||
|
|
||||||
q = PostVersion.joins(<<~SQL.squish)
|
|
||||||
LEFT JOIN
|
|
||||||
post_versions prev
|
|
||||||
ON
|
|
||||||
prev.post_id = post_versions.post_id
|
|
||||||
AND prev.version_no = post_versions.version_no - 1
|
|
||||||
SQL
|
|
||||||
.select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
|
|
||||||
'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
|
|
||||||
'prev.original_created_from AS prev_original_created_from',
|
|
||||||
'prev.original_created_before AS prev_original_created_before')
|
|
||||||
q = q.where('post_versions.post_id = ?', post_id) if post_id
|
|
||||||
if tag_name
|
|
||||||
escaped = ActiveRecord::Base.sanitize_sql_like(tag_name.name)
|
|
||||||
q = q.where(("CONCAT(' ', post_versions.tags, ' ') LIKE :kw " +
|
|
||||||
"OR CONCAT(' ', prev.tags, ' ') LIKE :kw"),
|
|
||||||
kw: "% #{ escaped } %")
|
|
||||||
end
|
|
||||||
|
|
||||||
count = q.except(:select, :order, :limit, :offset).count
|
|
||||||
|
|
||||||
versions = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC'))
|
|
||||||
.limit(limit)
|
|
||||||
.offset(offset)
|
|
||||||
|
|
||||||
render json: { versions: serialise_versions(versions), count: }
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def serialise_versions rows
|
|
||||||
user_ids = rows.map(&:created_by_user_id).compact.uniq
|
|
||||||
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
|
|
||||||
|
|
||||||
rows.map do |row|
|
|
||||||
cur_tags = split_tags(row.tags)
|
|
||||||
prev_tags = split_tags(row.attributes['prev_tags'])
|
|
||||||
|
|
||||||
{
|
|
||||||
post_id: row.post_id,
|
|
||||||
version_no: row.version_no,
|
|
||||||
event_type: row.event_type,
|
|
||||||
title: {
|
|
||||||
current: row.title,
|
|
||||||
prev: row.attributes['prev_title']
|
|
||||||
},
|
|
||||||
url: {
|
|
||||||
current: row.url,
|
|
||||||
prev: row.attributes['prev_url']
|
|
||||||
},
|
|
||||||
thumbnail: {
|
|
||||||
current: nil,
|
|
||||||
prev: nil
|
|
||||||
},
|
|
||||||
thumbnail_base: {
|
|
||||||
current: row.thumbnail_base,
|
|
||||||
prev: row.attributes['prev_thumbnail_base']
|
|
||||||
},
|
|
||||||
tags: build_version_tags(cur_tags, prev_tags),
|
|
||||||
original_created_from: {
|
|
||||||
current: row.original_created_from&.iso8601,
|
|
||||||
prev: row.attributes['prev_original_created_from']&.iso8601
|
|
||||||
},
|
|
||||||
original_created_before: {
|
|
||||||
current: row.original_created_before&.iso8601,
|
|
||||||
prev: row.attributes['prev_original_created_before']&.iso8601
|
|
||||||
},
|
|
||||||
created_at: row.created_at.iso8601,
|
|
||||||
created_by_user:
|
|
||||||
if row.created_by_user_id
|
|
||||||
{
|
|
||||||
id: row.created_by_user_id,
|
|
||||||
name: users_by_id[row.created_by_user_id]
|
|
||||||
}
|
|
||||||
end
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def build_version_tags(cur_tags, prev_tags)
|
|
||||||
(cur_tags | prev_tags).map do |name|
|
|
||||||
type =
|
|
||||||
if cur_tags.include?(name) && prev_tags.include?(name)
|
|
||||||
'context'
|
|
||||||
elsif cur_tags.include?(name)
|
|
||||||
'added'
|
|
||||||
else
|
|
||||||
'removed'
|
|
||||||
end
|
|
||||||
|
|
||||||
{
|
|
||||||
name:,
|
|
||||||
type:
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def split_tags(tags)
|
|
||||||
tags.to_s.split(/\s+/).reject(&:blank?)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -44,8 +44,7 @@ class PostsController < ApplicationController
|
|||||||
filtered_posts
|
filtered_posts
|
||||||
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
.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"))
|
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
||||||
.preload(:uploaded_user, :parents, :children,
|
.preload(tags: { tag_name: :wiki_page })
|
||||||
tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
|
||||||
.with_attached_thumbnail
|
.with_attached_thumbnail
|
||||||
|
|
||||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||||
@@ -96,9 +95,7 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def random
|
def random
|
||||||
post = filtered_posts.preload(:uploaded_user, :parents, :children,
|
post = filtered_posts.preload(tags: { tag_name: :wiki_page })
|
||||||
tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
|
||||||
.with_attached_thumbnail
|
|
||||||
.order('RAND()')
|
.order('RAND()')
|
||||||
.first
|
.first
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
@@ -107,25 +104,12 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
post =
|
post = Post.includes(tags: { tag_name: :wiki_page }).find_by(id: params[:id])
|
||||||
Post
|
|
||||||
.includes(:uploaded_user, :parents, :children,
|
|
||||||
tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
|
||||||
.with_attached_thumbnail
|
|
||||||
.find_by(id: params[:id])
|
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
|
|
||||||
parent_posts = post.parents.with_attached_thumbnail.order(:id).to_a
|
render json: PostRepr.base(post, current_user)
|
||||||
child_posts = post.children.with_attached_thumbnail.order(:id).to_a
|
.merge(tags: build_tag_tree_for(post.tags),
|
||||||
sibling_posts = sibling_posts_by_parent(parent_posts.map(&:id))
|
related: post.related(limit: 20))
|
||||||
related = post.related(limit: 20).to_a
|
|
||||||
|
|
||||||
render json: PostRepr.detail(post, current_user,
|
|
||||||
parent_posts:,
|
|
||||||
child_posts:,
|
|
||||||
sibling_posts:,
|
|
||||||
related:)
|
|
||||||
.merge(tags: build_tag_tree_for(post.tags))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -139,36 +123,26 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
||||||
original_created_from:, original_created_before:)
|
original_created_from:, original_created_before:)
|
||||||
post.thumbnail.attach(thumbnail) if thumbnail.present?
|
post.thumbnail.attach(thumbnail)
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
ActiveRecord::Base.transaction do
|
||||||
post.save!
|
post.save!
|
||||||
|
tags = Tag.normalise_tags(tag_names)
|
||||||
tags = Tag.normalise_tags!(tag_names)
|
|
||||||
TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
|
|
||||||
|
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
sync_parent_posts!(post, parent_post_ids)
|
|
||||||
|
|
||||||
post.resized_thumbnail!
|
post.resized_thumbnail!
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
post.reload
|
post.reload
|
||||||
render json: PostRepr.base(post), status: :created
|
render json: PostRepr.base(post), status: :created
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: { errors: post.errors.full_messages }, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
render_validation_error fields: { tags: 'ニコニコ・タグは直接指定できません.' }
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render_validation_error fields: { parent_post_ids: [e.message] }
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render_post_form_record_invalid e.record
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def viewed
|
def viewed
|
||||||
@@ -189,76 +163,30 @@ class PostsController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
force = bool?(:force)
|
|
||||||
merge = bool?(:merge)
|
|
||||||
return render_bad_request('force と merge は同時に指定できません.') if force && merge
|
|
||||||
|
|
||||||
base_version_no = parse_base_version_no
|
|
||||||
return render_bad_request('base_version_no は必須です.') if !(force) && !(base_version_no)
|
|
||||||
|
|
||||||
title = params[:title].presence
|
title = params[:title].presence
|
||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = nil
|
post = Post.find(params[:id].to_i)
|
||||||
conflict_json = nil
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
ActiveRecord::Base.transaction do
|
||||||
post = Post.lock.find(params[:id].to_i)
|
post.update!(title:, original_created_from:, original_created_before:)
|
||||||
|
tags = post.tags.where(category: 'nico').to_a +
|
||||||
base_version = nil
|
Tag.normalise_tags(tag_names, with_tagme: false)
|
||||||
base_snapshot = nil
|
tags = Tag.expand_parent_tags(tags)
|
||||||
current_snapshot = nil
|
sync_post_tags!(post, tags)
|
||||||
unless force
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
||||||
base_version = post.post_versions.find_by!(version_no: base_version_no)
|
|
||||||
|
|
||||||
base_snapshot = post_snapshot_from_version(base_version)
|
|
||||||
current_snapshot = post_snapshot_from_record(post)
|
|
||||||
end
|
end
|
||||||
incoming_snapshot = post_incoming_snapshot(title:,
|
|
||||||
original_created_from:,
|
|
||||||
original_created_before:,
|
|
||||||
tag_names:,
|
|
||||||
parent_post_ids:)
|
|
||||||
|
|
||||||
snapshot_to_apply =
|
|
||||||
if force || post.version_no == base_version_no || current_snapshot == base_snapshot
|
|
||||||
incoming_snapshot
|
|
||||||
else
|
|
||||||
changes = post_snapshot_changes(base_snapshot, current_snapshot, incoming_snapshot)
|
|
||||||
conflicts = changes.select { |change| change[:conflict] }
|
|
||||||
|
|
||||||
if merge && conflicts.empty?
|
|
||||||
merge_post_snapshots(base_snapshot, current_snapshot, incoming_snapshot)
|
|
||||||
else
|
|
||||||
conflict_json = post_conflict_json(post:,
|
|
||||||
base_version_no:,
|
|
||||||
base_snapshot:,
|
|
||||||
current_snapshot:,
|
|
||||||
incoming_snapshot:,
|
|
||||||
changes:,
|
|
||||||
conflicts:)
|
|
||||||
raise ActiveRecord::Rollback
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
apply_post_snapshot!(post, snapshot_to_apply)
|
|
||||||
end
|
|
||||||
|
|
||||||
return render json: conflict_json, status: :conflict if conflict_json
|
|
||||||
|
|
||||||
post.reload
|
post.reload
|
||||||
json = PostRepr.base(post, current_user)
|
json = post.as_json
|
||||||
json['tags'] = build_tag_tree_for(post.tags)
|
json['tags'] = build_tag_tree_for(post.tags)
|
||||||
render json:, status: :ok
|
render json:, status: :ok
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: post.errors, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
render_validation_error fields: { tags: ['ニコニコ・タグは直接指定できません.'] }
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render_validation_error fields: { parent_post_ids: [e.message] }
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render_post_form_record_invalid e.record
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def changes
|
def changes
|
||||||
@@ -276,7 +204,7 @@ class PostsController < ApplicationController
|
|||||||
pts = pts.where(post_id: id) if id.present?
|
pts = pts.where(post_id: id) if id.present?
|
||||||
pts = pts.where(tag_id:) if tag_id.present?
|
pts = pts.where(tag_id:) if tag_id.present?
|
||||||
pts = pts.includes(:post, :created_user, :deleted_user,
|
pts = pts.includes(:post, :created_user, :deleted_user,
|
||||||
tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
tag: { tag_name: :wiki_page })
|
||||||
|
|
||||||
events = []
|
events = []
|
||||||
pts.each do |pt|
|
pts.each do |pt|
|
||||||
@@ -401,7 +329,7 @@ class PostsController < ApplicationController
|
|||||||
return nil unless tag
|
return nil unless tag
|
||||||
|
|
||||||
if path.include?(tag_id)
|
if path.include?(tag_id)
|
||||||
return TagRepr.inline(tag).merge(children: [])
|
return TagRepr.base(tag).merge(children: [])
|
||||||
end
|
end
|
||||||
|
|
||||||
if memo.key?(tag_id)
|
if memo.key?(tag_id)
|
||||||
@@ -413,272 +341,9 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
|
children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
|
||||||
|
|
||||||
memo[tag_id] = TagRepr.inline(tag).merge(children:)
|
memo[tag_id] = TagRepr.base(tag).merge(children:)
|
||||||
end
|
end
|
||||||
|
|
||||||
root_ids.filter_map { |id| build_node.call(id, []) }
|
root_ids.filter_map { |id| build_node.call(id, []) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def sibling_posts_by_parent parent_post_ids
|
|
||||||
return { } if parent_post_ids.blank?
|
|
||||||
|
|
||||||
implications =
|
|
||||||
PostImplication
|
|
||||||
.where(parent_post_id: parent_post_ids)
|
|
||||||
.includes(post: { thumbnail_attachment: :blob })
|
|
||||||
.order(:parent_post_id, :post_id)
|
|
||||||
|
|
||||||
implications.group_by(&:parent_post_id).transform_values { |items|
|
|
||||||
items.map(&:post)
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def parse_parent_post_ids
|
|
||||||
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
|
||||||
|
|
||||||
params[:parent_post_ids].to_s.split.map { |token|
|
|
||||||
id = Integer(token, exception: false)
|
|
||||||
raise ArgumentError, "親投稿 Id. が不正です: #{ token }" if id.nil? || id <= 0
|
|
||||||
|
|
||||||
id
|
|
||||||
}.uniq
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_parent_posts! post, parent_post_ids
|
|
||||||
if parent_post_ids.include?(post.id)
|
|
||||||
post.errors.add :parent_post_ids, '自分自身を親投稿にはできません.'
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
existing_ids = Post.where(id: parent_post_ids).pluck(:id)
|
|
||||||
missing_ids = parent_post_ids - existing_ids
|
|
||||||
|
|
||||||
if missing_ids.present?
|
|
||||||
post.errors.add :parent_post_ids,
|
|
||||||
"存在しない親投稿 Id. があります: #{ missing_ids.join(' ') }"
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
current_ids = post.parent_posts.pluck(:id)
|
|
||||||
|
|
||||||
ids_to_add = parent_post_ids - current_ids
|
|
||||||
ids_to_remove = current_ids - parent_post_ids
|
|
||||||
|
|
||||||
PostImplication.where(post_id: post.id, parent_post_id: ids_to_remove).delete_all
|
|
||||||
|
|
||||||
ids_to_add.each do |parent_post_id|
|
|
||||||
PostImplication.create_or_find_by!(post_id: post.id, parent_post_id:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def parse_base_version_no
|
|
||||||
version_no = Integer(params[:base_version_no], exception: false)
|
|
||||||
if version_no&.positive?
|
|
||||||
version_no
|
|
||||||
else
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_snapshot_from_version version
|
|
||||||
{ title: version.title,
|
|
||||||
original_created_from: snapshot_time(version.original_created_from),
|
|
||||||
original_created_before: snapshot_time(version.original_created_before),
|
|
||||||
tag_names: editable_tag_names_from_version(version),
|
|
||||||
parent_post_ids: snapshot_parent_post_ids_from_version(version) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def editable_tag_names_from_version version
|
|
||||||
version.tags.to_s.split.reject { |name| name.downcase.start_with?('nico:') }.sort
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_snapshot_from_record post
|
|
||||||
{ title: post.title,
|
|
||||||
original_created_from: snapshot_time(post.original_created_from),
|
|
||||||
original_created_before: snapshot_time(post.original_created_before),
|
|
||||||
tag_names: editable_tag_names_from_post(post),
|
|
||||||
parent_post_ids: post.parent_posts.order(:id).pluck(:id) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def editable_tag_names_from_post post
|
|
||||||
post.tags.not_nico.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_incoming_snapshot title:, original_created_from:, original_created_before:,
|
|
||||||
tag_names:, parent_post_ids:
|
|
||||||
{ title:,
|
|
||||||
original_created_from: snapshot_time(original_created_from),
|
|
||||||
original_created_before: snapshot_time(original_created_before),
|
|
||||||
tag_names: incoming_tag_names_for_snapshot(tag_names),
|
|
||||||
parent_post_ids: parent_post_ids.sort }
|
|
||||||
end
|
|
||||||
|
|
||||||
def snapshot_parent_post_ids_from_version version
|
|
||||||
if version.respond_to?(:parent_post_ids)
|
|
||||||
version.parent_post_ids.to_s.split.map { |id| id.to_i }.sort
|
|
||||||
elsif version.respond_to?(:parent_id) && version.parent_id
|
|
||||||
[version.parent_id]
|
|
||||||
else
|
|
||||||
[]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def snapshot_time value
|
|
||||||
return nil if value.blank?
|
|
||||||
|
|
||||||
value = Time.zone.parse(value.to_s) if value in String
|
|
||||||
value&.in_time_zone&.iso8601(6)
|
|
||||||
rescue ArgumentError, TypeError
|
|
||||||
value.to_s
|
|
||||||
end
|
|
||||||
|
|
||||||
def incoming_tag_names_for_snapshot raw_tag_names
|
|
||||||
tags = Tag.normalise_tags!(raw_tag_names, with_tagme: false)
|
|
||||||
|
|
||||||
Tag.expand_parent_tags(tags).map(&:name).uniq.sort
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_conflict_json post:, base_version_no:, base_snapshot:,
|
|
||||||
current_snapshot:, incoming_snapshot:, changes:, conflicts:
|
|
||||||
{ error: 'conflict',
|
|
||||||
message: '競合が発生しました.',
|
|
||||||
post_id: post.id,
|
|
||||||
base_version_no:,
|
|
||||||
current_version_no: post.version_no,
|
|
||||||
base: base_snapshot,
|
|
||||||
current: current_snapshot,
|
|
||||||
mine: incoming_snapshot,
|
|
||||||
changes:,
|
|
||||||
conflicts:,
|
|
||||||
mergeable: conflicts.empty? }
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_snapshot_changes base_snapshot, current_snapshot, incoming_snapshot
|
|
||||||
[scalar_snapshot_change(:title, 'タイトル',
|
|
||||||
base_snapshot, current_snapshot, incoming_snapshot),
|
|
||||||
scalar_snapshot_change(:original_created_from, 'オリジナルの作成日時(以降)',
|
|
||||||
base_snapshot, current_snapshot, incoming_snapshot),
|
|
||||||
scalar_snapshot_change(:original_created_before, 'オリジナルの作成日時(より前)',
|
|
||||||
base_snapshot, current_snapshot, incoming_snapshot),
|
|
||||||
set_snapshot_change(:tag_names, 'タグ',
|
|
||||||
base_snapshot, current_snapshot, incoming_snapshot),
|
|
||||||
set_snapshot_change(:parent_post_ids, '親投稿',
|
|
||||||
base_snapshot, current_snapshot, incoming_snapshot)].compact
|
|
||||||
end
|
|
||||||
|
|
||||||
def scalar_snapshot_change field, label, base_snapshot, current_snapshot, incoming_snapshot
|
|
||||||
base = base_snapshot[field]
|
|
||||||
current = current_snapshot[field]
|
|
||||||
mine = incoming_snapshot[field]
|
|
||||||
|
|
||||||
return nil if current == base && mine == base
|
|
||||||
|
|
||||||
{ field:, label:, base:, current:, mine:,
|
|
||||||
changed_by_current: current != base,
|
|
||||||
changed_by_me: mine != base,
|
|
||||||
conflict: scalar_snapshot_conflict?(base, current, mine) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def scalar_snapshot_conflict? base, current, mine
|
|
||||||
current != base && mine != base && current != mine
|
|
||||||
end
|
|
||||||
|
|
||||||
def set_snapshot_change field, label, base_snapshot, current_snapshot, incoming_snapshot
|
|
||||||
base = base_snapshot[field].to_a
|
|
||||||
current = current_snapshot[field].to_a
|
|
||||||
mine = incoming_snapshot[field].to_a
|
|
||||||
|
|
||||||
added_by_current = current - base
|
|
||||||
removed_by_current = base - current
|
|
||||||
added_by_me = mine - base
|
|
||||||
removed_by_me = base - mine
|
|
||||||
|
|
||||||
if (added_by_current.empty? &&
|
|
||||||
removed_by_current.empty? &&
|
|
||||||
added_by_me.empty? &&
|
|
||||||
removed_by_me.empty?)
|
|
||||||
return nil
|
|
||||||
end
|
|
||||||
|
|
||||||
{ field:, label:, base:, current:, mine:, added_by_current:, removed_by_current:,
|
|
||||||
added_by_me:, removed_by_me:,
|
|
||||||
changed_by_current: added_by_current.present? || removed_by_current.present?,
|
|
||||||
changed_by_me: added_by_me.present? || removed_by_me.present?,
|
|
||||||
conflict: set_snapshot_conflict?(added_by_current:,
|
|
||||||
removed_by_current:,
|
|
||||||
added_by_me:,
|
|
||||||
removed_by_me:) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def set_snapshot_conflict? added_by_current:, removed_by_current:,
|
|
||||||
added_by_me:, removed_by_me:
|
|
||||||
(added_by_current & removed_by_me).present? || (removed_by_current & added_by_me).present?
|
|
||||||
end
|
|
||||||
|
|
||||||
def apply_post_snapshot! post, snapshot
|
|
||||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
|
|
||||||
|
|
||||||
post.update!(title: snapshot[:title],
|
|
||||||
original_created_from: snapshot[:original_created_from],
|
|
||||||
original_created_before: snapshot[:original_created_before])
|
|
||||||
|
|
||||||
editable_tags = Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false)
|
|
||||||
TagVersioning.record_tag_snapshots!(editable_tags, created_by_user: current_user)
|
|
||||||
|
|
||||||
readonly_tags = post.tags.nico.to_a
|
|
||||||
|
|
||||||
tags = readonly_tags + editable_tags
|
|
||||||
tags = Tag.expand_parent_tags(tags)
|
|
||||||
|
|
||||||
sync_post_tags!(post, tags)
|
|
||||||
sync_parent_posts!(post, snapshot[:parent_post_ids])
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
def merge_post_snapshots base_snapshot, current_snapshot, incoming_snapshot
|
|
||||||
[:title, :original_created_from, :original_created_before].map {
|
|
||||||
[_1, merge_scalar_snapshot_value(base_snapshot[_1],
|
|
||||||
current_snapshot[_1],
|
|
||||||
incoming_snapshot[_1])]
|
|
||||||
}.to_h.merge([:tag_names, :parent_post_ids].map {
|
|
||||||
[_1, merge_set_snapshot_value(base_snapshot[_1],
|
|
||||||
current_snapshot[_1],
|
|
||||||
incoming_snapshot[_1])]
|
|
||||||
}.to_h)
|
|
||||||
end
|
|
||||||
|
|
||||||
def merge_scalar_snapshot_value base, current, mine
|
|
||||||
return mine if current == base
|
|
||||||
return current if mine == base || current == mine
|
|
||||||
|
|
||||||
raise ArgumentError, '競合してゐる項目はマージできません.'
|
|
||||||
end
|
|
||||||
|
|
||||||
def merge_set_snapshot_value base, current, mine
|
|
||||||
base = base.to_a
|
|
||||||
current = current.to_a
|
|
||||||
mine = mine.to_a
|
|
||||||
|
|
||||||
added_by_current = current - base
|
|
||||||
removed_by_current = base - current
|
|
||||||
added_by_me = mine - base
|
|
||||||
removed_by_me = base - mine
|
|
||||||
|
|
||||||
merged = base + added_by_current + added_by_me
|
|
||||||
merged -= removed_by_current
|
|
||||||
merged -= removed_by_me
|
|
||||||
|
|
||||||
merged.uniq.sort
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_post_form_record_invalid record
|
|
||||||
if record.is_a?(TagName) || record.is_a?(Tag)
|
|
||||||
render_validation_error fields: { tags: record.errors.full_messages.map { |message|
|
|
||||||
"タグ名 “#{ record.name }”: #{ message }"
|
|
||||||
} }
|
|
||||||
else
|
|
||||||
render_validation_error record
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ class PreviewController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
|
|
||||||
url = params[:url]
|
url = params[:url]
|
||||||
return render_bad_request('URL は必須です.') unless url.present?
|
return head :bad_request unless url.present?
|
||||||
|
|
||||||
unless url.start_with?(/http(s)?:\/\//)
|
unless url.start_with?(/http(s)?:\/\//)
|
||||||
url = 'http://' + url
|
url = 'http://' + url
|
||||||
@@ -16,7 +16,7 @@ class PreviewController < ApplicationController
|
|||||||
|
|
||||||
render json: { title: title }
|
render json: { title: title }
|
||||||
rescue => e
|
rescue => e
|
||||||
render_bad_request(e.message)
|
render json: { error: e.message }, status: :bad_request
|
||||||
end
|
end
|
||||||
|
|
||||||
def thumbnail
|
def thumbnail
|
||||||
@@ -25,7 +25,7 @@ class PreviewController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
|
|
||||||
url = params[:url]
|
url = params[:url]
|
||||||
return render_bad_request('URL は必須です.') if url.blank?
|
return head :bad_request if url.blank?
|
||||||
|
|
||||||
unless url.start_with?(/http(s)?:\/\//)
|
unless url.start_with?(/http(s)?:\/\//)
|
||||||
url = 'http://' + url
|
url = 'http://' + url
|
||||||
@@ -40,11 +40,7 @@ class PreviewController < ApplicationController
|
|||||||
File.delete(path) rescue nil
|
File.delete(path) rescue nil
|
||||||
send_file image.path, type: 'image/png', disposition: 'inline'
|
send_file image.path, type: 'image/png', disposition: 'inline'
|
||||||
else
|
else
|
||||||
render json: { type: 'internal_server_error',
|
render json: { error: 'Failed to generate thumbnail' }, status: :internal_server_error
|
||||||
message: 'サムネールを生成できませんでした.',
|
|
||||||
errors: { },
|
|
||||||
base_errors: ['サムネールを生成できませんでした.'] },
|
|
||||||
status: :internal_server_error
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,19 +5,9 @@ class TagChildrenController < ApplicationController
|
|||||||
|
|
||||||
parent_id = params[:parent_id]
|
parent_id = params[:parent_id]
|
||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return render_bad_request('parent_id は必須です.') if parent_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
return render_bad_request('child_id は必須です.') if child_id.blank?
|
|
||||||
|
|
||||||
parent = Tag.find(parent_id)
|
Tag.find(parent_id).children << Tag.find(child_id) rescue nil
|
||||||
child = Tag.find(child_id)
|
|
||||||
return render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
|
||||||
|
|
||||||
TagImplication.find_or_create_by!(parent_tag: parent, tag: child)
|
|
||||||
TagVersionRecorder.record!(tag: child, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
@@ -28,19 +18,9 @@ class TagChildrenController < ApplicationController
|
|||||||
|
|
||||||
parent_id = params[:parent_id]
|
parent_id = params[:parent_id]
|
||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return render_bad_request('parent_id は必須です.') if parent_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
return render_bad_request('child_id は必須です.') if child_id.blank?
|
|
||||||
|
|
||||||
parent = Tag.find(parent_id)
|
Tag.find(parent_id).children.delete(Tag.find(child_id)) rescue nil
|
||||||
child = Tag.find(child_id)
|
|
||||||
return render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
|
||||||
|
|
||||||
TagImplication.find_by(parent_tag: parent, tag: child)&.destroy!
|
|
||||||
TagVersionRecorder.record!(tag: child, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
class TagVersionsController < ApplicationController
|
|
||||||
def index
|
|
||||||
tag_id = params[:id].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
|
|
||||||
|
|
||||||
q = TagVersion.joins(<<~SQL.squish)
|
|
||||||
LEFT JOIN
|
|
||||||
tag_versions prev
|
|
||||||
ON
|
|
||||||
prev.tag_id = tag_versions.tag_id
|
|
||||||
AND prev.version_no = tag_versions.version_no - 1
|
|
||||||
SQL
|
|
||||||
.select('tag_versions.*', 'prev.name AS prev_name', 'prev.category AS prev_category',
|
|
||||||
'prev.aliases AS prev_aliases', 'prev.parent_tag_ids AS prev_parent_tag_ids')
|
|
||||||
q = q.where('tag_versions.tag_id = ?', tag_id) if tag_id
|
|
||||||
|
|
||||||
count = q.except(:select, :order, :limit, :offset).count
|
|
||||||
|
|
||||||
versions = q.order(Arel.sql('tag_versions.created_at DESC, tag_versions.id DESC'))
|
|
||||||
.limit(limit)
|
|
||||||
.offset(offset)
|
|
||||||
|
|
||||||
render json: { versions: serialise_versions(versions), count: }
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def serialise_versions rows
|
|
||||||
user_ids = rows.map(&:created_by_user_id).compact.uniq
|
|
||||||
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
|
|
||||||
|
|
||||||
rows.map do |row|
|
|
||||||
cur_aliases = split_values(row.aliases)
|
|
||||||
prev_aliases = split_values(row.attributes['prev_aliases'])
|
|
||||||
|
|
||||||
cur_parent_tag_ids = split_parent_tag_ids(row.parent_tag_ids)
|
|
||||||
prev_parent_tag_ids = split_parent_tag_ids(row.attributes['prev_parent_tag_ids'])
|
|
||||||
|
|
||||||
all_parent_tag_ids = (cur_parent_tag_ids | prev_parent_tag_ids)
|
|
||||||
|
|
||||||
tags_by_id =
|
|
||||||
Tag
|
|
||||||
.includes(:tag_name, :materials, { tag_name: :wiki_page })
|
|
||||||
.where(id: all_parent_tag_ids)
|
|
||||||
.index_by(&:id)
|
|
||||||
|
|
||||||
parent_tags =
|
|
||||||
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
|
|
||||||
.map do |h|
|
|
||||||
{ tag: TagRepr.base(tags_by_id[h[:tag_id]]),
|
|
||||||
type: h[:type] }
|
|
||||||
end
|
|
||||||
|
|
||||||
{ tag_id: row.tag_id,
|
|
||||||
version_no: row.version_no,
|
|
||||||
event_type: row.event_type,
|
|
||||||
name: { current: row.name, prev: row.attributes['prev_name'] },
|
|
||||||
category: { current: row.category, prev: row.attributes['prev_category'] },
|
|
||||||
aliases: build_version_values(cur_aliases, prev_aliases, key: :name),
|
|
||||||
parent_tags:,
|
|
||||||
created_at: row.created_at.iso8601,
|
|
||||||
created_by_user: row.created_by_user_id &&
|
|
||||||
{ id: row.created_by_user_id,
|
|
||||||
name: users_by_id[row.created_by_user_id] } }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def build_version_values cur_values, prev_values, key:
|
|
||||||
(cur_values | prev_values).map do |value|
|
|
||||||
type =
|
|
||||||
if cur_values.include?(value) && prev_values.include?(value)
|
|
||||||
'context'
|
|
||||||
elsif cur_values.include?(value)
|
|
||||||
'added'
|
|
||||||
else
|
|
||||||
'removed'
|
|
||||||
end
|
|
||||||
|
|
||||||
{ key => value, type: }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def split_values(values) = values.to_s.split(/\s+/).reject(&:blank?)
|
|
||||||
|
|
||||||
def split_parent_tag_ids(values) = split_values(values).map(&:to_i)
|
|
||||||
end
|
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
require 'net/http'
|
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
|
|
||||||
class TagsController < ApplicationController
|
class TagsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
post_id = params[:post]
|
post_id = params[:post]
|
||||||
@@ -70,7 +66,7 @@ class TagsController < ApplicationController
|
|||||||
.offset(offset)
|
.offset(offset)
|
||||||
.to_a
|
.to_a
|
||||||
|
|
||||||
render json: { tags: TagRepr.many(tags), count: q.size }
|
render json: { tags: TagRepr.base(tags), count: q.size }
|
||||||
end
|
end
|
||||||
|
|
||||||
def with_depth
|
def with_depth
|
||||||
@@ -168,7 +164,7 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
def show_by_name
|
def show_by_name
|
||||||
name = params[:name].to_s.strip
|
name = params[:name].to_s.strip
|
||||||
return render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request if name.blank?
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name)
|
tag = Tag.joins(:tag_name)
|
||||||
.includes(:tag_name, :materials, tag_name: :wiki_page)
|
.includes(:tag_name, :materials, tag_name: :wiki_page)
|
||||||
@@ -186,52 +182,24 @@ class TagsController < ApplicationController
|
|||||||
.find_by(id: params[:id])
|
.find_by(id: params[:id])
|
||||||
return head :not_found unless tag
|
return head :not_found unless tag
|
||||||
|
|
||||||
render json: { tag: TagRepr.base(tag),
|
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def deerjikists_by_name
|
def deerjikists_by_name
|
||||||
name = params[:name].to_s.strip
|
name = params[:name].to_s.strip
|
||||||
return render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request if name.blank?
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name)
|
tag = Tag.joins(:tag_name)
|
||||||
.includes(:tag_name, tag_name: :wiki_page)
|
.includes(:tag_name, tag_name: :wiki_page)
|
||||||
.find_by(tag_names: { name: })
|
.find_by(tag_names: { name: })
|
||||||
return head :not_found unless tag
|
return head :not_found unless tag
|
||||||
|
|
||||||
render json: { tag: TagRepr.base(tag),
|
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_deerjikists
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
return head :forbidden unless current_user.gte_member?
|
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name)
|
|
||||||
.includes(:tag_name, tag_name: :wiki_page)
|
|
||||||
.find_by(id: params[:id])
|
|
||||||
return head :not_found unless tag
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
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
|
|
||||||
|
|
||||||
return if performed?
|
|
||||||
|
|
||||||
render json: DeerjikistRepr.many(tag.reload.deerjikists)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def materials_by_name
|
def materials_by_name
|
||||||
name = params[:name].to_s.strip
|
name = params[:name].to_s.strip
|
||||||
return render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request if name.blank?
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name)
|
tag = Tag.joins(:tag_name)
|
||||||
.includes(:tag_name, :materials, tag_name: :wiki_page)
|
.includes(:tag_name, :materials, tag_name: :wiki_page)
|
||||||
@@ -241,59 +209,6 @@ class TagsController < ApplicationController
|
|||||||
render json: build_tag_children(tag)
|
render json: build_tag_children(tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_all
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
return head :forbidden unless current_user.gte_member?
|
|
||||||
|
|
||||||
tag = Tag.find_by(id: params[:id])
|
|
||||||
return head :not_found unless tag
|
|
||||||
|
|
||||||
name = params[:name].to_s.strip
|
|
||||||
category = params[:category].to_s.strip
|
|
||||||
return render_unprocessable_entity('名前は必須です.', field: :name) if name.blank?
|
|
||||||
return render_unprocessable_entity('カテゴリは必須です.', field: :category) if category.blank?
|
|
||||||
|
|
||||||
if name != tag.name &&
|
|
||||||
tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
|
|
||||||
return render_unprocessable_entity('システム・タグの名称は変更できません.', field: :name)
|
|
||||||
end
|
|
||||||
|
|
||||||
if tag.nico? || category == 'nico'
|
|
||||||
return render_unprocessable_entity('ニコタグは変更できません.', field: :category)
|
|
||||||
end
|
|
||||||
|
|
||||||
alias_names = params[:aliases].to_s.split.uniq
|
|
||||||
parent_names = params[:parent_tags].to_s.split.uniq
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
|
||||||
|
|
||||||
old_name = tag.name
|
|
||||||
name_changed = name != old_name
|
|
||||||
wiki_page = tag.tag_name.wiki_page if name_changed
|
|
||||||
|
|
||||||
tag.update!(category:)
|
|
||||||
tag.tag_name.update!(name:)
|
|
||||||
|
|
||||||
alias_names << old_name if name_changed
|
|
||||||
alias_names.delete(name)
|
|
||||||
|
|
||||||
update_aliases!(tag, alias_names)
|
|
||||||
update_parent_tags!(tag, parent_names)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
|
|
||||||
record_tag_version!(
|
|
||||||
tag,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: current_user,
|
|
||||||
name_changed:,
|
|
||||||
wiki_page:)
|
|
||||||
end
|
|
||||||
|
|
||||||
render json: TagRepr.base(tag.reload)
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
def update
|
||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
@@ -303,36 +218,20 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
tag = Tag.find(params[:id])
|
tag = Tag.find(params[:id])
|
||||||
|
|
||||||
if tag.nico? || (category.present? && category == 'nico')
|
if name.present?
|
||||||
return render_unprocessable_entity('ニコタグは変更できません.', field: :category)
|
tag.tag_name.update!(name:)
|
||||||
end
|
end
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
if category.present?
|
||||||
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
tag.update!(category:)
|
||||||
|
|
||||||
old_name = tag.name
|
|
||||||
name_changed = name.present? && name != old_name
|
|
||||||
wiki_page = tag.tag_name.wiki_page if name_changed
|
|
||||||
|
|
||||||
tag.tag_name.update!(name:) if name.present?
|
|
||||||
tag.update!(category:) if category.present?
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
|
|
||||||
record_tag_version!(
|
|
||||||
tag,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: current_user,
|
|
||||||
name_changed:,
|
|
||||||
wiki_page:)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
render json: TagRepr.base(tag.reload)
|
render json: TagRepr.base(tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def build_tag_children tag
|
def build_tag_children(tag)
|
||||||
material = tag.materials.first
|
material = tag.materials.first
|
||||||
file = nil
|
file = nil
|
||||||
content_type = nil
|
content_type = nil
|
||||||
@@ -345,116 +244,4 @@ class TagsController < ApplicationController
|
|||||||
children: tag.children.sort_by { _1.name }.map { build_tag_children(_1) },
|
children: tag.children.sort_by { _1.name }.map { build_tag_children(_1) },
|
||||||
material: material.as_json&.merge(file:, content_type:))
|
material: material.as_json&.merge(file:, content_type:))
|
||||||
end
|
end
|
||||||
|
|
||||||
def record_tag_version! tag, event_type:, created_by_user:, name_changed: false, wiki_page: nil
|
|
||||||
if tag.nico?
|
|
||||||
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
|
||||||
|
|
||||||
return unless name_changed
|
|
||||||
|
|
||||||
wiki_page ||= tag.tag_name.wiki_page
|
|
||||||
return unless wiki_page&.wiki_versions&.exists?
|
|
||||||
|
|
||||||
WikiVersionRecorder.record!(
|
|
||||||
page: wiki_page,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_aliases! tag, alias_names
|
|
||||||
alias_names = alias_names.uniq
|
|
||||||
|
|
||||||
affected_tags = [tag]
|
|
||||||
|
|
||||||
current_aliases = tag.tag_name.aliases.to_a
|
|
||||||
|
|
||||||
current_aliases.each do |alias_tag_name|
|
|
||||||
next if alias_names.include?(alias_tag_name.name)
|
|
||||||
|
|
||||||
affected_tags << alias_tag_name.canonical&.tag
|
|
||||||
end
|
|
||||||
|
|
||||||
alias_names.each do |alias_name|
|
|
||||||
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
|
||||||
affected_tags << alias_tag_name.canonical&.tag
|
|
||||||
end
|
|
||||||
|
|
||||||
affected_tags.compact.uniq.each do |affected_tag|
|
|
||||||
TagVersioning.ensure_snapshot!(affected_tag, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
current_aliases.each do |alias_tag_name|
|
|
||||||
next if alias_names.include?(alias_tag_name.name)
|
|
||||||
|
|
||||||
alias_tag_name.update!(canonical: nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
alias_names.each do |alias_name|
|
|
||||||
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
|
||||||
alias_tag_name.update!(canonical: tag.tag_name)
|
|
||||||
end
|
|
||||||
|
|
||||||
affected_tags.compact.uniq.each do |affected_tag|
|
|
||||||
record_tag_version!(affected_tag, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_parent_tags! tag, parent_names
|
|
||||||
parent_tags = Tag.normalise_tags!(parent_names, with_tagme: false,
|
|
||||||
with_no_deerjikist: false,
|
|
||||||
deny_nico: true)
|
|
||||||
|
|
||||||
old_parent_tags = tag.parents.to_a
|
|
||||||
|
|
||||||
TagVersioning.record_tag_snapshots!((old_parent_tags + parent_tags).uniq,
|
|
||||||
created_by_user: current_user)
|
|
||||||
|
|
||||||
tag.reversed_tag_implications.destroy_all
|
|
||||||
|
|
||||||
parent_tags.each do |parent_tag|
|
|
||||||
next if parent_tag == tag
|
|
||||||
|
|
||||||
TagImplication.create!(tag:, parent_tag:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def normalise_deerjikist_code platform, code
|
|
||||||
return code if platform != 'youtube' || code[0] != '@'
|
|
||||||
|
|
||||||
url = "https://www.youtube.com/#{ code }"
|
|
||||||
|
|
||||||
html = Net::HTTP.get(URI(url))
|
|
||||||
|
|
||||||
canonical = html[
|
|
||||||
/<link rel="canonical" href="https:\/\/www\.youtube\.com\/channel\/(UC[a-zA-Z0-9_-]{22})"/,
|
|
||||||
1]
|
|
||||||
return canonical if canonical
|
|
||||||
|
|
||||||
html[/"channelId":"(UC[a-zA-Z0-9_-]{22})"/, 1] || html[/\bUC[a-zA-Z0-9_-]{22}\b/]
|
|
||||||
rescue
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_deerjikist_form_record_invalid deerjikist, index
|
|
||||||
fields = { }
|
|
||||||
|
|
||||||
deerjikist.errors.each do |error|
|
|
||||||
field =
|
|
||||||
case error.attribute
|
|
||||||
when :platform, :code
|
|
||||||
"deerjikists.#{ index }.#{ error.attribute }"
|
|
||||||
else
|
|
||||||
:deerjikists
|
|
||||||
end
|
|
||||||
|
|
||||||
fields[field] ||= []
|
|
||||||
fields[field] << error.full_message
|
|
||||||
end
|
|
||||||
|
|
||||||
render_validation_error fields:
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,28 +1,21 @@
|
|||||||
class TheatreCommentsController < ApplicationController
|
class TheatreCommentsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
|
||||||
limit = 20 if limit <= 0
|
|
||||||
|
|
||||||
no_gt = params[:no_gt].to_i
|
no_gt = params[:no_gt].to_i
|
||||||
no_gt = 0 if no_gt < 0
|
no_gt = 0 if no_gt.negative?
|
||||||
|
|
||||||
comments = TheatreComment
|
comments = TheatreComment
|
||||||
.where(theatre_id: params[:theatre_id])
|
.where(theatre_id: params[:theatre_id])
|
||||||
.where('no > ?', no_gt)
|
.where('no > ?', no_gt)
|
||||||
.order(no: :desc)
|
.order(no: :desc)
|
||||||
.limit(limit)
|
|
||||||
|
|
||||||
render json: comments.map {
|
render json: comments.as_json(include: { user: { only: [:id, :name] } })
|
||||||
_1.as_json(include: { user: { only: [:id, :name] } })
|
|
||||||
.merge(content: _1.discarded? ? nil : _1.content, deleted: _1.discarded?)
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
|
|
||||||
content = params[:content]
|
content = params[:content]
|
||||||
return render_unprocessable_entity('本文は必須です.', field: :content) if content.blank?
|
return head :unprocessable_entity if content.blank?
|
||||||
|
|
||||||
theatre = Theatre.find_by(id: params[:theatre_id])
|
theatre = Theatre.find_by(id: params[:theatre_id])
|
||||||
return head :not_found unless theatre
|
return head :not_found unless theatre
|
||||||
@@ -36,19 +29,4 @@ class TheatreCommentsController < ApplicationController
|
|||||||
|
|
||||||
render json: comment, status: :created
|
render json: comment, status: :created
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
theatre_id = params[:theatre_id].to_i
|
|
||||||
no = params[:id].to_i
|
|
||||||
|
|
||||||
comment = TheatreComment.find_by(theatre_id:, no:)
|
|
||||||
return head :not_found unless comment
|
|
||||||
return head :forbidden unless comment.user == current_user
|
|
||||||
|
|
||||||
comment.discard!
|
|
||||||
|
|
||||||
head :no_content
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
class TheatreProgrammesController < ApplicationController
|
|
||||||
def index
|
|
||||||
limit = params[:limit].to_i
|
|
||||||
limit = 100 if limit <= 0
|
|
||||||
|
|
||||||
position_gt = params[:position_gt].to_i
|
|
||||||
position_gt = 0 if position_gt < 0
|
|
||||||
|
|
||||||
programmes = TheatreProgramme
|
|
||||||
.where(theatre_id: params[:theatre_id])
|
|
||||||
.where('position > ?', position_gt)
|
|
||||||
.includes(:post)
|
|
||||||
.order(position: :desc).limit(100)
|
|
||||||
.limit(limit)
|
|
||||||
|
|
||||||
render json: programmes.map { |programme|
|
|
||||||
programme.as_json.merge(post: { id: programme.post.id,
|
|
||||||
title: programme.post.title,
|
|
||||||
url: programme.post.url })
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
class TheatreSkipEventsController < ApplicationController
|
|
||||||
def index
|
|
||||||
limit = params[:limit].to_i
|
|
||||||
limit = 50 if limit <= 0
|
|
||||||
|
|
||||||
events =
|
|
||||||
TheatreSkipEvent
|
|
||||||
.where(theatre_id: params[:theatre_id])
|
|
||||||
.includes(:post, tags: :tag_name)
|
|
||||||
.order(created_at: :desc)
|
|
||||||
.limit(limit)
|
|
||||||
|
|
||||||
render json: events.map { |event|
|
|
||||||
{ id: event.id,
|
|
||||||
theatre_id: event.theatre_id,
|
|
||||||
post: { id: event.post.id, title: event.post.title, url: event.post.url },
|
|
||||||
tags: event.tags.map { |tag| { id: tag.id, name: tag.name } },
|
|
||||||
programme_position: event.programme_position,
|
|
||||||
created_at: event.created_at }
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -31,7 +31,9 @@ class TheatresController < ApplicationController
|
|||||||
post_started_at = theatre.current_post_started_at
|
post_started_at = theatre.current_post_started_at
|
||||||
end
|
end
|
||||||
|
|
||||||
render json: theatre_info_json(theatre, host_flg:, post_id:, post_started_at:)
|
render json: {
|
||||||
|
host_flg:, post_id:, post_started_at:,
|
||||||
|
watching_users: theatre.watching_users.as_json(only: [:id, :name]) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def next_post
|
def next_post
|
||||||
@@ -41,119 +43,12 @@ class TheatresController < ApplicationController
|
|||||||
return head :not_found unless theatre
|
return head :not_found unless theatre
|
||||||
return head :forbidden if theatre.host_user != current_user
|
return head :forbidden if theatre.host_user != current_user
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
post = Post.where("url LIKE '%nicovideo.jp%'")
|
||||||
theatre.lock!
|
.or(Post.where("url LIKE '%youtube.com%'"))
|
||||||
TheatrePostAdvancer.call(theatre:)
|
.order('RAND()')
|
||||||
end
|
.first
|
||||||
|
theatre.update!(current_post: post, current_post_started_at: Time.current)
|
||||||
|
|
||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
|
|
||||||
def skip_vote
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
theatre = Theatre.find_by(id: params[:id])
|
|
||||||
return head :not_found unless theatre
|
|
||||||
requested_post_id = params[:post_id].to_i
|
|
||||||
return head :unprocessable_entity if requested_post_id <= 0
|
|
||||||
|
|
||||||
skipped = false
|
|
||||||
conflicted = false
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
theatre.lock!
|
|
||||||
if theatre.current_post
|
|
||||||
TheatreWatchingUser.find_or_initialize_by(theatre:, user: current_user).tap {
|
|
||||||
_1.expires_at = 30.seconds.from_now
|
|
||||||
}.save!
|
|
||||||
|
|
||||||
if theatre.current_post_id != requested_post_id
|
|
||||||
conflicted = true
|
|
||||||
next
|
|
||||||
end
|
|
||||||
|
|
||||||
TheatreSkipVote.find_or_create_by!(theatre:, post_id: requested_post_id, user: current_user)
|
|
||||||
|
|
||||||
vote_status = skip_vote_status(theatre)
|
|
||||||
if vote_status[:votes_count] >= vote_status[:required_count]
|
|
||||||
TheatreSkipFinalizer.call(theatre:, user: current_user)
|
|
||||||
TheatrePostAdvancer.call(theatre:)
|
|
||||||
skipped = true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
theatre.reload
|
|
||||||
return render json: theatre_info_json(theatre, skipped: false), status: :conflict if conflicted
|
|
||||||
|
|
||||||
render json: theatre_info_json(theatre, skipped:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def unskip_vote
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
theatre = Theatre.find_by(id: params[:id])
|
|
||||||
return head :not_found unless theatre
|
|
||||||
requested_post_id = params[:post_id].to_i
|
|
||||||
return head :unprocessable_entity if requested_post_id <= 0
|
|
||||||
|
|
||||||
conflicted = false
|
|
||||||
|
|
||||||
theatre.with_lock do
|
|
||||||
if theatre.current_post
|
|
||||||
if theatre.current_post_id != requested_post_id
|
|
||||||
conflicted = true
|
|
||||||
else
|
|
||||||
TheatreSkipVote.where(theatre:, post_id: requested_post_id, user: current_user).delete_all
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
theatre.reload
|
|
||||||
return render json: theatre_info_json(theatre, skipped: false), status: :conflict if conflicted
|
|
||||||
|
|
||||||
render json: theatre_info_json(theatre, skipped: false)
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_selection_weights
|
|
||||||
theatre = Theatre.find_by(id: params[:id])
|
|
||||||
return head :not_found unless theatre
|
|
||||||
|
|
||||||
render json: TheatrePostSelector.new(theatre:).weight_json
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def theatre_info_json(theatre, host_flg: nil, post_id: nil, post_started_at: nil, skipped: nil)
|
|
||||||
host_flg = theatre.host_user_id == current_user&.id if host_flg.nil?
|
|
||||||
post_id = theatre.current_post_id if post_id.nil?
|
|
||||||
post_started_at = theatre.current_post_started_at if post_started_at.nil?
|
|
||||||
|
|
||||||
json = { host_flg:,
|
|
||||||
post_id:,
|
|
||||||
post_started_at:,
|
|
||||||
post_elapsed_ms: post_started_at ? ((Time.current - post_started_at) * 1000).floor : nil,
|
|
||||||
watching_users: theatre.watching_users.as_json(only: [:id, :name]),
|
|
||||||
skip_vote: skip_vote_status(theatre) }
|
|
||||||
json[:skipped] = skipped unless skipped.nil?
|
|
||||||
json
|
|
||||||
end
|
|
||||||
|
|
||||||
def skip_vote_status(theatre)
|
|
||||||
watching_user_ids = theatre.watching_users.ids
|
|
||||||
watching_users_count = watching_user_ids.size
|
|
||||||
required_count = (watching_users_count / 2) + 1
|
|
||||||
post = theatre.current_post
|
|
||||||
votes =
|
|
||||||
if post
|
|
||||||
TheatreSkipVote.where(theatre:, post:, user_id: watching_user_ids)
|
|
||||||
else
|
|
||||||
TheatreSkipVote.none
|
|
||||||
end
|
|
||||||
|
|
||||||
{ votes_count: post ? votes.count : 0,
|
|
||||||
required_count:,
|
|
||||||
watching_users_count:,
|
|
||||||
voted: post && current_user ? votes.exists?(user_id: current_user.id) : false }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,22 +1,18 @@
|
|||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
def create
|
def create
|
||||||
user = nil
|
user = User.create!(inheritance_code: SecureRandom.uuid, role: 'guest')
|
||||||
User.transaction do
|
|
||||||
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
|
||||||
attach_ip_address!(user)
|
|
||||||
end
|
|
||||||
|
|
||||||
render json: { code: user.inheritance_code,
|
render json: { code: user.inheritance_code,
|
||||||
user: user.slice(:id, :name, :inheritance_code, :role) },
|
user: user.slice(:id, :name, :inheritance_code, :role) }
|
||||||
status: :created
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify
|
def verify
|
||||||
|
ip_bin = IPAddr.new(request.remote_ip).hton
|
||||||
|
ip_address = IpAddress.find_or_create_by!(ip_address: ip_bin)
|
||||||
|
|
||||||
user = User.find_by(inheritance_code: params[:code])
|
user = User.find_by(inheritance_code: params[:code])
|
||||||
return render json: { valid: false } unless user
|
return render json: { valid: false } unless user
|
||||||
return head :forbidden if user.banned?
|
|
||||||
|
|
||||||
attach_ip_address!(user)
|
UserIp.find_or_create_by!(user:, ip_address:)
|
||||||
|
|
||||||
render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
|
render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
|
||||||
end
|
end
|
||||||
@@ -42,21 +38,12 @@ class UsersController < ApplicationController
|
|||||||
return head :unauthorized if user&.id != params[:id].to_i
|
return head :unauthorized if user&.id != params[:id].to_i
|
||||||
|
|
||||||
name = params[:name]
|
name = params[:name]
|
||||||
return render_unprocessable_entity('名前は必須です.', field: :name) if name.blank?
|
return head :bad_request if name.blank?
|
||||||
|
|
||||||
if user.update(name:)
|
if user.update(name:)
|
||||||
render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
|
render json: user.slice(:id, :name, :inheritance_code, :role), status: :created
|
||||||
else
|
else
|
||||||
render_validation_error user
|
render json: user.errors, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def attach_ip_address! user
|
|
||||||
ip_bin = IPAddr.new(request.remote_ip).hton
|
|
||||||
ip_address = IpAddress.create_or_find_by!(ip_address: ip_bin)
|
|
||||||
|
|
||||||
UserIp.create_or_find_by!(user:, ip_address:)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class WikiPagesController < ApplicationController
|
|||||||
|
|
||||||
def diff
|
def diff
|
||||||
id = params[:id]
|
id = params[:id]
|
||||||
return render_bad_request('id は必須です.') if id.blank?
|
return head :bad_request if id.blank?
|
||||||
|
|
||||||
from = params[:from].presence
|
from = params[:from].presence
|
||||||
to = params[:to].presence
|
to = params[:to].presence
|
||||||
@@ -56,7 +56,7 @@ class WikiPagesController < ApplicationController
|
|||||||
from_rev = from && page.wiki_revisions.find(from)
|
from_rev = from && page.wiki_revisions.find(from)
|
||||||
to_rev = to ? page.wiki_revisions.find(to) : page.current_revision
|
to_rev = to ? page.wiki_revisions.find(to) : page.current_revision
|
||||||
if ((from_rev && !(from_rev.content?)) || !(to_rev&.content?))
|
if ((from_rev && !(from_rev.content?)) || !(to_rev&.content?))
|
||||||
return render_unprocessable_entity('差分を表示できない版です.')
|
return head :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
diffs = Diff::LCS.sdiff(from_rev&.body&.lines || [], to_rev.body.lines)
|
diffs = Diff::LCS.sdiff(from_rev&.body&.lines || [], to_rev.body.lines)
|
||||||
@@ -85,27 +85,22 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
title = params[:title].to_s.strip
|
name = params[:title]&.strip
|
||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
|
|
||||||
|
return head :unprocessable_entity if name.blank? || body.blank?
|
||||||
|
|
||||||
|
tag_name = TagName.find_undiscard_or_create_by!(name:)
|
||||||
|
page = WikiPage.new(tag_name:, created_user: current_user, updated_user: current_user)
|
||||||
|
if page.save
|
||||||
message = params[:message].presence
|
message = params[:message].presence
|
||||||
|
Wiki::Commit.content!(page:, body:, created_user: current_user, message:)
|
||||||
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
|
|
||||||
return render_unprocessable_entity('本文は必須です.', field: :body) if body.blank?
|
|
||||||
|
|
||||||
tag_name = TagName.find_undiscard_or_create_by!(name: title)
|
|
||||||
|
|
||||||
page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name:,
|
|
||||||
body:,
|
|
||||||
created_by_user: current_user,
|
|
||||||
message:)
|
|
||||||
|
|
||||||
render json: WikiPageRepr.base(page), status: :created
|
render json: WikiPageRepr.base(page), status: :created
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
else
|
||||||
render_validation_error e.record
|
render json: { errors: page.errors.full_messages },
|
||||||
rescue ActiveRecord::RecordNotUnique
|
status: :unprocessable_entity
|
||||||
render_record_not_unique
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@@ -115,25 +110,15 @@ class WikiPagesController < ApplicationController
|
|||||||
title = params[:title]&.strip
|
title = params[:title]&.strip
|
||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
|
|
||||||
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
|
return head :unprocessable_entity if title.blank? || body.blank?
|
||||||
return render_unprocessable_entity('本文は必須です.', field: :body) if body.blank?
|
|
||||||
|
|
||||||
page = WikiPage.find(params[:id])
|
page = WikiPage.find(params[:id])
|
||||||
base_revision_id = params[:base_revision_id].presence
|
base_revision_id = page.current_revision.id
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
if params[:title].present? && params[:title].strip != page.title
|
||||||
page.lock!
|
return head :unprocessable_entity
|
||||||
|
|
||||||
old_title = page.title
|
|
||||||
|
|
||||||
tag = Tag.find_by(tag_name_id: page.tag_name_id)
|
|
||||||
|
|
||||||
if tag && title != old_title
|
|
||||||
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
page.tag_name.update!(name: title) if title != old_title
|
|
||||||
|
|
||||||
message = params[:message].presence
|
message = params[:message].presence
|
||||||
Wiki::Commit.content!(page:,
|
Wiki::Commit.content!(page:,
|
||||||
body:,
|
body:,
|
||||||
@@ -141,12 +126,6 @@ class WikiPagesController < ApplicationController
|
|||||||
message:,
|
message:,
|
||||||
base_revision_id:)
|
base_revision_id:)
|
||||||
|
|
||||||
if tag && title != old_title
|
|
||||||
tag.reload
|
|
||||||
TagVersionRecorder.record!(tag:, event_type: :update, created_by_user: current_user)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
head :ok
|
head :ok
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
class IpAddress < ApplicationRecord
|
class IpAddress < ApplicationRecord
|
||||||
validates :ip_address, presence: true, length: { maximum: 16 }
|
validates :ip_address, presence: true, length: { maximum: 16 }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :user_ips, dependent: :destroy
|
has_many :users
|
||||||
has_many :users, through: :user_ips
|
|
||||||
|
|
||||||
def banned? = banned_at.present?
|
|
||||||
def ban! = banned? || update!(banned_at: Time.current)
|
|
||||||
def unban! = update!(banned_at: nil)
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,11 +1,7 @@
|
|||||||
module MyDiscard
|
module MyDiscard
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
included do
|
included { include Discard::Model }
|
||||||
include Discard::Model
|
|
||||||
|
|
||||||
default_scope -> { kept }
|
|
||||||
end
|
|
||||||
|
|
||||||
class_methods do
|
class_methods do
|
||||||
def find_undiscard_or_create_by! attrs, &block
|
def find_undiscard_or_create_by! attrs, &block
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
class NicoTagVersion < ApplicationRecord
|
|
||||||
include VersionRecord
|
|
||||||
|
|
||||||
belongs_to :tag
|
|
||||||
|
|
||||||
validates :name, presence: true
|
|
||||||
end
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
class Post < ApplicationRecord
|
class Post < ApplicationRecord
|
||||||
require 'mini_magick'
|
require 'mini_magick'
|
||||||
|
|
||||||
|
belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id'
|
||||||
belongs_to :uploaded_user, class_name: 'User', optional: true
|
belongs_to :uploaded_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
||||||
@@ -12,24 +13,8 @@ class Post < ApplicationRecord
|
|||||||
has_many :post_similarities, dependent: :delete_all
|
has_many :post_similarities, dependent: :delete_all
|
||||||
has_many :post_versions
|
has_many :post_versions
|
||||||
|
|
||||||
has_many :parent_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :post
|
|
||||||
has_many :parents, through: :parent_post_implications, source: :parent_post
|
|
||||||
|
|
||||||
has_many :child_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :parent_post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :parent_post
|
|
||||||
has_many :children, through: :child_post_implications, source: :post
|
|
||||||
|
|
||||||
has_one_attached :thumbnail
|
has_one_attached :thumbnail
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
before_validation :normalise_url
|
before_validation :normalise_url
|
||||||
|
|
||||||
validates :url, presence: true, uniqueness: true
|
validates :url, presence: true, uniqueness: true
|
||||||
@@ -37,29 +22,17 @@ class Post < ApplicationRecord
|
|||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
validate :url_must_be_http_url
|
validate :url_must_be_http_url
|
||||||
|
|
||||||
def parent_posts = parents
|
|
||||||
|
|
||||||
def child_posts = children
|
|
||||||
|
|
||||||
def sibling_posts
|
|
||||||
parent_post_ids = parent_posts.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
parent_post_ids.to_h { [_1, PostImplication.where(parent_post: _1).map(&:post)] }
|
|
||||||
end
|
|
||||||
|
|
||||||
def as_json options = { }
|
def as_json options = { }
|
||||||
super(options).merge(thumbnail: thumbnail.attached? ?
|
super(options).merge({ thumbnail: thumbnail.attached? ?
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(
|
Rails.application.routes.url_helpers.rails_blob_url(
|
||||||
thumbnail, only_path: false) :
|
thumbnail, only_path: false) :
|
||||||
nil)
|
nil })
|
||||||
rescue
|
rescue
|
||||||
super(options).merge(thumbnail: nil)
|
super(options).merge(thumbnail: nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
||||||
|
|
||||||
def snapshot_parent_post_ids = parents.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
def related limit: nil
|
def related limit: nil
|
||||||
ids = post_similarities.order(cos: :desc)
|
ids = post_similarities.order(cos: :desc)
|
||||||
ids = ids.limit(limit) if limit
|
ids = ids.limit(limit) if limit
|
||||||
@@ -94,7 +67,7 @@ class Post < ApplicationRecord
|
|||||||
return if !(f) || !(b)
|
return if !(f) || !(b)
|
||||||
|
|
||||||
if f >= b
|
if f >= b
|
||||||
errors.add :original_created_at, 'オリジナルの作成日時の順番がをかしぃです.'
|
errors.add :original_created_before, 'オリジナルの作成日時の順番がをかしぃです.'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
class PostImplication < ApplicationRecord
|
|
||||||
self.primary_key = :post_id, :parent_post_id
|
|
||||||
|
|
||||||
belongs_to :post, inverse_of: :parent_post_implications
|
|
||||||
belongs_to :parent_post, class_name: 'Post', inverse_of: :child_post_implications
|
|
||||||
|
|
||||||
validates :post_id, presence: true, uniqueness: { scope: :parent_post_id }
|
|
||||||
validates :parent_post_id, presence: true
|
|
||||||
|
|
||||||
validate :parent_post_mustnt_be_itself
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def parent_post_mustnt_be_itself
|
|
||||||
if parent_post_id == post_id
|
|
||||||
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,13 +1,29 @@
|
|||||||
class PostVersion < ApplicationRecord
|
class PostVersion < ApplicationRecord
|
||||||
include VersionRecord
|
before_update do
|
||||||
|
raise ActiveRecord::ReadOnlyRecord, '版は更新できません.'
|
||||||
|
end
|
||||||
|
|
||||||
|
before_destroy do
|
||||||
|
raise ActiveRecord::ReadOnlyRecord, '版は削除できません.'
|
||||||
|
end
|
||||||
|
|
||||||
belongs_to :post
|
belongs_to :post
|
||||||
belongs_to :parent, class_name: 'Post', optional: true
|
belongs_to :parent, class_name: 'Post', optional: true
|
||||||
|
belongs_to :created_by_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
|
enum :event_type, { create: 'create',
|
||||||
|
update: 'update',
|
||||||
|
discard: 'discard',
|
||||||
|
restore: 'restore' }, prefix: true, validate: true
|
||||||
|
|
||||||
|
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
||||||
|
validates :event_type, presence: true, inclusion: { in: event_types.keys }
|
||||||
validates :url, presence: true
|
validates :url, presence: true
|
||||||
|
|
||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
|
|
||||||
|
scope :chronological, -> { order(:version_no, :id) }
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def validate_original_created_range
|
def validate_original_created_range
|
||||||
|
|||||||
+25
-35
@@ -8,6 +8,8 @@ class Tag < ApplicationRecord
|
|||||||
;
|
;
|
||||||
end
|
end
|
||||||
|
|
||||||
|
default_scope -> { kept }
|
||||||
|
|
||||||
has_many :post_tags, inverse_of: :tag
|
has_many :post_tags, inverse_of: :tag
|
||||||
has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
|
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 :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
|
||||||
@@ -34,14 +36,9 @@ class Tag < ApplicationRecord
|
|||||||
has_many :deerjikists, dependent: :delete_all
|
has_many :deerjikists, dependent: :delete_all
|
||||||
has_many :materials
|
has_many :materials
|
||||||
|
|
||||||
has_many :tag_versions
|
|
||||||
has_many :nico_tag_versions
|
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
delegate :wiki_page, to: :tag_name
|
delegate :wiki_page, to: :tag_name
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
delegate :name, to: :tag_name, allow_nil: true
|
delegate :name, to: :tag_name, allow_nil: true
|
||||||
validates :tag_name, presence: true
|
validates :tag_name, presence: true
|
||||||
|
|
||||||
@@ -81,18 +78,27 @@ class Tag < ApplicationRecord
|
|||||||
|
|
||||||
def material_id = materials.first&.id
|
def material_id = materials.first&.id
|
||||||
|
|
||||||
def has_deerjikists = deerjikists.loaded? ? deerjikists.any? : deerjikists.exists?
|
def self.tagme
|
||||||
|
@tagme ||= find_or_create_by_tag_name!('タグ希望', category: :meta)
|
||||||
|
end
|
||||||
|
|
||||||
def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
|
def self.bot
|
||||||
def self.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
|
@bot ||= find_or_create_by_tag_name!('bot操作', category: :meta)
|
||||||
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
end
|
||||||
def self.video = find_or_create_by_tag_name!('動画', category: :meta)
|
|
||||||
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
|
||||||
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
|
||||||
|
|
||||||
def self.normalise_tags! tag_names, with_tagme: true,
|
def self.no_deerjikist
|
||||||
with_no_deerjikist: true,
|
@no_deerjikist ||= find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
||||||
deny_nico: true
|
end
|
||||||
|
|
||||||
|
def self.video
|
||||||
|
@video ||= find_or_create_by_tag_name!('動画', category: :meta)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.niconico
|
||||||
|
@niconico ||= find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.normalise_tags tag_names, with_tagme: true, deny_nico: true
|
||||||
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
||||||
raise NicoTagNormalisationError
|
raise NicoTagNormalisationError
|
||||||
end
|
end
|
||||||
@@ -106,7 +112,7 @@ class Tag < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
|
tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
|
||||||
tags << Tag.no_deerjikist if with_no_deerjikist && tags.all? { |t| !(t.deerjikist?) }
|
tags << Tag.no_deerjikist if tags.all? { |t| !(t.deerjikist?) }
|
||||||
tags.uniq(&:id)
|
tags.uniq(&:id)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -144,25 +150,21 @@ class Tag < ApplicationRecord
|
|||||||
retry
|
retry
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.merge_tags! target_tag, source_tags, created_by_user: nil
|
def self.merge_tags! target_tag, source_tags
|
||||||
target_tag => Tag
|
target_tag => Tag
|
||||||
|
|
||||||
affected_post_ids = Set.new
|
affected_post_ids = Set.new
|
||||||
|
|
||||||
Tag.transaction do
|
Tag.transaction do
|
||||||
TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
|
|
||||||
|
|
||||||
Array(source_tags).compact.uniq.each do |source_tag|
|
Array(source_tags).compact.uniq.each do |source_tag|
|
||||||
source_tag => Tag
|
source_tag => Tag
|
||||||
|
|
||||||
next if source_tag == target_tag
|
next if source_tag == target_tag
|
||||||
|
|
||||||
TagVersioning.ensure_snapshot!(source_tag, created_by_user:)
|
|
||||||
|
|
||||||
source_tag.post_tags.kept.find_each do |source_pt|
|
source_tag.post_tags.kept.find_each do |source_pt|
|
||||||
post_id = source_pt.post_id
|
post_id = source_pt.post_id
|
||||||
affected_post_ids << post_id
|
affected_post_ids << post_id
|
||||||
source_pt.discard_by!(created_by_user)
|
source_pt.discard_by!(nil)
|
||||||
unless PostTag.kept.exists?(post_id:, tag: target_tag)
|
unless PostTag.kept.exists?(post_id:, tag: target_tag)
|
||||||
PostTag.create!(post_id:, tag: target_tag)
|
PostTag.create!(post_id:, tag: target_tag)
|
||||||
end
|
end
|
||||||
@@ -174,7 +176,6 @@ class Tag < ApplicationRecord
|
|||||||
raise ActiveRecord::RecordInvalid.new(source_tag_name)
|
raise ActiveRecord::RecordInvalid.new(source_tag_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
TagVersioning.record!(source_tag, event_type: :discard, created_by_user:)
|
|
||||||
source_tag.discard!
|
source_tag.discard!
|
||||||
|
|
||||||
if source_tag.nico?
|
if source_tag.nico?
|
||||||
@@ -183,13 +184,10 @@ class Tag < ApplicationRecord
|
|||||||
source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
|
source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
|
||||||
updated_at: Time.current)
|
updated_at: Time.current)
|
||||||
end
|
end
|
||||||
|
|
||||||
TagVersioning.record!(target_tag, event_type: :update, created_by_user:)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Post.where(id: affected_post_ids.to_a).find_each do |post|
|
Post.where(id: affected_post_ids.to_a).find_each do |post|
|
||||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user:)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user:)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# 投稿件数を再集計
|
# 投稿件数を再集計
|
||||||
@@ -199,14 +197,6 @@ class Tag < ApplicationRecord
|
|||||||
target_tag.reload
|
target_tag.reload
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_aliases = tag_name.aliases.kept.order(:name).pluck(:name)
|
|
||||||
|
|
||||||
def snapshot_parent_tag_ids = parents.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
def snapshot_linked_tag_names
|
|
||||||
linked_tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def nico_tag_name_must_start_with_nico
|
def nico_tag_name_must_start_with_nico
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
class TagName < ApplicationRecord
|
class TagName < ApplicationRecord
|
||||||
include MyDiscard
|
include MyDiscard
|
||||||
|
|
||||||
|
default_scope -> { kept }
|
||||||
|
|
||||||
has_one :tag
|
has_one :tag
|
||||||
has_one :wiki_page
|
has_one :wiki_page
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
class TagVersion < ApplicationRecord
|
|
||||||
include VersionRecord
|
|
||||||
|
|
||||||
belongs_to :tag
|
|
||||||
|
|
||||||
enum :category, { deerjikist: 'deerjikist',
|
|
||||||
meme: 'meme',
|
|
||||||
character: 'character',
|
|
||||||
general: 'general',
|
|
||||||
material: 'material',
|
|
||||||
meta: 'meta' }, validate: true
|
|
||||||
|
|
||||||
validates :name, presence: true
|
|
||||||
validates :category, presence: true
|
|
||||||
end
|
|
||||||
@@ -7,10 +7,6 @@ class Theatre < ApplicationRecord
|
|||||||
class_name: 'TheatreWatchingUser', inverse_of: :theatre
|
class_name: 'TheatreWatchingUser', inverse_of: :theatre
|
||||||
has_many :watching_users, through: :active_theatre_watching_users, source: :user
|
has_many :watching_users, through: :active_theatre_watching_users, source: :user
|
||||||
|
|
||||||
has_many :programmes, class_name: 'TheatreProgramme'
|
|
||||||
has_many :skip_votes, class_name: 'TheatreSkipVote', dependent: :delete_all
|
|
||||||
has_many :skip_events, class_name: 'TheatreSkipEvent', dependent: :delete_all
|
|
||||||
|
|
||||||
belongs_to :host_user, class_name: 'User', optional: true
|
belongs_to :host_user, class_name: 'User', optional: true
|
||||||
belongs_to :current_post, class_name: 'Post', optional: true
|
belongs_to :current_post, class_name: 'Post', optional: true
|
||||||
belongs_to :created_by_user, class_name: 'User'
|
belongs_to :created_by_user, class_name: 'User'
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
class TheatreProgramme < ApplicationRecord
|
|
||||||
self.primary_key = :theatre_id, :position
|
|
||||||
|
|
||||||
belongs_to :theatre
|
|
||||||
belongs_to :post
|
|
||||||
end
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
class TheatreSkipEvent < ApplicationRecord
|
|
||||||
belongs_to :theatre
|
|
||||||
belongs_to :post
|
|
||||||
belongs_to :skipped_by_user, class_name: 'User'
|
|
||||||
|
|
||||||
has_many :voters, class_name: 'TheatreSkipEventVoter', dependent: :delete_all
|
|
||||||
has_many :event_tags, class_name: 'TheatreSkipEventTag', dependent: :delete_all
|
|
||||||
has_many :users, through: :voters
|
|
||||||
has_many :tags, through: :event_tags
|
|
||||||
end
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
class TheatreSkipEventTag < ApplicationRecord
|
|
||||||
self.primary_key = :theatre_skip_event_id, :tag_id
|
|
||||||
|
|
||||||
belongs_to :theatre_skip_event
|
|
||||||
belongs_to :tag
|
|
||||||
end
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
class TheatreSkipEventVoter < ApplicationRecord
|
|
||||||
self.primary_key = :theatre_skip_event_id, :user_id
|
|
||||||
|
|
||||||
belongs_to :theatre_skip_event
|
|
||||||
belongs_to :user
|
|
||||||
end
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
class TheatreSkipVote < ApplicationRecord
|
|
||||||
self.primary_key = :theatre_id, :post_id, :user_id
|
|
||||||
|
|
||||||
belongs_to :theatre
|
|
||||||
belongs_to :post
|
|
||||||
belongs_to :user
|
|
||||||
end
|
|
||||||
@@ -4,6 +4,7 @@ class User < ApplicationRecord
|
|||||||
validates :name, length: { maximum: 255 }
|
validates :name, length: { maximum: 255 }
|
||||||
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
||||||
validates :role, presence: true, inclusion: { in: roles.keys }
|
validates :role, presence: true, inclusion: { in: roles.keys }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :created_posts,
|
has_many :created_posts,
|
||||||
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
||||||
@@ -18,10 +19,5 @@ class User < ApplicationRecord
|
|||||||
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
||||||
|
|
||||||
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
||||||
|
|
||||||
def gte_member? = member? || admin?
|
def gte_member? = member? || admin?
|
||||||
|
|
||||||
def banned? = banned_at.present?
|
|
||||||
def ban! = banned? || update!(banned_at: Time.current)
|
|
||||||
def unban! = update!(banned_at: nil)
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
module VersionRecord
|
|
||||||
extend ActiveSupport::Concern
|
|
||||||
|
|
||||||
def readonly? = persisted?
|
|
||||||
|
|
||||||
included do
|
|
||||||
belongs_to :created_by_user, class_name: 'User', optional: true
|
|
||||||
|
|
||||||
enum :event_type, { create: 'create',
|
|
||||||
update: 'update',
|
|
||||||
discard: 'discard',
|
|
||||||
restore: 'restore' }, prefix: true, validate: true
|
|
||||||
|
|
||||||
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
|
||||||
validates :event_type, presence: true
|
|
||||||
|
|
||||||
scope :chronological, -> { order(:version_no, :id) }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -4,6 +4,8 @@ require 'set'
|
|||||||
class WikiPage < ApplicationRecord
|
class WikiPage < ApplicationRecord
|
||||||
include MyDiscard
|
include MyDiscard
|
||||||
|
|
||||||
|
default_scope -> { kept }
|
||||||
|
|
||||||
has_many :wiki_revisions, dependent: :destroy
|
has_many :wiki_revisions, dependent: :destroy
|
||||||
belongs_to :created_user, class_name: 'User'
|
belongs_to :created_user, class_name: 'User'
|
||||||
belongs_to :updated_user, class_name: 'User'
|
belongs_to :updated_user, class_name: 'User'
|
||||||
@@ -13,13 +15,8 @@ class WikiPage < ApplicationRecord
|
|||||||
foreign_key: :redirect_page_id,
|
foreign_key: :redirect_page_id,
|
||||||
dependent: :nullify
|
dependent: :nullify
|
||||||
|
|
||||||
has_many :wiki_versions
|
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
validates :tag_name, presence: true
|
validates :tag_name, presence: true
|
||||||
validates :body, presence: true
|
|
||||||
|
|
||||||
def title = tag_name.name
|
def title = tag_name.name
|
||||||
|
|
||||||
@@ -29,6 +26,11 @@ class WikiPage < ApplicationRecord
|
|||||||
|
|
||||||
def current_revision = wiki_revisions.order(id: :desc).first
|
def current_revision = wiki_revisions.order(id: :desc).first
|
||||||
|
|
||||||
|
def body
|
||||||
|
rev = current_revision
|
||||||
|
rev.body if rev&.content?
|
||||||
|
end
|
||||||
|
|
||||||
def resolve_redirect limit: 10
|
def resolve_redirect limit: 10
|
||||||
page = self
|
page = self
|
||||||
visited = Set.new
|
visited = Set.new
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
class WikiVersion < ApplicationRecord
|
|
||||||
include VersionRecord
|
|
||||||
|
|
||||||
belongs_to :wiki_page
|
|
||||||
|
|
||||||
validates :title, presence: true
|
|
||||||
validates :body, presence: true
|
|
||||||
end
|
|
||||||
@@ -2,65 +2,19 @@
|
|||||||
|
|
||||||
|
|
||||||
module PostRepr
|
module PostRepr
|
||||||
BASE_FIELDS = [
|
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE } }.freeze
|
||||||
:id,
|
|
||||||
:version_no,
|
|
||||||
:url,
|
|
||||||
:title,
|
|
||||||
:thumbnail_base,
|
|
||||||
:original_created_from,
|
|
||||||
:original_created_before,
|
|
||||||
:created_at,
|
|
||||||
:updated_at
|
|
||||||
].freeze
|
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
def base post, current_user = nil
|
def base post, current_user = nil
|
||||||
json = common(post)
|
json = post.as_json(BASE)
|
||||||
json['tags'] = tag_json(post.tags)
|
return json.merge(viewed: false) unless current_user
|
||||||
json['uploaded_user'] = post.uploaded_user && UserRepr.base(post.uploaded_user)
|
|
||||||
json['viewed'] = current_user ? current_user.viewed?(post) : false
|
|
||||||
json
|
|
||||||
end
|
|
||||||
|
|
||||||
def detail post, current_user = nil, parent_posts: [], child_posts: [],
|
viewed = current_user.viewed?(post)
|
||||||
sibling_posts: { }, related: []
|
json.merge(viewed:)
|
||||||
base(post, current_user).merge(
|
|
||||||
'parent_posts' => cards(parent_posts),
|
|
||||||
'child_posts' => cards(child_posts),
|
|
||||||
'sibling_posts' => sibling_posts.transform_keys(&:to_s).transform_values { |posts|
|
|
||||||
cards(posts)
|
|
||||||
},
|
|
||||||
'related' => cards(related))
|
|
||||||
end
|
|
||||||
|
|
||||||
def card post
|
|
||||||
common(post).merge('parent_posts' => [], 'child_posts' => [])
|
|
||||||
end
|
|
||||||
|
|
||||||
def cards posts
|
|
||||||
posts.map { |post| card(post) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def many posts, current_user = nil
|
def many posts, current_user = nil
|
||||||
posts.map { |p| base(p, current_user) }
|
posts.map { |p| base(p, current_user) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def common post
|
|
||||||
BASE_FIELDS.to_h { |field| [field.to_s, post.public_send(field)] }
|
|
||||||
.merge('thumbnail' => thumbnail_url(post))
|
|
||||||
end
|
|
||||||
|
|
||||||
def tag_json tags
|
|
||||||
tags.map { |tag| TagRepr.inline(tag) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def thumbnail_url post
|
|
||||||
return nil unless post.thumbnail.attached?
|
|
||||||
|
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(post.thumbnail, only_path: false)
|
|
||||||
rescue
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,18 +3,15 @@
|
|||||||
|
|
||||||
module TagRepr
|
module TagRepr
|
||||||
BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
|
BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
|
||||||
methods: [:name, :has_wiki, :material_id, :has_deerjikists] }.freeze
|
methods: [:name, :has_wiki, :material_id] }.freeze
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
def base tag
|
def base tag
|
||||||
tag.as_json(BASE).merge(aliases: tag.snapshot_aliases,
|
tag.as_json(BASE)
|
||||||
parents: tag.parents.map { _1.as_json(BASE) })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def inline tag
|
def many tags
|
||||||
tag.as_json(BASE).merge(aliases: [], parents: [])
|
tags.map { |t| base(t) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def many(tags) = tags.map { |t| base(t) }
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
class NicoTagVersionRecorder < VersionRecorder
|
|
||||||
def self.record! tag:, event_type:, created_by_user:
|
|
||||||
new(tag:, event_type:, created_by_user:).record!
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize tag:, event_type:, created_by_user:
|
|
||||||
super(record: tag, event_type:, created_by_user:)
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def version_class = NicoTagVersion
|
|
||||||
def version_association = :nico_tag_versions
|
|
||||||
def record_key = :tag
|
|
||||||
|
|
||||||
def snapshot_attributes
|
|
||||||
{ name: @record.name, linked_tags: @record.snapshot_linked_tag_names.join(' ') }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,31 +1,57 @@
|
|||||||
class PostVersionRecorder < VersionRecorder
|
class PostVersionRecorder
|
||||||
def self.record! post:, event_type:, created_by_user:
|
def self.record! post:, event_type:, created_by_user:
|
||||||
new(post:, event_type:, created_by_user:).record!
|
new(post:, event_type:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize post:, event_type:, created_by_user:
|
def initialize post:, event_type:, created_by_user:
|
||||||
super(record: post, event_type:, created_by_user:)
|
@post = post
|
||||||
|
@event_type = event_type
|
||||||
|
@created_by_user = created_by_user
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.ensure_snapshot! post, created_by_user:
|
def record!
|
||||||
return if post.post_versions.exists?
|
@post.with_lock do
|
||||||
|
latest = @post.post_versions.order(version_no: :desc).first
|
||||||
|
attrs = snapshot_attributes
|
||||||
|
|
||||||
record!(post:, event_type: :create, created_by_user:)
|
return latest if @event_type == :update && latest && same_snapshot?(latest, attrs)
|
||||||
|
|
||||||
|
PostVersion.create!(
|
||||||
|
post: @post,
|
||||||
|
version_no: (latest&.version_no || 0) + 1,
|
||||||
|
event_type: @event_type,
|
||||||
|
title: attrs[:title],
|
||||||
|
url: attrs[:url],
|
||||||
|
thumbnail_base: attrs[:thumbnail_base],
|
||||||
|
tags: attrs[:tags],
|
||||||
|
parent: attrs[:parent],
|
||||||
|
original_created_from: attrs[:original_created_from],
|
||||||
|
original_created_before: attrs[:original_created_before],
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: @created_by_user)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def version_class = PostVersion
|
|
||||||
def version_association = :post_versions
|
|
||||||
def record_key = :post
|
|
||||||
|
|
||||||
def snapshot_attributes
|
def snapshot_attributes
|
||||||
{ title: @record.title,
|
{ title: @post.title,
|
||||||
url: @record.url,
|
url: @post.url,
|
||||||
thumbnail_base: @record.thumbnail_base,
|
thumbnail_base: @post.thumbnail_base,
|
||||||
tags: @record.snapshot_tag_names.join(' '),
|
tags: @post.snapshot_tag_names.join(' '),
|
||||||
parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
|
parent: @post.parent,
|
||||||
original_created_from: @record.original_created_from,
|
original_created_from: @post.original_created_from,
|
||||||
original_created_before: @record.original_created_before }
|
original_created_before: @post.original_created_before }
|
||||||
|
end
|
||||||
|
|
||||||
|
def same_snapshot? version, attrs
|
||||||
|
true &&
|
||||||
|
version.title == attrs[:title] &&
|
||||||
|
version.url == attrs[:url] &&
|
||||||
|
version.thumbnail_base == attrs[:thumbnail_base] &&
|
||||||
|
version.tags == attrs[:tags] &&
|
||||||
|
version.parent_id == attrs[:parent]&.id &&
|
||||||
|
version.original_created_from == attrs[:original_created_from] &&
|
||||||
|
version.original_created_before == attrs[:original_created_before]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
class TagVersionRecorder < VersionRecorder
|
|
||||||
def self.record! tag:, event_type:, created_by_user:
|
|
||||||
new(tag:, event_type:, created_by_user:).record!
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize tag:, event_type:, created_by_user:
|
|
||||||
super(record: tag, event_type:, created_by_user:)
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def version_class = TagVersion
|
|
||||||
def version_association = :tag_versions
|
|
||||||
def record_key = :tag
|
|
||||||
|
|
||||||
def snapshot_attributes
|
|
||||||
{ name: @record.name,
|
|
||||||
category: @record.category,
|
|
||||||
aliases: @record.snapshot_aliases.join(' '),
|
|
||||||
parent_tag_ids: @record.snapshot_parent_tag_ids.join(' ') }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
class TagVersioning
|
|
||||||
def self.record! tag, event_type:, created_by_user:
|
|
||||||
if tag.nico?
|
|
||||||
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
|
||||||
else
|
|
||||||
TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.ensure_snapshot! tag, created_by_user:
|
|
||||||
if tag.nico?
|
|
||||||
return if tag.nico_tag_versions.exists?
|
|
||||||
|
|
||||||
NicoTagVersionRecorder.record!(tag:, event_type: :create, created_by_user:)
|
|
||||||
else
|
|
||||||
return if tag.tag_versions.exists?
|
|
||||||
|
|
||||||
TagVersionRecorder.record!(tag:, event_type: :create, created_by_user:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.record_tag_snapshot! tag, created_by_user:
|
|
||||||
event_type =
|
|
||||||
if tag.nico?
|
|
||||||
tag.nico_tag_versions.exists? ? :update : :create
|
|
||||||
else
|
|
||||||
tag.tag_versions.exists? ? :update : :create
|
|
||||||
end
|
|
||||||
|
|
||||||
record!(tag, event_type:, created_by_user:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.record_tag_snapshots! tags, created_by_user:
|
|
||||||
tags.each do |tag|
|
|
||||||
record_tag_snapshot!(tag, created_by_user:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
class TheatrePostAdvancer
|
|
||||||
def self.call(theatre:)
|
|
||||||
new(theatre:).call
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize(theatre:)
|
|
||||||
@theatre = theatre
|
|
||||||
end
|
|
||||||
|
|
||||||
def call
|
|
||||||
previous_post = theatre.current_post
|
|
||||||
post = TheatrePostSelector.new(theatre:).select
|
|
||||||
|
|
||||||
TheatreSkipVote.where(theatre:, post: previous_post).delete_all if previous_post
|
|
||||||
|
|
||||||
theatre.update!(current_post: post, current_post_started_at: post ? Time.current : nil)
|
|
||||||
|
|
||||||
if post
|
|
||||||
position = (theatre.programmes.maximum(:position) || 0) + 1
|
|
||||||
theatre.programmes.create!(position:, post:)
|
|
||||||
end
|
|
||||||
|
|
||||||
post
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
attr_reader :theatre
|
|
||||||
end
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
class TheatrePostSelector
|
|
||||||
Candidate = Struct.new(:post, :weight, :penalty, :tags, keyword_init: true)
|
|
||||||
ELIGIBLE_POST_URL_CONDITION =
|
|
||||||
["url LIKE '%nicovideo.jp%'",
|
|
||||||
"url LIKE '%youtube.com/watch%'",
|
|
||||||
"url LIKE '%youtu.be/%'"]
|
|
||||||
.join(' OR ')
|
|
||||||
|
|
||||||
def initialize theatre:
|
|
||||||
@theatre = theatre
|
|
||||||
end
|
|
||||||
|
|
||||||
def select
|
|
||||||
candidates = weighted_candidates
|
|
||||||
return nil if candidates.empty?
|
|
||||||
|
|
||||||
total = candidates.sum(&:weight)
|
|
||||||
target = rand * total
|
|
||||||
|
|
||||||
candidates.each do |candidate|
|
|
||||||
target -= candidate.weight
|
|
||||||
return candidate.post if target <= 0
|
|
||||||
end
|
|
||||||
|
|
||||||
candidates.last.post
|
|
||||||
end
|
|
||||||
|
|
||||||
def weight_json limit: 20
|
|
||||||
candidates = weighted_candidates
|
|
||||||
sorted = candidates.sort_by { |candidate| [candidate.weight, candidate.post.id] }
|
|
||||||
|
|
||||||
{ tag_penalties: tag_penalty_json,
|
|
||||||
lightest_posts: post_weight_json(sorted.first(limit)),
|
|
||||||
heaviest_posts: post_weight_json(sorted.reverse.first(limit)) }
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
attr_reader :theatre
|
|
||||||
|
|
||||||
def weighted_candidates
|
|
||||||
@weighted_candidates ||= begin
|
|
||||||
penalties = tag_penalties
|
|
||||||
posts = eligible_posts.includes(tags: :tag_name).to_a
|
|
||||||
|
|
||||||
posts.map do |post|
|
|
||||||
post_tags = post.tags.to_a
|
|
||||||
penalty = post_tags.sum { |tag| penalties[tag.id].to_i }
|
|
||||||
|
|
||||||
Candidate.new(
|
|
||||||
post:,
|
|
||||||
penalty:,
|
|
||||||
tags: post_tags,
|
|
||||||
weight: 1.0 / (1.0 + penalty))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def eligible_posts
|
|
||||||
posts = Post.where(ELIGIBLE_POST_URL_CONDITION)
|
|
||||||
posts = posts.where.not(id: theatre.current_post_id) if theatre.current_post_id
|
|
||||||
posts
|
|
||||||
end
|
|
||||||
|
|
||||||
def active_user_ids
|
|
||||||
@active_user_ids ||= theatre.watching_users.ids
|
|
||||||
end
|
|
||||||
|
|
||||||
def tag_penalties
|
|
||||||
@tag_penalties ||=
|
|
||||||
if active_user_ids.empty?
|
|
||||||
{}
|
|
||||||
else
|
|
||||||
TheatreSkipEventVoter
|
|
||||||
.joins(theatre_skip_event: :event_tags)
|
|
||||||
.where(user_id: active_user_ids)
|
|
||||||
.group('theatre_skip_event_tags.tag_id')
|
|
||||||
.count
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def tag_penalty_json
|
|
||||||
return [] if tag_penalties.empty?
|
|
||||||
|
|
||||||
tags = Tag.where(id: tag_penalties.keys).includes(:tag_name).index_by(&:id)
|
|
||||||
|
|
||||||
tag_penalties
|
|
||||||
.map { |tag_id, penalty|
|
|
||||||
tag = tags[tag_id]
|
|
||||||
next unless tag
|
|
||||||
|
|
||||||
{ tag: light_tag_json(tag),
|
|
||||||
penalty: }
|
|
||||||
}
|
|
||||||
.compact
|
|
||||||
.sort_by { |row| [-row[:penalty], row[:tag][:name].to_s] }
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_weight_json candidates
|
|
||||||
candidates.map { |candidate|
|
|
||||||
{ post: light_post_json(candidate.post),
|
|
||||||
weight: candidate.weight,
|
|
||||||
penalty: candidate.penalty,
|
|
||||||
tags: candidate.tags.map { |tag| light_tag_json(tag) } }
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def light_post_json post
|
|
||||||
{ id: post.id,
|
|
||||||
title: post.title,
|
|
||||||
url: post.url }
|
|
||||||
end
|
|
||||||
|
|
||||||
def light_tag_json tag
|
|
||||||
{ id: tag.id,
|
|
||||||
name: tag.name,
|
|
||||||
category: tag.category }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
class TheatreSkipFinalizer
|
|
||||||
def self.call(theatre:, user:)
|
|
||||||
new(theatre:, user:).call
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize(theatre:, user:)
|
|
||||||
@theatre = theatre
|
|
||||||
@user = user
|
|
||||||
end
|
|
||||||
|
|
||||||
def call
|
|
||||||
return unless theatre.current_post
|
|
||||||
|
|
||||||
post = theatre.current_post
|
|
||||||
voters = TheatreSkipVote.where(theatre:, post:).includes(:user).map(&:user)
|
|
||||||
return if voters.empty?
|
|
||||||
|
|
||||||
event = TheatreSkipEvent.create!(
|
|
||||||
theatre:,
|
|
||||||
post:,
|
|
||||||
skipped_by_user: user,
|
|
||||||
programme_position: theatre.programmes.maximum(:position))
|
|
||||||
|
|
||||||
voters.uniq(&:id).each do |voter|
|
|
||||||
TheatreSkipEventVoter.create!(theatre_skip_event: event, user: voter)
|
|
||||||
end
|
|
||||||
|
|
||||||
post.tags.find_each do |tag|
|
|
||||||
TheatreSkipEventTag.create!(theatre_skip_event: event, tag:)
|
|
||||||
end
|
|
||||||
|
|
||||||
TheatreSkipVote.where(theatre:, post:).delete_all
|
|
||||||
|
|
||||||
event
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
attr_reader :theatre, :user
|
|
||||||
end
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
class VersionRecorder
|
|
||||||
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
|
||||||
|
|
||||||
def initialize record:, event_type:, created_by_user:
|
|
||||||
@record = record
|
|
||||||
@event_type = event_type.to_s
|
|
||||||
@created_by_user = created_by_user
|
|
||||||
|
|
||||||
validate_event_type!
|
|
||||||
end
|
|
||||||
|
|
||||||
def record!
|
|
||||||
raise "#{ record_class.name } must be persisted" unless @record.persisted?
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
@record = record_class.unscoped.lock.find(@record.id)
|
|
||||||
latest = latest_version
|
|
||||||
|
|
||||||
validate_version_sequence!(latest)
|
|
||||||
|
|
||||||
attrs = snapshot_attributes
|
|
||||||
|
|
||||||
if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
|
|
||||||
return latest
|
|
||||||
end
|
|
||||||
|
|
||||||
version = version_class.create!(
|
|
||||||
base_attributes(latest).merge(record_key => @record).merge(attrs))
|
|
||||||
|
|
||||||
update_record_version_no!(version.version_no)
|
|
||||||
|
|
||||||
version
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def latest_version = versions.order(version_no: :desc).first
|
|
||||||
|
|
||||||
def versions = @record.public_send(version_association)
|
|
||||||
|
|
||||||
def base_attributes latest
|
|
||||||
{ version_no: (latest&.version_no || 0) + 1,
|
|
||||||
event_type: @event_type,
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: @created_by_user }
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_record_version_no! version_no
|
|
||||||
@record.update_columns(version_no:)
|
|
||||||
@record.version_no = version_no
|
|
||||||
end
|
|
||||||
|
|
||||||
def validate_version_sequence! latest
|
|
||||||
if !(latest) && @event_type != 'create'
|
|
||||||
raise "#{ version_class.name } first event must be create"
|
|
||||||
end
|
|
||||||
|
|
||||||
if @event_type == 'create' && latest
|
|
||||||
raise "#{ version_class.name } create event already exists"
|
|
||||||
end
|
|
||||||
|
|
||||||
return unless latest
|
|
||||||
|
|
||||||
if @record.version_no != latest.version_no
|
|
||||||
raise ("#{ record_class.name }##{ @record.id } version_no is #{ @record.version_no }, " +
|
|
||||||
"but latest #{ version_class.name } version_no is #{ latest.version_no }")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def same_snapshot? version, attrs
|
|
||||||
attrs.all? { |k, v| version.public_send(k) == v }
|
|
||||||
end
|
|
||||||
|
|
||||||
def validate_event_type!
|
|
||||||
return if EVENT_TYPES.include?(@event_type)
|
|
||||||
|
|
||||||
raise ArgumentError, "Invalid event_type: #{ @event_type }"
|
|
||||||
end
|
|
||||||
|
|
||||||
def version_class = raise NotImplementedError
|
|
||||||
def version_association = raise NotImplementedError
|
|
||||||
def record_key = raise NotImplementedError
|
|
||||||
def snapshot_attributes = raise NotImplementedError
|
|
||||||
|
|
||||||
def record_class = @record.class
|
|
||||||
end
|
|
||||||
@@ -7,31 +7,6 @@ module Wiki
|
|||||||
;
|
;
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.create_content! tag_name:, body:, created_by_user:, message: nil
|
|
||||||
normalised = normalise_body(body)
|
|
||||||
|
|
||||||
page = WikiPage.new(tag_name:,
|
|
||||||
body: normalised,
|
|
||||||
created_user: created_by_user,
|
|
||||||
updated_user: created_by_user)
|
|
||||||
|
|
||||||
if normalised.blank?
|
|
||||||
page.errors.add(:body, :blank)
|
|
||||||
raise ActiveRecord::RecordInvalid, page
|
|
||||||
end
|
|
||||||
|
|
||||||
ActiveRecord::Base.transaction do
|
|
||||||
page.save!
|
|
||||||
|
|
||||||
new(page:, created_user: created_by_user).content!(
|
|
||||||
body: normalised,
|
|
||||||
message:,
|
|
||||||
base_revision_id: nil)
|
|
||||||
|
|
||||||
page
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.content! page:, body:, created_user:, message: nil, base_revision_id: nil
|
def self.content! page:, body:, created_user:, message: nil, base_revision_id: nil
|
||||||
new(page:, created_user:).content!(body:, message:, base_revision_id:)
|
new(page:, created_user:).content!(body:, message:, base_revision_id:)
|
||||||
end
|
end
|
||||||
@@ -46,12 +21,7 @@ module Wiki
|
|||||||
end
|
end
|
||||||
|
|
||||||
def content! body:, message:, base_revision_id:
|
def content! body:, message:, base_revision_id:
|
||||||
normalised = self.class.normalise_body(body)
|
normalised = normalise_body(body)
|
||||||
if normalised.blank?
|
|
||||||
@page.errors.add(:body, :blank)
|
|
||||||
raise ActiveRecord::RecordInvalid, @page
|
|
||||||
end
|
|
||||||
|
|
||||||
lines = split_lines(normalised)
|
lines = split_lines(normalised)
|
||||||
|
|
||||||
line_shas = lines.map { |line| Digest::SHA256.hexdigest(line) }
|
line_shas = lines.map { |line| Digest::SHA256.hexdigest(line) }
|
||||||
@@ -67,19 +37,10 @@ module Wiki
|
|||||||
current_id = @page.wiki_revisions.maximum(:id)
|
current_id = @page.wiki_revisions.maximum(:id)
|
||||||
if current_id && current_id != base_revision_id.to_i
|
if current_id && current_id != base_revision_id.to_i
|
||||||
raise Conflict,
|
raise Conflict,
|
||||||
"競合が発生してゐます" +
|
"競合が発生してゐます(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
||||||
"(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@page.update!(body: normalised)
|
|
||||||
|
|
||||||
WikiVersionRecorder.record!(
|
|
||||||
page: @page,
|
|
||||||
event_type: @page.wiki_versions.exists? ? :update : :create,
|
|
||||||
reason: message,
|
|
||||||
created_by_user: @created_user)
|
|
||||||
|
|
||||||
rev = WikiRevision.create!(
|
rev = WikiRevision.create!(
|
||||||
wiki_page: @page,
|
wiki_page: @page,
|
||||||
base_revision_id:,
|
base_revision_id:,
|
||||||
@@ -93,45 +54,65 @@ module Wiki
|
|||||||
rows = line_ids.each_with_index.map do |line_id, pos|
|
rows = line_ids.each_with_index.map do |line_id, pos|
|
||||||
{ wiki_revision_id: rev.id, wiki_line_id: line_id, position: pos }
|
{ wiki_revision_id: rev.id, wiki_line_id: line_id, position: pos }
|
||||||
end
|
end
|
||||||
WikiRevisionLine.insert_all!(rows) if rows.any?
|
WikiRevisionLine.insert_all!(rows)
|
||||||
|
|
||||||
rev
|
rev
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def redirect!(redirect_page:, message:, base_revision_id:) = raise '廃止しました.'
|
def redirect! redirect_page:, message:, base_revision_id:
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
@page.lock!
|
||||||
|
|
||||||
def self.normalise_body body
|
if base_revision_id.present?
|
||||||
s = body.to_s
|
current_id = @page.wiki_revisions.maximum(:id)
|
||||||
s.gsub!(/\r\n?/, "\n")
|
if current_id && current_id != base_revision_id.to_i
|
||||||
s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '🖕')
|
raise Conflict,
|
||||||
s.gsub(/\n+$/, '')
|
"競合が発生してゐます(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
WikiRevision.create!(
|
||||||
|
wiki_page: @page,
|
||||||
|
base_revision_id:,
|
||||||
|
created_user: @created_user,
|
||||||
|
kind: :redirect,
|
||||||
|
redirect_page:,
|
||||||
|
message:,
|
||||||
|
lines_count: 0,
|
||||||
|
tree_sha256: nil)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def split_lines(body) = body.split("\n")
|
def normalise_body body
|
||||||
|
s = body.to_s
|
||||||
|
s.gsub!("\r\n", "\n")
|
||||||
|
s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '🖕')
|
||||||
|
end
|
||||||
|
|
||||||
|
def split_lines body
|
||||||
|
body.split("\n")
|
||||||
|
end
|
||||||
|
|
||||||
def upsert_lines! lines, line_shas
|
def upsert_lines! lines, line_shas
|
||||||
now = Time.current
|
now = Time.current
|
||||||
|
|
||||||
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
||||||
|
|
||||||
missing_by_sha = { }
|
missing_rows = []
|
||||||
|
|
||||||
line_shas.each_with_index do |sha, i|
|
line_shas.each_with_index do |sha, i|
|
||||||
next if id_by_sha.key?(sha)
|
next if id_by_sha.key?(sha)
|
||||||
next if missing_by_sha.key?(sha)
|
|
||||||
|
|
||||||
missing_by_sha[sha] = {
|
missing_rows << { sha256: sha,
|
||||||
sha256: sha,
|
|
||||||
body: lines[i],
|
body: lines[i],
|
||||||
created_at: now,
|
created_at: now,
|
||||||
updated_at: now }
|
updated_at: now }
|
||||||
end
|
end
|
||||||
|
|
||||||
if missing_by_sha.any?
|
if missing_rows.any?
|
||||||
WikiLine.upsert_all(missing_by_sha.values)
|
WikiLine.upsert_all(missing_rows)
|
||||||
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
class WikiVersionRecorder < VersionRecorder
|
|
||||||
def self.record! page:, event_type:, reason: nil, created_by_user:
|
|
||||||
new(page:, event_type:, reason:, created_by_user:).record!
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize page:, event_type:, reason: nil, created_by_user:
|
|
||||||
@reason = reason
|
|
||||||
super(record: page, event_type:, created_by_user:)
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def version_class = WikiVersion
|
|
||||||
def version_association = :wiki_versions
|
|
||||||
def record_key = :wiki_page
|
|
||||||
|
|
||||||
def snapshot_attributes = {
|
|
||||||
title: @record.title,
|
|
||||||
body: @record.body,
|
|
||||||
reason: @reason }
|
|
||||||
end
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
require 'json'
|
|
||||||
require 'net/http'
|
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
|
|
||||||
module Youtube
|
|
||||||
class ApiClient
|
|
||||||
ENDPOINT = 'https://www.googleapis.com/youtube/v3'
|
|
||||||
|
|
||||||
def initialize api_key: ENV.fetch('YOUTUBE_API_KEY')
|
|
||||||
@api_key = api_key
|
|
||||||
end
|
|
||||||
|
|
||||||
def search_videos q:, published_after: nil, published_before: nil, page_token: nil
|
|
||||||
get_json('/search', {
|
|
||||||
part: 'snippet',
|
|
||||||
type: 'video',
|
|
||||||
q:,
|
|
||||||
order: 'date',
|
|
||||||
maxResults: 50,
|
|
||||||
regionCode: 'JP',
|
|
||||||
relevanceLanguage: 'ja',
|
|
||||||
publishedAfter: published_after&.iso8601,
|
|
||||||
publishedBefore: published_before&.iso8601,
|
|
||||||
pageToken: page_token }.compact)
|
|
||||||
end
|
|
||||||
|
|
||||||
def videos ids
|
|
||||||
return { 'items' => [] } if ids.empty?
|
|
||||||
|
|
||||||
get_json('/videos', part: 'snippet,status,contentDetails', id: ids.join(','))
|
|
||||||
end
|
|
||||||
|
|
||||||
def playlist_items playlist_id:, page_token: nil
|
|
||||||
get_json('/playlistItems', {
|
|
||||||
part: 'snippet,contentDetails,status',
|
|
||||||
playlistId: playlist_id,
|
|
||||||
maxResults: 50,
|
|
||||||
pageToken: page_token }.compact)
|
|
||||||
end
|
|
||||||
|
|
||||||
def channel id: nil, handle: nil
|
|
||||||
raise ArgumentError, 'id or handle is required' if id.present? == handle.present?
|
|
||||||
|
|
||||||
params = { part: 'snippet,contentDetails' }
|
|
||||||
params[:id] = id if id.present?
|
|
||||||
params[:forHandle] = handle if handle.present?
|
|
||||||
|
|
||||||
get_json('/channels', params)
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def get_json path, params
|
|
||||||
uri = URI(ENDPOINT + path)
|
|
||||||
uri.query = URI.encode_www_form(params.merge(key: @api_key))
|
|
||||||
|
|
||||||
response = Net::HTTP.start(uri.host,
|
|
||||||
uri.port,
|
|
||||||
use_ssl: true,
|
|
||||||
open_timeout: 10,
|
|
||||||
read_timeout: 30) do |http|
|
|
||||||
http.get(uri)
|
|
||||||
end
|
|
||||||
|
|
||||||
unless response.is_a?(Net::HTTPSuccess)
|
|
||||||
raise "YouTube API error: #{ response.code } #{ response.body }"
|
|
||||||
end
|
|
||||||
|
|
||||||
JSON.parse(response.body)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
require 'open-uri'
|
|
||||||
require 'set'
|
|
||||||
require 'time'
|
|
||||||
|
|
||||||
|
|
||||||
module Youtube
|
|
||||||
class Sync
|
|
||||||
def initialize client: ApiClient.new
|
|
||||||
@client = client
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync!
|
|
||||||
video_ids = discover_video_ids
|
|
||||||
return if video_ids.empty?
|
|
||||||
|
|
||||||
video_ids.each_slice(50) do |ids|
|
|
||||||
@client.videos(ids).fetch('items', []).each do |item|
|
|
||||||
sync_video!(VideoItem.new(item))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def discover_video_ids
|
|
||||||
ids = Set.new
|
|
||||||
|
|
||||||
query_terms.each do |q|
|
|
||||||
response = @client.search_videos(q:, published_after: sync_since)
|
|
||||||
|
|
||||||
response.fetch('items', []).each do |item|
|
|
||||||
video_id = item.dig('id', 'videoId')
|
|
||||||
ids << video_id if video_id.present?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
playlist_ids.each do |playlist_id|
|
|
||||||
each_playlist_item(playlist_id) do |item|
|
|
||||||
video_id = item.dig('contentDetails', 'videoId')
|
|
||||||
video_id ||= item.dig('snippet', 'resourceId', 'videoId')
|
|
||||||
|
|
||||||
ids << video_id if video_id.present?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
ids.to_a
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_video! video
|
|
||||||
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
|
|
||||||
|
|
||||||
original_created_from = video.published_at.change(sec: 0)
|
|
||||||
original_created_before = original_created_from + 1.minute
|
|
||||||
|
|
||||||
post_created = false
|
|
||||||
post_changed = false
|
|
||||||
|
|
||||||
if post
|
|
||||||
post.assign_attributes(title: video.title,
|
|
||||||
original_created_from:,
|
|
||||||
original_created_before:,
|
|
||||||
thumbnail_base: video.thumbnail_url)
|
|
||||||
|
|
||||||
post_changed = post.changed?
|
|
||||||
post.save! if post_changed
|
|
||||||
|
|
||||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
|
||||||
else
|
|
||||||
post_created = true
|
|
||||||
post = Post.create!(
|
|
||||||
title: video.title,
|
|
||||||
url: video.url,
|
|
||||||
thumbnail_base: video.thumbnail_url,
|
|
||||||
uploaded_user_id: nil,
|
|
||||||
original_created_from:,
|
|
||||||
original_created_before:)
|
|
||||||
|
|
||||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
|
||||||
|
|
||||||
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id])
|
|
||||||
end
|
|
||||||
|
|
||||||
kept_tag_ids = post.tags.pluck(:id).to_set
|
|
||||||
desired_tag_ids = kept_tag_ids.to_a
|
|
||||||
|
|
||||||
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
|
|
||||||
if deerjikist
|
|
||||||
desired_tag_ids.delete(Tag.no_deerjikist.id)
|
|
||||||
desired_tag_ids << deerjikist.tag_id
|
|
||||||
elsif post.tags.where(category: :deerjikist).none?
|
|
||||||
desired_tag_ids << Tag.no_deerjikist.id
|
|
||||||
end
|
|
||||||
|
|
||||||
desired_tag_ids.uniq!
|
|
||||||
|
|
||||||
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
|
|
||||||
|
|
||||||
if post_created
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
|
||||||
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
|
|
||||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
|
|
||||||
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
|
|
||||||
to_remove = current_tag_ids - desired_tag_ids
|
|
||||||
|
|
||||||
Tag.where(id: to_add.to_a).find_each do |tag|
|
|
||||||
begin
|
|
||||||
PostTag.create!(post:, tag:)
|
|
||||||
rescue ActiveRecord::RecordNotUnique
|
|
||||||
;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
|
||||||
pt.discard_by!(nil)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def attach_thumbnail_if_needed! post, thumbnail_url
|
|
||||||
return if post.thumbnail.attached?
|
|
||||||
return if thumbnail_url.blank?
|
|
||||||
|
|
||||||
post.thumbnail.attach(
|
|
||||||
io: URI.open(thumbnail_url),
|
|
||||||
filename: File.basename(URI.parse(thumbnail_url).path),
|
|
||||||
content_type: 'image/jpeg')
|
|
||||||
|
|
||||||
post.resized_thumbnail!
|
|
||||||
end
|
|
||||||
|
|
||||||
def youtube_url_regexp id
|
|
||||||
escaped = Regexp.escape(id)
|
|
||||||
"(youtube\\.com/watch\\?v=#{ escaped }|youtu\\.be/#{ escaped })([^A-Za-z0-9_-]|$)"
|
|
||||||
end
|
|
||||||
|
|
||||||
def query_terms = ['ぼざろクリーチャーシリーズ', '伊地知ニジカ', '伊地知虹鹿']
|
|
||||||
|
|
||||||
def playlist_ids
|
|
||||||
['PLrOch4zHkI5vu29b-f9umUQQ4tQkuWLPX',
|
|
||||||
'PLrOch4zHkI5vOK0RaytQq6PbucxQkkL0K',
|
|
||||||
'PLrOch4zHkI5tdwm9vSegiDQJOM-hgpcOC']
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_since = 14.days.ago
|
|
||||||
|
|
||||||
def each_playlist_item playlist_id
|
|
||||||
page_token = nil
|
|
||||||
|
|
||||||
loop do
|
|
||||||
response = @client.playlist_items(playlist_id:, page_token:)
|
|
||||||
|
|
||||||
response.fetch('items', []).each do |item|
|
|
||||||
yield item
|
|
||||||
end
|
|
||||||
|
|
||||||
page_token = response['nextPageToken']
|
|
||||||
break if page_token.blank?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
require 'time'
|
|
||||||
|
|
||||||
|
|
||||||
module Youtube
|
|
||||||
class VideoItem
|
|
||||||
attr_reader :id, :title, :channel_id, :published_at, :thumbnail_url, :raw_tags
|
|
||||||
|
|
||||||
def initialize item
|
|
||||||
snippet = item.fetch('snippet')
|
|
||||||
|
|
||||||
@id = item.fetch('id')
|
|
||||||
@title = snippet['title']
|
|
||||||
@channel_id = snippet['channelId']
|
|
||||||
@published_at = Time.iso8601(snippet['publishedAt'])
|
|
||||||
@thumbnail_url = pick_thumbnail(snippet['thumbnails'] || { })
|
|
||||||
@raw_tags = snippet['tags'] || []
|
|
||||||
end
|
|
||||||
|
|
||||||
def url = "https://www.youtube.com/watch?v=#{ @id }"
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def pick_thumbnail thumbnails
|
|
||||||
['maxres', 'standard', 'high', 'medium', 'default'].each do |key|
|
|
||||||
url = thumbnails.dig(key, 'url')
|
|
||||||
return url if url.present?
|
|
||||||
end
|
|
||||||
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
+2
-13
@@ -6,11 +6,10 @@ Rails.application.routes.draw do
|
|||||||
delete ':child_id', action: :destroy
|
delete ':child_id', action: :destroy
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :tags, only: [:index, :show] do
|
resources :tags, only: [:index, :show, :update] do
|
||||||
collection do
|
collection do
|
||||||
get :autocomplete
|
get :autocomplete
|
||||||
get :'with-depth', action: :with_depth
|
get :'with-depth', action: :with_depth
|
||||||
get :versions, to: 'tag_versions#index'
|
|
||||||
|
|
||||||
scope :name do
|
scope :name do
|
||||||
get ':name/deerjikists', action: :deerjikists_by_name
|
get ':name/deerjikists', action: :deerjikists_by_name
|
||||||
@@ -20,11 +19,7 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
put '', action: :update_all
|
|
||||||
patch '', action: :update
|
|
||||||
|
|
||||||
get :deerjikists
|
get :deerjikists
|
||||||
put :deerjikists, action: :update_deerjikists
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -54,7 +49,6 @@ Rails.application.routes.draw do
|
|||||||
collection do
|
collection do
|
||||||
get :random
|
get :random
|
||||||
get :changes
|
get :changes
|
||||||
get :versions, to: 'post_versions#index'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
@@ -85,14 +79,9 @@ Rails.application.routes.draw do
|
|||||||
member do
|
member do
|
||||||
put :watching
|
put :watching
|
||||||
patch :next_post
|
patch :next_post
|
||||||
put :skip_vote
|
|
||||||
delete :skip_vote, action: :unskip_vote
|
|
||||||
get :post_selection_weights
|
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :comments, controller: :theatre_comments, only: [:index, :create, :destroy]
|
resources :comments, controller: :theatre_comments, only: [:index, :create]
|
||||||
resources :programmes, controller: :theatre_programmes, only: [:index]
|
|
||||||
resources :skip_events, controller: :theatre_skip_events, only: [:index]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :materials, only: [:index, :show, :create, :update, :destroy]
|
resources :materials, only: [:index, :show, :create, :update, :destroy]
|
||||||
|
|||||||
@@ -1,27 +1,12 @@
|
|||||||
env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
|
env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
|
||||||
|
|
||||||
set :path, '/var/www/btrc-hub/backend'
|
|
||||||
set :environment, 'production'
|
|
||||||
set :output, standard: '/var/log/btrc_hub_nico_sync.log',
|
set :output, standard: '/var/log/btrc_hub_nico_sync.log',
|
||||||
error: '/var/log/btrc_hub_nico_sync_err.log'
|
error: '/var/log/btrc_hub_nico_sync_err.log'
|
||||||
|
|
||||||
job_type :rake,
|
every 1.day, at: '3:00 pm' do
|
||||||
'cd :path && set -a && . /etc/btrc-hub/backend.env && set +a && ' \
|
|
||||||
':environment_variable=:environment bundle exec rake :task --silent :output'
|
|
||||||
|
|
||||||
every 1.day, at: '11:00 am' do
|
|
||||||
rake 'nico:sync', environment: 'production'
|
rake 'nico:sync', environment: 'production'
|
||||||
end
|
end
|
||||||
|
|
||||||
every 1.day, at: '0:00 am' do
|
every 1.day, at: '0:00 am' do
|
||||||
rake 'post_similarity:calc', environment: 'production'
|
rake 'post_similarity:calc', environment: 'production'
|
||||||
rake 'tag_similarity:calc', environment: 'production'
|
|
||||||
end
|
|
||||||
|
|
||||||
every 1.day, at: '7:50 am' do
|
|
||||||
rake 'nico:export', environment: 'production'
|
|
||||||
end
|
|
||||||
|
|
||||||
every :hour do
|
|
||||||
rake 'post:sync', environment: 'production'
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,4 +13,3 @@ r2:
|
|||||||
secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %>
|
secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %>
|
||||||
bucket: <%= ENV['R2_BUCKET'] %>
|
bucket: <%= ENV['R2_BUCKET'] %>
|
||||||
region: auto
|
region: auto
|
||||||
request_checksum_calculation: when_required
|
|
||||||
|
|||||||
@@ -2,15 +2,15 @@ require 'set'
|
|||||||
|
|
||||||
|
|
||||||
class CreatePostVersions < ActiveRecord::Migration[8.0]
|
class CreatePostVersions < ActiveRecord::Migration[8.0]
|
||||||
class Post < ActiveRecord::Base
|
class Post < ApplicationRecord
|
||||||
self.table_name = 'posts'
|
self.table_name = 'posts'
|
||||||
end
|
end
|
||||||
|
|
||||||
class PostTag < ActiveRecord::Base
|
class PostTag < ApplicationRecord
|
||||||
self.table_name = 'post_tags'
|
self.table_name = 'post_tags'
|
||||||
end
|
end
|
||||||
|
|
||||||
class PostVersion < ActiveRecord::Base
|
class PostVersion < ApplicationRecord
|
||||||
self.table_name = 'post_versions'
|
self.table_name = 'post_versions'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,156 +0,0 @@
|
|||||||
class CreateTagVersions < ActiveRecord::Migration[8.0]
|
|
||||||
class Tag < ActiveRecord::Base
|
|
||||||
self.table_name = 'tags'
|
|
||||||
end
|
|
||||||
|
|
||||||
class TagName < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_names'
|
|
||||||
end
|
|
||||||
|
|
||||||
class TagImplication < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_implications'
|
|
||||||
end
|
|
||||||
|
|
||||||
class TagVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class NicoTagVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'nico_tag_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class NicoTagRelation < ActiveRecord::Base
|
|
||||||
self.table_name = 'nico_tag_relations'
|
|
||||||
end
|
|
||||||
|
|
||||||
def up
|
|
||||||
create_table :tag_versions do |t|
|
|
||||||
t.references :tag, null: false, foreign_key: true, index: false
|
|
||||||
t.integer :version_no, null: false
|
|
||||||
t.string :event_type, null: false
|
|
||||||
t.string :name, null: false
|
|
||||||
t.string :category, null: false
|
|
||||||
t.text :aliases, null: false
|
|
||||||
t.text :parent_tag_ids, null: false
|
|
||||||
t.datetime :created_at, null: false
|
|
||||||
t.references :created_by_user, foreign_key: { to_table: :users }, index: false
|
|
||||||
|
|
||||||
t.index [:tag_id, :version_no], unique: true
|
|
||||||
t.index :created_at
|
|
||||||
t.index [:tag_id, :created_at], order: { created_at: :desc }
|
|
||||||
t.index [:created_by_user_id, :created_at], order: { created_at: :desc }
|
|
||||||
t.check_constraint 'version_no > 0',
|
|
||||||
name: 'tag_versions_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table :nico_tag_versions do |t|
|
|
||||||
t.references :tag, null: false, foreign_key: true, index: false
|
|
||||||
t.integer :version_no, 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.references :created_by_user, foreign_key: { to_table: :users }, index: false
|
|
||||||
|
|
||||||
t.index [:tag_id, :version_no], unique: true
|
|
||||||
t.index :created_at
|
|
||||||
t.index [:tag_id, :created_at], order: { created_at: :desc }
|
|
||||||
t.index [:created_by_user_id, :created_at], order: { created_at: :desc }
|
|
||||||
t.check_constraint 'version_no > 0',
|
|
||||||
name: 'nico_tag_versions_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
TagVersion.reset_column_information
|
|
||||||
say_with_time 'Backfilling tag_versions' do
|
|
||||||
Tag.where(discarded_at: nil)
|
|
||||||
.where.not(category: 'nico')
|
|
||||||
.find_in_batches(batch_size: 500) do |tags|
|
|
||||||
tag_ids = tags.map(&:id)
|
|
||||||
|
|
||||||
tag_implication_rows_by_tag_id =
|
|
||||||
TagImplication
|
|
||||||
.where(tag_id: tag_ids)
|
|
||||||
.pluck(:tag_id, :parent_tag_id)
|
|
||||||
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
|
||||||
h[row[0]] << row[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
tag_name_rows_by_tag_id =
|
|
||||||
TagName
|
|
||||||
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.id')
|
|
||||||
.where(tags: { id: tag_ids })
|
|
||||||
.pluck('tags.id', 'tag_names.name')
|
|
||||||
.each_with_object({ }) do |row, h|
|
|
||||||
h[row[0]] = row[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
tag_alias_rows_by_tag_id =
|
|
||||||
TagName
|
|
||||||
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.canonical_id')
|
|
||||||
.where(tags: { id: tag_ids })
|
|
||||||
.where(tag_names: { discarded_at: nil })
|
|
||||||
.pluck('tags.id', 'tag_names.name')
|
|
||||||
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
|
||||||
h[row[0]] << row[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
TagVersion.insert_all(tags.map { |tag|
|
|
||||||
{ tag_id: tag.id,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: tag_name_rows_by_tag_id[tag.id],
|
|
||||||
category: tag.category,
|
|
||||||
aliases: tag_alias_rows_by_tag_id[tag.id].sort.join(' '),
|
|
||||||
parent_tag_ids: tag_implication_rows_by_tag_id[tag.id].sort.join(' '),
|
|
||||||
created_at: tag.created_at,
|
|
||||||
created_by_user_id: nil }
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
NicoTagVersion.reset_column_information
|
|
||||||
say_with_time 'Backfilling nico_tag_versions' do
|
|
||||||
Tag.where(discarded_at: nil, category: 'nico')
|
|
||||||
.find_in_batches(batch_size: 500) do |tags|
|
|
||||||
tag_ids = tags.map(&:id)
|
|
||||||
|
|
||||||
tag_name_rows_by_tag_id =
|
|
||||||
TagName
|
|
||||||
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.id')
|
|
||||||
.where(tags: { id: tag_ids })
|
|
||||||
.pluck('tags.id', 'tag_names.name')
|
|
||||||
.each_with_object({ }) do |row, h|
|
|
||||||
h[row[0]] = row[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
nico_tag_relation_rows_by_tag_id =
|
|
||||||
NicoTagRelation
|
|
||||||
.joins('INNER JOIN tags nico_tags ON nico_tags.id = nico_tag_relations.nico_tag_id')
|
|
||||||
.joins('INNER JOIN tags linked_tags ON linked_tags.id = nico_tag_relations.tag_id')
|
|
||||||
.joins('INNER JOIN tag_names ON tag_names.id = linked_tags.tag_name_id')
|
|
||||||
.where(nico_tags: { id: tag_ids })
|
|
||||||
.where(linked_tags: { discarded_at: nil })
|
|
||||||
.where(tag_names: { discarded_at: nil })
|
|
||||||
.pluck('nico_tags.id', 'tag_names.name')
|
|
||||||
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
|
||||||
h[row[0]] << row[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
NicoTagVersion.insert_all(tags.map { |tag|
|
|
||||||
{ tag_id: tag.id,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: tag_name_rows_by_tag_id[tag.id],
|
|
||||||
linked_tags: nico_tag_relation_rows_by_tag_id[tag.id].sort.join(' '),
|
|
||||||
created_at: tag.created_at,
|
|
||||||
created_by_user_id: nil }
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
drop_table :nico_tag_versions
|
|
||||||
drop_table :tag_versions
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
class CreateWikiVersions < ActiveRecord::Migration[8.0]
|
|
||||||
class WikiPage < ActiveRecord::Base
|
|
||||||
self.table_name = 'wiki_pages'
|
|
||||||
end
|
|
||||||
|
|
||||||
class WikiRevision < ActiveRecord::Base
|
|
||||||
self.table_name = 'wiki_revisions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class WikiRevisionLine < ActiveRecord::Base
|
|
||||||
self.table_name = 'wiki_revision_lines'
|
|
||||||
end
|
|
||||||
|
|
||||||
class WikiLine < ActiveRecord::Base
|
|
||||||
self.table_name = 'wiki_lines'
|
|
||||||
end
|
|
||||||
|
|
||||||
class WikiVersion < ActiveRecord::Base
|
|
||||||
self.table_name = 'wiki_versions'
|
|
||||||
end
|
|
||||||
|
|
||||||
class TagName < ActiveRecord::Base
|
|
||||||
self.table_name = 'tag_names'
|
|
||||||
end
|
|
||||||
|
|
||||||
def up
|
|
||||||
add_column :wiki_pages, :body, :text, after: :tag_name_id
|
|
||||||
|
|
||||||
create_table :wiki_versions do |t|
|
|
||||||
t.references :wiki_page, null: false, foreign_key: true
|
|
||||||
t.integer :version_no, null: false
|
|
||||||
t.string :event_type, null: false
|
|
||||||
t.string :title, null: false
|
|
||||||
t.text :body, null: false
|
|
||||||
t.text :reason
|
|
||||||
t.datetime :created_at, null: false
|
|
||||||
t.references :created_by_user, foreign_key: { to_table: :users }
|
|
||||||
|
|
||||||
t.index [:wiki_page_id, :version_no], unique: true
|
|
||||||
t.check_constraint 'version_no > 0',
|
|
||||||
name: 'wiki_versions_version_no_positive'
|
|
||||||
t.check_constraint "event_type IN ('create', 'update', 'discard', 'restore')",
|
|
||||||
name: 'wiki_versions_event_type_valid'
|
|
||||||
end
|
|
||||||
|
|
||||||
WikiPage.reset_column_information
|
|
||||||
WikiVersion.reset_column_information
|
|
||||||
|
|
||||||
say_with_time 'Backfilling wiki_versions' do
|
|
||||||
WikiPage.find_each do |page|
|
|
||||||
base_revision_id = nil
|
|
||||||
version_no = 1
|
|
||||||
title = TagName.find(page.tag_name_id).name
|
|
||||||
body = nil
|
|
||||||
loop do
|
|
||||||
rev = WikiRevision.where(wiki_page_id: page.id).find_by(base_revision_id:)
|
|
||||||
break unless rev
|
|
||||||
|
|
||||||
body = WikiRevisionLine.where(wiki_revision_id: rev.id).order(:position).map { |wrl|
|
|
||||||
WikiLine.find(wrl.wiki_line_id).body
|
|
||||||
}.join("\n")
|
|
||||||
|
|
||||||
WikiVersion.create!(
|
|
||||||
wiki_page_id: page.id,
|
|
||||||
version_no:,
|
|
||||||
event_type: version_no == 1 ? 'create' : 'update',
|
|
||||||
title:,
|
|
||||||
body:,
|
|
||||||
reason: rev.message,
|
|
||||||
created_at: rev.created_at,
|
|
||||||
created_by_user_id: rev.created_user_id)
|
|
||||||
|
|
||||||
version_no += 1
|
|
||||||
base_revision_id = rev.id
|
|
||||||
end
|
|
||||||
if body
|
|
||||||
page.update!(body:)
|
|
||||||
else
|
|
||||||
page.destroy!
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
change_column_null :wiki_pages, :body, false
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
drop_table :wiki_versions
|
|
||||||
remove_column :wiki_pages, :body
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
class CreatePostImplications < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
create_table :post_implications, primary_key: [:post_id, :parent_post_id] do |t|
|
|
||||||
t.references :post, null: false, foreign_key: true, index: false
|
|
||||||
t.references :parent_post, null: false, foreign_key: { to_table: :posts }
|
|
||||||
t.timestamps
|
|
||||||
|
|
||||||
t.check_constraint 'post_id <> parent_post_id',
|
|
||||||
name: 'chk_post_implications_no_self'
|
|
||||||
end
|
|
||||||
|
|
||||||
add_column :post_versions, :parent_post_ids, :text, null: false, after: :parent_id
|
|
||||||
remove_column :post_versions, :parent_id, :bigint
|
|
||||||
remove_reference :posts, :parent, foreign_key: { to_table: :posts }
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
add_reference :posts, :parent, foreign_key: { to_table: :posts }, after: :thumbnail_base
|
|
||||||
add_column :post_versions, :parent_id, :bigint, after: :post_id
|
|
||||||
remove_column :post_versions, :parent_post_ids, :text
|
|
||||||
|
|
||||||
drop_table :post_implications
|
|
||||||
end
|
|
||||||
end
|
|
||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
class RenameBannedToBannedAtInUsersAndIpAddresses < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
[:users, :ip_addresses].each do
|
|
||||||
add_column _1, :banned_at, :datetime, after: :banned
|
|
||||||
add_index _1, :banned_at
|
|
||||||
remove_column _1, :banned
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
[:ip_addresses, :users].each do
|
|
||||||
add_column _1, :banned, :boolean, null: false, default: false, after: :banned_at
|
|
||||||
remove_column _1, :banned_at
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
class AddVersionNoToPosts < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :posts, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
posts
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
post_versions
|
|
||||||
WHERE
|
|
||||||
post_id = posts.id)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :posts, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :posts, 'version_no > 0', name: 'chk_posts_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :posts, name: 'chk_posts_version_no_positive'
|
|
||||||
remove_column :posts, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
class AddVersionNoToTags < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :tags, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
tags
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
CASE category
|
|
||||||
WHEN 'nico' THEN
|
|
||||||
(SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
nico_tag_versions
|
|
||||||
WHERE
|
|
||||||
tag_id = tags.id)
|
|
||||||
ELSE
|
|
||||||
(SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
tag_versions
|
|
||||||
WHERE
|
|
||||||
tag_id = tags.id)
|
|
||||||
END)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :tags, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :tags, 'version_no > 0', name: 'chk_tags_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :tags, name: 'chk_tags_version_no_positive'
|
|
||||||
remove_column :tags, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
class AddVersionNoToWikiPages < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :wiki_pages, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
wiki_pages
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
wiki_versions
|
|
||||||
WHERE
|
|
||||||
wiki_page_id = wiki_pages.id)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :wiki_pages, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :wiki_pages, 'version_no > 0', name: 'chk_wiki_pages_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :wiki_pages, name: 'chk_wiki_pages_version_no_positive'
|
|
||||||
remove_column :wiki_pages, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
class CreateTheatreProgrammes < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :theatre_programmes, primary_key: [:theatre_id, :position] do |t|
|
|
||||||
t.references :theatre, null: false, foreign_key: true
|
|
||||||
t.integer :position, null: false
|
|
||||||
t.references :post, null: false, foreign_key: true
|
|
||||||
t.datetime :created_at, null: false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
class CreateTheatreSkipVotesAndEvents < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :theatre_skip_votes, primary_key: [:theatre_id, :post_id, :user_id] do |t|
|
|
||||||
t.references :theatre, null: false, foreign_key: true
|
|
||||||
t.references :post, null: false, foreign_key: true
|
|
||||||
t.references :user, null: false, foreign_key: true
|
|
||||||
t.timestamps
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table :theatre_skip_events do |t|
|
|
||||||
t.references :theatre, null: false, foreign_key: true
|
|
||||||
t.references :post, null: false, foreign_key: true
|
|
||||||
t.references :skipped_by_user, null: false, foreign_key: { to_table: :users }
|
|
||||||
t.integer :programme_position
|
|
||||||
t.datetime :created_at, null: false
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table :theatre_skip_event_voters, primary_key: [:theatre_skip_event_id, :user_id] do |t|
|
|
||||||
t.references :theatre_skip_event, null: false, foreign_key: true
|
|
||||||
t.references :user, null: false, foreign_key: true
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table :theatre_skip_event_tags, primary_key: [:theatre_skip_event_id, :tag_id] do |t|
|
|
||||||
t.references :theatre_skip_event, null: false, foreign_key: true
|
|
||||||
t.references :tag, null: false, foreign_key: true
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index :theatre_skip_events, [:theatre_id, :created_at]
|
|
||||||
add_index :theatre_skip_votes, [:theatre_id, :post_id, :created_at],
|
|
||||||
name: 'idx_theatre_skip_votes_theatre_post_created'
|
|
||||||
add_index :theatre_skip_event_voters, [:user_id, :theatre_skip_event_id],
|
|
||||||
name: 'idx_theatre_skip_event_voters_user_event'
|
|
||||||
add_index :theatre_skip_event_tags, [:tag_id, :theatre_skip_event_id],
|
|
||||||
name: 'idx_theatre_skip_event_tags_tag_event'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
生成ファイル
+9
-139
@@ -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_06_06_000000) do
|
ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) 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
|
||||||
@@ -50,10 +50,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
|
|
||||||
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.binary "ip_address", limit: 16, null: false
|
t.binary "ip_address", limit: 16, null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_ip_addresses_on_banned_at"
|
|
||||||
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -105,30 +104,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.index ["tag_id"], name: "index_nico_tag_relations_on_tag_id"
|
t.index ["tag_id"], name: "index_nico_tag_relations_on_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "nico_tag_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "tag_id", null: false
|
|
||||||
t.integer "version_no", 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.bigint "created_by_user_id"
|
|
||||||
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 ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
|
||||||
t.index ["tag_id", "version_no"], name: "index_nico_tag_versions_on_tag_id_and_version_no", unique: true
|
|
||||||
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "post_implications", primary_key: ["post_id", "parent_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.bigint "parent_post_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["parent_post_id"], name: "index_post_implications_on_parent_post_id"
|
|
||||||
t.check_constraint "`post_id` <> `parent_post_id`", name: "chk_post_implications_no_self"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "post_id", null: false
|
t.bigint "post_id", null: false
|
||||||
t.bigint "target_post_id", null: false
|
t.bigint "target_post_id", null: false
|
||||||
@@ -165,12 +140,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
t.text "tags", null: false
|
t.text "tags", null: false
|
||||||
t.text "parent_post_ids", null: false
|
t.bigint "parent_id"
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
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.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 ["parent_id"], name: "index_post_versions_on_parent_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.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
||||||
@@ -181,15 +157,15 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.string "title"
|
t.string "title"
|
||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
|
t.bigint "parent_id"
|
||||||
t.bigint "uploaded_user_id"
|
t.bigint "uploaded_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "version_no", null: false
|
t.index ["parent_id"], name: "index_posts_on_parent_id"
|
||||||
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
||||||
t.index ["url"], name: "index_posts_on_url", unique: true
|
t.index ["url"], name: "index_posts_on_url", unique: true
|
||||||
t.check_constraint "`version_no` > 0", name: "chk_posts_version_no_positive"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -240,23 +216,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.index ["target_tag_id"], name: "index_tag_similarities_on_target_tag_id"
|
t.index ["target_tag_id"], name: "index_tag_similarities_on_target_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "tag_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "tag_id", null: false
|
|
||||||
t.integer "version_no", null: false
|
|
||||||
t.string "event_type", null: false
|
|
||||||
t.string "name", null: false
|
|
||||||
t.string "category", null: false
|
|
||||||
t.text "aliases", null: false
|
|
||||||
t.text "parent_tag_ids", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.bigint "created_by_user_id"
|
|
||||||
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 ["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.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
t.string "category", default: "general", null: false
|
t.string "category", default: "general", null: false
|
||||||
@@ -264,10 +223,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "post_count", default: 0, null: false
|
t.integer "post_count", default: 0, null: false
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "version_no", null: false
|
|
||||||
t.index ["discarded_at"], name: "index_tags_on_discarded_at"
|
t.index ["discarded_at"], name: "index_tags_on_discarded_at"
|
||||||
t.index ["tag_name_id"], name: "index_tags_on_tag_name_id", unique: true
|
t.index ["tag_name_id"], name: "index_tags_on_tag_name_id", unique: true
|
||||||
t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -283,55 +240,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.index ["user_id"], name: "index_theatre_comments_on_user_id"
|
t.index ["user_id"], name: "index_theatre_comments_on_user_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "theatre_programmes", primary_key: ["theatre_id", "position"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "theatre_id", null: false
|
|
||||||
t.integer "position", null: false
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.index ["post_id"], name: "index_theatre_programmes_on_post_id"
|
|
||||||
t.index ["theatre_id"], name: "index_theatre_programmes_on_theatre_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "theatre_skip_event_tags", primary_key: ["theatre_skip_event_id", "tag_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "theatre_skip_event_id", null: false
|
|
||||||
t.bigint "tag_id", null: false
|
|
||||||
t.index ["tag_id", "theatre_skip_event_id"], name: "idx_theatre_skip_event_tags_tag_event"
|
|
||||||
t.index ["tag_id"], name: "index_theatre_skip_event_tags_on_tag_id"
|
|
||||||
t.index ["theatre_skip_event_id"], name: "index_theatre_skip_event_tags_on_theatre_skip_event_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "theatre_skip_event_voters", primary_key: ["theatre_skip_event_id", "user_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "theatre_skip_event_id", null: false
|
|
||||||
t.bigint "user_id", null: false
|
|
||||||
t.index ["theatre_skip_event_id"], name: "index_theatre_skip_event_voters_on_theatre_skip_event_id"
|
|
||||||
t.index ["user_id", "theatre_skip_event_id"], name: "idx_theatre_skip_event_voters_user_event"
|
|
||||||
t.index ["user_id"], name: "index_theatre_skip_event_voters_on_user_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "theatre_skip_events", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "theatre_id", null: false
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.bigint "skipped_by_user_id", null: false
|
|
||||||
t.integer "programme_position"
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.index ["post_id"], name: "index_theatre_skip_events_on_post_id"
|
|
||||||
t.index ["skipped_by_user_id"], name: "index_theatre_skip_events_on_skipped_by_user_id"
|
|
||||||
t.index ["theatre_id", "created_at"], name: "index_theatre_skip_events_on_theatre_id_and_created_at"
|
|
||||||
t.index ["theatre_id"], name: "index_theatre_skip_events_on_theatre_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "theatre_skip_votes", primary_key: ["theatre_id", "post_id", "user_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "theatre_id", null: false
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.bigint "user_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["post_id"], name: "index_theatre_skip_votes_on_post_id"
|
|
||||||
t.index ["theatre_id", "post_id", "created_at"], name: "idx_theatre_skip_votes_theatre_post_created"
|
|
||||||
t.index ["theatre_id"], name: "index_theatre_skip_votes_on_theatre_id"
|
|
||||||
t.index ["user_id"], name: "index_theatre_skip_votes_on_user_id"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "theatre_watching_users", primary_key: ["theatre_id", "user_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "theatre_watching_users", primary_key: ["theatre_id", "user_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "theatre_id", null: false
|
t.bigint "theatre_id", null: false
|
||||||
t.bigint "user_id", null: false
|
t.bigint "user_id", null: false
|
||||||
@@ -386,10 +294,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "inheritance_code", limit: 64, null: false
|
t.string "inheritance_code", limit: 64, null: false
|
||||||
t.string "role", null: false
|
t.string "role", null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -415,19 +322,16 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
|
|
||||||
create_table "wiki_pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
t.text "body", null: false
|
|
||||||
t.bigint "created_user_id", null: false
|
t.bigint "created_user_id", null: false
|
||||||
t.bigint "updated_user_id", null: false
|
t.bigint "updated_user_id", null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "next_asset_no", default: 1, null: false
|
t.integer "next_asset_no", default: 1, null: false
|
||||||
t.integer "version_no", null: false
|
|
||||||
t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
|
t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
|
||||||
t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
|
t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
|
||||||
t.index ["tag_name_id"], name: "index_wiki_pages_on_tag_name_id", unique: true
|
t.index ["tag_name_id"], name: "index_wiki_pages_on_tag_name_id", unique: true
|
||||||
t.index ["updated_user_id"], name: "index_wiki_pages_on_updated_user_id"
|
t.index ["updated_user_id"], name: "index_wiki_pages_on_updated_user_id"
|
||||||
t.check_constraint "`version_no` > 0", name: "chk_wiki_pages_version_no_positive"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -460,22 +364,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
t.index ["wiki_page_id"], name: "index_wiki_revisions_on_wiki_page_id"
|
t.index ["wiki_page_id"], name: "index_wiki_revisions_on_wiki_page_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "wiki_page_id", null: false
|
|
||||||
t.integer "version_no", null: false
|
|
||||||
t.string "event_type", null: false
|
|
||||||
t.string "title", null: false
|
|
||||||
t.text "body", null: false
|
|
||||||
t.text "reason"
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.bigint "created_by_user_id"
|
|
||||||
t.index ["created_by_user_id"], name: "index_wiki_versions_on_created_by_user_id"
|
|
||||||
t.index ["wiki_page_id", "version_no"], name: "index_wiki_versions_on_wiki_page_id_and_version_no", unique: true
|
|
||||||
t.index ["wiki_page_id"], name: "index_wiki_versions_on_wiki_page_id"
|
|
||||||
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "wiki_versions_event_type_valid"
|
|
||||||
t.check_constraint "`version_no` > 0", name: "wiki_versions_version_no_positive"
|
|
||||||
end
|
|
||||||
|
|
||||||
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 "material_versions", "materials"
|
add_foreign_key "material_versions", "materials"
|
||||||
@@ -489,10 +377,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
add_foreign_key "materials", "users", column: "updated_by_user_id"
|
add_foreign_key "materials", "users", column: "updated_by_user_id"
|
||||||
add_foreign_key "nico_tag_relations", "tags"
|
add_foreign_key "nico_tag_relations", "tags"
|
||||||
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
||||||
add_foreign_key "nico_tag_versions", "tags"
|
|
||||||
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
|
||||||
add_foreign_key "post_implications", "posts"
|
|
||||||
add_foreign_key "post_implications", "posts", column: "parent_post_id"
|
|
||||||
add_foreign_key "post_similarities", "posts"
|
add_foreign_key "post_similarities", "posts"
|
||||||
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
||||||
add_foreign_key "post_tags", "posts"
|
add_foreign_key "post_tags", "posts"
|
||||||
@@ -500,7 +384,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||||
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
||||||
add_foreign_key "post_versions", "posts"
|
add_foreign_key "post_versions", "posts"
|
||||||
|
add_foreign_key "post_versions", "posts", column: "parent_id"
|
||||||
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", "posts", column: "parent_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_implications", "tags"
|
add_foreign_key "tag_implications", "tags"
|
||||||
@@ -508,23 +394,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
add_foreign_key "tag_names", "tag_names", column: "canonical_id"
|
add_foreign_key "tag_names", "tag_names", column: "canonical_id"
|
||||||
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", "tags"
|
|
||||||
add_foreign_key "tag_versions", "users", column: "created_by_user_id"
|
|
||||||
add_foreign_key "tags", "tag_names"
|
add_foreign_key "tags", "tag_names"
|
||||||
add_foreign_key "theatre_comments", "theatres"
|
add_foreign_key "theatre_comments", "theatres"
|
||||||
add_foreign_key "theatre_comments", "users"
|
add_foreign_key "theatre_comments", "users"
|
||||||
add_foreign_key "theatre_programmes", "posts"
|
|
||||||
add_foreign_key "theatre_programmes", "theatres"
|
|
||||||
add_foreign_key "theatre_skip_event_tags", "tags"
|
|
||||||
add_foreign_key "theatre_skip_event_tags", "theatre_skip_events"
|
|
||||||
add_foreign_key "theatre_skip_event_voters", "theatre_skip_events"
|
|
||||||
add_foreign_key "theatre_skip_event_voters", "users"
|
|
||||||
add_foreign_key "theatre_skip_events", "posts"
|
|
||||||
add_foreign_key "theatre_skip_events", "theatres"
|
|
||||||
add_foreign_key "theatre_skip_events", "users", column: "skipped_by_user_id"
|
|
||||||
add_foreign_key "theatre_skip_votes", "posts"
|
|
||||||
add_foreign_key "theatre_skip_votes", "theatres"
|
|
||||||
add_foreign_key "theatre_skip_votes", "users"
|
|
||||||
add_foreign_key "theatre_watching_users", "theatres"
|
add_foreign_key "theatre_watching_users", "theatres"
|
||||||
add_foreign_key "theatre_watching_users", "users"
|
add_foreign_key "theatre_watching_users", "users"
|
||||||
add_foreign_key "theatres", "posts", column: "current_post_id"
|
add_foreign_key "theatres", "posts", column: "current_post_id"
|
||||||
@@ -545,6 +417,4 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_06_000000) do
|
|||||||
add_foreign_key "wiki_revisions", "wiki_pages"
|
add_foreign_key "wiki_revisions", "wiki_pages"
|
||||||
add_foreign_key "wiki_revisions", "wiki_pages", column: "redirect_page_id"
|
add_foreign_key "wiki_revisions", "wiki_pages", column: "redirect_page_id"
|
||||||
add_foreign_key "wiki_revisions", "wiki_revisions", column: "base_revision_id"
|
add_foreign_key "wiki_revisions", "wiki_revisions", column: "base_revision_id"
|
||||||
add_foreign_key "wiki_versions", "users", column: "created_by_user_id"
|
|
||||||
add_foreign_key "wiki_versions", "wiki_pages"
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
namespace :nico do
|
|
||||||
desc 'ニコニコ DB 逆連携'
|
|
||||||
task export: :environment do
|
|
||||||
require 'open3'
|
|
||||||
|
|
||||||
mysql_user = ENV.fetch('MYSQL_USER')
|
|
||||||
mysql_pass = ENV.fetch('MYSQL_PASS')
|
|
||||||
nizika_nico_path = ENV.fetch('NIZIKA_NICO_PATH')
|
|
||||||
|
|
||||||
videos = Post.where('url LIKE ?', '%nicovideo.jp/watch/%').pluck(:url).filter_map {
|
|
||||||
_1[%r{nicovideo\.jp/watch/([^/?#]+)}, 1]
|
|
||||||
}.uniq
|
|
||||||
|
|
||||||
next if videos.empty?
|
|
||||||
|
|
||||||
_, stderr, status = Open3.capture3(
|
|
||||||
{ 'MYSQL_USER' => mysql_user, 'MYSQL_PASS' => mysql_pass },
|
|
||||||
'python3', '-m', 'tracked_videos.put_bulk_upsert', *videos,
|
|
||||||
chdir: nizika_nico_path)
|
|
||||||
|
|
||||||
raise stderr unless status.success?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -115,10 +115,6 @@ namespace :nico do
|
|||||||
datum['tags'].each do |raw|
|
datum['tags'].each do |raw|
|
||||||
name = TagNameSanitisationRule.sanitise("nico:#{ raw }")
|
name = TagNameSanitisationRule.sanitise("nico:#{ raw }")
|
||||||
tag = Tag.find_or_create_by_tag_name!(name, category: :nico)
|
tag = Tag.find_or_create_by_tag_name!(name, category: :nico)
|
||||||
|
|
||||||
event_type = tag.nico_tag_versions.exists? ? :update : :create
|
|
||||||
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user: nil)
|
|
||||||
|
|
||||||
desired_nico_tag_based_ids << tag.id
|
desired_nico_tag_based_ids << tag.id
|
||||||
|
|
||||||
# 新たに記載される外部タグと連携される内部タグを記載
|
# 新たに記載される外部タグと連携される内部タグを記載
|
||||||
@@ -153,7 +149,6 @@ namespace :nico do
|
|||||||
if post_created
|
if post_created
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||||
elsif post_changed || kept_tag_ids != desired_all_tag_ids.to_set
|
elsif post_changed || kept_tag_ids != desired_all_tag_ids.to_set
|
||||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace :post do
|
|
||||||
desc '投稿同期(ニコニコ以外)'
|
|
||||||
task sync: :environment do
|
|
||||||
Youtube::Sync.new.sync!
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
FactoryBot.define do
|
|
||||||
factory :ip_address do
|
|
||||||
ip_address { IPAddr.new('203.0.113.10').hton }
|
|
||||||
banned_at { nil }
|
|
||||||
|
|
||||||
trait :banned do
|
|
||||||
banned_at { Time.current }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,24 +1,15 @@
|
|||||||
FactoryBot.define do
|
FactoryBot.define do
|
||||||
factory :user do
|
factory :user do
|
||||||
name { nil }
|
name { "test-user" }
|
||||||
inheritance_code { SecureRandom.uuid }
|
inheritance_code { SecureRandom.uuid }
|
||||||
role { 'guest' }
|
role { "guest" }
|
||||||
banned_at { nil }
|
|
||||||
|
|
||||||
trait :guest do
|
|
||||||
role { 'guest' }
|
|
||||||
end
|
|
||||||
|
|
||||||
trait :member do
|
trait :member do
|
||||||
role { 'member' }
|
role { "member" }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :admin do
|
trait :admin do
|
||||||
role { 'admin' }
|
role { 'admin' }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :banned do
|
|
||||||
banned_at { Time.current }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,7 +3,5 @@ FactoryBot.define do
|
|||||||
title { "TestPage" }
|
title { "TestPage" }
|
||||||
association :created_user, factory: :user
|
association :created_user, factory: :user
|
||||||
association :updated_user, factory: :user
|
association :updated_user, factory: :user
|
||||||
|
|
||||||
body { ' ' }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe PostImplication, type: :model do
|
|
||||||
let!(:post_record) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'post',
|
|
||||||
url: 'https://example.com/post-implication-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:parent_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'parent post',
|
|
||||||
url: 'https://example.com/post-implication-parent'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is valid with post and parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow same post as parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post: post_record
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).not_to be_valid
|
|
||||||
expect(implication.errors[:parent_post_id]).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow duplicate pair' do
|
|
||||||
described_class.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
duplicate = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(duplicate).not_to be_valid
|
|
||||||
expect(duplicate.errors[:post_id]).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -19,7 +19,7 @@ RSpec.describe PostVersion, type: :model do
|
|||||||
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(' '),
|
||||||
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
parent: post_record.parent,
|
||||||
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,
|
||||||
|
|||||||
@@ -107,13 +107,11 @@ RSpec.describe Tag, type: :model do
|
|||||||
context 'when the source tag_name has a wiki_page' do
|
context 'when the source tag_name has a wiki_page' do
|
||||||
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
||||||
let!(:wiki_page) do
|
let!(:wiki_page) do
|
||||||
admin = create_admin_user!
|
WikiPage.create!(
|
||||||
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: source_tag_name,
|
tag_name: source_tag_name,
|
||||||
body: 'source wiki body',
|
created_user: create_admin_user!,
|
||||||
created_by_user: admin,
|
updated_user: create_admin_user!
|
||||||
message: 'init')
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'rolls back the transaction' do
|
it 'rolls back the transaction' do
|
||||||
@@ -161,7 +159,7 @@ RSpec.describe Tag, type: :model do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
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,
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe VersionRecord, type: :model do
|
|
||||||
let!(:tag) { create(:tag, name: 'version_record_tag') }
|
|
||||||
let!(:nico_tag) { create(:tag, :nico, name: 'nico:version_record_tag') }
|
|
||||||
|
|
||||||
it 'makes TagVersion read only after create' do
|
|
||||||
version = TagVersion.create!(
|
|
||||||
tag: tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: tag.name,
|
|
||||||
category: tag.category,
|
|
||||||
aliases: '',
|
|
||||||
parent_tag_ids: '',
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version.update!(name: 'changed')
|
|
||||||
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'prevents TagVersion destroy' do
|
|
||||||
version = TagVersion.create!(
|
|
||||||
tag: tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: tag.name,
|
|
||||||
category: tag.category,
|
|
||||||
aliases: '',
|
|
||||||
parent_tag_ids: '',
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version.destroy!
|
|
||||||
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'makes NicoTagVersion read only after create' do
|
|
||||||
version = NicoTagVersion.create!(
|
|
||||||
tag: nico_tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: nico_tag.name,
|
|
||||||
linked_tags: '',
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version.update!(name: 'nico:changed')
|
|
||||||
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'prevents NicoTagVersion destroy' do
|
|
||||||
version = NicoTagVersion.create!(
|
|
||||||
tag: nico_tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: nico_tag.name,
|
|
||||||
linked_tags: '',
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version.destroy!
|
|
||||||
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'error responses', type: :request do
|
|
||||||
describe 'manual input errors' do
|
|
||||||
it 'returns a stable payload for bad requests' do
|
|
||||||
get '/tags/name/%20/deerjikists'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
expect(json).to include(
|
|
||||||
'type' => 'bad_request',
|
|
||||||
'message' => be_present,
|
|
||||||
'errors' => {},
|
|
||||||
'base_errors' => [be_present])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns a stable field-error payload for unprocessable requests' do
|
|
||||||
member = create(:user, :member)
|
|
||||||
tag = create(:tag, :general, name: 'error_response_tag')
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
patch "/tags/#{ tag.id }", params: { category: 'nico' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json).to include(
|
|
||||||
'type' => 'validation_error',
|
|
||||||
'message' => '入力内容を確認してください.',
|
|
||||||
'base_errors' => [])
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'category' => ['ニコタグは変更できません.'])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'model validation errors' do
|
|
||||||
it 'returns field messages for model errors' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
|
|
||||||
put "/users/#{ user.id }", params: { name: 'a' * 256 }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json).to include(
|
|
||||||
'type' => 'validation_error',
|
|
||||||
'message' => '入力内容を確認してください.')
|
|
||||||
expect(json.fetch('errors').fetch('name')).to include(be_present)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -141,21 +141,16 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
context 'when logged in' do
|
context 'when logged in' do
|
||||||
before { sign_in_as(guest_user) }
|
before { sign_in_as(guest_user) }
|
||||||
|
|
||||||
it 'returns 422 when tag is blank' do
|
it 'returns 400 when tag is blank' do
|
||||||
post '/materials', params: { tag: ' ', file: dummy_upload }
|
post '/materials', params: { tag: ' ', file: dummy_upload }
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:bad_request)
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'tag' => ['タグは必須です.'])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 422 when both file and url are blank' do
|
it 'returns 400 when both file and url are blank' do
|
||||||
post '/materials', params: { tag: 'material_create_blank' }
|
post '/materials', params: { tag: 'material_create_blank' }
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:bad_request)
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'file' => ['ファイルまたは URL は必須です.'],
|
|
||||||
'url' => ['ファイルまたは URL は必須です.'])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates a material with an attached file' do
|
it 'creates a material with an attached file' do
|
||||||
@@ -266,26 +261,21 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 422 when tag is blank' do
|
it 'returns 400 when tag is blank' do
|
||||||
put "/materials/#{ material.id }", params: {
|
put "/materials/#{ material.id }", params: {
|
||||||
tag: ' ',
|
tag: ' ',
|
||||||
file: dummy_upload
|
file: dummy_upload
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:bad_request)
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'tag' => ['タグは必須です.'])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 422 when both file and url are blank' do
|
it 'returns 400 when both file and url are blank' do
|
||||||
put "/materials/#{ material.id }", params: {
|
put "/materials/#{ material.id }", params: {
|
||||||
tag: 'material_update_no_payload'
|
tag: 'material_update_no_payload'
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:bad_request)
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'file' => ['ファイルまたは URL は必須です.'],
|
|
||||||
'url' => ['ファイルまたは URL は必須です.'])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'updates tag, url, file, and updated_by_user' do
|
it 'updates tag, url, file, and updated_by_user' do
|
||||||
|
|||||||
@@ -3,74 +3,17 @@ require 'rails_helper'
|
|||||||
|
|
||||||
RSpec.describe 'NicoTags', type: :request do
|
RSpec.describe 'NicoTags', type: :request do
|
||||||
describe 'GET /tags/nico' do
|
describe 'GET /tags/nico' do
|
||||||
it 'returns paginated tags and total count' do
|
it 'returns tags and next_cursor when overflowing limit' do
|
||||||
create_list(:tag, 3, :nico)
|
create_list(:tag, 21, :nico)
|
||||||
|
get '/tags/nico', params: { limit: 20 }
|
||||||
get '/tags/nico', params: { page: 2, limit: 2 }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['tags'].size).to eq(1)
|
expect(json['tags'].size).to eq(20)
|
||||||
expect(json['count']).to eq(3)
|
expect(json['next_cursor']).to be_present
|
||||||
end
|
|
||||||
|
|
||||||
it 'filters by nico tag name, linked tag name, and link status' do
|
|
||||||
linked = create(:tag, :nico)
|
|
||||||
linked.tag_name.update!(name: 'nico:search_linked')
|
|
||||||
unlinked = create(:tag, :nico)
|
|
||||||
unlinked.tag_name.update!(name: 'nico:search_unlinked')
|
|
||||||
other = create(:tag, :nico)
|
|
||||||
other.tag_name.update!(name: 'nico:other')
|
|
||||||
destination = create(:tag, :general)
|
|
||||||
destination.tag_name.update!(name: 'destination_search')
|
|
||||||
NicoTagRelation.create!(nico_tag: linked, tag: destination)
|
|
||||||
NicoTagRelation.create!(nico_tag: other, tag: create(:tag, :general))
|
|
||||||
|
|
||||||
get '/tags/nico', params: {
|
|
||||||
name: 'search_',
|
|
||||||
linked_tag: 'destination_',
|
|
||||||
link_status: 'linked'
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['count']).to eq(1)
|
|
||||||
expect(json.fetch('tags').map { |tag| tag['id'] }).to eq([linked.id])
|
|
||||||
|
|
||||||
get '/tags/nico', params: { name: 'search_', link_status: 'unlinked' }
|
|
||||||
|
|
||||||
expect(json['count']).to eq(1)
|
|
||||||
expect(json.fetch('tags').map { |tag| tag['id'] }).to eq([unlinked.id])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'sorts by name and timestamps' do
|
|
||||||
older = create(:tag, :nico)
|
|
||||||
older.tag_name.update!(name: 'nico:a')
|
|
||||||
older.update_columns(created_at: 2.days.ago)
|
|
||||||
newer = create(:tag, :nico)
|
|
||||||
newer.tag_name.update!(name: 'nico:b')
|
|
||||||
newer.update_columns(created_at: 1.day.ago)
|
|
||||||
older_post_tag =
|
|
||||||
PostTag.create!(post: Post.create!(url: 'https://example.com/nico-older'), tag: older)
|
|
||||||
older_post_tag.update_columns(created_at: 1.hour.ago)
|
|
||||||
newer_post_tag =
|
|
||||||
PostTag.create!(post: Post.create!(url: 'https://example.com/nico-newer'), tag: newer)
|
|
||||||
newer_post_tag.update_columns(created_at: 2.hours.ago)
|
|
||||||
|
|
||||||
get '/tags/nico', params: { order: 'name:desc' }
|
|
||||||
expect(json.fetch('tags').map { |tag| tag['id'] }).to eq([newer.id, older.id])
|
|
||||||
|
|
||||||
get '/tags/nico', params: { order: 'created_at:asc' }
|
|
||||||
expect(json.fetch('tags').map { |tag| tag['id'] }).to eq([older.id, newer.id])
|
|
||||||
|
|
||||||
get '/tags/nico', params: { order: 'updated_at:desc' }
|
|
||||||
expect(json.fetch('tags').map { |tag| tag['id'] }).to eq([older.id, newer.id])
|
|
||||||
expect(Time.zone.parse(json.fetch('tags').first.fetch('recent_post_tag_created_at')))
|
|
||||||
.to be_within(1.second).of(older_post_tag.created_at)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PATCH /tags/nico/:id' do
|
describe 'PATCH /tags/nico/:id' do
|
||||||
let(:member) { create(:user, :member) }
|
let(:member) { create(:user, :member) }
|
||||||
let(:admin) { create(:user, :admin) }
|
|
||||||
let(:nico_tag) { create(:tag, :nico) }
|
let(:nico_tag) { create(:tag, :nico) }
|
||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
@@ -91,89 +34,5 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
patch "/tags/nico/#{non_nico.id}", params: { tags: 'a b' }
|
patch "/tags/nico/#{non_nico.id}", params: { tags: 'a b' }
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '200 and updates linked tags while recording tag versions' do
|
|
||||||
sign_in_as(admin)
|
|
||||||
|
|
||||||
nico_tag_name = TagName.create!(name: 'nico:nico_tags_spec_source')
|
|
||||||
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
|
||||||
|
|
||||||
linked_a_name = TagName.create!(name: 'nico_linked_a')
|
|
||||||
linked_a = Tag.create!(tag_name: linked_a_name, category: :general)
|
|
||||||
|
|
||||||
linked_b_name = TagName.create!(name: 'nico_linked_b')
|
|
||||||
linked_b = Tag.create!(tag_name: linked_b_name, category: :general)
|
|
||||||
|
|
||||||
TagVersioning.ensure_snapshot!(nico_tag, created_by_user: admin)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/nico/#{nico_tag.id}", params: {
|
|
||||||
tags: " #{linked_a.name}\n#{linked_b.name} "
|
|
||||||
}
|
|
||||||
}.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(NicoTagVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
names = json.map { |t| t['name'] }
|
|
||||||
expect(names).to match_array(['nico_linked_a', 'nico_linked_b'])
|
|
||||||
|
|
||||||
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(&:created_by_user_id)).to all(eq(admin.id))
|
|
||||||
|
|
||||||
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
|
|
||||||
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
|
||||||
expect(versions.last.linked_tags.split).to match_array([
|
|
||||||
'nico_linked_a',
|
|
||||||
'nico_linked_b'
|
|
||||||
])
|
|
||||||
expect(versions.last.created_by_user_id).to eq(admin.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when linked tag normalises to nico tag' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
other_nico = create(:tag, :nico, name: 'nico:linked_ng')
|
|
||||||
TagName.create!(name: 'linked_ng_alias', canonical: other_nico.tag_name)
|
|
||||||
|
|
||||||
TagVersioning.ensure_snapshot!(nico_tag, created_by_user: member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/nico/#{nico_tag.id}", params: { tags: 'linked_ng_alias' }
|
|
||||||
}.not_to change(NicoTagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'tags' => ['ニコニコ・タグ同士は連携できません.'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns the tags field error when a nico tag is specified directly' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
patch "/tags/nico/#{nico_tag.id}", params: { tags: 'nico:linked_ng' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'tags' => ['ニコニコ・タグ同士は連携できません.'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns tag name validation errors on the tags field and rolls back created tags' do
|
|
||||||
sign_in_as(member)
|
|
||||||
TagNameSanitisationRule.create!(
|
|
||||||
priority: 1,
|
|
||||||
source_pattern: 'invalid',
|
|
||||||
replacement: 'valid'
|
|
||||||
)
|
|
||||||
nico_tag
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/nico/#{nico_tag.id}", params: { tags: 'created_first invalid' }
|
|
||||||
}.not_to change(TagName, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors').fetch('tags')).to include(
|
|
||||||
a_string_including('タグ名 “invalid”:', '名前に使用できない文字が含まれてゐます.'))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -58,47 +58,15 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when Tag.find raises (invalid ids)" do
|
context "when Tag.find raises (invalid ids) it still returns 204" do
|
||||||
before { stub_current_user(admin) }
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
let(:parent_id) { -1 }
|
let(:parent_id) { -1 }
|
||||||
let(:child_id) { -1 }
|
let(:child_id) { -1 }
|
||||||
|
|
||||||
it "returns 404" do
|
it "returns 204 (rescue nil)" do
|
||||||
do_request
|
do_request
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:no_content)
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent is nico' do
|
|
||||||
before { stub_current_user(admin) }
|
|
||||||
|
|
||||||
let!(:parent) { create(:tag, :nico, name: 'nico:parent_ng') }
|
|
||||||
let(:parent_id) { parent.id }
|
|
||||||
let(:child_id) { child.id }
|
|
||||||
|
|
||||||
it 'returns 400 and does not create relation' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.not_to change(TagImplication, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when child is nico' do
|
|
||||||
before { stub_current_user(admin) }
|
|
||||||
|
|
||||||
let!(:child) { create(:tag, :nico, name: 'nico:child_ng') }
|
|
||||||
let(:parent_id) { parent.id }
|
|
||||||
let(:child_id) { child.id }
|
|
||||||
|
|
||||||
it 'returns 400 and does not create relation' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.not_to change(TagImplication, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -148,57 +116,17 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'records create and update versions for child tag' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
|
||||||
|
|
||||||
versions = child.reload.tag_versions.order(:version_no)
|
|
||||||
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
|
||||||
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
|
|
||||||
expect(versions.second.parent_tag_ids).to eq('')
|
|
||||||
expect(versions.second.created_by_user_id).to eq(admin.id)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when Tag.find raises (invalid ids)" do
|
context "when Tag.find raises (invalid ids) it still returns 204" do
|
||||||
before { stub_current_user(admin) }
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
let(:parent_id) { -1 }
|
let(:parent_id) { -1 }
|
||||||
let(:child_id) { -1 }
|
let(:child_id) { -1 }
|
||||||
|
|
||||||
it "returns 404" do
|
it "returns 204 (rescue nil)" do
|
||||||
do_request
|
do_request
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:no_content)
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent is nico' do
|
|
||||||
before { stub_current_user(admin) }
|
|
||||||
|
|
||||||
let!(:parent) { create(:tag, :nico, name: 'nico:parent_ng_delete') }
|
|
||||||
let(:parent_id) { parent.id }
|
|
||||||
let(:child_id) { child.id }
|
|
||||||
|
|
||||||
it 'returns 400' do
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when child is nico' do
|
|
||||||
before { stub_current_user(admin) }
|
|
||||||
|
|
||||||
let!(:child) { create(:tag, :nico, name: 'nico:child_ng_delete') }
|
|
||||||
let(:parent_id) { parent.id }
|
|
||||||
let(:child_id) { child.id }
|
|
||||||
|
|
||||||
it 'returns 400' do
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,248 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'TagVersions API', type: :request do
|
|
||||||
let(:member) { create(:user, :member, name: 'version member') }
|
|
||||||
|
|
||||||
let!(:tag) { create(:tag, name: 'tag_versions_target', category: :general) }
|
|
||||||
let!(:other_tag) { create(:tag, name: 'tag_versions_other', category: :general) }
|
|
||||||
|
|
||||||
let!(:parent_shared) { create(:tag, name: 'parent_shared', category: :general) }
|
|
||||||
let!(:parent_old) { create(:tag, name: 'parent_old', category: :general) }
|
|
||||||
let!(:parent_new) { create(:tag, name: 'parent_new', category: :general) }
|
|
||||||
let!(:other_parent) { create(:tag, name: 'other_parent', category: :general) }
|
|
||||||
|
|
||||||
let(:t_v1) { Time.zone.local(2020, 1, 1, 12, 0, 0) }
|
|
||||||
let(:t_v2) { Time.zone.local(2020, 1, 2, 12, 0, 0) }
|
|
||||||
let(:t_other) { Time.zone.local(2020, 1, 3, 12, 0, 0) }
|
|
||||||
|
|
||||||
def create_tag_version!(
|
|
||||||
tag:,
|
|
||||||
version_no:,
|
|
||||||
event_type:,
|
|
||||||
name:,
|
|
||||||
category:,
|
|
||||||
aliases: [],
|
|
||||||
parent_tags: [],
|
|
||||||
created_by_user:,
|
|
||||||
created_at:
|
|
||||||
)
|
|
||||||
version =
|
|
||||||
TagVersion.create!(
|
|
||||||
tag: tag,
|
|
||||||
version_no: version_no,
|
|
||||||
event_type: event_type,
|
|
||||||
name: name,
|
|
||||||
category: category,
|
|
||||||
aliases: Array(aliases).join(' '),
|
|
||||||
parent_tag_ids: Array(parent_tags).map(&:id).join(' '),
|
|
||||||
created_by_user: created_by_user,
|
|
||||||
created_at: created_at)
|
|
||||||
|
|
||||||
tag.update_columns(version_no: version_no) if tag.has_attribute?(:version_no)
|
|
||||||
tag.version_no = version_no if tag.respond_to?(:version_no=)
|
|
||||||
|
|
||||||
version
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:v1) do
|
|
||||||
create_tag_version!(
|
|
||||||
tag: tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: 'old_tag_name',
|
|
||||||
category: 'general',
|
|
||||||
aliases: ['alias_shared', 'alias_old'],
|
|
||||||
parent_tags: [parent_shared, parent_old],
|
|
||||||
created_by_user: member,
|
|
||||||
created_at: t_v1
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:v2) do
|
|
||||||
create_tag_version!(
|
|
||||||
tag: tag,
|
|
||||||
version_no: 2,
|
|
||||||
event_type: 'update',
|
|
||||||
name: 'new_tag_name',
|
|
||||||
category: 'meme',
|
|
||||||
aliases: ['alias_shared', 'alias_new'],
|
|
||||||
parent_tags: [parent_shared, parent_new],
|
|
||||||
created_by_user: member,
|
|
||||||
created_at: t_v2
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:other_v1) do
|
|
||||||
create_tag_version!(
|
|
||||||
tag: other_tag,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
name: 'other_tag_name',
|
|
||||||
category: 'general',
|
|
||||||
aliases: ['other_alias'],
|
|
||||||
parent_tags: [other_parent],
|
|
||||||
created_by_user: member,
|
|
||||||
created_at: t_other
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'GET /tags/versions' do
|
|
||||||
it 'returns all versions in reverse chronological order when id is omitted' do
|
|
||||||
get '/tags/versions'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to include('versions', 'count')
|
|
||||||
expect(json.fetch('count')).to eq(3)
|
|
||||||
|
|
||||||
versions = json.fetch('versions')
|
|
||||||
|
|
||||||
expect(versions.map { |v| [v['tag_id'], v['version_no']] }).to eq([
|
|
||||||
[other_tag.id, 1],
|
|
||||||
[tag.id, 2],
|
|
||||||
[tag.id, 1]
|
|
||||||
])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns versions for the specified tag with diffs' do
|
|
||||||
get '/tags/versions', params: { id: tag.id }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to include('versions', 'count')
|
|
||||||
expect(json.fetch('count')).to eq(2)
|
|
||||||
|
|
||||||
versions = json.fetch('versions')
|
|
||||||
expect(versions.map { |v| v['tag_id'] }.uniq).to eq([tag.id])
|
|
||||||
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
|
|
||||||
|
|
||||||
latest = versions.first
|
|
||||||
expect(latest).to include(
|
|
||||||
'tag_id' => tag.id,
|
|
||||||
'version_no' => 2,
|
|
||||||
'event_type' => 'update',
|
|
||||||
'created_by_user' => {
|
|
||||||
'id' => member.id,
|
|
||||||
'name' => member.name
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(latest.fetch('name')).to eq(
|
|
||||||
'current' => 'new_tag_name',
|
|
||||||
'prev' => 'old_tag_name'
|
|
||||||
)
|
|
||||||
expect(latest.fetch('category')).to eq(
|
|
||||||
'current' => 'meme',
|
|
||||||
'prev' => 'general'
|
|
||||||
)
|
|
||||||
expect(latest.fetch('aliases')).to include(
|
|
||||||
{ 'name' => 'alias_shared', 'type' => 'context' },
|
|
||||||
{ 'name' => 'alias_new', 'type' => 'added' },
|
|
||||||
{ 'name' => 'alias_old', 'type' => 'removed' }
|
|
||||||
)
|
|
||||||
expect(latest.fetch('parent_tags')).to include(
|
|
||||||
a_hash_including(
|
|
||||||
'type' => 'context',
|
|
||||||
'tag' => a_hash_including(
|
|
||||||
'id' => parent_shared.id
|
|
||||||
)
|
|
||||||
),
|
|
||||||
a_hash_including(
|
|
||||||
'type' => 'added',
|
|
||||||
'tag' => a_hash_including(
|
|
||||||
'id' => parent_new.id
|
|
||||||
)
|
|
||||||
),
|
|
||||||
a_hash_including(
|
|
||||||
'type' => 'removed',
|
|
||||||
'tag' => a_hash_including(
|
|
||||||
'id' => parent_old.id
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
expect(latest.fetch('created_at')).to eq(t_v2.iso8601)
|
|
||||||
|
|
||||||
first = versions.second
|
|
||||||
expect(first).to include(
|
|
||||||
'tag_id' => tag.id,
|
|
||||||
'version_no' => 1,
|
|
||||||
'event_type' => 'create',
|
|
||||||
'created_by_user' => {
|
|
||||||
'id' => member.id,
|
|
||||||
'name' => member.name
|
|
||||||
}
|
|
||||||
)
|
|
||||||
expect(first.fetch('name')).to eq(
|
|
||||||
'current' => 'old_tag_name',
|
|
||||||
'prev' => nil
|
|
||||||
)
|
|
||||||
expect(first.fetch('category')).to eq(
|
|
||||||
'current' => 'general',
|
|
||||||
'prev' => nil
|
|
||||||
)
|
|
||||||
expect(first.fetch('aliases')).to include(
|
|
||||||
{ 'name' => 'alias_shared', 'type' => 'added' },
|
|
||||||
{ 'name' => 'alias_old', 'type' => 'added' }
|
|
||||||
)
|
|
||||||
expect(first.fetch('parent_tags')).to include(
|
|
||||||
a_hash_including(
|
|
||||||
'type' => 'added',
|
|
||||||
'tag' => a_hash_including(
|
|
||||||
'id' => parent_shared.id
|
|
||||||
)
|
|
||||||
),
|
|
||||||
a_hash_including(
|
|
||||||
'type' => 'added',
|
|
||||||
'tag' => a_hash_including(
|
|
||||||
'id' => parent_old.id
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns empty when the specified tag has no versions' do
|
|
||||||
fresh_tag = create(:tag, name: 'no_versions_tag', category: :general)
|
|
||||||
|
|
||||||
get '/tags/versions', params: { id: fresh_tag.id }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('versions')).to eq([])
|
|
||||||
expect(json.fetch('count')).to eq(0)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'clamps page and limit to at least 1' do
|
|
||||||
get '/tags/versions', params: { id: tag.id, page: 0, limit: 0 }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('count')).to eq(2)
|
|
||||||
|
|
||||||
versions = json.fetch('versions')
|
|
||||||
expect(versions.size).to eq(1)
|
|
||||||
expect(versions.first['version_no']).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not create tag versions by wiki updates when tag has no versions yet' do
|
|
||||||
wiki_tag_name = TagName.create!(name: 'tag_versions_from_wiki')
|
|
||||||
wiki_tag = Tag.create!(tag_name: wiki_tag_name, category: :general)
|
|
||||||
|
|
||||||
wiki_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: wiki_tag_name,
|
|
||||||
body: 'before',
|
|
||||||
created_by_user: member,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
Wiki::Commit.content!(
|
|
||||||
page: wiki_page,
|
|
||||||
body: 'after',
|
|
||||||
created_user: member,
|
|
||||||
message: 'edit',
|
|
||||||
base_revision_id: wiki_page.current_revision.id)
|
|
||||||
|
|
||||||
get '/tags/versions', params: { id: wiki_tag.id }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('versions')).to eq([])
|
|
||||||
expect(json.fetch('count')).to eq(0)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Tag and wiki history integrity', type: :request do
|
|
||||||
let(:member_user) { create(:user, role: 'member') }
|
|
||||||
|
|
||||||
def stub_current_user user
|
|
||||||
allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_tag! name:, category: :general
|
|
||||||
tag_name = TagName.create!(name:)
|
|
||||||
Tag.create!(tag_name:, category:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_wiki_for_tag! tag:, body: 'wiki body', user: member_user
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: tag.tag_name,
|
|
||||||
body:,
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
stub_current_user(member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PATCH /tags/:id' do
|
|
||||||
it 'records wiki_version when tag name changes and tag has wiki' do
|
|
||||||
tag = create_tag!(name: 'patch_tag_wiki_before')
|
|
||||||
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'patch_tag_wiki_after',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
wiki_page.reload
|
|
||||||
version = wiki_page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(tag.name).to eq('patch_tag_wiki_after')
|
|
||||||
expect(wiki_page.title).to eq('patch_tag_wiki_after')
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'patch_tag_wiki_after',
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user_id: member_user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not record wiki_version when only category changes' do
|
|
||||||
tag = create_tag!(name: 'patch_tag_category_only')
|
|
||||||
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
|
||||||
|
|
||||||
before_wiki_versions = wiki_page.wiki_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{ tag.id }", params: {
|
|
||||||
category: 'meme',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
wiki_page.reload
|
|
||||||
|
|
||||||
expect(tag.name).to eq('patch_tag_category_only')
|
|
||||||
expect(tag.category).to eq('meme')
|
|
||||||
expect(wiki_page.wiki_versions.count).to eq(before_wiki_versions)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /tags/:id' do
|
|
||||||
it 'records wiki_version when tag name changes and tag has wiki' do
|
|
||||||
tag = create_tag!(name: 'put_tag_wiki_before')
|
|
||||||
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_tag_wiki_after',
|
|
||||||
category: 'general',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
wiki_page.reload
|
|
||||||
version = wiki_page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(tag.name).to eq('put_tag_wiki_after')
|
|
||||||
expect(wiki_page.title).to eq('put_tag_wiki_after')
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'put_tag_wiki_after',
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user_id: member_user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not record wiki_version when only category changes' do
|
|
||||||
tag = create_tag!(name: 'put_tag_category_only')
|
|
||||||
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
|
||||||
|
|
||||||
before_wiki_versions = wiki_page.wiki_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_tag_category_only',
|
|
||||||
category: 'meme',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
wiki_page.reload
|
|
||||||
|
|
||||||
expect(tag.name).to eq('put_tag_category_only')
|
|
||||||
expect(tag.category).to eq('meme')
|
|
||||||
expect(wiki_page.wiki_versions.count).to eq(before_wiki_versions)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not record wiki_version when only aliases change' do
|
|
||||||
tag = create_tag!(name: 'put_tag_alias_only')
|
|
||||||
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
|
||||||
|
|
||||||
before_wiki_versions = wiki_page.wiki_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_tag_alias_only',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'put_tag_alias_only_alias',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_versions)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -8,35 +8,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
let!(:tag) { create(:tag, category: :deerjikist) }
|
let!(:tag) { create(:tag, category: :deerjikist) }
|
||||||
|
|
||||||
let(:member) { create(:user, :member) }
|
|
||||||
let(:guest) { create(:user, role: :guest) }
|
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
# show_by_name / deerjikists_by_name 用に名前を固定
|
||||||
tag.tag_name.update!(name: 'deerjika')
|
tag.tag_name.update!(name: 'deerjika')
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /tags/:id/deerjikists' do
|
describe 'GET /tags/:id/deerjikists' do
|
||||||
subject(:do_request) do
|
subject(:do_request) do
|
||||||
get "/tags/#{tag_id}/deerjikists"
|
get "/tags/#{ tag_id }/deerjikists"
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:tag_id) { tag.id }
|
let(:tag_id) { tag.id }
|
||||||
|
|
||||||
context 'when tag exists and has no deerjikists' do
|
context 'when tag exists and has no deerjikists' do
|
||||||
it 'returns 200 with tag and empty deerjikists array' do
|
it 'returns 200 and empty array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to eq([])
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(false)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to eq([])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,24 +34,14 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
expect(json).to be_a(Array)
|
||||||
|
expect(json.size).to eq(2)
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
expect(json.map { |h| [h['platform'], h['code']] }).to contain_exactly(
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(true)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to be_a(Array)
|
|
||||||
expect(json['deerjikists'].size).to eq(2)
|
|
||||||
|
|
||||||
expect(json['deerjikists'].map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
[platform1, code1],
|
||||||
[platform2, code2],
|
[platform2, code2],
|
||||||
)
|
)
|
||||||
@@ -75,7 +53,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -83,7 +60,7 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
describe 'GET /tags/name/:name/deerjikists' do
|
describe 'GET /tags/name/:name/deerjikists' do
|
||||||
subject(:do_request) do
|
subject(:do_request) do
|
||||||
get "/tags/name/#{name}/deerjikists"
|
get "/tags/name/#{ name }/deerjikists"
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:name) { 'deerjika' }
|
let(:name) { 'deerjika' }
|
||||||
@@ -93,7 +70,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 400' do
|
it 'returns 400' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -103,233 +79,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when tag exists and has no deerjikists' do
|
|
||||||
it 'returns 200 with tag and empty deerjikists array' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(false)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to eq([])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag exists and has deerjikists' do
|
context 'when tag exists and has deerjikists' do
|
||||||
before do
|
before do
|
||||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(true)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to be_a(Array)
|
|
||||||
expect(json['deerjikists'].size).to eq(1)
|
|
||||||
|
|
||||||
expect(json['deerjikists'][0]['platform']).to eq(platform1)
|
|
||||||
expect(json['deerjikists'][0]['code']).to eq(code1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /tags/:id/deerjikists' do
|
|
||||||
subject(:do_request) do
|
|
||||||
put "/tags/#{tag_id}/deerjikists", params: payload, as: :json
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:tag_id) { tag.id }
|
|
||||||
let(:payload) do
|
|
||||||
[
|
|
||||||
{ platform: platform1, code: code1 },
|
|
||||||
{ platform: platform2, code: code2 },
|
|
||||||
]
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when not logged in' do
|
|
||||||
it 'returns 401' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when logged in but not member' do
|
|
||||||
before do
|
|
||||||
sign_in_as guest
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag does not exist' do
|
|
||||||
let(:tag_id) { 9_999_999 }
|
|
||||||
|
|
||||||
before do
|
|
||||||
sign_in_as member
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 404' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when logged in as member' do
|
|
||||||
before do
|
|
||||||
sign_in_as member
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag has no deerjikists' do
|
|
||||||
it 'creates deerjikists and returns deerjikists array' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(0).to(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
|
||||||
expect(json.map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag already has deerjikists' do
|
|
||||||
before do
|
|
||||||
Deerjikist.create!(platform: platform1, code: 'old-code-1', tag: tag)
|
|
||||||
Deerjikist.create!(platform: platform2, code: 'old-code-2', tag: tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'replaces deerjikists and returns deerjikists array' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(Deerjikist.exists?(platform: platform1, code: 'old-code-1')).to eq(false)
|
|
||||||
expect(Deerjikist.exists?(platform: platform2, code: 'old-code-2')).to eq(false)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
|
||||||
expect(json.map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when payload is empty array' do
|
|
||||||
let(:payload) { [] }
|
|
||||||
|
|
||||||
before do
|
|
||||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
|
||||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'clears deerjikists and returns empty array' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(2).to(0)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to eq([])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when a row is invalid' do
|
|
||||||
let(:payload) do
|
|
||||||
[
|
|
||||||
{ platform: '', code: code1 },
|
|
||||||
]
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 with indexed field errors and does not replace existing deerjikists' 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).to include(
|
|
||||||
'type' => 'validation_error',
|
|
||||||
'message' => '入力内容を確認してください.',
|
|
||||||
'base_errors' => [])
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'deerjikists.0.platform' => [be_present])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when youtube code is handle' do
|
|
||||||
let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
|
|
||||||
let(:payload) do
|
|
||||||
[
|
|
||||||
{ platform: 'youtube', code: '@deerjika' },
|
|
||||||
]
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
allow(Net::HTTP).to receive(:get).and_return(
|
|
||||||
%(<link rel="canonical" href="https://www.youtube.com/channel/#{channel_id}">),
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'normalises youtube handle to channel id' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(0).to(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(Net::HTTP).to have_received(:get)
|
|
||||||
|
|
||||||
expect(Deerjikist.exists?(platform: 'youtube', code: channel_id, tag: tag))
|
|
||||||
.to eq(true)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
expect(json).to be_a(Array)
|
||||||
expect(json.size).to eq(1)
|
expect(json.size).to eq(1)
|
||||||
expect(json[0]['platform']).to eq('youtube')
|
expect(json[0]['platform']).to eq(platform1)
|
||||||
expect(json[0]['code']).to eq(channel_id)
|
expect(json[0]['code']).to eq(code1)
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
require 'cgi'
|
require 'cgi'
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
|
|
||||||
RSpec.describe 'Tags API', type: :request do
|
RSpec.describe 'Tags API', type: :request do
|
||||||
let!(:tn) { TagName.create!(name: 'spec_tag') }
|
let!(:tn) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tn, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tn, category: :general) }
|
||||||
@@ -196,30 +197,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(response_tags.size).to eq(1)
|
expect(response_tags.size).to eq(1)
|
||||||
expect(response_names).to eq(['norm_a'])
|
expect(response_names).to eq(['norm_a'])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns aliases and parent tags' do
|
|
||||||
parent_tag = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'index_parent_tag'),
|
|
||||||
category: :meme
|
|
||||||
)
|
|
||||||
TagImplication.create!(tag:, parent_tag:)
|
|
||||||
|
|
||||||
get '/tags', params: { name: 'spec_tag' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
row = response_tags.find { |t| t['name'] == 'spec_tag' }
|
|
||||||
|
|
||||||
expect(row['aliases']).to include('unko')
|
|
||||||
expect(row['parents'].map { |t| t['name'] }).to include('index_parent_tag')
|
|
||||||
|
|
||||||
parent = row['parents'].find { |t| t['name'] == 'index_parent_tag' }
|
|
||||||
expect(parent).to include(
|
|
||||||
'id' => parent_tag.id,
|
|
||||||
'name' => 'index_parent_tag',
|
|
||||||
'category' => 'meme'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /tags/:id' do
|
describe 'GET /tags/:id' do
|
||||||
@@ -243,28 +220,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(json).to have_key('created_at')
|
expect(json).to have_key('created_at')
|
||||||
expect(json).to have_key('updated_at')
|
expect(json).to have_key('updated_at')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns aliases and parent tags' do
|
|
||||||
parent_tag = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'show_parent_tag'),
|
|
||||||
category: :character
|
|
||||||
)
|
|
||||||
TagImplication.create!(tag:, parent_tag:)
|
|
||||||
|
|
||||||
request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(json['aliases']).to include('unko')
|
|
||||||
expect(json['parents'].map { |t| t['name'] }).to include('show_parent_tag')
|
|
||||||
|
|
||||||
parent = json['parents'].find { |t| t['name'] == 'show_parent_tag' }
|
|
||||||
expect(parent).to include(
|
|
||||||
'id' => parent_tag.id,
|
|
||||||
'name' => 'show_parent_tag',
|
|
||||||
'category' => 'character'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when tag does not exist' do
|
context 'when tag does not exist' do
|
||||||
@@ -404,120 +359,14 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(tag.category).to eq('meta')
|
expect(tag.category).to eq('meta')
|
||||||
end
|
end
|
||||||
|
|
||||||
it '存在しない id なら 404 を返す' do
|
it '存在しない id だと RecordNotFound になる(通常は 404)' do
|
||||||
patch '/tags/999999999', params: { name: 'x' }
|
patch '/tags/999999999', params: { name: 'x' }
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response.status).to be_in([404, 500])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'nico category への変更は 422 を返す' do
|
it 'バリデーションで update! が失敗したら(通常は 422 か 500)' do
|
||||||
patch "/tags/#{tag.id}", params: { name: 'new', category: 'nico' }
|
patch "/tags/#{ tag.id }", params: { name: 'new', category: 'nico' }
|
||||||
|
expect(response.status).to be_in([422, 500])
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(tag.reload.name).to eq('spec_tag')
|
|
||||||
expect(tag.category).to eq('general')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates initial and update tag versions when name and category change' do
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
|
|
||||||
}.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
versions = tag.reload.tag_versions.order(:version_no)
|
|
||||||
|
|
||||||
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
|
||||||
|
|
||||||
expect(versions.first.name).to eq('spec_tag')
|
|
||||||
expect(versions.first.category).to eq('general')
|
|
||||||
expect(versions.first.aliases.split).to include('unko')
|
|
||||||
|
|
||||||
expect(versions.second.name).to eq('new_tag_name')
|
|
||||||
expect(versions.second.category).to eq('meme')
|
|
||||||
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when changing normal tag category to nico' do
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{tag.id}", params: { category: 'nico' }
|
|
||||||
}.not_to change(TagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(tag.reload.category).to eq('general')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when updating nico tag name' do
|
|
||||||
nico_tag_name = TagName.create!(name: 'nico:tags_spec_source')
|
|
||||||
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{ nico_tag.id }", params: { name: 'nico:tags_spec_renamed' }
|
|
||||||
}.not_to change(NicoTagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(nico_tag.reload.name).to eq('nico:tags_spec_source')
|
|
||||||
expect(nico_tag.category).to eq('nico')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when changing nico tag category to normal category' do
|
|
||||||
nico_tag_name = TagName.create!(name: 'nico:category_change_ng')
|
|
||||||
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{nico_tag.id}", params: { category: 'general' }
|
|
||||||
}.not_to change(NicoTagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(nico_tag.reload.category).to eq('nico')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'PATCH で tag の name を変更すると対応する wiki version を作成する' do
|
|
||||||
wiki_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: tag.tag_name,
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user: member_user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'patch_wiki_renamed_tag',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'patch_wiki_renamed_tag',
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user_id: member_user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'tag の category だけを変更しても wiki version は作成しない' do
|
|
||||||
wiki_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: tag.tag_name,
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user: member_user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
before_wiki_version_count = wiki_page.reload.wiki_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
patch "/tags/#{ tag.id }", params: {
|
|
||||||
category: 'meme',
|
|
||||||
}
|
|
||||||
}.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -661,397 +510,4 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT /tags/:id' do
|
|
||||||
context '未ログイン' do
|
|
||||||
before { stub_current_user(nil) }
|
|
||||||
|
|
||||||
it '401 を返す' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'new',
|
|
||||||
category: 'general',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'ログインしてゐるが member でない' do
|
|
||||||
before { stub_current_user(non_member_user) }
|
|
||||||
|
|
||||||
it '403 を返す' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'new',
|
|
||||||
category: 'general',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'member' do
|
|
||||||
before { stub_current_user(member_user) }
|
|
||||||
|
|
||||||
it '存在しない id なら 404 を返す' do
|
|
||||||
put '/tags/999999999', params: {
|
|
||||||
name: 'new',
|
|
||||||
category: 'general',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'name が空なら 422 を返す' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: '',
|
|
||||||
category: 'general',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(tag.reload.name).to eq('spec_tag')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'category が空なら 422 を返す' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'new',
|
|
||||||
category: '',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(tag.reload.name).to eq('spec_tag')
|
|
||||||
expect(tag.category).to eq('general')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'name, category, aliases, parent tags をまとめて更新できる' do
|
|
||||||
old_parent = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_old_parent'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
kept_parent = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_kept_parent'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
TagImplication.create!(tag:, parent_tag: old_parent)
|
|
||||||
TagImplication.create!(tag:, parent_tag: kept_parent)
|
|
||||||
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_renamed_tag',
|
|
||||||
category: 'meme',
|
|
||||||
aliases: 'put_alias_a put_alias_b put_alias_a',
|
|
||||||
parent_tags: 'put_kept_parent put_new_parent',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
|
|
||||||
expect(tag.name).to eq('put_renamed_tag')
|
|
||||||
expect(tag.category).to eq('meme')
|
|
||||||
|
|
||||||
expect(TagName.find_by(name: 'put_alias_a').canonical).to eq(tag.tag_name)
|
|
||||||
expect(TagName.find_by(name: 'put_alias_b').canonical).to eq(tag.tag_name)
|
|
||||||
|
|
||||||
old_name_alias = TagName.find_by(name: 'spec_tag')
|
|
||||||
expect(old_name_alias).to be_present
|
|
||||||
expect(old_name_alias.canonical).to eq(tag.tag_name)
|
|
||||||
|
|
||||||
expect(alias_tn.reload.canonical).to be_nil
|
|
||||||
|
|
||||||
expect(tag.parents.map(&:name)).to contain_exactly(
|
|
||||||
'put_kept_parent',
|
|
||||||
'put_new_parent'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(TagImplication.where(tag:, parent_tag: old_parent)).not_to exist
|
|
||||||
|
|
||||||
expect(json['name']).to eq('put_renamed_tag')
|
|
||||||
expect(json['category']).to eq('meme')
|
|
||||||
expect(json['aliases']).to contain_exactly(
|
|
||||||
'put_alias_a',
|
|
||||||
'put_alias_b',
|
|
||||||
'spec_tag'
|
|
||||||
)
|
|
||||||
expect(json['parents'].map { |t| t['name'] }).to contain_exactly(
|
|
||||||
'put_kept_parent',
|
|
||||||
'put_new_parent'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'aliases に現在名を指定しても alias には残さない' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'spec_tag put_alias_self_test',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag.reload
|
|
||||||
|
|
||||||
expect(TagName.find_by(name: 'put_alias_self_test').canonical).to eq(tag.tag_name)
|
|
||||||
expect(json['aliases']).to include('put_alias_self_test')
|
|
||||||
expect(json['aliases']).not_to include('spec_tag')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'parent_tags に自分自身を指定しても自己参照は作らない' do
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'unko',
|
|
||||||
parent_tags: 'spec_tag',
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(TagImplication.where(tag:, parent_tag: tag)).not_to exist
|
|
||||||
expect(tag.reload.parents).to eq([])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'initial and update tag versions を作成する' do
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_versioned_tag',
|
|
||||||
category: 'meta',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}.to change(TagVersion, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
versions = tag.reload.tag_versions.order(:version_no)
|
|
||||||
|
|
||||||
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
|
||||||
|
|
||||||
expect(versions.first.name).to eq('spec_tag')
|
|
||||||
expect(versions.first.category).to eq('general')
|
|
||||||
expect(versions.first.aliases.split).to include('unko')
|
|
||||||
|
|
||||||
expect(versions.second.name).to eq('put_versioned_tag')
|
|
||||||
expect(versions.second.category).to eq('meta')
|
|
||||||
expect(versions.second.aliases.split).to include('spec_tag')
|
|
||||||
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'parent tag の snapshot も作成する' do
|
|
||||||
old_parent = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
new_parent = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_snapshot_new_parent'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
TagImplication.create!(tag:, parent_tag: old_parent)
|
|
||||||
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'unko',
|
|
||||||
parent_tags: new_parent.name,
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(old_parent.reload.tag_versions.map(&:event_type)).to include('create')
|
|
||||||
expect(new_parent.reload.tag_versions.map(&:event_type)).to include('create')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'normal tag を nico category には変更できない' do
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'nico',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}.not_to change(TagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(tag.reload.name).to eq('spec_tag')
|
|
||||||
expect(tag.category).to eq('general')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'nico tag は更新できない' do
|
|
||||||
nico_tag = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'nico:put_update_all_ng'),
|
|
||||||
category: :nico
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ nico_tag.id }", params: {
|
|
||||||
name: 'nico:put_update_all_renamed',
|
|
||||||
category: 'nico',
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}.not_to change(NicoTagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(nico_tag.reload.name).to eq('nico:put_update_all_ng')
|
|
||||||
expect(nico_tag.category).to eq('nico')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'system tag の name は変更できない' do
|
|
||||||
system_tag = Tag.tagme
|
|
||||||
old_name = system_tag.name
|
|
||||||
old_category = system_tag.category
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ system_tag.id }", params: {
|
|
||||||
name: 'put_system_tag_renamed',
|
|
||||||
category: old_category,
|
|
||||||
aliases: '',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}.not_to change(TagVersion, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(system_tag.reload.name).to eq(old_name)
|
|
||||||
expect(system_tag.category).to eq(old_category)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'wiki を持つ tag を更新すると wiki version も作成する' do
|
|
||||||
wiki_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: tag.tag_name,
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user: member_user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
Wiki::Commit.content!(
|
|
||||||
page: wiki_page,
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_user: member_user,
|
|
||||||
message: 'init'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_wiki_version_tag',
|
|
||||||
category: 'meme',
|
|
||||||
aliases: 'unko',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'put_wiki_version_tag',
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user_id: member_user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
|
|
||||||
old_owner = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_alias_old_owner'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
stolen_alias = TagName.create!(
|
|
||||||
name: 'put_stolen_alias',
|
|
||||||
canonical: old_owner.tag_name
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(old_owner.tag_name.aliases.map(&:name)).to include('put_stolen_alias')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'unko put_stolen_alias',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change { tag.reload.tag_versions.count }.by(2)
|
|
||||||
.and change { old_owner.reload.tag_versions.count }.by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(stolen_alias.reload.canonical).to eq(tag.tag_name)
|
|
||||||
expect(old_owner.reload.tag_name.aliases.map(&:name)).not_to include('put_stolen_alias')
|
|
||||||
|
|
||||||
old_owner_versions = old_owner.tag_versions.order(:version_no)
|
|
||||||
|
|
||||||
expect(old_owner_versions.first.event_type).to eq('create')
|
|
||||||
expect(old_owner_versions.first.aliases.split).to include('put_stolen_alias')
|
|
||||||
|
|
||||||
expect(old_owner_versions.second.event_type).to eq('update')
|
|
||||||
expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'parent_tags に指定すると循環する tag は 422 にする' do
|
|
||||||
pending '#332 で対応予定'
|
|
||||||
|
|
||||||
child = Tag.create!(
|
|
||||||
tag_name: TagName.create!(name: 'put_cycle_child'),
|
|
||||||
category: :general
|
|
||||||
)
|
|
||||||
|
|
||||||
TagImplication.create!(tag: child, parent_tag: tag)
|
|
||||||
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'spec_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'unko',
|
|
||||||
parent_tags: child.name,
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(TagImplication.where(tag:, parent_tag: child)).not_to exist
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'tag の name を変更すると対応する wiki version を作成する' do
|
|
||||||
wiki_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: tag.tag_name,
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user: member_user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/tags/#{ tag.id }", params: {
|
|
||||||
name: 'put_wiki_renamed_tag',
|
|
||||||
category: 'general',
|
|
||||||
aliases: 'unko',
|
|
||||||
parent_tags: '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.to change(TagVersion, :count).by(2)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'put_wiki_renamed_tag',
|
|
||||||
body: 'wiki body before',
|
|
||||||
created_by_user_id: member_user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -80,26 +80,6 @@ RSpec.describe 'TheatreComments', type: :request do
|
|||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(response.parsed_body.map { |row| row['no'] }).to eq([3, 2, 1])
|
expect(response.parsed_body.map { |row| row['no'] }).to eq([3, 2, 1])
|
||||||
end
|
end
|
||||||
|
|
||||||
it '削除済みコメントは deleted として返し、本文を隠す' do
|
|
||||||
comment_2.discard!
|
|
||||||
|
|
||||||
get "/theatres/#{theatre.id}/comments", params: { no_gt: 1 }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
deleted_comment = response.parsed_body.find { _1['no'] == 2 }
|
|
||||||
expect(deleted_comment).to include(
|
|
||||||
'deleted' => true,
|
|
||||||
'content' => nil
|
|
||||||
)
|
|
||||||
|
|
||||||
visible_comment = response.parsed_body.find { _1['no'] == 3 }
|
|
||||||
expect(visible_comment).to include(
|
|
||||||
'deleted' => false,
|
|
||||||
'content' => 'third comment'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST /theatres/:theatre_id/comments' do
|
describe 'POST /theatres/:theatre_id/comments' do
|
||||||
@@ -167,44 +147,4 @@ RSpec.describe 'TheatreComments', type: :request do
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'DELETE /theatres/:theatre_id/comments/:id' do
|
|
||||||
let(:theatre) { create(:theatre) }
|
|
||||||
let(:alice) { create(:user, name: 'Alice') }
|
|
||||||
let(:bob) { create(:user, name: 'Bob') }
|
|
||||||
let!(:comment) do
|
|
||||||
create(
|
|
||||||
:theatre_comment,
|
|
||||||
theatre: theatre,
|
|
||||||
no: 1,
|
|
||||||
user: alice,
|
|
||||||
content: 'delete target'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 401 when not logged in' do
|
|
||||||
delete "/theatres/#{theatre.id}/comments/#{comment.no}"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
expect(comment.reload.discarded?).to eq(false)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'allows the comment owner to delete it' do
|
|
||||||
sign_in_as(alice)
|
|
||||||
|
|
||||||
delete "/theatres/#{theatre.id}/comments/#{comment.no}"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
|
||||||
expect(comment.reload.discarded?).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when another user tries to delete it' do
|
|
||||||
sign_in_as(bob)
|
|
||||||
|
|
||||||
delete "/theatres/#{theatre.id}/comments/#{comment.no}"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
expect(comment.reload.discarded?).to eq(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'TheatreProgrammes', type: :request do
|
|
||||||
describe 'GET /theatres/:theatre_id/programmes' do
|
|
||||||
let(:theatre) { create(:theatre) }
|
|
||||||
let(:other_theatre) { create(:theatre) }
|
|
||||||
let(:post_1) { Post.create!(title: 'first', url: 'https://www.nicovideo.jp/watch/sm1') }
|
|
||||||
let(:post_2) { Post.create!(title: 'second', url: 'https://www.nicovideo.jp/watch/sm2') }
|
|
||||||
let(:other_post) { Post.create!(title: 'other', url: 'https://www.nicovideo.jp/watch/sm3') }
|
|
||||||
|
|
||||||
before do
|
|
||||||
TheatreProgramme.create!(theatre:, position: 1, post: post_1, created_at: 2.minutes.ago)
|
|
||||||
TheatreProgramme.create!(theatre:, position: 2, post: post_2, created_at: 1.minute.ago)
|
|
||||||
TheatreProgramme.create!(
|
|
||||||
theatre: other_theatre,
|
|
||||||
position: 1,
|
|
||||||
post: other_post,
|
|
||||||
created_at: 1.minute.ago
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns programmes for the theatre in descending position with post json' do
|
|
||||||
get "/theatres/#{theatre.id}/programmes"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { _1['position'] }).to eq([2, 1])
|
|
||||||
expect(json.map { _1.dig('post', 'title') }).to eq(['second', 'first'])
|
|
||||||
expect(json.first['post']).to include('id' => post_2.id, 'url' => post_2.url)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'filters programmes by position_gt' do
|
|
||||||
get "/theatres/#{theatre.id}/programmes", params: { position_gt: 1 }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { _1['position'] }).to eq([2])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -14,24 +14,10 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
let(:member) { create(:user, :member, name: 'member user') }
|
let(:member) { create(:user, :member, name: 'member user') }
|
||||||
let(:other_user) { create(:user, :member, name: 'other user') }
|
let(:other_user) { create(:user, :member, name: 'other user') }
|
||||||
|
|
||||||
let!(:niconico_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'niconico post',
|
|
||||||
url: 'https://www.nicovideo.jp/watch/sm123'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:second_niconico_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'second niconico post',
|
|
||||||
url: 'https://www.nicovideo.jp/watch/sm456'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:youtube_post) do
|
let!(:youtube_post) do
|
||||||
Post.create!(
|
Post.create!(
|
||||||
title: 'youtube post',
|
title: 'youtube post',
|
||||||
url: 'https://www.youtube.com/watch?v=yt123'
|
url: 'https://www.youtube.com/watch?v=spec123'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -134,8 +120,7 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
expect(json).to include(
|
expect(json).to include(
|
||||||
'host_flg' => true,
|
'host_flg' => true,
|
||||||
'post_id' => nil,
|
'post_id' => nil,
|
||||||
'post_started_at' => nil,
|
'post_started_at' => nil
|
||||||
'post_elapsed_ms' => nil
|
|
||||||
)
|
)
|
||||||
|
|
||||||
expect(json.fetch('watching_users')).to contain_exactly(
|
expect(json.fetch('watching_users')).to contain_exactly(
|
||||||
@@ -192,8 +177,7 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
expect(json).to include(
|
expect(json).to include(
|
||||||
'host_flg' => false,
|
'host_flg' => false,
|
||||||
'post_id' => nil,
|
'post_id' => nil,
|
||||||
'post_started_at' => nil,
|
'post_started_at' => nil
|
||||||
'post_elapsed_ms' => nil
|
|
||||||
)
|
)
|
||||||
|
|
||||||
expect(json.fetch('watching_users')).to contain_exactly(
|
expect(json.fetch('watching_users')).to contain_exactly(
|
||||||
@@ -220,7 +204,7 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
)
|
)
|
||||||
theatre.update!(
|
theatre.update!(
|
||||||
host_user: other_user,
|
host_user: other_user,
|
||||||
current_post: niconico_post,
|
current_post: youtube_post,
|
||||||
current_post_started_at: started_at
|
current_post_started_at: started_at
|
||||||
)
|
)
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
@@ -236,11 +220,9 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
expect(theatre.host_user_id).to eq(member.id)
|
expect(theatre.host_user_id).to eq(member.id)
|
||||||
|
|
||||||
expect(json['host_flg']).to eq(true)
|
expect(json['host_flg']).to eq(true)
|
||||||
expect(json['post_id']).to eq(niconico_post.id)
|
expect(json['post_id']).to eq(youtube_post.id)
|
||||||
expect(Time.zone.parse(json['post_started_at']))
|
expect(Time.zone.parse(json['post_started_at']))
|
||||||
.to be_within(1.second).of(started_at)
|
.to be_within(1.second).of(started_at)
|
||||||
expect(json['post_elapsed_ms'])
|
|
||||||
.to be_within(1_000).of(120_000)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -291,36 +273,16 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
it 'sets current_post to an eligible post and updates current_post_started_at' do
|
it 'sets current_post to an eligible post and updates current_post_started_at' do
|
||||||
expect { do_request }
|
expect { do_request }
|
||||||
.to change { theatre.reload.current_post_id }
|
.to change { theatre.reload.current_post_id }
|
||||||
|
.from(nil).to(youtube_post.id)
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
expect([niconico_post.id, second_niconico_post.id, youtube_post.id])
|
|
||||||
.to include(theatre.reload.current_post_id)
|
|
||||||
expect(theatre.reload.current_post_started_at)
|
expect(theatre.reload.current_post_started_at)
|
||||||
.to be_within(1.second).of(Time.current)
|
.to be_within(1.second).of(Time.current)
|
||||||
expect(theatre.programmes.count).to eq(1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when only a YouTube post is eligible' do
|
|
||||||
before do
|
|
||||||
niconico_post.destroy!
|
|
||||||
second_niconico_post.destroy!
|
|
||||||
theatre.update!(host_user: member)
|
|
||||||
sign_in_as(member)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'sets current_post to the YouTube post' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
|
||||||
expect(theatre.reload.current_post_id).to eq(youtube_post.id)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when current user is host and no eligible post exists' do
|
context 'when current user is host and no eligible post exists' do
|
||||||
before do
|
before do
|
||||||
niconico_post.destroy!
|
|
||||||
second_niconico_post.destroy!
|
|
||||||
youtube_post.destroy!
|
youtube_post.destroy!
|
||||||
theatre.update!(
|
theatre.update!(
|
||||||
host_user: member,
|
host_user: member,
|
||||||
@@ -337,189 +299,9 @@ RSpec.describe 'Theatres API', type: :request do
|
|||||||
|
|
||||||
theatre.reload
|
theatre.reload
|
||||||
expect(theatre.current_post_id).to be_nil
|
expect(theatre.current_post_id).to be_nil
|
||||||
expect(theatre.current_post_started_at).to be_nil
|
expect(theatre.current_post_started_at)
|
||||||
|
.to be_within(1.second).of(Time.current)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT /theatres/:id/skip_vote' do
|
|
||||||
subject(:do_request) do
|
|
||||||
put "/theatres/#{theatre.id}/skip_vote", params: { post_id: requested_post_id }
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:third_user) { create(:user, :member, name: 'third user') }
|
|
||||||
let(:requested_post_id) { niconico_post.id }
|
|
||||||
|
|
||||||
before do
|
|
||||||
theatre.update!(current_post: niconico_post, current_post_started_at: 10.seconds.ago)
|
|
||||||
[member, other_user, third_user].each do |user|
|
|
||||||
TheatreWatchingUser.create!(
|
|
||||||
theatre:,
|
|
||||||
user:,
|
|
||||||
expires_at: 10.seconds.from_now
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 401 when not logged in' do
|
|
||||||
sign_out
|
|
||||||
|
|
||||||
expect { do_request }.not_to change(TheatreSkipVote, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when post_id is invalid' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/theatres/#{theatre.id}/skip_vote", params: { post_id: 'invalid' }
|
|
||||||
}.not_to change(TheatreSkipVote, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records a vote and returns the current vote status before majority' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect { do_request }.to change(TheatreSkipVote, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['skipped']).to eq(false)
|
|
||||||
expect(json['post_id']).to eq(niconico_post.id)
|
|
||||||
expect(json['skip_vote']).to include(
|
|
||||||
'votes_count' => 1,
|
|
||||||
'required_count' => 2,
|
|
||||||
'watching_users_count' => 3,
|
|
||||||
'voted' => true
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'finalizes skip when votes reach majority and stores voters and tag snapshots' do
|
|
||||||
tag = create(:tag, name: 'skip-target')
|
|
||||||
PostTag.create!(post: niconico_post, tag:)
|
|
||||||
|
|
||||||
TheatreSkipVote.create!(theatre:, post: niconico_post, user: member)
|
|
||||||
sign_in_as(other_user)
|
|
||||||
|
|
||||||
expect { do_request }
|
|
||||||
.to change(TheatreSkipEvent, :count).by(1)
|
|
||||||
.and change(TheatreSkipEventVoter, :count).by(2)
|
|
||||||
.and change(TheatreSkipEventTag, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['skipped']).to eq(true)
|
|
||||||
expect([second_niconico_post.id, youtube_post.id]).to include(json['post_id'])
|
|
||||||
|
|
||||||
event = TheatreSkipEvent.last
|
|
||||||
expect(event.post).to eq(niconico_post)
|
|
||||||
expect(event.users).to contain_exactly(member, other_user)
|
|
||||||
expect(event.tags).to contain_exactly(tag)
|
|
||||||
expect(TheatreSkipVote.where(theatre:, post: niconico_post)).to be_empty
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not record a vote when requested post is no longer current' do
|
|
||||||
theatre.update!(current_post: second_niconico_post)
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect { do_request }.not_to change(TheatreSkipVote, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
expect(json['post_id']).to eq(second_niconico_post.id)
|
|
||||||
expect(json['skip_vote']).to include(
|
|
||||||
'votes_count' => 0,
|
|
||||||
'voted' => false
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'DELETE /theatres/:id/skip_vote' do
|
|
||||||
let(:requested_post_id) { niconico_post.id }
|
|
||||||
|
|
||||||
before do
|
|
||||||
theatre.update!(current_post: niconico_post, current_post_started_at: 10.seconds.ago)
|
|
||||||
TheatreWatchingUser.create!(theatre:, user: member, expires_at: 10.seconds.from_now)
|
|
||||||
TheatreSkipVote.create!(theatre:, post: niconico_post, user: member)
|
|
||||||
sign_in_as(member)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'removes the current user vote' do
|
|
||||||
expect {
|
|
||||||
delete "/theatres/#{theatre.id}/skip_vote", params: { post_id: requested_post_id }
|
|
||||||
}.to change(TheatreSkipVote, :count).by(-1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['skip_vote']).to include(
|
|
||||||
'votes_count' => 0,
|
|
||||||
'required_count' => 1,
|
|
||||||
'watching_users_count' => 1,
|
|
||||||
'voted' => false
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not remove a vote when requested post is no longer current' do
|
|
||||||
theatre.update!(current_post: second_niconico_post)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
delete "/theatres/#{theatre.id}/skip_vote", params: { post_id: requested_post_id }
|
|
||||||
}.not_to change(TheatreSkipVote, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
expect(json['post_id']).to eq(second_niconico_post.id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'GET /theatres/:id/skip_events' do
|
|
||||||
before do
|
|
||||||
sign_in_as(member)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not expose skip voters' do
|
|
||||||
event = TheatreSkipEvent.create!(
|
|
||||||
theatre:,
|
|
||||||
post: niconico_post,
|
|
||||||
skipped_by_user: member,
|
|
||||||
created_at: Time.current
|
|
||||||
)
|
|
||||||
TheatreSkipEventVoter.create!(theatre_skip_event: event, user: member)
|
|
||||||
|
|
||||||
get "/theatres/#{theatre.id}/skip_events"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.first).to include(
|
|
||||||
'id' => event.id,
|
|
||||||
'theatre_id' => theatre.id
|
|
||||||
)
|
|
||||||
expect(json.first).not_to have_key('voters')
|
|
||||||
expect(json.first).not_to have_key('skipped_by_user')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'GET /theatres/:id/post_selection_weights' do
|
|
||||||
before do
|
|
||||||
theatre.update!(current_post: niconico_post)
|
|
||||||
TheatreWatchingUser.create!(theatre:, user: member, expires_at: 10.seconds.from_now)
|
|
||||||
sign_in_as(member)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns tag penalties and candidate weights for the current watchers' do
|
|
||||||
tag = create(:tag, name: 'heavy-tag')
|
|
||||||
PostTag.create!(post: second_niconico_post, tag:)
|
|
||||||
event = TheatreSkipEvent.create!(
|
|
||||||
theatre:,
|
|
||||||
post: niconico_post,
|
|
||||||
skipped_by_user: member,
|
|
||||||
created_at: Time.current
|
|
||||||
)
|
|
||||||
TheatreSkipEventVoter.create!(theatre_skip_event: event, user: member)
|
|
||||||
TheatreSkipEventTag.create!(theatre_skip_event: event, tag:)
|
|
||||||
|
|
||||||
get "/theatres/#{theatre.id}/post_selection_weights"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['tag_penalties'].first['penalty']).to eq(1)
|
|
||||||
expect(json['lightest_posts'].first['post']['id']).to eq(second_niconico_post.id)
|
|
||||||
expect(json['lightest_posts'].first['penalty']).to eq(1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,268 +1,110 @@
|
|||||||
require 'rails_helper'
|
require "rails_helper"
|
||||||
|
|
||||||
RSpec.describe 'Users', type: :request do
|
|
||||||
let(:remote_ip) { '203.0.113.10' }
|
|
||||||
|
|
||||||
before do
|
RSpec.describe "Users", type: :request do
|
||||||
allow_any_instance_of(ActionDispatch::Request)
|
describe "POST /users" do
|
||||||
.to receive(:remote_ip)
|
it "creates guest user and returns code" do
|
||||||
.and_return(remote_ip)
|
post "/users"
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json["code"]).to be_present
|
||||||
|
expect(json["user"]["role"]).to eq("guest")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def auth_headers(user)
|
describe "POST /users/code/renew" do
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
it "returns 401 when not logged in" do
|
||||||
|
sign_out
|
||||||
|
post "/users/code/renew"
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST /users' do
|
describe "PUT /users/:id" do
|
||||||
it 'creates guest user, IpAddress and UserIp, and returns code' do
|
let(:user) { create(:user, name: "old-name", role: "guest") }
|
||||||
expect {
|
|
||||||
post '/users'
|
it "returns 401 when current_user id mismatch" do
|
||||||
}.to change(User, :count).by(1)
|
sign_in_as(create(:user))
|
||||||
.and change(IpAddress, :count).by(1)
|
put "/users/#{user.id}", params: { name: "new-name" }
|
||||||
.and change(UserIp, :count).by(1)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns 400 when name is blank" do
|
||||||
|
sign_in_as(user)
|
||||||
|
put "/users/#{user.id}", params: { name: " " }
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "updates name and returns 201 with user slice" do
|
||||||
|
sign_in_as(user)
|
||||||
|
put "/users/#{user.id}", params: { name: "new-name" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json['code']).to be_present
|
expect(json["id"]).to eq(user.id)
|
||||||
expect(json['user']['role']).to eq('guest')
|
expect(json["name"]).to eq("new-name")
|
||||||
|
|
||||||
user = User.last
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
|
|
||||||
|
|
||||||
expect(user.role).to eq('guest')
|
|
||||||
expect(ip_address).to be_present
|
|
||||||
expect(UserIp.exists?(user:, ip_address:)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 and does not create user when current IP address is banned' do
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users'
|
|
||||||
}.not_to change(User, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
expect(UserIp.count).to eq(0)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'POST /users/code/renew' do
|
|
||||||
it 'returns 401 when not logged in' do
|
|
||||||
post '/users/code/renew'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current user is banned' do
|
|
||||||
user = create(:user, :banned)
|
|
||||||
|
|
||||||
post '/users/code/renew', headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
user = create(:user)
|
|
||||||
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
post '/users/code/renew', headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /users/:id' do
|
|
||||||
let(:user) { create(:user, name: 'old-name', role: 'guest') }
|
|
||||||
|
|
||||||
it 'returns 401 when current_user id mismatch' do
|
|
||||||
other_user = create(:user)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(other_user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when name is blank' do
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: ' ' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'name' => ['名前は必須です.'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates name and returns user slice' do
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['id']).to eq(user.id)
|
|
||||||
expect(json['name']).to eq('new-name')
|
|
||||||
|
|
||||||
user.reload
|
user.reload
|
||||||
expect(user.name).to eq('new-name')
|
expect(user.name).to eq("new-name")
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current user is banned' do
|
|
||||||
user.update!(banned_at: Time.current)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
|
|
||||||
user.reload
|
|
||||||
expect(user.name).to eq('old-name')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
|
|
||||||
user.reload
|
|
||||||
expect(user.name).to eq('old-name')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST /users/verify' do
|
describe "POST /users/verify" do
|
||||||
it 'returns valid:false when code not found' do
|
it "returns valid:false when code not found" do
|
||||||
post '/users/verify', params: { code: 'nope' }
|
post "/users/verify", params: { code: "nope" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['valid']).to eq(false)
|
expect(json["valid"]).to eq(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
it "creates IpAddress and UserIp, and returns valid:true with user slice" do
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
|
||||||
|
|
||||||
IpAddress.create!(
|
# request.remote_ip を固定
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when verified user is banned' do
|
|
||||||
user = create(
|
|
||||||
:user,
|
|
||||||
:banned,
|
|
||||||
inheritance_code: SecureRandom.uuid,
|
|
||||||
role: 'guest'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates IpAddress and UserIp, and returns valid:true with user slice' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.to change(UserIp, :count).by(1)
|
|
||||||
.and change(IpAddress, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['valid']).to eq(true)
|
|
||||||
expect(json['user']['id']).to eq(user.id)
|
|
||||||
expect(json['user']['inheritance_code']).to eq(user.inheritance_code)
|
|
||||||
expect(json['user']['role']).to eq('guest')
|
|
||||||
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
|
|
||||||
expect(ip_address).to be_present
|
|
||||||
expect(UserIp.exists?(user:, ip_address:)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is idempotent for same user and same IP address' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['valid']).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates another UserIp for same user and different IP address' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
allow_any_instance_of(ActionDispatch::Request)
|
|
||||||
.to receive(:remote_ip)
|
|
||||||
.and_return('203.0.113.11')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.to change(UserIp, :count).by(1)
|
}.to change(UserIp, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['valid']).to eq(true)
|
expect(json["valid"]).to eq(true)
|
||||||
|
expect(json["user"]["id"]).to eq(user.id)
|
||||||
|
expect(json["user"]["inheritance_code"]).to eq(user.inheritance_code)
|
||||||
|
expect(json["user"]["role"]).to eq("guest")
|
||||||
|
|
||||||
|
# ついでに IpAddress もできてることを確認(ipの保存形式がバイナリでも count で見れる)
|
||||||
|
expect(IpAddress.count).to be >= 1
|
||||||
|
end
|
||||||
|
|
||||||
|
it "is idempotent for same user+ip (does not create duplicate UserIp)" do
|
||||||
|
user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
|
||||||
|
allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
|
||||||
|
|
||||||
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
|
}.not_to change(UserIp, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json["valid"]).to eq(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /users/me' do
|
describe "GET /users/me" do
|
||||||
it 'returns 404 when code not found' do
|
it "returns 404 when code not found" do
|
||||||
get '/users/me', params: { code: 'nope' }
|
get "/users/me", params: { code: "nope" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns user slice when found' do
|
it "returns user slice when found" do
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, name: 'me', role: 'guest')
|
user = create(:user, inheritance_code: SecureRandom.uuid, name: "me", role: "guest")
|
||||||
|
get "/users/me", params: { code: user.inheritance_code }
|
||||||
get '/users/me', params: { code: user.inheritance_code }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['id']).to eq(user.id)
|
expect(json["id"]).to eq(user.id)
|
||||||
expect(json['name']).to eq('me')
|
expect(json["name"]).to eq("me")
|
||||||
expect(json['inheritance_code']).to eq(user.inheritance_code)
|
expect(json["inheritance_code"]).to eq(user.inheritance_code)
|
||||||
expect(json['role']).to eq('guest')
|
expect(json["role"]).to eq("guest")
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid)
|
|
||||||
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
get '/users/me', params: { code: user.inheritance_code }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki body search', type: :request do
|
|
||||||
let!(:user) { create_member_user! }
|
|
||||||
|
|
||||||
it 'searches wiki pages by body text' do
|
|
||||||
pending '#336 で対応予定'
|
|
||||||
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: 'wiki_body_search_hit'),
|
|
||||||
body: 'unique body keyword for wiki search',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: 'wiki_body_search_miss'),
|
|
||||||
body: 'ordinary body',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
get '/wiki/search', params: { body: 'unique body keyword' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { |page| page['title'] }).to include('wiki_body_search_hit')
|
|
||||||
expect(json.map { |page| page['title'] }).not_to include('wiki_body_search_miss')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki conflict handling', type: :request do
|
|
||||||
let!(:user) { create_member_user! }
|
|
||||||
|
|
||||||
def auth_headers user
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 409 when base_revision_id is stale' do
|
|
||||||
page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: 'wiki_conflict_request'),
|
|
||||||
body: 'first',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
stale_id = page.current_revision.id
|
|
||||||
|
|
||||||
Wiki::Commit.content!(
|
|
||||||
page:,
|
|
||||||
body: 'second',
|
|
||||||
created_user: user,
|
|
||||||
message: 'other edit',
|
|
||||||
base_revision_id: stale_id)
|
|
||||||
|
|
||||||
put "/wiki/#{ page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_conflict_request',
|
|
||||||
body: 'third',
|
|
||||||
message: 'stale',
|
|
||||||
base_revision_id: stale_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
expect(page.body).to eq('second')
|
|
||||||
expect(page.current_revision.message).to eq('other edit')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,196 +0,0 @@
|
|||||||
require 'cgi'
|
|
||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki history integrity', type: :request do
|
|
||||||
let!(:user) { create_member_user! }
|
|
||||||
|
|
||||||
def auth_headers user
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_wiki_page title:, body: 'body', message: 'init', user: self.user
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: title),
|
|
||||||
body:,
|
|
||||||
created_by_user: user,
|
|
||||||
message:)
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'POST /wiki' do
|
|
||||||
it 'creates wiki_page, wiki_revision, and wiki_version atomically' do
|
|
||||||
expect {
|
|
||||||
post '/wiki',
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_create_atomic',
|
|
||||||
body: "a\nb\nc",
|
|
||||||
message: 'initial commit',
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.to change(WikiPage, :count).by(1)
|
|
||||||
.and change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
page = WikiPage.find(json.fetch('id'))
|
|
||||||
revision = page.current_revision
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.title).to eq('wiki_history_create_atomic')
|
|
||||||
expect(page.body).to eq("a\nb\nc")
|
|
||||||
|
|
||||||
expect(revision).to be_content
|
|
||||||
expect(revision.message).to eq('initial commit')
|
|
||||||
expect(revision.lines_count).to eq(3)
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
title: 'wiki_history_create_atomic',
|
|
||||||
body: "a\nb\nc",
|
|
||||||
reason: 'initial commit',
|
|
||||||
created_by_user_id: user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 and creates nothing when normalised body is blank' do
|
|
||||||
expect {
|
|
||||||
post '/wiki',
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_blank_body',
|
|
||||||
body: "\r\n\r\n",
|
|
||||||
message: 'blank',
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.not_to change(WikiPage, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(WikiPage.joins(:tag_name).where(tag_names: { name: 'wiki_history_blank_body' })).not_to exist
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 and creates no partial page when title already exists' do
|
|
||||||
create_wiki_page(title: 'wiki_history_duplicate_title', body: 'first')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/wiki',
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_duplicate_title',
|
|
||||||
body: 'second',
|
|
||||||
message: 'duplicate',
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.not_to change(WikiPage, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(WikiPage.joins(:tag_name).where(tag_names: { name: 'wiki_history_duplicate_title' }).count).to eq(1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /wiki/:id' do
|
|
||||||
it 'updates body and records wiki_revision and wiki_version' do
|
|
||||||
page = create_wiki_page(title: 'wiki_history_update_body', body: 'before')
|
|
||||||
current_id = page.current_revision.id
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/wiki/#{ page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_update_body',
|
|
||||||
body: 'after',
|
|
||||||
message: 'edit body',
|
|
||||||
base_revision_id: current_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.title).to eq('wiki_history_update_body')
|
|
||||||
expect(page.body).to eq('after')
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'wiki_history_update_body',
|
|
||||||
body: 'after',
|
|
||||||
reason: 'edit body',
|
|
||||||
created_by_user_id: user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'renames title and records wiki_version with new title' do
|
|
||||||
page = create_wiki_page(title: 'wiki_history_rename_before', body: 'before')
|
|
||||||
current_id = page.current_revision.id
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/wiki/#{ page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_rename_after',
|
|
||||||
body: 'after',
|
|
||||||
message: 'rename',
|
|
||||||
base_revision_id: current_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.title).to eq('wiki_history_rename_after')
|
|
||||||
expect(page.body).to eq('after')
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'wiki_history_rename_after',
|
|
||||||
body: 'after',
|
|
||||||
reason: 'rename',
|
|
||||||
created_by_user_id: user.id
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not change title, body, revision, or version on stale base_revision_id' do
|
|
||||||
page = create_wiki_page(title: 'wiki_history_conflict_page', body: 'first')
|
|
||||||
stale_id = page.current_revision.id
|
|
||||||
|
|
||||||
Wiki::Commit.content!(
|
|
||||||
page:,
|
|
||||||
body: 'second',
|
|
||||||
created_user: user,
|
|
||||||
message: 'other edit',
|
|
||||||
base_revision_id: stale_id)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
current_title = page.title
|
|
||||||
current_body = page.body
|
|
||||||
revision_count = page.wiki_revisions.count
|
|
||||||
version_count = page.wiki_versions.count
|
|
||||||
|
|
||||||
put "/wiki/#{ page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_history_conflict_renamed',
|
|
||||||
body: 'third',
|
|
||||||
message: 'stale edit',
|
|
||||||
base_revision_id: stale_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
expect(page.title).to eq(current_title)
|
|
||||||
expect(page.body).to eq(current_body)
|
|
||||||
expect(page.wiki_revisions.count).to eq(revision_count)
|
|
||||||
expect(page.wiki_versions.count).to eq(version_count)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki restore', type: :request do
|
|
||||||
let!(:user) { create_member_user! }
|
|
||||||
|
|
||||||
def auth_headers user
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'restores wiki page to previous version' do
|
|
||||||
pending '#337 で対応予定'
|
|
||||||
|
|
||||||
page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: 'wiki_restore_page'),
|
|
||||||
body: 'v1',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
v1 = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
Wiki::Commit.content!(
|
|
||||||
page:,
|
|
||||||
body: 'v2',
|
|
||||||
created_user: user,
|
|
||||||
message: 'edit',
|
|
||||||
base_revision_id: page.current_revision.id)
|
|
||||||
|
|
||||||
post "/wiki/#{ page.id }/restore",
|
|
||||||
params: { version_no: v1.version_no },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(page.reload.body).to eq('v1')
|
|
||||||
expect(page.wiki_versions.order(:version_no).last.event_type).to eq('restore')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -4,19 +4,13 @@ require 'securerandom'
|
|||||||
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki API', type: :request do
|
RSpec.describe 'Wiki API', type: :request do
|
||||||
def auth_headers(user)
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:user) { create_member_user! }
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
let!(:tn) { TagName.create!(name: 'spec_wiki_title') }
|
let!(:tn) { TagName.create!(name: 'spec_wiki_title') }
|
||||||
let!(:page) do
|
let!(:page) do
|
||||||
Wiki::Commit.create_content!(
|
WikiPage.create!(tag_name: tn, created_user: user, updated_user: user).tap do |p|
|
||||||
tag_name: tn,
|
Wiki::Commit.content!(page: p, body: 'init', created_user: user, message: 'init')
|
||||||
body: 'init',
|
end
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /wiki' do
|
describe 'GET /wiki' do
|
||||||
@@ -43,7 +37,6 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
context 'when wiki page exists' do
|
context 'when wiki page exists' do
|
||||||
it 'returns wiki page with title' do
|
it 'returns wiki page with title' do
|
||||||
request
|
request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to include(
|
expect(json).to include(
|
||||||
@@ -57,7 +50,6 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
request
|
request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -107,34 +99,25 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
end
|
end
|
||||||
.to change(WikiPage, :count).by(1)
|
.to change(WikiPage, :count).by(1)
|
||||||
.and change(WikiRevision, :count).by(1)
|
.and change(WikiRevision, :count).by(1)
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
page_id = json.fetch('id')
|
page_id = json.fetch('id')
|
||||||
expect(json.fetch('title')).to eq('TestPage')
|
expect(json.fetch('title')).to eq('TestPage')
|
||||||
|
|
||||||
created_page = WikiPage.find(page_id)
|
page = WikiPage.find(page_id)
|
||||||
version = created_page.wiki_versions.order(:version_no).last
|
rev = page.current_revision
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
title: 'TestPage',
|
|
||||||
body: "a\nb\nc",
|
|
||||||
created_by_user_id: member.id
|
|
||||||
)
|
|
||||||
|
|
||||||
rev = created_page.current_revision
|
|
||||||
expect(rev).to be_present
|
expect(rev).to be_present
|
||||||
expect(rev).to be_content
|
expect(rev).to be_content
|
||||||
expect(rev.message).to eq('init')
|
expect(rev.message).to eq('init')
|
||||||
|
|
||||||
expect(created_page.body).to eq("a\nb\nc")
|
# body が復元できること
|
||||||
|
expect(page.body).to eq("a\nb\nc")
|
||||||
|
|
||||||
|
# 行数とリレーションの整合
|
||||||
expect(rev.lines_count).to eq(3)
|
expect(rev.lines_count).to eq(3)
|
||||||
expect(rev.wiki_revision_lines.order(:position).pluck(:position)).to eq([0, 1, 2])
|
expect(rev.wiki_revision_lines.order(:position).pluck(:position)).to eq([0, 1, 2])
|
||||||
expect(rev.wiki_lines.pluck(:body)).to match_array(['a', 'b', 'c'])
|
expect(rev.wiki_lines.pluck(:body)).to match_array(%w[a b c])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'reuses existing WikiLine rows by sha256' do
|
it 'reuses existing WikiLine rows by sha256' do
|
||||||
@@ -152,41 +135,6 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
# "a" の WikiLine が増殖しない(1行のはず)
|
# "a" の WikiLine が増殖しない(1行のはず)
|
||||||
expect(WikiLine.where(body: 'a').count).to eq(1)
|
expect(WikiLine.where(body: 'a').count).to eq(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'deduplicates duplicated new lines before upsert' do
|
|
||||||
duplicated = 'duplicated_line_for_wiki_line_upsert_spec'
|
|
||||||
|
|
||||||
post endpoint,
|
|
||||||
params: { title: 'DuplicateNewLine', body: "#{ duplicated }\n#{ duplicated }" },
|
|
||||||
headers: auth_headers(member)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
page = WikiPage.find(json.fetch('id'))
|
|
||||||
rev = page.current_revision
|
|
||||||
|
|
||||||
expect(rev.lines_count).to eq(2)
|
|
||||||
expect(WikiLine.where(body: duplicated).count).to eq(1)
|
|
||||||
expect(rev.wiki_revision_lines.count).to eq(2)
|
|
||||||
expect(rev.wiki_revision_lines.pluck(:wiki_line_id).uniq.size).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'normalises CRLF and strips trailing newlines' do
|
|
||||||
post endpoint,
|
|
||||||
params: { title: 'NormalisedBody', body: "a\r\nb\r\n\r\n", message: 'normalise' },
|
|
||||||
headers: auth_headers(member)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
page = WikiPage.find(json.fetch('id'))
|
|
||||||
rev = page.current_revision
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.body).to eq("a\nb")
|
|
||||||
expect(version.body).to eq("a\nb")
|
|
||||||
expect(rev.lines_count).to eq(2)
|
|
||||||
expect(rev.wiki_lines.order('wiki_revision_lines.position').map(&:body)).to eq(['a', 'b'])
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -198,14 +146,17 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
end
|
end
|
||||||
|
|
||||||
let!(:test_tag_name) { TagName.create!(name: 'TestPage') }
|
#let!(:page) { create(:wiki_page, title: 'TestPage') }
|
||||||
|
|
||||||
let!(:page) do
|
let!(:page) do
|
||||||
Wiki::Commit.create_content!(
|
build(:wiki_page, title: 'TestPage').tap do |p|
|
||||||
tag_name: test_tag_name,
|
puts p.errors.full_messages unless p.valid?
|
||||||
body: "a\nb",
|
p.save!
|
||||||
created_by_user: member,
|
end
|
||||||
message: 'init')
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
# 初期版を 1 つ作っておく(更新が“2版目”になるように)
|
||||||
|
Wiki::Commit.content!(page: page, body: "a\nb", created_user: member, message: 'init')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when not logged in' do
|
context 'when not logged in' do
|
||||||
@@ -231,6 +182,14 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
headers: auth_headers(member)
|
headers: auth_headers(member)
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when title mismatched (if you forbid rename here)' do
|
||||||
|
put "/wiki/#{page.id}",
|
||||||
|
params: { title: 'OtherTitle', body: 'x' },
|
||||||
|
headers: auth_headers(member)
|
||||||
|
# 君の controller 例だと title 変更は 422 にしてた
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when success' do
|
context 'when success' do
|
||||||
@@ -241,18 +200,7 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
put "/wiki/#{page.id}",
|
put "/wiki/#{page.id}",
|
||||||
params: { title: 'TestPage', body: "x\ny", message: 'edit', base_revision_id: current_id },
|
params: { title: 'TestPage', body: "x\ny", message: 'edit', base_revision_id: current_id },
|
||||||
headers: auth_headers(member)
|
headers: auth_headers(member)
|
||||||
end
|
end.to change(WikiRevision, :count).by(1)
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version).to have_attributes(
|
|
||||||
event_type: 'update',
|
|
||||||
title: 'TestPage',
|
|
||||||
body: "x\ny",
|
|
||||||
created_by_user_id: member.id
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -263,60 +211,25 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(page.body).to eq("x\ny")
|
expect(page.body).to eq("x\ny")
|
||||||
expect(rev.base_revision_id).to eq(current_id)
|
expect(rev.base_revision_id).to eq(current_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'wiki body だけを変更しても tag version は作成しない' do
|
|
||||||
linked_tag_name = TagName.create!(name: 'wiki_body_only_tag')
|
|
||||||
linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
|
|
||||||
|
|
||||||
TagVersionRecorder.record!(
|
|
||||||
tag: linked_tag,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
linked_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: linked_tag_name,
|
|
||||||
body: 'before',
|
|
||||||
created_by_user: member,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
current_id = linked_page.current_revision.id
|
|
||||||
before_count = linked_tag.reload.tag_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/wiki/#{ linked_page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_body_only_tag',
|
|
||||||
body: 'after',
|
|
||||||
message: 'edit',
|
|
||||||
base_revision_id: current_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(member)
|
|
||||||
}
|
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(linked_tag.reload.tag_versions.count).to eq(before_count)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when conflict' do
|
# TODO: コンフリクト未実装のため,実装したらコメント外す.
|
||||||
it 'returns 409 when base_revision_id mismatches' do
|
# context 'when conflict' do
|
||||||
# 先に別ユーザ(同じ member でもOK)が 1 回更新して先頭を進める
|
# it 'returns 409 when base_revision_id mismatches' do
|
||||||
Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
|
# # 先に別ユーザ(同じ member でもOK)が 1 回更新して先頭を進める
|
||||||
page.reload
|
# Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
|
||||||
|
# page.reload
|
||||||
|
|
||||||
stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
|
# stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
|
||||||
put "/wiki/#{page.id}",
|
# put "/wiki/#{page.id}",
|
||||||
params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
|
# params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
|
||||||
headers: auth_headers(member)
|
# headers: auth_headers(member)
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
# expect(response).to have_http_status(:conflict)
|
||||||
json = JSON.parse(response.body)
|
# json = JSON.parse(response.body)
|
||||||
expect(json['error']).to eq('conflict')
|
# expect(json['error']).to eq('conflict')
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
|
||||||
context 'when page not found' do
|
context 'when page not found' do
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
@@ -348,17 +261,14 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
|
|
||||||
describe 'GET /wiki/search' do
|
describe 'GET /wiki/search' do
|
||||||
before do
|
before do
|
||||||
Wiki::Commit.create_content!(
|
# 追加で検索ヒット用
|
||||||
tag_name: TagName.create!(name: 'spec_wiki_title_2'),
|
TagName.create!(name: 'spec_wiki_title_2')
|
||||||
body: 'search body 2',
|
WikiPage.create!(tag_name: TagName.find_by!(name: 'spec_wiki_title_2'),
|
||||||
created_by_user: user,
|
created_user: user, updated_user: user)
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
Wiki::Commit.create_content!(
|
TagName.create!(name: 'unrelated_title')
|
||||||
tag_name: TagName.create!(name: 'unrelated_title'),
|
WikiPage.create!(tag_name: TagName.find_by!(name: 'unrelated_title'),
|
||||||
body: 'unrelated body',
|
created_user: user, updated_user: user)
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns up to 20 pages filtered by title like' do
|
it 'returns up to 20 pages filtered by title like' do
|
||||||
@@ -368,9 +278,7 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(json).to be_an(Array)
|
expect(json).to be_an(Array)
|
||||||
|
|
||||||
titles = json.map { |p| p['title'] }
|
titles = json.map { |p| p['title'] }
|
||||||
|
expect(titles).to include('spec_wiki_title', 'spec_wiki_title_2')
|
||||||
expect(titles).to include('spec_wiki_title')
|
|
||||||
expect(titles).to include('spec_wiki_title_2')
|
|
||||||
expect(titles).not_to include('unrelated_title')
|
expect(titles).not_to include('unrelated_title')
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -421,12 +329,7 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
it 'returns empty array when page has no revisions and filtered by id' do
|
it 'returns empty array when page has no revisions and filtered by id' do
|
||||||
# 別ページを作って revision 無し
|
# 別ページを作って revision 無し
|
||||||
tn2 = TagName.create!(name: 'spec_no_rev')
|
tn2 = TagName.create!(name: 'spec_no_rev')
|
||||||
# 異常データ: revision 無し WikiPage を直接作る
|
p2 = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
||||||
p2 = WikiPage.create!(
|
|
||||||
tag_name: tn2,
|
|
||||||
body: 'init',
|
|
||||||
created_user: user,
|
|
||||||
updated_user: user)
|
|
||||||
|
|
||||||
get "/wiki/changes?id=#{p2.id}"
|
get "/wiki/changes?id=#{p2.id}"
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
@@ -495,68 +398,29 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(json['older_revision_id']).to eq(rev_a.id)
|
expect(json['older_revision_id']).to eq(rev_a.id)
|
||||||
expect(json['newer_revision_id']).to eq(page.current_revision.id)
|
expect(json['newer_revision_id']).to eq(page.current_revision.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when "to" is redirect revision' do
|
||||||
|
# redirect revision を作る
|
||||||
|
tn2 = TagName.create!(name: 'redirect_target')
|
||||||
|
target = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
||||||
|
|
||||||
|
Wiki::Commit.redirect!(page: page, redirect_page: target, created_user: user, message: 'redir')
|
||||||
|
redirect_rev = page.current_revision
|
||||||
|
expect(redirect_rev).to be_redirect
|
||||||
|
|
||||||
|
get "/wiki/#{page.id}/diff?from=#{rev_a.id}&to=#{redirect_rev.id}"
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Wiki::Commit.redirect!' do
|
it 'returns 422 when "from" is redirect revision' do
|
||||||
it 'raises because redirect revisions are deprecated' do
|
tn2 = TagName.create!(name: 'redirect_target2')
|
||||||
target_tag_name = TagName.create!(name: 'redirect_deprecated_target')
|
target = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
||||||
target =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: target_tag_name,
|
|
||||||
body: 'target',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
expect {
|
Wiki::Commit.redirect!(page: page, redirect_page: target, created_user: user, message: 'redir2')
|
||||||
Wiki::Commit.redirect!(
|
redirect_rev = page.current_revision
|
||||||
page: page,
|
|
||||||
redirect_page: target,
|
get "/wiki/#{page.id}/diff?from=#{redirect_rev.id}&to=#{rev_b.id}"
|
||||||
created_user: user,
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
message: 'redirect',
|
|
||||||
base_revision_id: page.current_revision.id
|
|
||||||
)
|
|
||||||
}.to raise_error(RuntimeError, '廃止しました.')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'wiki title を変更すると対応する tag の version を作成する' do
|
|
||||||
linked_tag_name = TagName.create!(name: 'wiki_linked_tag_for_version')
|
|
||||||
linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
|
|
||||||
|
|
||||||
linked_page =
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: linked_tag_name,
|
|
||||||
body: 'before',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
current_id = linked_page.current_revision.id
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put "/wiki/#{ linked_page.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_linked_tag_for_version_renamed',
|
|
||||||
body: 'after',
|
|
||||||
message: 'rename',
|
|
||||||
base_revision_id: current_id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
.and change { linked_tag.reload.tag_versions.count }.by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
linked_tag.reload
|
|
||||||
expect(linked_tag.name).to eq('wiki_linked_tag_for_version_renamed')
|
|
||||||
|
|
||||||
versions = linked_tag.tag_versions.order(:version_no)
|
|
||||||
|
|
||||||
expect(versions.first.event_type).to eq('create')
|
|
||||||
expect(versions.first.name).to eq('wiki_linked_tag_for_version')
|
|
||||||
|
|
||||||
expect(versions.second.event_type).to eq('update')
|
|
||||||
expect(versions.second.name).to eq('wiki_linked_tag_for_version_renamed')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki title collision', type: :request do
|
|
||||||
let!(:user) { create_member_user! }
|
|
||||||
|
|
||||||
def auth_headers user
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_wiki_page title:, body:
|
|
||||||
Wiki::Commit.create_content!(
|
|
||||||
tag_name: TagName.create!(name: title),
|
|
||||||
body:,
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when renaming wiki title to existing title' do
|
|
||||||
source = create_wiki_page(title: 'wiki_collision_source', body: 'source body')
|
|
||||||
create_wiki_page(title: 'wiki_collision_target', body: 'target body')
|
|
||||||
|
|
||||||
source_revision_count = source.wiki_revisions.count
|
|
||||||
source_version_count = source.wiki_versions.count
|
|
||||||
old_title = source.title
|
|
||||||
old_body = source.body
|
|
||||||
|
|
||||||
put "/wiki/#{ source.id }",
|
|
||||||
params: {
|
|
||||||
title: 'wiki_collision_target',
|
|
||||||
body: 'new body',
|
|
||||||
message: 'rename collision',
|
|
||||||
base_revision_id: source.current_revision.id,
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
source.reload
|
|
||||||
|
|
||||||
expect(source.title).to eq(old_title)
|
|
||||||
expect(source.body).to eq(old_body)
|
|
||||||
expect(source.wiki_revisions.count).to eq(source_revision_count)
|
|
||||||
expect(source.wiki_versions.count).to eq(source_version_count)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 422 when creating wiki with existing title' do
|
|
||||||
create_wiki_page(title: 'wiki_collision_create', body: 'already exists')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/wiki',
|
|
||||||
params: {
|
|
||||||
title: 'wiki_collision_create',
|
|
||||||
body: 'new body',
|
|
||||||
message: 'duplicate create',
|
|
||||||
},
|
|
||||||
headers: auth_headers(user)
|
|
||||||
}
|
|
||||||
.not_to change(WikiPage, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe VersionRecorder do
|
|
||||||
let(:member) { create(:user, :member) }
|
|
||||||
|
|
||||||
let(:post_record) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'version recorder post',
|
|
||||||
url: 'https://example.com/version-recorder-post')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates record version_no when creating the first version' do
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(1)
|
|
||||||
expect(post_record.reload.version_no).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates record version_no when creating the next version' do
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated version recorder post')
|
|
||||||
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(2)
|
|
||||||
expect(post_record.reload.version_no).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not create a new version or advance version_no when snapshot is unchanged' do
|
|
||||||
first =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version).to eq(first)
|
|
||||||
}.not_to change(PostVersion, :count)
|
|
||||||
|
|
||||||
expect(post_record.reload.version_no).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'raises when record version_no is older than the latest version' do
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated once')
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update_columns(version_no: 1)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated with stale version_no')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
}.to raise_error(RuntimeError, /version_no/)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
require 'digest'
|
|
||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Wiki::Commit do
|
|
||||||
let(:user) { create_member_user! }
|
|
||||||
|
|
||||||
def create_page title:, body: 'initial body'
|
|
||||||
described_class.create_content!(
|
|
||||||
tag_name: TagName.create!(name: title),
|
|
||||||
body:,
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.create_content!' do
|
|
||||||
it 'creates page, revision, and version with normalised body' do
|
|
||||||
expect {
|
|
||||||
described_class.create_content!(
|
|
||||||
tag_name: TagName.create!(name: 'commit_integrity_create'),
|
|
||||||
body: "a\r\nb\r\n\r\n",
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
}
|
|
||||||
.to change(WikiPage, :count).by(1)
|
|
||||||
.and change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
page = WikiPage.joins(:tag_name).find_by!(tag_names: { name: 'commit_integrity_create' })
|
|
||||||
revision = page.current_revision
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.body).to eq("a\nb")
|
|
||||||
expect(revision.lines_count).to eq(2)
|
|
||||||
expect(version.body).to eq("a\nb")
|
|
||||||
expect(version.reason).to eq('init')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects body that becomes blank after normalisation' do
|
|
||||||
tag_name = TagName.create!(name: 'commit_integrity_blank')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.create_content!(
|
|
||||||
tag_name:,
|
|
||||||
body: "\r\n\r\n",
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'blank')
|
|
||||||
}
|
|
||||||
.to raise_error(ActiveRecord::RecordInvalid)
|
|
||||||
|
|
||||||
expect(WikiPage.where(tag_name:)).not_to exist
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.content!' do
|
|
||||||
it 'updates page body, revision, and version' do
|
|
||||||
page = create_page(title: 'commit_integrity_update', body: 'before')
|
|
||||||
current_id = page.current_revision.id
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.content!(
|
|
||||||
page:,
|
|
||||||
body: 'after',
|
|
||||||
created_user: user,
|
|
||||||
message: 'edit',
|
|
||||||
base_revision_id: current_id)
|
|
||||||
}
|
|
||||||
.to change(WikiRevision, :count).by(1)
|
|
||||||
.and change(WikiVersion, :count).by(1)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
version = page.wiki_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(page.body).to eq('after')
|
|
||||||
expect(version.body).to eq('after')
|
|
||||||
expect(version.reason).to eq('edit')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not record tag_version on body-only wiki update' do
|
|
||||||
tag_name = TagName.create!(name: 'commit_integrity_linked_tag')
|
|
||||||
tag = Tag.create!(tag_name:, category: :general)
|
|
||||||
|
|
||||||
page =
|
|
||||||
described_class.create_content!(
|
|
||||||
tag_name:,
|
|
||||||
body: 'before',
|
|
||||||
created_by_user: user,
|
|
||||||
message: 'init')
|
|
||||||
|
|
||||||
TagVersionRecorder.record!(
|
|
||||||
tag:,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: user)
|
|
||||||
|
|
||||||
before_count = tag.reload.tag_versions.count
|
|
||||||
|
|
||||||
described_class.content!(
|
|
||||||
page:,
|
|
||||||
body: 'after',
|
|
||||||
created_user: user,
|
|
||||||
message: 'edit',
|
|
||||||
base_revision_id: page.current_revision.id)
|
|
||||||
|
|
||||||
expect(tag.reload.tag_versions.count).to eq(before_count)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'raises conflict and leaves page, revision, and version unchanged' do
|
|
||||||
page = create_page(title: 'commit_integrity_conflict', body: 'first')
|
|
||||||
stale_id = page.current_revision.id
|
|
||||||
|
|
||||||
described_class.content!(
|
|
||||||
page:,
|
|
||||||
body: 'second',
|
|
||||||
created_user: user,
|
|
||||||
message: 'second',
|
|
||||||
base_revision_id: stale_id)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
before_body = page.body
|
|
||||||
before_revision_count = page.wiki_revisions.count
|
|
||||||
before_version_count = page.wiki_versions.count
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.content!(
|
|
||||||
page:,
|
|
||||||
body: 'third',
|
|
||||||
created_user: user,
|
|
||||||
message: 'stale',
|
|
||||||
base_revision_id: stale_id)
|
|
||||||
}
|
|
||||||
.to raise_error(Wiki::Commit::Conflict)
|
|
||||||
|
|
||||||
page.reload
|
|
||||||
expect(page.body).to eq(before_body)
|
|
||||||
expect(page.wiki_revisions.count).to eq(before_revision_count)
|
|
||||||
expect(page.wiki_versions.count).to eq(before_version_count)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'deduplicates duplicated missing wiki lines' do
|
|
||||||
page = create_page(title: 'commit_integrity_dedup', body: 'before')
|
|
||||||
duplicated = 'commit_integrity_duplicate_line'
|
|
||||||
|
|
||||||
described_class.content!(
|
|
||||||
page:,
|
|
||||||
body: "#{ duplicated }\n#{ duplicated }",
|
|
||||||
created_user: user,
|
|
||||||
message: 'dedup',
|
|
||||||
base_revision_id: page.current_revision.id)
|
|
||||||
|
|
||||||
revision = page.reload.current_revision
|
|
||||||
|
|
||||||
expect(WikiLine.where(body: duplicated).count).to eq(1)
|
|
||||||
expect(revision.wiki_revision_lines.count).to eq(2)
|
|
||||||
expect(revision.wiki_revision_lines.pluck(:wiki_line_id).uniq.size).to eq(1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.redirect!' do
|
|
||||||
it 'raises because redirect revisions are deprecated' do
|
|
||||||
page = create_page(title: 'commit_integrity_redirect_source', body: 'source')
|
|
||||||
target = create_page(title: 'commit_integrity_redirect_target', body: 'target')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.redirect!(
|
|
||||||
page:,
|
|
||||||
redirect_page: target,
|
|
||||||
created_user: user,
|
|
||||||
message: 'redirect',
|
|
||||||
base_revision_id: page.current_revision.id)
|
|
||||||
}
|
|
||||||
.to raise_error(RuntimeError, '廃止しました.')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
変更されたファイルが多すぎるため,一部のファイルは表示されません さらに表示
新しい課題から参照
ユーザをブロックする