コミットを比較
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,120 +0,0 @@
|
||||
import { act, cleanup, render } from '@testing-library/react'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { GekanatorBackdrop } from '@/pages/GekanatorPage'
|
||||
import { buildPost } from '@/test/factories'
|
||||
|
||||
import type { CSSProperties, ReactNode } from 'react'
|
||||
|
||||
vi.mock ('framer-motion', async importOriginal => ({
|
||||
...await importOriginal<typeof import ('framer-motion')> (),
|
||||
motion: {
|
||||
div: (
|
||||
{ children, animate: animation, initial, transition, style }: {
|
||||
children?: ReactNode
|
||||
animate?: { scale?: number; rotateY?: number }
|
||||
initial?: { rotateY?: number }
|
||||
transition?: { duration?: number }
|
||||
style?: CSSProperties },
|
||||
) => (
|
||||
<div
|
||||
data-scale={animation?.scale}
|
||||
data-rotation={animation?.rotateY}
|
||||
data-initial-rotation={initial?.rotateY}
|
||||
data-duration={transition?.duration}
|
||||
data-columns={style?.gridTemplateColumns}>
|
||||
{children}
|
||||
</div>) } }))
|
||||
|
||||
const target = buildPost ({ id: 1, thumbnail: 'https://example.com/target.jpg' })
|
||||
const candidates = [
|
||||
buildPost ({ id: 2, thumbnail: 'https://example.com/second.jpg' }),
|
||||
buildPost ({ id: 3, thumbnail: 'https://example.com/third.jpg' })]
|
||||
const candidateThumbnails = candidates.map (post => post.thumbnail)
|
||||
|
||||
describe.each ([
|
||||
{ motionMode: 'on', duration: 450, columns: 10 },
|
||||
{ motionMode: 'calm', duration: 600, columns: 7 }] as const) (
|
||||
'GekanatorBackdrop winning-run collapse ($motionMode)',
|
||||
({ motionMode, duration, columns }) => {
|
||||
const props = {
|
||||
posts: [target],
|
||||
mascotAsset: '/mascot.png',
|
||||
phase: 'question' as const,
|
||||
visualSeed: 'winning-run',
|
||||
motionMode,
|
||||
winningRunTargetPost: target,
|
||||
winningRunQuestionCount: 2 }
|
||||
|
||||
beforeEach (() => {
|
||||
vi.useFakeTimers ()
|
||||
})
|
||||
|
||||
afterEach (() => {
|
||||
cleanup ()
|
||||
vi.useRealTimers ()
|
||||
})
|
||||
|
||||
it ('flips the old target to normal candidates before restoring the scale', () => {
|
||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="collapsed"
|
||||
winningRunTargetPost={null}
|
||||
winningRunQuestionCount={0}/>)
|
||||
|
||||
const flips = container.querySelectorAll ('[data-rotation="180"]')
|
||||
expect (flips).toHaveLength (9 * 8 * 8)
|
||||
for (const flip of flips) {
|
||||
const images = flip.querySelectorAll ('img')
|
||||
expect (flip).toHaveAttribute ('data-initial-rotation', '0')
|
||||
expect (flip).toHaveAttribute ('data-duration', String (duration / 1000))
|
||||
expect (images).toHaveLength (2)
|
||||
expect (candidateThumbnails).toContain (images[0].getAttribute ('src'))
|
||||
expect (images[1]).toHaveAttribute ('src', target.thumbnail)
|
||||
}
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
||||
|
||||
act (() => { vi.advanceTimersByTime (duration - 1) })
|
||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (flips.length)
|
||||
act (() => { vi.advanceTimersByTime (1) })
|
||||
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '1')
|
||||
expect (container.querySelector ('[data-columns]')).toHaveAttribute (
|
||||
'data-columns', `repeat(${ columns }, minmax(0, 1fr))`)
|
||||
const images = container.querySelectorAll ('img')
|
||||
expect (images).toHaveLength (9 * columns * columns)
|
||||
for (const image of images)
|
||||
expect (candidateThumbnails).toContain (image.getAttribute ('src'))
|
||||
})
|
||||
|
||||
it ('cancels the collapse when a winning run resumes during the flip', () => {
|
||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="collapsed"
|
||||
winningRunTargetPost={null}
|
||||
winningRunQuestionCount={0}/>)
|
||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (9 * 8 * 8)
|
||||
act (() => { vi.advanceTimersByTime (duration / 2) })
|
||||
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="resumed"
|
||||
winningRunTargetPost={candidates[0]}
|
||||
winningRunQuestionCount={1}/>)
|
||||
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
act (() => { vi.advanceTimersByTime (duration) })
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute (
|
||||
'data-scale', String (8 / 6))
|
||||
const images = container.querySelectorAll ('img')
|
||||
expect (images).toHaveLength (9 * 8 * 8)
|
||||
for (const image of images)
|
||||
expect (image).toHaveAttribute ('src', candidates[0].thumbnail)
|
||||
})
|
||||
})
|
||||
@@ -3203,7 +3203,7 @@ const backgroundPostsFor = ({
|
||||
}
|
||||
|
||||
|
||||
export const GekanatorBackdrop: FC<{
|
||||
const GekanatorBackdrop: FC<{
|
||||
posts: Post[]
|
||||
mascotAsset: string
|
||||
phase: Phase
|
||||
@@ -3362,9 +3362,6 @@ export const GekanatorBackdrop: FC<{
|
||||
const renderedSettings = settingsForMode (displayedBackdropMode)
|
||||
const renderedTileCount = renderedSettings.columns * renderedSettings.rows
|
||||
const renderedScale = scaleForMode (displayedBackdropMode, displayedWinningRunCount)
|
||||
const tileFlipAllowed =
|
||||
displayedBackdropMode === 'normal'
|
||||
|| (displayedBackdropMode === 'winning_run' && backdropMode === 'normal')
|
||||
|
||||
const isGuessPresentation =
|
||||
backdropMode === 'guess' || displayedBackdropMode === 'guess'
|
||||
@@ -3612,14 +3609,16 @@ export const GekanatorBackdrop: FC<{
|
||||
? toThumbnails[index % Math.max (toThumbnails.length, 1)]
|
||||
: currentThumbnail
|
||||
const thumbnail =
|
||||
tileFlipAllowed
|
||||
? currentThumbnail
|
||||
: nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
||||
displayedBackdropMode === 'winning_run'
|
||||
|| displayedBackdropMode === 'guess'
|
||||
? nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
||||
: currentThumbnail
|
||||
if (!(thumbnail) || !(frontThumbnail) || !(backThumbnail))
|
||||
return null
|
||||
|
||||
const imageSource = ['intro', 'end'].includes (phase) ? mascotAsset : thumbnail
|
||||
const staticTile = !tileFlipAllowed || !isFlippingTiles
|
||||
const showStaticTile =
|
||||
displayedBackdropMode !== 'normal' || !(isFlippingTiles)
|
||||
|
||||
return (
|
||||
<motion.div
|
||||
@@ -3628,14 +3627,14 @@ export const GekanatorBackdrop: FC<{
|
||||
layout={displayedBackdropMode !== 'normal'}
|
||||
transition={{ duration: tileFlipDuration, ease: 'easeInOut' }}
|
||||
style={{ perspective: 1600 }}>
|
||||
{staticTile && (
|
||||
{showStaticTile && (
|
||||
<img
|
||||
src={imageSource}
|
||||
alt=""
|
||||
className="absolute inset-0 h-full w-full object-cover"
|
||||
style={{ opacity: renderedSettings.opacity }}/>)
|
||||
}
|
||||
{!staticTile && (
|
||||
{!(showStaticTile) && (
|
||||
<motion.div
|
||||
className="absolute inset-0"
|
||||
initial={{ rotateY: 0 }}
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする