* 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>
210 lines
7.2 KiB
TypeScript
210 lines
7.2 KiB
TypeScript
import { getAuth } from "@clerk/react-router/server";
|
|
import { addDays, subDays } from "date-fns";
|
|
import { toEventSortKey } from "~/lib/date-utils";
|
|
import {
|
|
findLeagueById,
|
|
findTeamsBySeasonId,
|
|
findCommissionersByLeagueId,
|
|
isUserLeagueMember,
|
|
isCommissioner,
|
|
findUsersByClerkIds,
|
|
getUserDisplayName,
|
|
findDraftSlotsBySeasonId,
|
|
} from "~/models";
|
|
import { findCurrentSeasonWithSports } from "~/models/season";
|
|
import { getSeasonStandings } from "~/models/standings";
|
|
import { getUpcomingEventsForDraftedParticipants } from "~/models/scoring-event";
|
|
import { getUpcomingGroupStageMatchesForParticipants } from "~/models/group-stage-match";
|
|
import { getDraftedParticipantsBySportsSeason } from "~/models/draft-pick";
|
|
import type { Route } from "./+types/$leagueId";
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const { userId } = await getAuth(args);
|
|
const { params } = args;
|
|
const { leagueId } = params;
|
|
|
|
// Fetch league
|
|
const league = await findLeagueById(leagueId);
|
|
|
|
if (!league) {
|
|
throw new Response("League not found", { status: 404 });
|
|
}
|
|
|
|
// Fetch current season with sports
|
|
const seasonWithSports = await findCurrentSeasonWithSports(leagueId);
|
|
const season = seasonWithSports || null;
|
|
|
|
// Fetch commissioners
|
|
const commissioners = await findCommissionersByLeagueId(leagueId);
|
|
|
|
// Check if current user is a commissioner
|
|
const isUserCommissioner = userId
|
|
? await isCommissioner(leagueId, userId)
|
|
: false;
|
|
|
|
// Check if user is a member (has a team in current season)
|
|
const isUserMember = userId
|
|
? await isUserLeagueMember(leagueId, userId)
|
|
: false;
|
|
|
|
// Check access: user must be a commissioner, a member, or an admin
|
|
// If not logged in or not authorized, throw 403
|
|
if (!userId) {
|
|
throw new Response("You must be logged in to view this league", {
|
|
status: 401,
|
|
});
|
|
}
|
|
|
|
if (!isUserCommissioner && !isUserMember) {
|
|
throw new Response("You do not have access to this league", {
|
|
status: 403,
|
|
});
|
|
}
|
|
|
|
// Fetch teams for current season
|
|
const teams = season ? await findTeamsBySeasonId(season.id) : [];
|
|
|
|
// Fetch draft slots if season is in pre_draft or draft status
|
|
const draftSlots =
|
|
season && (season.status === "pre_draft" || season.status === "draft")
|
|
? await findDraftSlotsBySeasonId(season.id)
|
|
: [];
|
|
|
|
// Fetch standings for active/completed seasons
|
|
const standings =
|
|
season && (season.status === "active" || season.status === "completed")
|
|
? await getSeasonStandings(season.id)
|
|
: [];
|
|
|
|
// Batch-fetch all users needed for owner and commissioner maps in one query
|
|
const ownerIds = [...new Set(teams.map((t) => t.ownerId).filter((id): id is string => id !== null))];
|
|
const commissionerIds = commissioners.map((c) => c.userId);
|
|
const allUserIds = [...new Set([...ownerIds, ...commissionerIds])];
|
|
const userRows = await findUsersByClerkIds(allUserIds);
|
|
const userByClerkId = new Map(userRows.map((u) => [u.clerkId, u]));
|
|
|
|
const ownerMap = new Map(
|
|
ownerIds
|
|
.map((id) => [id, userByClerkId.get(id)] as const)
|
|
.filter((entry): entry is [string, NonNullable<typeof entry[1]>] => entry[1] !== undefined)
|
|
.map(([id, user]) => [id, getUserDisplayName(user)])
|
|
);
|
|
|
|
const commissionerMap = new Map(
|
|
commissionerIds
|
|
.map((id) => [id, userByClerkId.get(id)] as const)
|
|
.filter((entry): entry is [string, NonNullable<typeof entry[1]>] => entry[1] !== undefined)
|
|
.map(([id, user]) => [id, getUserDisplayName(user)])
|
|
);
|
|
|
|
// Count available teams
|
|
const availableTeamCount = teams.filter((t) => !t.ownerId).length;
|
|
|
|
// Count teams with owners
|
|
const teamsWithOwners = teams.filter((t) => t.ownerId !== null).length;
|
|
|
|
// Get sports seasons data with upcoming participant events for the current user
|
|
const rawSportsSeasons = seasonWithSports?.seasonSports?.map((ss) => ss.sportsSeason) || [];
|
|
|
|
const myTeam = teams.find((t) => t.ownerId === userId) ?? null;
|
|
const today = new Date();
|
|
const dateFromStr = subDays(today, 1).toISOString().split("T")[0];
|
|
const dateToStr = addDays(today, 30).toISOString().split("T")[0];
|
|
|
|
const participantsBySportsSeason = myTeam && season
|
|
? await getDraftedParticipantsBySportsSeason(myTeam.id, season.id)
|
|
: new Map<string, Array<{ id: string; name: string }>>();
|
|
|
|
const dateFrom = new Date(dateFromStr + "T00:00:00.000Z");
|
|
const dateTo = new Date(dateToStr + "T23:59:59.999Z");
|
|
|
|
const sportsSeasons = await Promise.all(
|
|
rawSportsSeasons.map(async (ss) => {
|
|
const draftedParticipants = participantsBySportsSeason.get(ss.id) ?? [];
|
|
const upcomingParticipantEvents =
|
|
draftedParticipants.length > 0
|
|
? await getUpcomingEventsForDraftedParticipants(
|
|
ss.id,
|
|
ss.scoringPattern ?? "",
|
|
draftedParticipants,
|
|
dateFromStr,
|
|
dateToStr
|
|
)
|
|
: [];
|
|
|
|
// For group-stage bracket sports, also include scheduled group matches
|
|
if (ss.scoringPattern === "playoff_bracket" && draftedParticipants.length > 0) {
|
|
const draftedIds = draftedParticipants.map((p) => p.id);
|
|
const groupMatches = await getUpcomingGroupStageMatchesForParticipants(
|
|
ss.id,
|
|
draftedIds,
|
|
dateFrom,
|
|
dateTo
|
|
);
|
|
for (const gm of groupMatches) {
|
|
const relevant = draftedParticipants.filter(
|
|
(p) => p.id === gm.participant1.id || p.id === gm.participant2.id
|
|
);
|
|
upcomingParticipantEvents.push({
|
|
id: gm.matchId,
|
|
name: `${gm.participant1.name} vs ${gm.participant2.name}`,
|
|
eventDate: gm.scheduledAt ? gm.scheduledAt.split("T")[0] : null,
|
|
earliestGameTime: gm.scheduledAt || null,
|
|
matchLabel: `Group ${gm.groupName} · MD${gm.matchday}`,
|
|
eventType: "group_match",
|
|
sportsSeasonId: ss.id,
|
|
relevantParticipants: relevant,
|
|
});
|
|
}
|
|
}
|
|
|
|
return {
|
|
id: ss.id,
|
|
name: ss.name,
|
|
status: ss.status as "upcoming" | "active" | "completed",
|
|
scoringPattern: ss.scoringPattern,
|
|
sport: ss.sport,
|
|
upcomingParticipantEvents,
|
|
};
|
|
})
|
|
);
|
|
const sportsCount = sportsSeasons.length;
|
|
|
|
// Flatten all events into a panel-ready list, sorted by date
|
|
const upcomingCalendarEvents = sportsSeasons
|
|
.flatMap((ss) =>
|
|
ss.upcomingParticipantEvents.map((e) => ({
|
|
...e,
|
|
sportName: ss.sport.name,
|
|
sportSeasonName: ss.name,
|
|
sportsSeasonPageUrl: `/leagues/${leagueId}/sports-seasons/${ss.id}`,
|
|
}))
|
|
)
|
|
.toSorted((a, b) => toEventSortKey(a).localeCompare(toEventSortKey(b)));
|
|
|
|
// Check if draft order is set
|
|
const isDraftOrderSet = draftSlots.length > 0;
|
|
|
|
// Extract origin for client use (avoids SSR/client mismatch on invite URLs)
|
|
const origin = new URL(args.request.url).origin;
|
|
|
|
return {
|
|
league,
|
|
season,
|
|
teams,
|
|
commissioners,
|
|
currentUserId: userId,
|
|
isUserCommissioner,
|
|
ownerMap: Object.fromEntries(ownerMap),
|
|
commissionerMap: Object.fromEntries(commissionerMap),
|
|
availableTeamCount,
|
|
sportsCount,
|
|
teamsWithOwners,
|
|
isDraftOrderSet,
|
|
draftSlots,
|
|
sportsSeasons,
|
|
standings,
|
|
origin,
|
|
upcomingCalendarEvents,
|
|
};
|
|
}
|