* Add FIFA World Cup 2026 support with group stage display and Monte Carlo simulator, fixes #127 - New `groupStageMatches` table for recording group play results (W/D/L, scores, matchday, schedule) - `computeGroupStandings()` model function: pts → GD → GF → name tiebreaker ordering - `GroupStageStandings` component showing all 12 groups with standings table and manager column - Admin bracket UI: group match score entry, per-group standings, "Recalculate Floors" action - `WorldCupSimulator`: 50k Monte Carlo covering group stage + best-8 3rd-place + knockout + 3rd place game - Fuzzy name matching for national team Elo lookup (exact → substring → word-overlap), warns on miss - Partial group completion: completed matches replayed with real scores, remaining matches simulated - Elo priority: admin-entered sourceElo > futures odds converted to Elo > hardcoded national team ratings - `fifa_48` bracket template: added Third Place Game round with `loserFeedsInto` on Semifinals - Scoring rules: distinct 3rd/4th place for `fifa_48` (not averaged), QF losers share 5th–8th equally - Floor scoring: SF participants guaranteed 4th (provisional), finalized after 3rd place game - `recalculate-floors` admin action deletes and replays all results from scratch (fixes stale guard bug) - Unique index on `(tournamentGroupId, participant1Id, participant2Id)` to prevent duplicate pairings - Batch `findMatchesByGroupIds()` replacing N sequential queries in the sport season loader - League home mini-standings now shows `actualPoints` (includes floor) instead of `totalPoints` only - Elo ratings admin page supports World Cup (same bulk-import flow as snooker) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix TypeScript errors: update GroupStandingData type to use findMatchesByGroupIds Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Increase Node heap to 4GB for unit tests in CI to prevent OOM Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix OOM in CI: make WorldCupSimulator simulation count configurable for tests Tests now pass numSimulations=500 instead of the production default of 50,000. Six simulator tests × 50k iterations each was exhausting the 4GB heap on GitHub Actions runners. Also reduce simGroupMatch stat tests from 50k to 5k iterations. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
343 lines
12 KiB
TypeScript
343 lines
12 KiB
TypeScript
import { getAuth } from "@clerk/react-router/server";
|
|
import type { Route } from "./+types/$leagueId.sports-seasons.$sportsSeasonId";
|
|
import {
|
|
findLeagueById,
|
|
isUserLeagueMember,
|
|
isCommissioner,
|
|
findTeamsBySeasonId,
|
|
getUserDisplayName,
|
|
} from "~/models";
|
|
import { getDraftPicks } from "~/models/draft-pick";
|
|
import { getSeasonResults } from "~/models/participant-season-result";
|
|
import { calculateBracketPoints } from "~/models/scoring-rules";
|
|
import { getQPStandings } from "~/models/qualifying-points";
|
|
import {
|
|
getUpcomingScoringEvents,
|
|
getRecentCompletedEvents,
|
|
} from "~/models/scoring-event";
|
|
import { getRegularSeasonStandings } from "~/models/regular-season-standings";
|
|
import { getAllParticipantEVsForSeason } from "~/models/participant-expected-value";
|
|
import { getBracketTemplate, getOrderedRoundsFromMatches } from "~/lib/bracket-templates";
|
|
import {
|
|
findMatchesByGroupIds,
|
|
computeGroupStandings,
|
|
} from "~/models/group-stage-match";
|
|
import { findGroupsByEventId } from "~/models/tournament-group";
|
|
import type { PlayoffMatch } from "~/models/playoff-match";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and, inArray } from "drizzle-orm";
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const { userId } = await getAuth(args);
|
|
const { params } = args;
|
|
const { leagueId, sportsSeasonId } = params;
|
|
|
|
// Check authentication
|
|
if (!userId) {
|
|
throw new Response("You must be logged in to view this page", {
|
|
status: 401,
|
|
});
|
|
}
|
|
|
|
// Fetch league
|
|
const league = await findLeagueById(leagueId);
|
|
if (!league) {
|
|
throw new Response("League not found", { status: 404 });
|
|
}
|
|
|
|
// Check access: user must be a commissioner or member
|
|
const isUserCommissioner = await isCommissioner(leagueId, userId);
|
|
const isUserMember = await isUserLeagueMember(leagueId, userId);
|
|
|
|
if (!isUserCommissioner && !isUserMember) {
|
|
throw new Response("You do not have access to this league", {
|
|
status: 403,
|
|
});
|
|
}
|
|
|
|
// Fetch sports season with relations
|
|
const db = database();
|
|
const sportsSeason = await db.query.sportsSeasons.findFirst({
|
|
where: eq(schema.sportsSeasons.id, sportsSeasonId),
|
|
with: {
|
|
sport: true,
|
|
seasonSports: {
|
|
with: {
|
|
season: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
if (!sportsSeason) {
|
|
throw new Response("Sports season not found", { status: 404 });
|
|
}
|
|
|
|
// Get the fantasy season for this league (to get teams and draft picks)
|
|
// We need to find which season in this league includes this sports season
|
|
// Filter by leagueId since a sports season can be linked to multiple leagues
|
|
const seasonSport = sportsSeason.seasonSports?.find(
|
|
(ss) => ss.season.leagueId === leagueId
|
|
);
|
|
if (!seasonSport) {
|
|
throw new Response("This sports season is not linked to this league", {
|
|
status: 404,
|
|
});
|
|
}
|
|
|
|
const season = seasonSport.season;
|
|
|
|
// Fetch teams and draft picks to determine ownership
|
|
const teams = await findTeamsBySeasonId(season.id);
|
|
const draftPicks = await getDraftPicks(season.id);
|
|
|
|
// Build ownership map: participantId -> { teamName, teamId, ownerName }
|
|
const ownershipMap = new Map<
|
|
string,
|
|
{ teamName: string; teamId: string; ownerName?: string }
|
|
>();
|
|
|
|
// Get unique owner IDs and batch-fetch their user records in a single query
|
|
const ownerIds = [...new Set(teams.map((t) => t.ownerId).filter(Boolean))] as string[];
|
|
const ownerUserRows = ownerIds.length > 0
|
|
? await db.query.users.findMany({
|
|
where: inArray(schema.users.clerkId, ownerIds),
|
|
columns: { clerkId: true, username: true, displayName: true },
|
|
})
|
|
: [];
|
|
const ownerMap = new Map(
|
|
ownerUserRows.map((u) => [u.clerkId, getUserDisplayName(u) ?? "Unknown"])
|
|
);
|
|
|
|
// Map draft picks to ownership
|
|
for (const pick of draftPicks) {
|
|
const team = teams.find((t) => t.id === pick.teamId);
|
|
if (team && pick.participantId) {
|
|
ownershipMap.set(pick.participantId, {
|
|
teamName: team.name,
|
|
teamId: team.id,
|
|
ownerName: team.ownerId ? ownerMap.get(team.ownerId) : undefined,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Convert to array for serialization
|
|
const teamOwnerships = Array.from(ownershipMap.entries()).map(
|
|
([participantId, data]) => ({
|
|
participantId,
|
|
...data,
|
|
})
|
|
);
|
|
|
|
// Derive which participant IDs the current user has drafted
|
|
const userTeams = teams.filter((t) => t.ownerId === userId);
|
|
const userTeamIds = new Set(userTeams.map((t) => t.id));
|
|
const userParticipantIds = draftPicks
|
|
.filter((p) => p.teamId && userTeamIds.has(p.teamId) && p.participantId)
|
|
.map((p) => p.participantId as string);
|
|
|
|
// Fetch pattern-specific data based on scoring pattern
|
|
const scoringPattern = sportsSeason.scoringPattern;
|
|
|
|
type SeasonStanding = { id: string; position: number; championshipPoints: string; participant: { id: string; name: string } };
|
|
|
|
type PlayoffMatchWithRelations = PlayoffMatch & {
|
|
participant1: { id: string; name: string } | null;
|
|
participant2: { id: string; name: string } | null;
|
|
winner: { id: string; name: string } | null;
|
|
loser: { id: string; name: string } | null;
|
|
};
|
|
let playoffMatches: PlayoffMatchWithRelations[] = [];
|
|
let playoffRounds: string[] = [];
|
|
let preEliminatedParticipants: { id: string; name: string }[] = [];
|
|
let participantPoints: { participantId: string; points: number }[] = [];
|
|
let partialScoreParticipantIds: string[] = [];
|
|
let seasonStandings: SeasonStanding[] = [];
|
|
type QPStanding = Awaited<ReturnType<typeof getQPStandings>>[number];
|
|
let qpStandings: QPStanding[] = [];
|
|
|
|
// Group standings for group-stage events (e.g. FIFA World Cup)
|
|
type RawGroupMatch = Awaited<ReturnType<typeof findMatchesByGroupIds>> extends Map<string, Array<infer T>> ? T : never;
|
|
type GroupStandingData = {
|
|
groupName: string;
|
|
standings: ReturnType<typeof computeGroupStandings>;
|
|
matches: Array<Omit<RawGroupMatch, "scheduledAt"> & { scheduledAt: string | null }>;
|
|
};
|
|
let groupStandings: GroupStandingData[] = [];
|
|
|
|
if (scoringPattern === "playoff_bracket") {
|
|
// Fetch playoff matches via scoring events
|
|
const events = await db.query.scoringEvents.findMany({
|
|
where: eq(schema.scoringEvents.sportsSeasonId, sportsSeasonId),
|
|
});
|
|
|
|
let templateId: string | undefined;
|
|
|
|
if (events.length > 0) {
|
|
const eventIds = events.map((e) => e.id);
|
|
const matches = await db.query.playoffMatches.findMany({
|
|
where: (pm) => inArray(pm.scoringEventId, eventIds),
|
|
with: {
|
|
participant1: true,
|
|
participant2: true,
|
|
winner: true,
|
|
loser: true,
|
|
},
|
|
});
|
|
playoffMatches = matches as PlayoffMatchWithRelations[];
|
|
|
|
templateId = events.find((e) => e.bracketTemplateId)?.bracketTemplateId ?? undefined;
|
|
const template = templateId ? getBracketTemplate(templateId) : undefined;
|
|
playoffRounds = getOrderedRoundsFromMatches(matches, template);
|
|
|
|
// Load group stage standings if this event uses a group-stage template
|
|
if (template?.groupStage) {
|
|
const groupStageEventId = events.find((e) => e.bracketTemplateId === templateId)?.id;
|
|
if (groupStageEventId) {
|
|
const groups = await findGroupsByEventId(groupStageEventId);
|
|
// Single batched query for all groups instead of N round-trips
|
|
const matchesByGroupId = await findMatchesByGroupIds(groups.map((g) => g.id));
|
|
groupStandings = groups.map((group) => {
|
|
const groupMatches = matchesByGroupId.get(group.id) ?? [];
|
|
const members = (group.members ?? [])
|
|
.filter((m) => m.participant !== null && m.participant !== undefined)
|
|
.map((m) => ({
|
|
participantId: m.participant?.id ?? "",
|
|
participantName: m.participant?.name ?? "",
|
|
}));
|
|
return {
|
|
groupName: group.groupName,
|
|
standings: computeGroupStandings(
|
|
members,
|
|
groupMatches.map((m) => ({
|
|
participant1Id: m.participant1Id,
|
|
participant2Id: m.participant2Id,
|
|
participant1Score: m.participant1Score,
|
|
participant2Score: m.participant2Score,
|
|
isComplete: m.isComplete,
|
|
}))
|
|
),
|
|
matches: groupMatches.map((m) => ({
|
|
...m,
|
|
scheduledAt: m.scheduledAt ? m.scheduledAt.toISOString() : null,
|
|
})),
|
|
};
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
// Fetch group-stage losers and all participant results for bracket scoring
|
|
const [eliminatedResults, allResults] = await Promise.all([
|
|
db.query.participantResults.findMany({
|
|
where: and(
|
|
eq(schema.participantResults.sportsSeasonId, sportsSeasonId),
|
|
eq(schema.participantResults.finalPosition, 0)
|
|
),
|
|
with: { participant: true },
|
|
}),
|
|
db.query.participantResults.findMany({
|
|
where: eq(schema.participantResults.sportsSeasonId, sportsSeasonId),
|
|
}),
|
|
]);
|
|
|
|
preEliminatedParticipants = eliminatedResults
|
|
.filter((r): r is typeof r & { participant: NonNullable<typeof r.participant> } => r.participant !== null && r.participant !== undefined)
|
|
.map((r) => ({ id: r.participant.id, name: r.participant.name }));
|
|
|
|
// Compute per-participant fantasy points directly from participant_results.
|
|
// This covers both finalized placements and progressive floor scores for still-alive participants.
|
|
const scoringRules = {
|
|
pointsFor1st: season.pointsFor1st,
|
|
pointsFor2nd: season.pointsFor2nd,
|
|
pointsFor3rd: season.pointsFor3rd,
|
|
pointsFor4th: season.pointsFor4th,
|
|
pointsFor5th: season.pointsFor5th,
|
|
pointsFor6th: season.pointsFor6th,
|
|
pointsFor7th: season.pointsFor7th,
|
|
pointsFor8th: season.pointsFor8th,
|
|
};
|
|
const seenParticipantIds = new Set<string>();
|
|
participantPoints = allResults
|
|
.filter((r) => r.finalPosition !== null && r.finalPosition > 0)
|
|
.filter((r) => {
|
|
if (seenParticipantIds.has(r.participantId)) return false;
|
|
seenParticipantIds.add(r.participantId);
|
|
return true;
|
|
})
|
|
.map((r) => ({
|
|
participantId: r.participantId,
|
|
points: calculateBracketPoints(r.finalPosition ?? 0, scoringRules, templateId),
|
|
}));
|
|
|
|
// Track which participants have provisional (floor) scores — still competing
|
|
partialScoreParticipantIds = allResults
|
|
.filter((r) => r.isPartialScore)
|
|
.map((r) => r.participantId);
|
|
} else if (scoringPattern === "season_standings") {
|
|
// Fetch F1-style championship standings and map to SeasonStanding shape
|
|
const results = await getSeasonResults(sportsSeasonId);
|
|
seasonStandings = results
|
|
.filter((r) => r.currentPosition !== null || (r.currentPoints && parseFloat(r.currentPoints) > 0))
|
|
.map((r) => ({
|
|
id: r.id,
|
|
position: r.currentPosition ?? 999,
|
|
championshipPoints: r.currentPoints ?? "0",
|
|
participant: {
|
|
id: r.participant.id,
|
|
name: r.participant.name,
|
|
},
|
|
}));
|
|
} else if (scoringPattern === "qualifying_points") {
|
|
// Fetch qualifying points standings
|
|
const standings = await getQPStandings(sportsSeasonId);
|
|
qpStandings = standings;
|
|
}
|
|
|
|
// Fetch event schedule for all patterns (upcoming + recent)
|
|
const [upcomingEvents, recentEvents] = await Promise.all([
|
|
getUpcomingScoringEvents(sportsSeasonId, 5),
|
|
getRecentCompletedEvents(sportsSeasonId, 3),
|
|
]);
|
|
|
|
// Fetch regular season standings for team-sport playoff_bracket seasons (NBA, NHL)
|
|
const isTeamBracket =
|
|
scoringPattern === "playoff_bracket" && sportsSeason.sport?.type === "team";
|
|
const [regularSeasonStandings, regularSeasonEvs] = isTeamBracket
|
|
? await Promise.all([
|
|
getRegularSeasonStandings(sportsSeasonId),
|
|
getAllParticipantEVsForSeason(sportsSeasonId),
|
|
])
|
|
: [[], []];
|
|
|
|
// Derive seasonIsFinalized from status
|
|
const seasonIsFinalized = sportsSeason.status === "completed";
|
|
|
|
// Build participantId → expectedValue map for display
|
|
const participantEvs = Object.fromEntries(
|
|
regularSeasonEvs.map((ev) => [ev.participantId, ev.expectedValue])
|
|
);
|
|
|
|
return {
|
|
league,
|
|
season,
|
|
sportsSeason,
|
|
scoringPattern,
|
|
playoffMatches,
|
|
playoffRounds,
|
|
preEliminatedParticipants,
|
|
participantPoints,
|
|
partialScoreParticipantIds,
|
|
seasonStandings,
|
|
qpStandings,
|
|
teamOwnerships,
|
|
userParticipantIds,
|
|
upcomingEvents,
|
|
recentEvents,
|
|
seasonIsFinalized,
|
|
regularSeasonStandings,
|
|
participantEvs,
|
|
groupStandings,
|
|
};
|
|
}
|