コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
d6fc57a00e |
+1
-1
@@ -424,7 +424,7 @@ races according to the target constraint's business meaning.
|
||||
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
|
||||
user, `:not_found` for missing records, and `:unprocessable_content` for
|
||||
validation failures.
|
||||
- For diagnostic or internal helper JSON, prefer a deliberately light response
|
||||
shape over full representation classes when callers only need identifiers,
|
||||
|
||||
@@ -95,7 +95,7 @@ class ApplicationController < ActionController::API
|
||||
render_validation_error base: ['すでに存在してゐます.']
|
||||
end
|
||||
|
||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_entity
|
||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_content
|
||||
errors = { }
|
||||
|
||||
if record
|
||||
|
||||
@@ -18,7 +18,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
@@ -63,7 +63,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
@@ -107,7 +107,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
|
||||
@@ -24,7 +24,7 @@ class CountsTablesController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue CountsPivotTotals::TimedOut
|
||||
Rails.logger.warn('counts_query_timeout: pivot_totals')
|
||||
render json: { error: 'counts_query_timeout', stage: 'totals',
|
||||
|
||||
@@ -15,7 +15,7 @@ class GekanatorGamesController < ApplicationController
|
||||
answers:)
|
||||
|
||||
if game.invalid?
|
||||
render json: { errors: game.errors.full_messages }, status: :unprocessable_entity
|
||||
render json: { errors: game.errors.full_messages }, status: :unprocessable_content
|
||||
return
|
||||
end
|
||||
|
||||
@@ -31,7 +31,7 @@ class GekanatorGamesController < ApplicationController
|
||||
learned_example_count:
|
||||
}, status: :created
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_content
|
||||
end
|
||||
|
||||
def extra_questions
|
||||
|
||||
@@ -536,7 +536,7 @@ class MaterialsController < ApplicationController
|
||||
errors: { },
|
||||
base_errors: ['ZIP export に必要な素材ファイルが欠損しています.'],
|
||||
missing_files: },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
end
|
||||
|
||||
def build_uploaded_material_blob! file, file_sha256
|
||||
|
||||
@@ -429,7 +429,7 @@ class PostsController < ApplicationController
|
||||
filters = literals.map do |literal|
|
||||
internal, = source_ids.fetch(literal[:name])
|
||||
name = internal.empty? ? literal[:name] : names[internal.first]
|
||||
return head :unprocessable_entity unless name && internal.length <= 1
|
||||
return head :unprocessable_content unless name && internal.length <= 1
|
||||
|
||||
literal[:negative] ? "not:#{ name }" : name
|
||||
end
|
||||
@@ -438,7 +438,7 @@ class PostsController < ApplicationController
|
||||
literals.zip(translated).each do |literal, translation|
|
||||
unless (source_ids.fetch(literal[:name]).map(&:sort) ==
|
||||
target_ids.fetch(translation[:name]).map(&:sort))
|
||||
return head :unprocessable_entity
|
||||
return head :unprocessable_content
|
||||
end
|
||||
end
|
||||
index = 0
|
||||
|
||||
@@ -55,7 +55,7 @@ class TheatresController < ApplicationController
|
||||
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
|
||||
return head :unprocessable_content if requested_post_id <= 0
|
||||
|
||||
skipped = false
|
||||
conflicted = false
|
||||
@@ -95,7 +95,7 @@ class TheatresController < ApplicationController
|
||||
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
|
||||
return head :unprocessable_content if requested_post_id <= 0
|
||||
|
||||
conflicted = false
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ RSpec.describe 'error responses', type: :request do
|
||||
|
||||
patch "/tags/#{ tag.id }", params: { category: 'nico' }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(response).to have_http_status(:unprocessable_content)
|
||||
expect(json).to include(
|
||||
'type' => 'validation_error',
|
||||
'message' => '入力内容を確認してください.',
|
||||
@@ -37,7 +37,7 @@ RSpec.describe 'error responses', type: :request do
|
||||
|
||||
put "/users/#{ user.id }", params: { name: 'a' * 256 }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(response).to have_http_status(:unprocessable_content)
|
||||
expect(json).to include(
|
||||
'type' => 'validation_error',
|
||||
'message' => '入力内容を確認してください.')
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { fireEvent, screen, waitFor, within } from '@testing-library/react'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { textContentOf } from '@/test/text'
|
||||
import PostEditForm from '@/components/PostEditForm'
|
||||
@@ -21,99 +21,14 @@ const toastApi = vi.hoisted (() => ({
|
||||
vi.mock ('@/lib/posts', () => postsApi)
|
||||
vi.mock ('@/lib/api', () => api)
|
||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
||||
vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
||||
...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
|
||||
default: () => ({
|
||||
choice: vi.fn (),
|
||||
}),
|
||||
}))
|
||||
|
||||
describe ('PostEditForm', () => {
|
||||
beforeEach (() => {
|
||||
postsApi.updatePost.mockReset ()
|
||||
api.isApiError.mockReset ().mockReturnValue (false)
|
||||
toastApi.toast.mockClear ()
|
||||
})
|
||||
|
||||
it ('shows all conflict values before a choice and preserves edits on cancel', async () => {
|
||||
const post = buildPost ({ versionNo: 4, title: 'original title' })
|
||||
const onSave = vi.fn ()
|
||||
api.isApiError.mockReturnValue (true)
|
||||
postsApi.updatePost.mockRejectedValueOnce ({ response: {
|
||||
status: 409,
|
||||
data: { base_version_no: 4, current_version_no: 5, mergeable: false,
|
||||
changes: [
|
||||
{ field: 'title', label: 'server label', base: 'original title',
|
||||
current: 'server title', mine: '<b>my title</b>' },
|
||||
{ field: 'video_ms', base: null, current: 180_500, mine: 0 },
|
||||
{ field: 'original_created_from', base: null,
|
||||
current: '2026-01-01T00:00:00Z', mine: '2026-02-01T00:00:00Z' },
|
||||
{ field: 'original_created_before', base: '2026-01-02T00:00:00Z',
|
||||
current: '2026-01-03T00:00:00Z', mine: null },
|
||||
{ field: 'tag_names', base: ['old-tag'], current: ['tag-a', 'tag-b'],
|
||||
mine: [] },
|
||||
{ field: 'parent_post_ids', base: [2], current: [], mine: [3, 4] }] } } })
|
||||
|
||||
render (<PostEditForm post={post} onSave={onSave}/>)
|
||||
const title = screen.getAllByRole ('textbox')[0]
|
||||
fireEvent.change (title, { target: { value: '<b>my title</b>' } })
|
||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
||||
|
||||
const dialogue = within (await screen.findByRole ('dialog'))
|
||||
const table = dialogue.getByRole ('table')
|
||||
expect (within (table).getAllByRole ('columnheader').map (cell => cell.textContent))
|
||||
.toEqual (['版 4', '版 5', '編輯'])
|
||||
const rows = within (table).getAllByRole ('row').slice (1)
|
||||
expect (rows.map (row => within (row).getByRole ('rowheader').textContent))
|
||||
.toEqual (['タイトル', '動画時間', 'オリジナルの作成日時 以降',
|
||||
'オリジナルの作成日時 より前', 'タグ', '親投稿'])
|
||||
expect (rows.map (row => within (row).getAllByRole ('cell')
|
||||
.map (cell => cell.textContent))).toEqual ([
|
||||
['original title', 'server title', '<b>my title</b>'],
|
||||
['', '3:00.500', '0:00'],
|
||||
['', '2026-01-01T00:00:00Z', '2026-02-01T00:00:00Z'],
|
||||
['2026-01-02T00:00:00Z', '2026-01-03T00:00:00Z', ''],
|
||||
['old-tag', 'tag-a\ntag-b', ''], ['2', '', '3\n4']])
|
||||
expect (table.querySelector ('b')).toBeNull ()
|
||||
expect (dialogue.queryByText ('server label')).not.toBeInTheDocument ()
|
||||
expect (dialogue.queryByRole ('button', { name: '差分をマージ' }))
|
||||
.not.toBeInTheDocument ()
|
||||
expect (postsApi.updatePost).toHaveBeenCalledTimes (1)
|
||||
expect (onSave).not.toHaveBeenCalled ()
|
||||
|
||||
fireEvent.click (dialogue.getByRole ('button', { name: '取消' }))
|
||||
await waitFor (() => expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ())
|
||||
expect (title).toHaveValue ('<b>my title</b>')
|
||||
await waitFor (() => expect (screen.getByRole ('button', { name: '更新' }))
|
||||
.not.toBeDisabled ())
|
||||
expect (postsApi.updatePost).toHaveBeenCalledTimes (1)
|
||||
expect (onSave).not.toHaveBeenCalled ()
|
||||
})
|
||||
|
||||
it.each ([
|
||||
{ action: '差分をマージ', mergeable: true, options: { merge: true } },
|
||||
{ action: '強制上書き', mergeable: false, options: { force: true } }]) (
|
||||
'keeps the $action flow after displaying conflict values',
|
||||
async ({ action, mergeable, options }) => {
|
||||
const post = buildPost ({ id: 8, versionNo: 4, title: 'original' })
|
||||
const onSave = vi.fn ()
|
||||
api.isApiError.mockReturnValue (true)
|
||||
postsApi.updatePost.mockRejectedValueOnce ({ response: {
|
||||
status: 409,
|
||||
data: { base_version_no: 4, current_version_no: 5, mergeable,
|
||||
changes: [{ field: 'title', base: 'original',
|
||||
current: 'server', mine: 'mine' }] } } })
|
||||
.mockResolvedValueOnce ({ ...post, versionNo: 6, title: 'mine' })
|
||||
|
||||
render (<PostEditForm post={post} onSave={onSave}/>)
|
||||
fireEvent.change (screen.getAllByRole ('textbox')[0], { target: { value: 'mine' } })
|
||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
||||
|
||||
const dialogue = within (await screen.findByRole ('dialog'))
|
||||
expect (dialogue.getByRole ('table')).toHaveTextContent ('server')
|
||||
fireEvent.click (dialogue.getByRole ('button', { name: action }))
|
||||
await waitFor (() => expect (onSave)
|
||||
.toHaveBeenCalledWith (expect.objectContaining ({ versionNo: 6 })))
|
||||
expect (postsApi.updatePost).toHaveBeenCalledTimes (2)
|
||||
expect (postsApi.updatePost).toHaveBeenLastCalledWith (
|
||||
expect.objectContaining ({ id: 8, title: 'mine' }),
|
||||
{ baseVersionNo: 4, ...options }, 'ja')
|
||||
})
|
||||
|
||||
it ('submits edited post fields with the current base version', async () => {
|
||||
const onSave = vi.fn ()
|
||||
const post = buildPost ({
|
||||
|
||||
@@ -23,27 +23,6 @@ type PostFormField =
|
||||
'parentPostIds' | 'tags' | 'videoMs'
|
||||
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
||||
|
||||
type PostConflictValue = string | number | null | (string | number)[]
|
||||
|
||||
type PostConflict = {
|
||||
base_version_no: number
|
||||
current_version_no: number
|
||||
mergeable?: boolean
|
||||
changes?: {
|
||||
field: 'title' | 'video_ms' | 'original_created_from'
|
||||
| 'original_created_before' | 'tag_names' | 'parent_post_ids'
|
||||
base: PostConflictValue
|
||||
current: PostConflictValue
|
||||
mine: PostConflictValue }[] }
|
||||
|
||||
|
||||
const formatConflictValue = (field: string, value: PostConflictValue): string => {
|
||||
if (value == null) return ''
|
||||
if (Array.isArray (value)) return value.join ('\n')
|
||||
return (field === 'video_ms' && typeof value === 'number') ? msToTime (value) : String (value)
|
||||
}
|
||||
|
||||
|
||||
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
||||
[...new Set (values.flatMap (value => value ?? []))]
|
||||
|
||||
@@ -118,7 +97,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
const response = isApiError<PostConflict> (e) ? e.response : undefined
|
||||
const response = isApiError<{ mergeable?: boolean }> (e) ? e.response : undefined
|
||||
|
||||
if (response?.status !== 409)
|
||||
{
|
||||
@@ -134,54 +113,11 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
return
|
||||
}
|
||||
|
||||
const conflict = response.data
|
||||
const fieldLabels = {
|
||||
title: label ('shared:labels.title'),
|
||||
video_ms: label ('shared:labels.duration'),
|
||||
original_created_from: <>{label ('shared:labels.originalCreatedAt')}
|
||||
{' '}{label ('shared:labels.since')}</>,
|
||||
original_created_before: <>{label ('shared:labels.originalCreatedAt')}
|
||||
{' '}{label ('shared:labels.before')}</>,
|
||||
tag_names: label ('navigation:tags'),
|
||||
parent_post_ids: label ('shared:labels.parentPosts') }
|
||||
|
||||
const action = await dialogue.choice ({
|
||||
title: label ('edit.conflictTitle'),
|
||||
description: (
|
||||
<div>
|
||||
<p>{label ('edit.conflictDescription')}</p>
|
||||
{(conflict.changes?.length ?? 0) > 0 && (
|
||||
<div className="my-3 max-h-[40dvh] overflow-auto text-left">
|
||||
<table className="w-full table-fixed text-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<td/>
|
||||
<th scope="col" className="p-1 align-top">
|
||||
{label ('history:version')} {conflict.base_version_no}
|
||||
</th>
|
||||
<th scope="col" className="p-1 align-top">
|
||||
{label ('history:version')} {conflict.current_version_no}
|
||||
</th>
|
||||
<th scope="col" className="p-1 align-top">
|
||||
{label ('shared:actions.edit')}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{conflict.changes?.map (change => (
|
||||
<tr key={change.field}>
|
||||
<th scope="row" className="p-1 align-top break-words">
|
||||
{fieldLabels[change.field]}
|
||||
</th>
|
||||
{(['base', 'current', 'mine'] as const).map (column => (
|
||||
<td key={column}
|
||||
className="p-1 align-top whitespace-pre-wrap break-words">
|
||||
{formatConflictValue (change.field, change[column])}
|
||||
</td>))}
|
||||
</tr>))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>)}
|
||||
<p>{label ('edit.conflictQuestion')}</p>
|
||||
</div>),
|
||||
cancelText: label ('shared:actions.cancel'),
|
||||
@@ -192,6 +128,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
|
||||
if (action === 'merge')
|
||||
{
|
||||
// TODO: 差分 UI
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
@@ -281,4 +218,5 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
</form>)
|
||||
}
|
||||
|
||||
|
||||
export default PostEditForm
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする