From 7a6eb0b88e0566a370013eb12f5cfb7873b7825b Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 16:51:21 +0000 Subject: [PATCH 1/8] fix(frontend): restore canonical reveal payload typecheck --- frontend/src/api/client.ts | 10 +++++----- frontend/tests/gameplay-phase-machine.test.ts | 2 ++ frontend/tests/vertical-slice.test.ts | 11 ++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index 397365c..02b3775 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -4,10 +4,10 @@ import { mapHealthResponse, mapJoinSessionResponse, mapMixAnswersResponse, - mapNextRoundResponse, mapScoreboardResponse, mapSessionDetailResponse, mapShowQuestionResponse, + mapStartNextRoundResponse, mapStartRoundResponse, mapSubmitGuessResponse, mapSubmitLieResponse @@ -20,10 +20,10 @@ import type { JoinSessionRequest, JoinSessionResponse, MixAnswersResponse, - NextRoundResponse, ScoreboardResponse, SessionDetailResponse, ShowQuestionResponse, + StartNextRoundResponse, StartRoundRequest, StartRoundResponse, SubmitGuessRequest, @@ -41,7 +41,7 @@ export interface ApiClient { mixAnswers(code: string, roundQuestionId: number): Promise>; calculateScores(code: string, roundQuestionId: number): Promise>; getScoreboard(code: string): Promise>; - startNextRound(code: string): Promise>; + startNextRound(code: string): Promise>; finishGame(code: string): Promise>; submitLie(code: string, roundQuestionId: number, payload: SubmitLieRequest): Promise>; submitGuess(code: string, roundQuestionId: number, payload: SubmitGuessRequest): Promise>; @@ -167,10 +167,10 @@ export function createApiClient(baseUrl = '', fetchImpl: typeof fetch = fetch): mapScoreboardResponse ), startNextRound: (code: string) => - request( + request( `/lobby/sessions/${encodeURIComponent(normalizeCode(code))}/rounds/next`, 'POST', - mapNextRoundResponse, + mapStartNextRoundResponse, {} ), finishGame: (code: string) => diff --git a/frontend/tests/gameplay-phase-machine.test.ts b/frontend/tests/gameplay-phase-machine.test.ts index 2d71a7b..420d822 100644 --- a/frontend/tests/gameplay-phase-machine.test.ts +++ b/frontend/tests/gameplay-phase-machine.test.ts @@ -40,6 +40,7 @@ describe('gameplay phase machine skeleton', () => { session: { code: 'ABCD12', status: 'lie', host_id: 1, current_round: 1, players_count: 3 }, players: [], round_question: null, + reveal: null, phase_view_model: { status: 'lie', round_number: 1, @@ -74,6 +75,7 @@ describe('gameplay phase machine skeleton', () => { session: { code: 'ABCD12', status: 'finished', host_id: 1, current_round: 1, players_count: 3 }, players: [], round_question: null, + reveal: null, phase_view_model: { status: 'finished', round_number: 1, diff --git a/frontend/tests/vertical-slice.test.ts b/frontend/tests/vertical-slice.test.ts index 81544ee..f1c94f8 100644 --- a/frontend/tests/vertical-slice.test.ts +++ b/frontend/tests/vertical-slice.test.ts @@ -16,6 +16,7 @@ function makeApiMock(overrides?: Partial): ApiClient { session: { code: 'ABCD12', status: 'lobby', host_id: 1, current_round: 1, players_count: 3 }, players: [], round_question: null, + reveal: null, phase_view_model: { status: 'lobby', round_number: 1, @@ -56,7 +57,15 @@ function makeApiMock(overrides?: Partial): ApiClient { session: { code: 'ABCD12', status: 'lie', current_round: 1 }, round: { number: 1, category: { slug: 'history', name: 'History' } } } - }) + }), + showQuestion: vi.fn(), + mixAnswers: vi.fn(), + calculateScores: vi.fn(), + getScoreboard: vi.fn(), + startNextRound: vi.fn(), + finishGame: vi.fn(), + submitLie: vi.fn(), + submitGuess: vi.fn() }; return { ...base, ...overrides }; From 2472b70d450ab20a594efd32a97f15281683ceb4 Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 17:54:00 +0000 Subject: [PATCH 2/8] test(lobby): align lie submission assertions with i18n payload --- lobby/tests.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lobby/tests.py b/lobby/tests.py index c6c967d..3c1555f 100644 --- a/lobby/tests.py +++ b/lobby/tests.py @@ -360,7 +360,8 @@ class LieSubmissionTests(TestCase): ) self.assertEqual(response.status_code, 400) - self.assertEqual(response.json()["error"], "Lie submission window has closed") + self.assertEqual(response.json()["error_code"], "lie_submission_window_closed") + self.assertEqual(response.json()["error"], "Lie submission window has closed.") def test_submit_lie_rejects_duplicate_submission(self): round_question = RoundQuestion.objects.create( @@ -381,7 +382,8 @@ class LieSubmissionTests(TestCase): ) self.assertEqual(response.status_code, 409) - self.assertEqual(response.json()["error"], "Lie already submitted for this player") + self.assertEqual(response.json()["error_code"], "lie_already_submitted") + self.assertEqual(response.json()["error"], "Lie has already been submitted for this player.") def test_submit_lie_requires_session_token(self): round_question = RoundQuestion.objects.create( @@ -423,7 +425,8 @@ class LieSubmissionTests(TestCase): ) self.assertEqual(response.status_code, 403) - self.assertEqual(response.json()["error"], "Invalid player session token") + self.assertEqual(response.json()["error_code"], "invalid_player_session_token") + self.assertEqual(response.json()["error"], "Player session token is invalid.") class MixAnswersTests(TestCase): def setUp(self): From f44dd92543cf2a396409e65a328890d7ffa39a5c Mon Sep 17 00:00:00 2001 From: dev-bot Date: Sun, 15 Mar 2026 18:32:20 +0000 Subject: [PATCH 3/8] test(frontend): normalize reveal guess fooled-player nullability --- frontend/src/api/mappers.ts | 5 +- frontend/tests/angular-api-client.test.ts | 73 +++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/frontend/src/api/mappers.ts b/frontend/src/api/mappers.ts index 1944ec3..4a98aea 100644 --- a/frontend/src/api/mappers.ts +++ b/frontend/src/api/mappers.ts @@ -131,10 +131,11 @@ function mapSessionDetail(payload: unknown): SessionDetailResponse { }), guesses: guessesRaw.map((guess, index) => { const record = asRecord(guess, `session_detail.reveal.guesses[${index}]`); - const fooledPlayerId = record.fooled_player_id; - if (fooledPlayerId !== null && !isNumber(fooledPlayerId)) { + const fooledPlayerIdRaw = record.fooled_player_id; + if (fooledPlayerIdRaw !== undefined && fooledPlayerIdRaw !== null && !isNumber(fooledPlayerIdRaw)) { throw new Error(`Invalid API contract: expected number|null at session_detail.reveal.guesses[${index}].fooled_player_id`); } + const fooledPlayerId = fooledPlayerIdRaw === undefined ? null : fooledPlayerIdRaw; const fooledPlayerNickname = record.fooled_player_nickname; if (fooledPlayerNickname !== undefined && !isString(fooledPlayerNickname)) { throw new Error(`Invalid API contract: expected string at session_detail.reveal.guesses[${index}].fooled_player_nickname`); diff --git a/frontend/tests/angular-api-client.test.ts b/frontend/tests/angular-api-client.test.ts index d0f2aef..46a46fd 100644 --- a/frontend/tests/angular-api-client.test.ts +++ b/frontend/tests/angular-api-client.test.ts @@ -283,6 +283,79 @@ describe('createAngularApiClient', () => { } }); + it('normalizes omitted fooled_player_id to null in canonical reveal payload guesses', async () => { + const get = vi.fn(async (url: string) => { + if (url === '/lobby/sessions/ABCD12') { + return { + session: { code: 'ABCD12', status: 'reveal', host_id: 1, current_round: 1, players_count: 2 }, + players: [ + { id: 2, nickname: 'Maja', score: 10, is_connected: true }, + { id: 3, nickname: 'Bo', score: 7, is_connected: true } + ], + round_question: { + id: 77, + round_number: 1, + prompt: 'Q?', + shown_at: '2026-03-01T18:00:00Z', + answers: [{ text: 'A' }, { text: 'B' }] + }, + reveal: { + round_question_id: 77, + round_number: 1, + prompt: 'Q?', + correct_answer: 'A', + lies: [], + guesses: [ + { + player_id: 3, + nickname: 'Bo', + selected_text: 'A', + is_correct: true, + created_at: '2026-03-01T18:00:15Z' + } + ] + }, + phase_view_model: { + status: 'reveal', + round_number: 1, + players_count: 2, + constraints: { + min_players_to_start: 2, + max_players_mvp: 8, + min_players_reached: true, + max_players_allowed: true + }, + host: { + can_start_round: false, + can_show_question: false, + can_mix_answers: false, + can_calculate_scores: false, + can_reveal_scoreboard: true, + can_start_next_round: false, + can_finish_game: false + }, + player: { + can_join: true, + can_submit_lie: false, + can_submit_guess: false, + can_view_final_result: false + } + } + } as T; + } + throw { status: 404, error: { error: 'Not found' } }; + }); + + const client = createAngularApiClient({ get, post: vi.fn() } as unknown as AngularHttpClientLike); + const session = await client.getSession('abcd12'); + + expect(session.ok).toBe(true); + if (session.ok) { + expect(session.data.reveal?.guesses[0].fooled_player_id).toBeNull(); + expect(session.data.reveal?.guesses[0]).not.toHaveProperty('fooled_player_nickname'); + } + }); + it('maps host/player gameplay endpoints through typed response mappers', async () => { const get = vi.fn(async (url: string) => { if (url === '/lobby/sessions/ABCD12/scoreboard') { From 0b0e3c325c15e0d14c1170b0008278c7c0e69e1d Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 21:54:30 +0000 Subject: [PATCH 4/8] fix(frontend): normalize omitted reveal fooled-player ids --- frontend/src/api/mappers.ts | 7 ++--- frontend/tests/angular-api-client.test.ts | 32 +++++++++++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/frontend/src/api/mappers.ts b/frontend/src/api/mappers.ts index 4a98aea..34e9531 100644 --- a/frontend/src/api/mappers.ts +++ b/frontend/src/api/mappers.ts @@ -135,7 +135,7 @@ function mapSessionDetail(payload: unknown): SessionDetailResponse { if (fooledPlayerIdRaw !== undefined && fooledPlayerIdRaw !== null && !isNumber(fooledPlayerIdRaw)) { throw new Error(`Invalid API contract: expected number|null at session_detail.reveal.guesses[${index}].fooled_player_id`); } - const fooledPlayerId = fooledPlayerIdRaw === undefined ? null : fooledPlayerIdRaw; + const fooledPlayerId = fooledPlayerIdRaw ?? null; const fooledPlayerNickname = record.fooled_player_nickname; if (fooledPlayerNickname !== undefined && !isString(fooledPlayerNickname)) { throw new Error(`Invalid API contract: expected string at session_detail.reveal.guesses[${index}].fooled_player_nickname`); @@ -389,10 +389,11 @@ export function mapSubmitGuessResponse(payload: unknown): SubmitGuessResponse { const root = asRecord(payload, 'submit_guess'); const guess = asRecord(root.guess, 'submit_guess.guess'); const window = asRecord(root.window, 'submit_guess.window'); - const fooledPlayerId = guess.fooled_player_id; - if (fooledPlayerId !== null && !isNumber(fooledPlayerId)) { + const fooledPlayerIdRaw = guess.fooled_player_id; + if (fooledPlayerIdRaw !== undefined && fooledPlayerIdRaw !== null && !isNumber(fooledPlayerIdRaw)) { throw new Error('Invalid API contract: expected number|null at submit_guess.guess.fooled_player_id'); } + const fooledPlayerId = fooledPlayerIdRaw ?? null; return { guess: { diff --git a/frontend/tests/angular-api-client.test.ts b/frontend/tests/angular-api-client.test.ts index 46a46fd..0fc0b40 100644 --- a/frontend/tests/angular-api-client.test.ts +++ b/frontend/tests/angular-api-client.test.ts @@ -283,7 +283,7 @@ describe('createAngularApiClient', () => { } }); - it('normalizes omitted fooled_player_id to null in canonical reveal payload guesses', async () => { + it('normalizes omitted fooled_player_id to null in canonical reveal payloads', async () => { const get = vi.fn(async (url: string) => { if (url === '/lobby/sessions/ABCD12') { return { @@ -346,7 +346,25 @@ describe('createAngularApiClient', () => { throw { status: 404, error: { error: 'Not found' } }; }); - const client = createAngularApiClient({ get, post: vi.fn() } as unknown as AngularHttpClientLike); + const post = vi.fn(async (url: string, body: unknown) => { + if (url === '/lobby/sessions/ABCD12/questions/77/guesses/submit') { + expect(body).toEqual({ player_id: 9, session_token: 'tok', selected_text: 'A' }); + return { + guess: { + id: 200, + player_id: 9, + round_question_id: 77, + selected_text: 'A', + is_correct: false, + created_at: '2026-03-01T16:01:00Z' + }, + window: { guess_deadline_at: '2026-03-01T16:01:30Z' } + } as T; + } + throw { status: 404, error: { error: 'Not found' } }; + }); + + const client = createAngularApiClient({ get, post } as AngularHttpClientLike); const session = await client.getSession('abcd12'); expect(session.ok).toBe(true); @@ -354,6 +372,16 @@ describe('createAngularApiClient', () => { expect(session.data.reveal?.guesses[0].fooled_player_id).toBeNull(); expect(session.data.reveal?.guesses[0]).not.toHaveProperty('fooled_player_nickname'); } + + const submitGuess = await client.submitGuess('ABCD12', 77, { + player_id: 9, + session_token: 'tok', + selected_text: 'A' + }); + expect(submitGuess.ok).toBe(true); + if (submitGuess.ok) { + expect(submitGuess.data.guess.fooled_player_id).toBeNull(); + } }); it('maps host/player gameplay endpoints through typed response mappers', async () => { From e566e0967dc90262639c2ab06401913303d7a6de Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 22:14:54 +0000 Subject: [PATCH 5/8] test(frontend): harden reveal fooled-player normalization --- frontend/src/api/mappers.ts | 27 ++++++++++++++--------- frontend/tests/angular-api-client.test.ts | 17 ++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/frontend/src/api/mappers.ts b/frontend/src/api/mappers.ts index 34e9531..9f3365e 100644 --- a/frontend/src/api/mappers.ts +++ b/frontend/src/api/mappers.ts @@ -60,6 +60,17 @@ function readBoolean(record: Record, key: string, path: string) return value; } +function readNullableNumber(record: Record, key: string, path: string): number | null { + const value = record[key]; + if (value === undefined || value === null) { + return null; + } + if (!isNumber(value)) { + throw new Error(`Invalid API contract: expected number|null at ${path}.${key}`); + } + return value; +} + export function mapHealthResponse(payload: unknown): HealthResponse { const root = asRecord(payload, 'health'); return { @@ -131,11 +142,11 @@ function mapSessionDetail(payload: unknown): SessionDetailResponse { }), guesses: guessesRaw.map((guess, index) => { const record = asRecord(guess, `session_detail.reveal.guesses[${index}]`); - const fooledPlayerIdRaw = record.fooled_player_id; - if (fooledPlayerIdRaw !== undefined && fooledPlayerIdRaw !== null && !isNumber(fooledPlayerIdRaw)) { - throw new Error(`Invalid API contract: expected number|null at session_detail.reveal.guesses[${index}].fooled_player_id`); - } - const fooledPlayerId = fooledPlayerIdRaw ?? null; + const fooledPlayerId = readNullableNumber( + record, + 'fooled_player_id', + `session_detail.reveal.guesses[${index}]` + ); const fooledPlayerNickname = record.fooled_player_nickname; if (fooledPlayerNickname !== undefined && !isString(fooledPlayerNickname)) { throw new Error(`Invalid API contract: expected string at session_detail.reveal.guesses[${index}].fooled_player_nickname`); @@ -389,11 +400,7 @@ export function mapSubmitGuessResponse(payload: unknown): SubmitGuessResponse { const root = asRecord(payload, 'submit_guess'); const guess = asRecord(root.guess, 'submit_guess.guess'); const window = asRecord(root.window, 'submit_guess.window'); - const fooledPlayerIdRaw = guess.fooled_player_id; - if (fooledPlayerIdRaw !== undefined && fooledPlayerIdRaw !== null && !isNumber(fooledPlayerIdRaw)) { - throw new Error('Invalid API contract: expected number|null at submit_guess.guess.fooled_player_id'); - } - const fooledPlayerId = fooledPlayerIdRaw ?? null; + const fooledPlayerId = readNullableNumber(guess, 'fooled_player_id', 'submit_guess.guess'); return { guess: { diff --git a/frontend/tests/angular-api-client.test.ts b/frontend/tests/angular-api-client.test.ts index 0fc0b40..584b289 100644 --- a/frontend/tests/angular-api-client.test.ts +++ b/frontend/tests/angular-api-client.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; import { createAngularApiClient, type AngularHttpClientLike } from '../src/api/angular-client'; +import { mapSubmitGuessResponse } from '../src/api/mappers'; describe('createAngularApiClient', () => { it('reads health and session detail using Django-compatible endpoints', async () => { @@ -384,6 +385,22 @@ describe('createAngularApiClient', () => { } }); + it('maps omitted fooled_player_id to null in submit guess mapper payloads', () => { + const mapped = mapSubmitGuessResponse({ + guess: { + id: 200, + player_id: 9, + round_question_id: 77, + selected_text: 'A', + is_correct: false, + created_at: '2026-03-01T16:01:00Z' + }, + window: { guess_deadline_at: '2026-03-01T16:01:30Z' } + }); + + expect(mapped.guess.fooled_player_id).toBeNull(); + }); + it('maps host/player gameplay endpoints through typed response mappers', async () => { const get = vi.fn(async (url: string) => { if (url === '/lobby/sessions/ABCD12/scoreboard') { From 0d91531b909f07577921c80da0e7c26d9538ed04 Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 22:56:34 +0000 Subject: [PATCH 6/8] test(frontend): lock omitted reveal nickname contract --- frontend/tests/angular-api-client.test.ts | 64 ++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/frontend/tests/angular-api-client.test.ts b/frontend/tests/angular-api-client.test.ts index 584b289..5d58920 100644 --- a/frontend/tests/angular-api-client.test.ts +++ b/frontend/tests/angular-api-client.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; import { createAngularApiClient, type AngularHttpClientLike } from '../src/api/angular-client'; -import { mapSubmitGuessResponse } from '../src/api/mappers'; +import { mapSessionDetailResponse, mapSubmitGuessResponse } from '../src/api/mappers'; describe('createAngularApiClient', () => { it('reads health and session detail using Django-compatible endpoints', async () => { @@ -401,6 +401,68 @@ describe('createAngularApiClient', () => { expect(mapped.guess.fooled_player_id).toBeNull(); }); + it('keeps fooled_player_nickname omitted when canonical reveal payload omits fooled player refs', () => { + const mapped = mapSessionDetailResponse({ + session: { code: 'ABCD12', status: 'reveal', host_id: 1, current_round: 1, players_count: 2 }, + players: [ + { id: 2, nickname: 'Maja', score: 10, is_connected: true }, + { id: 3, nickname: 'Bo', score: 7, is_connected: true } + ], + round_question: { + id: 77, + round_number: 1, + prompt: 'Q?', + shown_at: '2026-03-01T18:00:00Z', + answers: [{ text: 'A' }, { text: 'B' }] + }, + reveal: { + round_question_id: 77, + round_number: 1, + prompt: 'Q?', + correct_answer: 'A', + lies: [], + guesses: [ + { + player_id: 3, + nickname: 'Bo', + selected_text: 'A', + is_correct: true, + created_at: '2026-03-01T18:00:15Z' + } + ] + }, + phase_view_model: { + status: 'reveal', + round_number: 1, + players_count: 2, + constraints: { + min_players_to_start: 2, + max_players_mvp: 8, + min_players_reached: true, + max_players_allowed: true + }, + host: { + can_start_round: false, + can_show_question: false, + can_mix_answers: false, + can_calculate_scores: false, + can_reveal_scoreboard: true, + can_start_next_round: false, + can_finish_game: false + }, + player: { + can_join: true, + can_submit_lie: false, + can_submit_guess: false, + can_view_final_result: false + } + } + }); + + expect(mapped.reveal?.guesses[0].fooled_player_id).toBeNull(); + expect(mapped.reveal?.guesses[0]).not.toHaveProperty('fooled_player_nickname'); + }); + it('maps host/player gameplay endpoints through typed response mappers', async () => { const get = vi.fn(async (url: string) => { if (url === '/lobby/sessions/ABCD12/scoreboard') { From 2cc2a08ccb945ed21b4876c4121ff11c6b87dcf8 Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 23:16:17 +0000 Subject: [PATCH 7/8] test(lobby): lock omitted reveal fooled-player nickname contract --- lobby/tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lobby/tests.py b/lobby/tests.py index 4322a32..c537595 100644 --- a/lobby/tests.py +++ b/lobby/tests.py @@ -1427,6 +1427,7 @@ class SessionDetailRoundQuestionTests(TestCase): self.assertEqual(payload["reveal"]["guesses"][1]["selected_text"], "Edison") self.assertTrue(payload["reveal"]["guesses"][1]["is_correct"]) self.assertIsNone(payload["reveal"]["guesses"][1]["fooled_player_id"]) + self.assertNotIn("fooled_player_nickname", payload["reveal"]["guesses"][1]) def test_session_detail_includes_canonical_reveal_payload_in_scoreboard_phase(self): self.session.status = GameSession.Status.SCOREBOARD From c43975a1c8cadfd18e74ec8ba4aa99cc4dd0056b Mon Sep 17 00:00:00 2001 From: DEV-bot Date: Sun, 15 Mar 2026 23:36:26 +0000 Subject: [PATCH 8/8] fix(frontend): enforce canonical reveal fooled-player refs --- frontend/src/api/mappers.ts | 27 ++--- frontend/tests/angular-api-client.test.ts | 124 ++++++++++++++++++++++ 2 files changed, 138 insertions(+), 13 deletions(-) diff --git a/frontend/src/api/mappers.ts b/frontend/src/api/mappers.ts index 9f3365e..0cab015 100644 --- a/frontend/src/api/mappers.ts +++ b/frontend/src/api/mappers.ts @@ -141,24 +141,25 @@ function mapSessionDetail(payload: unknown): SessionDetailResponse { }; }), guesses: guessesRaw.map((guess, index) => { - const record = asRecord(guess, `session_detail.reveal.guesses[${index}]`); - const fooledPlayerId = readNullableNumber( - record, - 'fooled_player_id', - `session_detail.reveal.guesses[${index}]` - ); + const path = `session_detail.reveal.guesses[${index}]`; + const record = asRecord(guess, path); + const fooledPlayerId = readNullableNumber(record, 'fooled_player_id', path); const fooledPlayerNickname = record.fooled_player_nickname; - if (fooledPlayerNickname !== undefined && !isString(fooledPlayerNickname)) { - throw new Error(`Invalid API contract: expected string at session_detail.reveal.guesses[${index}].fooled_player_nickname`); + if (fooledPlayerId === null) { + if (fooledPlayerNickname !== undefined) { + throw new Error(`Invalid API contract: expected ${path}.fooled_player_nickname to be omitted when fooled_player_id is null`); + } + } else if (!isString(fooledPlayerNickname)) { + throw new Error(`Invalid API contract: expected string at ${path}.fooled_player_nickname when fooled_player_id is set`); } return { - player_id: readNumber(record, 'player_id', `session_detail.reveal.guesses[${index}]`), - nickname: readString(record, 'nickname', `session_detail.reveal.guesses[${index}]`), - selected_text: readString(record, 'selected_text', `session_detail.reveal.guesses[${index}]`), - is_correct: readBoolean(record, 'is_correct', `session_detail.reveal.guesses[${index}]`), + player_id: readNumber(record, 'player_id', path), + nickname: readString(record, 'nickname', path), + selected_text: readString(record, 'selected_text', path), + is_correct: readBoolean(record, 'is_correct', path), fooled_player_id: fooledPlayerId, ...(fooledPlayerNickname === undefined ? {} : { fooled_player_nickname: fooledPlayerNickname }), - created_at: readString(record, 'created_at', `session_detail.reveal.guesses[${index}]`) + created_at: readString(record, 'created_at', path) }; }) }; diff --git a/frontend/tests/angular-api-client.test.ts b/frontend/tests/angular-api-client.test.ts index 5d58920..275f463 100644 --- a/frontend/tests/angular-api-client.test.ts +++ b/frontend/tests/angular-api-client.test.ts @@ -463,6 +463,130 @@ describe('createAngularApiClient', () => { expect(mapped.reveal?.guesses[0]).not.toHaveProperty('fooled_player_nickname'); }); + it('rejects canonical reveal payloads that include fooled_player_nickname without fooled_player_id', () => { + expect(() => + mapSessionDetailResponse({ + session: { code: 'ABCD12', status: 'reveal', host_id: 1, current_round: 1, players_count: 2 }, + players: [ + { id: 2, nickname: 'Maja', score: 10, is_connected: true }, + { id: 3, nickname: 'Bo', score: 7, is_connected: true } + ], + round_question: { + id: 77, + round_number: 1, + prompt: 'Q?', + shown_at: '2026-03-01T18:00:00Z', + answers: [{ text: 'A' }, { text: 'B' }] + }, + reveal: { + round_question_id: 77, + round_number: 1, + prompt: 'Q?', + correct_answer: 'A', + lies: [], + guesses: [ + { + player_id: 3, + nickname: 'Bo', + selected_text: 'A', + is_correct: true, + fooled_player_nickname: 'Maja', + created_at: '2026-03-01T18:00:15Z' + } + ] + }, + phase_view_model: { + status: 'reveal', + round_number: 1, + players_count: 2, + constraints: { + min_players_to_start: 2, + max_players_mvp: 8, + min_players_reached: true, + max_players_allowed: true + }, + host: { + can_start_round: false, + can_show_question: false, + can_mix_answers: false, + can_calculate_scores: false, + can_reveal_scoreboard: true, + can_start_next_round: false, + can_finish_game: false + }, + player: { + can_join: true, + can_submit_lie: false, + can_submit_guess: false, + can_view_final_result: false + } + } + }) + ).toThrow('fooled_player_nickname to be omitted when fooled_player_id is null'); + }); + + it('rejects canonical reveal payloads that omit fooled_player_nickname when fooled_player_id is set', () => { + expect(() => + mapSessionDetailResponse({ + session: { code: 'ABCD12', status: 'reveal', host_id: 1, current_round: 1, players_count: 2 }, + players: [ + { id: 2, nickname: 'Maja', score: 10, is_connected: true }, + { id: 3, nickname: 'Bo', score: 7, is_connected: true } + ], + round_question: { + id: 77, + round_number: 1, + prompt: 'Q?', + shown_at: '2026-03-01T18:00:00Z', + answers: [{ text: 'A' }, { text: 'B' }] + }, + reveal: { + round_question_id: 77, + round_number: 1, + prompt: 'Q?', + correct_answer: 'A', + lies: [], + guesses: [ + { + player_id: 3, + nickname: 'Bo', + selected_text: 'B', + is_correct: false, + fooled_player_id: 2, + created_at: '2026-03-01T18:00:15Z' + } + ] + }, + phase_view_model: { + status: 'reveal', + round_number: 1, + players_count: 2, + constraints: { + min_players_to_start: 2, + max_players_mvp: 8, + min_players_reached: true, + max_players_allowed: true + }, + host: { + can_start_round: false, + can_show_question: false, + can_mix_answers: false, + can_calculate_scores: false, + can_reveal_scoreboard: true, + can_start_next_round: false, + can_finish_game: false + }, + player: { + can_join: true, + can_submit_lie: false, + can_submit_guess: false, + can_view_final_result: false + } + } + }) + ).toThrow('fooled_player_nickname when fooled_player_id is set'); + }); + it('maps host/player gameplay endpoints through typed response mappers', async () => { const get = vi.fn(async (url: string) => { if (url === '/lobby/sessions/ABCD12/scoreboard') {