* refactor(schema): rename per-window tables to season_* prefix Renames participants, participant_expected_values, participant_qualifying_totals, participant_results, participant_surface_elos to season_* prefixed names. Renames event_results.participant_id to season_participant_id. Phase 1a of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor: rename participant.ts model file to season-participant.ts Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(models): update model layer to use renamed schema exports Updated all model files to use the renamed schema exports from Task 1: - participants → seasonParticipants - participantExpectedValues → seasonParticipantExpectedValues - participantQualifyingTotals → seasonParticipantQualifyingTotals - participantResults → seasonParticipantResults - participantSurfaceElos → seasonParticipantSurfaceElos - eventResults.participantId → eventResults.seasonParticipantId - db.query relation accessors updated - Relation field .participant → .seasonParticipant where applicable - Import paths updated: ./participant → ./season-participant Files updated (14 model files + 3 test files): - draft-pick.ts - draft-utils.ts - event-result.ts - group-stage-match.ts - participant-result.ts - qualifying-points.ts - scoring-calculator.ts - scoring-event.ts - sports-season.ts - surface-elo.ts - team-score-events.ts - cs2-major-stage.ts - golf-skills.ts - participant-expected-value.ts - __tests__/sports-season.clone.test.ts - __tests__/auto-pick.test.ts - __tests__/executeAutoPick.timer.test.ts Typecheck errors decreased: 779 → 499 (280 fewer) All model file errors related to renamed schemas resolved. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(routes): update route layer to use renamed schema exports - Update model import from ~/models/participant to ~/models/season-participant - Rename schema.participants to schema.seasonParticipants - Rename schema.participantResults to schema.seasonParticipantResults - Rename db.query.participants to db.query.seasonParticipants - Update 9 route files and 1 test file Affected files: - admin.sports-seasons.$id.events.$eventId.bracket.server.ts - admin.sports-seasons.$id.participants.tsx - api/draft.force-manual-pick.ts - api/draft.make-pick.ts - api/draft.replace-pick.ts - api/seasons.$seasonId.draft.ts - leagues/$leagueId.draft-board.$seasonId.tsx - leagues/$leagueId.sports-seasons.$sportsSeasonId.server.ts - admin/__tests__/sports-seasons-participants.test.ts Error count reduced from 499 to 453 (46 errors fixed). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(routes): update route files for schema rename Update route imports from ~/models/participant to ~/models/season-participant and fix references to .participant/.participantId on event results to use .seasonParticipant/.seasonParticipantId after schema rename. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(services): update simulators and services for renamed schema Update all simulators, services, and server files to use renamed schema tables: - participants → seasonParticipants - participantExpectedValues → seasonParticipantExpectedValues - participantResults → seasonParticipantResults - eventResults.participantId → eventResults.seasonParticipantId Files updated: - 20 sport simulators (NBA, NHL, NFL, MLB, etc.) - probability-updater.ts - standings-sync/index.ts - sports-data-sync.server.ts - server/socket.ts Typecheck errors reduced from 365 to 0. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * migration: rename per-window tables to season_* prefix * fix(tests): update mock query keys after participants table rename Change mock db.query.participants to db.query.seasonParticipants in test files to match the schema rename from commit66145a9. This fixes "Cannot read properties of undefined (reading 'findFirst'/'findMany')" errors that occurred when production code queries db.query.seasonParticipants but test mocks only defined the old participants key. Files updated: - app/services/simulations/__tests__/world-cup-simulator.test.ts - app/routes/api/__tests__/draft.force-manual-pick.test.ts - app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts - app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts - server/__tests__/timer-autodraft.test.ts - app/models/__tests__/team-score-events.test.ts Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(tests): update remaining mock paths and keys after schema rename * fix(tests): final two mock stragglers after schema rename - draft-pick.test.ts: assertion on db.query.participantQualifyingTotals - process-match-result.test.ts: mock key participants → seasonParticipants Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore: add post-phase1a baseline capture (temp, for diff verification) * chore: capture pre-migration baselines * chore: remove post-phase1a capture helper after verification * schema: add canonical tournament & participant tables Adds tournaments, participants (canonical), tournament_results, and participant_surface_elos (canonical). Adds nullable tournament_id to scoring_events and nullable participant_id to season_participants. Phase 1b of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * feat(models): add canonical tournament, participant, result, surface-elo models Adds CRUD modules for the canonical tables created in commit775b905. Each module mirrors existing app/models conventions (database() from ~/database/context, schema from ~/database/schema, mock-based tests). Key implementation notes: - participant.ts exports use "Canonical" prefix (CanonicalParticipant, createCanonicalParticipant, etc.) to avoid collision with existing season-participant.ts exports - All four models include comprehensive unit tests following the audit-log.test.ts pattern - Tests use mocked db responses (no real database access) - Upsert functions use onConflictDoUpdate for appropriate unique constraints Part of Phase 1b of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * migration: create canonical tables, add nullable FKs * scripts: add extractTournamentIdentity helper for backfill Pure function that derives canonical (name, year) identity from a scoring_events row, stripping trailing 4-digit years from the name or falling back to eventDate. Used by the Phase 2 backfill to group per-window events into canonical tournaments. * scripts: add backfill orchestrator for canonical layer Populates canonical tournaments, participants, tournament_results, and participant_surface_elos from per-window data for qualifying-points sports. Skips already-linked rows, is idempotent, and supports dry-run mode. Critical invariants enforced by the implementation: - qualifying_points_awarded is never copied to tournament_results - season_participant_qualifying_totals is never touched - conflicting surface-Elo values between windows raise a loud error (recorded in report.errors) rather than overwriting * scripts: add backfill CLI with dry-run default Wires backfill-canonical-layer.ts to a CLI entry point exposed as `npm run backfill:canonical`. Defaults to --dry-run; requires --apply to actually write. Supports --sport=<uuid> to limit to a single sport. Exits 2 if the backfill reports errors (e.g., surface-Elo conflicts). * fix(backfill-cli): wrap runBackfill in DatabaseContext.run The orchestrator uses database() from ~/database/context, which requires AsyncLocalStorage to be populated. Wrap the CLI invocation with DatabaseContext.run(db, ...) using server/db's cached connection pool. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(backfill-cli): exit 0 on success so pg pool doesn't block The cached postgres connection pool keeps the Node event loop open after main() returns. Explicit process.exit(0) on success mirrors the pattern in scripts/capture-baseline.ts. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Chris Parsons <chrisp@extrahop.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
361 lines
10 KiB
TypeScript
361 lines
10 KiB
TypeScript
import { and, asc, eq, gte, inArray, lte, or } from "drizzle-orm";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { logger } from "~/lib/logger";
|
|
|
|
export type GroupStageMatch = typeof schema.groupStageMatches.$inferSelect;
|
|
|
|
export interface GroupStandingsRow {
|
|
participantId: string;
|
|
participantName: string;
|
|
played: number;
|
|
wins: number;
|
|
draws: number;
|
|
losses: number;
|
|
gf: number; // goals for
|
|
ga: number; // goals against
|
|
gd: number; // goal difference
|
|
points: number;
|
|
}
|
|
|
|
export interface UpcomingGroupMatch {
|
|
matchId: string;
|
|
groupId: string;
|
|
groupName: string;
|
|
sportsSeasonId: string;
|
|
matchday: number;
|
|
scheduledAt: string; // ISO string
|
|
isComplete: boolean;
|
|
participant1: { id: string; name: string };
|
|
participant2: { id: string; name: string };
|
|
participant1Score: number | null;
|
|
participant2Score: number | null;
|
|
}
|
|
|
|
interface MatchInput {
|
|
participant1Id: string;
|
|
participant2Id: string;
|
|
matchday: number;
|
|
scheduledAt?: Date | null;
|
|
}
|
|
|
|
/**
|
|
* Create the 6 round-robin matches for a tournament group.
|
|
* Matches are created without scores (to be filled in as the tournament progresses).
|
|
*/
|
|
export async function createGroupStageMatches(
|
|
groupId: string,
|
|
matches: MatchInput[]
|
|
): Promise<GroupStageMatch[]> {
|
|
const db = database();
|
|
return await db
|
|
.insert(schema.groupStageMatches)
|
|
.values(
|
|
matches.map((m) => ({
|
|
tournamentGroupId: groupId,
|
|
participant1Id: m.participant1Id,
|
|
participant2Id: m.participant2Id,
|
|
matchday: m.matchday,
|
|
scheduledAt: m.scheduledAt ?? null,
|
|
}))
|
|
)
|
|
.returning();
|
|
}
|
|
|
|
/**
|
|
* Generate all 6 round-robin pairings for 4 participants in a group.
|
|
* Uses a fixed round-robin schedule (matchdays 1, 2, 3).
|
|
*
|
|
* Standard 4-team round-robin schedule:
|
|
* Matchday 1: 1v4, 2v3
|
|
* Matchday 2: 1v3, 4v2
|
|
* Matchday 3: 1v2, 3v4
|
|
*/
|
|
export function generateRoundRobinPairings(
|
|
participantIds: string[]
|
|
): MatchInput[] {
|
|
if (participantIds.length !== 4) {
|
|
throw new Error("Round-robin generation requires exactly 4 participants");
|
|
}
|
|
const [p1, p2, p3, p4] = participantIds;
|
|
return [
|
|
{ participant1Id: p1, participant2Id: p4, matchday: 1 },
|
|
{ participant1Id: p2, participant2Id: p3, matchday: 1 },
|
|
{ participant1Id: p1, participant2Id: p3, matchday: 2 },
|
|
{ participant1Id: p4, participant2Id: p2, matchday: 2 },
|
|
{ participant1Id: p1, participant2Id: p2, matchday: 3 },
|
|
{ participant1Id: p3, participant2Id: p4, matchday: 3 },
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Record the result of a group stage match and mark it complete.
|
|
*/
|
|
export async function updateGroupStageMatchResult(
|
|
matchId: string,
|
|
participant1Score: number,
|
|
participant2Score: number
|
|
): Promise<GroupStageMatch> {
|
|
const db = database();
|
|
const [updated] = await db
|
|
.update(schema.groupStageMatches)
|
|
.set({
|
|
participant1Score,
|
|
participant2Score,
|
|
isComplete: true,
|
|
updatedAt: new Date(),
|
|
})
|
|
.where(eq(schema.groupStageMatches.id, matchId))
|
|
.returning();
|
|
return updated;
|
|
}
|
|
|
|
/**
|
|
* Update the scheduled time of a group stage match.
|
|
*/
|
|
export async function updateGroupStageMatchSchedule(
|
|
matchId: string,
|
|
scheduledAt: Date | null
|
|
): Promise<GroupStageMatch> {
|
|
const db = database();
|
|
const [updated] = await db
|
|
.update(schema.groupStageMatches)
|
|
.set({ scheduledAt, updatedAt: new Date() })
|
|
.where(eq(schema.groupStageMatches.id, matchId))
|
|
.returning();
|
|
return updated;
|
|
}
|
|
|
|
/**
|
|
* Fetch all matches for a group, with participant info.
|
|
*/
|
|
export async function findMatchesByGroupId(groupId: string) {
|
|
const db = database();
|
|
return await db.query.groupStageMatches.findMany({
|
|
where: eq(schema.groupStageMatches.tournamentGroupId, groupId),
|
|
orderBy: [
|
|
asc(schema.groupStageMatches.matchday),
|
|
asc(schema.groupStageMatches.createdAt),
|
|
],
|
|
with: {
|
|
participant1: true,
|
|
participant2: true,
|
|
},
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Fetch all matches for multiple groups in a single query.
|
|
* Returns a Map from groupId → matches (ordered by matchday, createdAt).
|
|
* Use this instead of calling findMatchesByGroupId N times.
|
|
*/
|
|
export async function findMatchesByGroupIds(
|
|
groupIds: string[]
|
|
): Promise<Map<string, Awaited<ReturnType<typeof findMatchesByGroupId>>>> {
|
|
if (groupIds.length === 0) return new Map();
|
|
const db = database();
|
|
const rows = await db.query.groupStageMatches.findMany({
|
|
where: inArray(schema.groupStageMatches.tournamentGroupId, groupIds),
|
|
orderBy: [
|
|
asc(schema.groupStageMatches.matchday),
|
|
asc(schema.groupStageMatches.createdAt),
|
|
],
|
|
with: {
|
|
participant1: true,
|
|
participant2: true,
|
|
},
|
|
});
|
|
const result = new Map<string, typeof rows>();
|
|
for (const groupId of groupIds) result.set(groupId, []);
|
|
for (const row of rows) {
|
|
result.get(row.tournamentGroupId)?.push(row);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Fetch all group stage matches for a scoring event (all groups combined).
|
|
*/
|
|
export async function findMatchesByEventId(eventId: string) {
|
|
const db = database();
|
|
const groups = await db.query.tournamentGroups.findMany({
|
|
where: eq(schema.tournamentGroups.scoringEventId, eventId),
|
|
with: {
|
|
matches: {
|
|
orderBy: [
|
|
asc(schema.groupStageMatches.matchday),
|
|
asc(schema.groupStageMatches.createdAt),
|
|
],
|
|
with: {
|
|
participant1: true,
|
|
participant2: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
return groups;
|
|
}
|
|
|
|
/**
|
|
* Compute standings for a group from match results.
|
|
* Sorted by: points desc → goal difference desc → goals for desc → name asc.
|
|
*/
|
|
export function computeGroupStandings(
|
|
members: Array<{ participantId: string; participantName: string }>,
|
|
matches: Array<{
|
|
participant1Id: string;
|
|
participant2Id: string;
|
|
participant1Score: number | null;
|
|
participant2Score: number | null;
|
|
isComplete: boolean;
|
|
}>
|
|
): GroupStandingsRow[] {
|
|
const stats = new Map<string, GroupStandingsRow>();
|
|
|
|
for (const m of members) {
|
|
stats.set(m.participantId, {
|
|
participantId: m.participantId,
|
|
participantName: m.participantName,
|
|
played: 0,
|
|
wins: 0,
|
|
draws: 0,
|
|
losses: 0,
|
|
gf: 0,
|
|
ga: 0,
|
|
gd: 0,
|
|
points: 0,
|
|
});
|
|
}
|
|
|
|
for (const match of matches) {
|
|
if (!match.isComplete) continue;
|
|
if (match.participant1Score === null || match.participant2Score === null) {
|
|
logger.warn(
|
|
`[computeGroupStandings] Match between ${match.participant1Id} and ${match.participant2Id} is marked complete but has null scores — skipping`
|
|
);
|
|
continue;
|
|
}
|
|
|
|
const p1 = stats.get(match.participant1Id);
|
|
const p2 = stats.get(match.participant2Id);
|
|
if (!p1 || !p2) continue;
|
|
|
|
const s1 = match.participant1Score;
|
|
const s2 = match.participant2Score;
|
|
|
|
p1.played++;
|
|
p2.played++;
|
|
p1.gf += s1;
|
|
p1.ga += s2;
|
|
p2.gf += s2;
|
|
p2.ga += s1;
|
|
p1.gd = p1.gf - p1.ga;
|
|
p2.gd = p2.gf - p2.ga;
|
|
|
|
if (s1 > s2) {
|
|
p1.wins++;
|
|
p1.points += 3;
|
|
p2.losses++;
|
|
} else if (s2 > s1) {
|
|
p2.wins++;
|
|
p2.points += 3;
|
|
p1.losses++;
|
|
} else {
|
|
p1.draws++;
|
|
p2.draws++;
|
|
p1.points++;
|
|
p2.points++;
|
|
}
|
|
}
|
|
|
|
return [...stats.values()].toSorted((a, b) => {
|
|
if (b.points !== a.points) return b.points - a.points;
|
|
if (b.gd !== a.gd) return b.gd - a.gd;
|
|
if (b.gf !== a.gf) return b.gf - a.gf;
|
|
return a.participantName.localeCompare(b.participantName);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Get upcoming group stage matches (within a date window) for specific participants.
|
|
* Used for calendar/schedule display on league home and team pages.
|
|
*/
|
|
export async function getUpcomingGroupStageMatchesForParticipants(
|
|
sportsSeasonId: string,
|
|
participantIds: string[],
|
|
dateFrom: Date,
|
|
dateTo: Date
|
|
): Promise<UpcomingGroupMatch[]> {
|
|
if (participantIds.length === 0) return [];
|
|
|
|
const db = database();
|
|
|
|
const rows = await db
|
|
.select({
|
|
matchId: schema.groupStageMatches.id,
|
|
groupId: schema.tournamentGroups.id,
|
|
groupName: schema.tournamentGroups.groupName,
|
|
sportsSeasonId: schema.scoringEvents.sportsSeasonId,
|
|
matchday: schema.groupStageMatches.matchday,
|
|
scheduledAt: schema.groupStageMatches.scheduledAt,
|
|
isComplete: schema.groupStageMatches.isComplete,
|
|
participant1Id: schema.groupStageMatches.participant1Id,
|
|
participant2Id: schema.groupStageMatches.participant2Id,
|
|
participant1Score: schema.groupStageMatches.participant1Score,
|
|
participant2Score: schema.groupStageMatches.participant2Score,
|
|
})
|
|
.from(schema.groupStageMatches)
|
|
.innerJoin(
|
|
schema.tournamentGroups,
|
|
eq(schema.groupStageMatches.tournamentGroupId, schema.tournamentGroups.id)
|
|
)
|
|
.innerJoin(
|
|
schema.scoringEvents,
|
|
eq(schema.tournamentGroups.scoringEventId, schema.scoringEvents.id)
|
|
)
|
|
.where(
|
|
and(
|
|
eq(schema.scoringEvents.sportsSeasonId, sportsSeasonId),
|
|
or(
|
|
inArray(schema.groupStageMatches.participant1Id, participantIds),
|
|
inArray(schema.groupStageMatches.participant2Id, participantIds)
|
|
),
|
|
and(
|
|
gte(schema.groupStageMatches.scheduledAt, dateFrom),
|
|
lte(schema.groupStageMatches.scheduledAt, dateTo)
|
|
)
|
|
)
|
|
)
|
|
.orderBy(asc(schema.groupStageMatches.scheduledAt));
|
|
|
|
if (rows.length === 0) return [];
|
|
|
|
// Load participant names for all involved participants
|
|
const allParticipantIds = [
|
|
...new Set(rows.flatMap((r) => [r.participant1Id, r.participant2Id])),
|
|
];
|
|
const participantRows = await db.query.seasonParticipants.findMany({
|
|
where: inArray(schema.seasonParticipants.id, allParticipantIds),
|
|
});
|
|
const participantMap = new Map(participantRows.map((p) => [p.id, p]));
|
|
|
|
return rows
|
|
.filter((r) => r.scheduledAt !== null)
|
|
.map((r) => {
|
|
const p1 = participantMap.get(r.participant1Id);
|
|
const p2 = participantMap.get(r.participant2Id);
|
|
return {
|
|
matchId: r.matchId,
|
|
groupId: r.groupId,
|
|
groupName: r.groupName,
|
|
sportsSeasonId: r.sportsSeasonId,
|
|
matchday: r.matchday,
|
|
scheduledAt: r.scheduledAt?.toISOString() ?? "",
|
|
isComplete: r.isComplete,
|
|
participant1: { id: r.participant1Id, name: p1?.name ?? "Unknown" },
|
|
participant2: { id: r.participant2Id, name: p2?.name ?? "Unknown" },
|
|
participant1Score: r.participant1Score,
|
|
participant2Score: r.participant2Score,
|
|
};
|
|
});
|
|
}
|