From 23daeb1dde82b578893bc357b676c6725667584d Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 15 Apr 2026 16:17:44 +0000 Subject: [PATCH] Fix NBA Play-In 7/8 loser incorrectly marked as eliminated processPlayoffEvent (called by autoCompleteRoundIfDone when all round matches finish) was marking every non-scoring round loser as eliminated without checking doesLoserAdvance. This caused the 7v8 loser, who should advance to Play-In Round 2, to get finalPosition=0 as soon as the full round completed. Fixes: - processPlayoffEvent now calls doesLoserAdvance per match before writing a 0-pt elimination result, matching the guard already in processMatchResult - recalculate-floors handler now passes loserAdvances to processMatchResult so a full reprocess also respects the loser-advances rule - recalculateAffectedLeagues gains a skipDiscord option; recalculate-floors uses it so clicking the admin "Recalculate Floors" button corrects the bad data without re-announcing results on Discord - Add two tests confirming 7v8 loser is not eliminated and 9v10 loser is https://claude.ai/code/session_01QmvezscLYY38gN4GbvXZbA --- .../__tests__/process-match-result.test.ts | 95 ++++++++++++++++++- app/models/scoring-calculator.ts | 8 +- ...sons.$id.events.$eventId.bracket.server.ts | 3 +- 3 files changed, 101 insertions(+), 5 deletions(-) diff --git a/app/models/__tests__/process-match-result.test.ts b/app/models/__tests__/process-match-result.test.ts index 3afc8fc..ddf0827 100644 --- a/app/models/__tests__/process-match-result.test.ts +++ b/app/models/__tests__/process-match-result.test.ts @@ -59,7 +59,7 @@ function makeDb(existingResult?: { id: string; isPartialScore: boolean }) { }; } -import { processMatchResult, isLoserNotifiable } from "../scoring-calculator"; +import { processMatchResult, isLoserNotifiable, processPlayoffEvent } from "../scoring-calculator"; import { doesLoserAdvance } from "../playoff-match"; import { updateProbabilitiesAfterResult } from "~/services/probability-updater"; @@ -398,3 +398,96 @@ describe("isLoserNotifiable", () => { ).toBe(true); }); }); + +describe("processPlayoffEvent - NBA Play-In Round 1 loserAdvances fix", () => { + function makePlayInDb(matches: object[]) { + const insertedRows: Array<{ participantId: string; finalPosition: number; isPartialScore: boolean }> = []; + const insertValues = vi.fn().mockImplementation((values: object) => { + insertedRows.push(values as typeof insertedRows[0]); + return Promise.resolve(); + }); + + return { + db: { + insert: vi.fn().mockReturnValue({ values: insertValues }), + update: vi.fn().mockReturnValue({ + set: vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue(undefined) }), + }), + delete: vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue(undefined) }), + query: { + scoringEvents: { + findFirst: vi.fn().mockResolvedValue({ + id: "event-1", + playoffRound: "Play-In Round 1", + bracketTemplateId: "nba_20", + sportsSeasonId: "ss-1", + name: "NBA Playoffs", + sportsSeason: { + seasonSports: [{ seasonId: "season-1", season: {} }], + }, + }), + }, + playoffMatches: { + findMany: vi.fn().mockResolvedValue(matches), + }, + participants: { + findMany: vi.fn().mockResolvedValue([]), + }, + participantResults: { + findFirst: vi.fn().mockResolvedValue(undefined), + }, + seasons: { + findFirst: vi.fn().mockResolvedValue({ + id: "season-1", + pointsFor1st: 100, pointsFor2nd: 70, pointsFor3rd: 50, + pointsFor4th: 40, pointsFor5th: 25, pointsFor6th: 25, + pointsFor7th: 15, pointsFor8th: 15, + }), + }, + seasonSports: { findMany: vi.fn().mockResolvedValue([]) }, + sportsSeasons: { findFirst: vi.fn().mockResolvedValue(null) }, + }, + } as any, + insertedRows, + }; + } + + const PLAY_IN_MATCHES = [ + { + id: "m1", round: "Play-In Round 1", matchNumber: 1, isScoring: false, + isComplete: true, scoringEventId: "event-1", + participant1Id: "winner-78e", participant2Id: "loser-78e", + winnerId: "winner-78e", loserId: "loser-78e", + }, + { + id: "m2", round: "Play-In Round 1", matchNumber: 2, isScoring: false, + isComplete: true, scoringEventId: "event-1", + participant1Id: "winner-910e", participant2Id: "loser-910e", + winnerId: "winner-910e", loserId: "loser-910e", + }, + ]; + + it("does NOT eliminate the 7v8 loser (they advance to Play-In Round 2)", async () => { + const { db, insertedRows } = makePlayInDb(PLAY_IN_MATCHES); + + await processPlayoffEvent("event-1", db, { skipRecalculate: true }); + + const eliminatedIds = insertedRows + .filter((r) => r.finalPosition === 0 && !r.isPartialScore) + .map((r) => r.participantId); + + expect(eliminatedIds).not.toContain("loser-78e"); + }); + + it("DOES eliminate the 9v10 loser", async () => { + const { db, insertedRows } = makePlayInDb(PLAY_IN_MATCHES); + + await processPlayoffEvent("event-1", db, { skipRecalculate: true }); + + const eliminatedIds = insertedRows + .filter((r) => r.finalPosition === 0 && !r.isPartialScore) + .map((r) => r.participantId); + + expect(eliminatedIds).toContain("loser-910e"); + }); +}); diff --git a/app/models/scoring-calculator.ts b/app/models/scoring-calculator.ts index 11d39d0..3a94b9a 100644 --- a/app/models/scoring-calculator.ts +++ b/app/models/scoring-calculator.ts @@ -6,6 +6,7 @@ import { getSeasonResults } from "./participant-season-result"; import { updateProbabilitiesAfterResult } from "~/services/probability-updater"; import { sendStandingsUpdateNotification, type ScoredMatch } from "~/services/discord"; import { BRACKET_TEMPLATES } from "~/lib/bracket-templates"; +import { doesLoserAdvance } from "~/models/playoff-match"; import { getUserDisplayName } from "~/models/user"; import { createDailySnapshot } from "~/models/standings"; import { logger } from "~/lib/logger"; @@ -251,7 +252,8 @@ export async function processPlayoffEvent( // receive floor points — R64 and R32 winners are not yet guaranteed top-8. const awardFloor = doesNonScoringRoundFeedIntoScoringRound(round, event.bracketTemplateId); for (const match of matches) { - if (match.loserId) { + const loserAdvances = doesLoserAdvance(match.round, match.matchNumber, event.bracketTemplateId ?? ""); + if (match.loserId && !loserAdvances) { await upsertParticipantResult(match.loserId, event.sportsSeasonId, 0, db); } if (match.winnerId && awardFloor) { @@ -1271,7 +1273,7 @@ export async function recalculateStandings( export async function recalculateAffectedLeagues( sportsSeasonId: string, providedDb?: ReturnType, - options?: { eventName?: string; eventId?: string; matchIds?: string[] } + options?: { eventName?: string; eventId?: string; matchIds?: string[]; skipDiscord?: boolean } ): Promise { const db = providedDb || database(); @@ -1386,7 +1388,7 @@ export async function recalculateAffectedLeagues( }); const webhookUrl = season?.league?.discordWebhookUrl; - if (!webhookUrl) continue; + if (!webhookUrl || options?.skipDiscord) continue; // Build clerkId → username map for all team owners in this season const ownerClerkIds = afterStandings diff --git a/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts b/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts index ab20924..90f697d 100644 --- a/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts +++ b/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts @@ -614,11 +614,12 @@ export async function action({ request, params }: Route.ActionArgs) { sportsSeasonId: event.sportsSeasonId, bracketTemplateId: event.bracketTemplateId, skipSideEffects: true, + loserAdvances: doesLoserAdvance(match.round, match.matchNumber, event.bracketTemplateId ?? ""), } ); } - await recalculateAffectedLeagues(event.sportsSeasonId); + await recalculateAffectedLeagues(event.sportsSeasonId, undefined, { skipDiscord: true }); return { success: `Recalculated floors from ${sortedMatches.length} completed match(es)` }; } catch (error) {