* 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>
351 lines
11 KiB
TypeScript
351 lines
11 KiB
TypeScript
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and, inArray, asc } from "drizzle-orm";
|
|
import { getScoringRules, calculateFantasyPoints, calculateBracketPoints } from "./scoring-rules";
|
|
|
|
export async function createDraftPick(data: {
|
|
seasonId: string;
|
|
teamId: string;
|
|
participantId: string;
|
|
pickNumber: number;
|
|
round: number;
|
|
pickInRound: number;
|
|
pickedByUserId: string;
|
|
pickedByType: "owner" | "commissioner" | "auto";
|
|
timeUsed: number;
|
|
}) {
|
|
const db = database();
|
|
const [pick] = await db.insert(schema.draftPicks).values(data).returning();
|
|
return pick;
|
|
}
|
|
|
|
export async function getDraftPicks(seasonId: string) {
|
|
const db = database();
|
|
return await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
}
|
|
|
|
export async function getDraftPickByNumber(seasonId: string, pickNumber: number) {
|
|
const db = database();
|
|
const [pick] = await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.pickNumber, pickNumber)
|
|
)
|
|
);
|
|
return pick;
|
|
}
|
|
|
|
export async function getTeamDraftPicks(teamId: string) {
|
|
const db = database();
|
|
return await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.teamId, teamId))
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
}
|
|
|
|
export async function isParticipantDrafted(seasonId: string, participantId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const [pick] = await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.participantId, participantId)
|
|
)
|
|
);
|
|
return !!pick;
|
|
}
|
|
|
|
/**
|
|
* Get a team's drafted participants grouped by sports season.
|
|
* Returns a map of sportsSeasonId → [{id, name}].
|
|
*/
|
|
export async function getDraftedParticipantsBySportsSeason(
|
|
teamId: string,
|
|
seasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
): Promise<Map<string, Array<{ id: string; name: string }>>> {
|
|
const db = providedDb || database();
|
|
|
|
const results = await db
|
|
.select({
|
|
sportsSeasonId: schema.seasonParticipants.sportsSeasonId,
|
|
participantId: schema.seasonParticipants.id,
|
|
participantName: schema.seasonParticipants.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(
|
|
schema.seasonParticipants,
|
|
eq(schema.draftPicks.participantId, schema.seasonParticipants.id)
|
|
)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.teamId, teamId),
|
|
eq(schema.draftPicks.seasonId, seasonId)
|
|
)
|
|
);
|
|
|
|
const map = new Map<string, Array<{ id: string; name: string }>>();
|
|
for (const row of results) {
|
|
if (!map.has(row.sportsSeasonId)) {
|
|
map.set(row.sportsSeasonId, []);
|
|
}
|
|
map.get(row.sportsSeasonId)?.push({ id: row.participantId, name: row.participantName });
|
|
}
|
|
return map;
|
|
}
|
|
|
|
export interface DraftedParticipantWithPoints {
|
|
id: string;
|
|
name: string;
|
|
/** Fantasy league points earned (position → scoring rules). null = no result yet. */
|
|
earnedPoints: number | null;
|
|
/** Accumulated qualifying points for qualifying_points sports. null for other sports. */
|
|
currentQP: number | null;
|
|
}
|
|
|
|
/**
|
|
* Get a team's drafted participants with their current earned points, grouped by
|
|
* sports season. Used for the league home summary card.
|
|
*
|
|
* - playoff_bracket / season_standings: earnedPoints = finalPosition → scoring rules
|
|
* - qualifying_points (active): currentQP = accumulated QP from participantQualifyingTotals
|
|
* - qualifying_points (finalized): earnedPoints = finalPosition → scoring rules (participantResults written)
|
|
* - No EV / projected points — actual earned only.
|
|
*/
|
|
export async function getDraftedParticipantsWithPoints(
|
|
teamId: string,
|
|
seasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
): Promise<Map<string, DraftedParticipantWithPoints[]>> {
|
|
const db = providedDb || database();
|
|
|
|
const scoringRules = await getScoringRules(seasonId, db);
|
|
if (!scoringRules) return new Map();
|
|
|
|
// One query: picks → participant → sportsSeason (scoringPattern) + results (position)
|
|
const picks = await db.query.draftPicks.findMany({
|
|
where: and(
|
|
eq(schema.draftPicks.teamId, teamId),
|
|
eq(schema.draftPicks.seasonId, seasonId)
|
|
),
|
|
columns: {},
|
|
with: {
|
|
participant: {
|
|
columns: { id: true, name: true, sportsSeasonId: true },
|
|
with: {
|
|
sportsSeason: { columns: { id: true, scoringPattern: true } },
|
|
results: { columns: { finalPosition: true }, limit: 1 },
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
// Collect unique sportsSeasonIds per scoring pattern
|
|
const bracketSeasonIds = new Set<string>();
|
|
const qpSeasonIds = new Set<string>();
|
|
const qpParticipantIds = new Set<string>();
|
|
|
|
for (const pick of picks) {
|
|
const pattern = pick.participant.sportsSeason.scoringPattern;
|
|
const ssId = pick.participant.sportsSeasonId;
|
|
if (pattern === "playoff_bracket") bracketSeasonIds.add(ssId);
|
|
if (pattern === "qualifying_points") {
|
|
qpSeasonIds.add(ssId);
|
|
qpParticipantIds.add(pick.participant.id);
|
|
}
|
|
}
|
|
|
|
// Batch-fetch bracket template IDs (one per sports season)
|
|
const bracketTemplateMap = new Map<string, string | null>();
|
|
if (bracketSeasonIds.size > 0) {
|
|
const events = await db.query.scoringEvents.findMany({
|
|
where: inArray(schema.scoringEvents.sportsSeasonId, [...bracketSeasonIds]),
|
|
columns: { sportsSeasonId: true, bracketTemplateId: true },
|
|
});
|
|
for (const ev of events) {
|
|
if (!bracketTemplateMap.has(ev.sportsSeasonId)) {
|
|
bracketTemplateMap.set(ev.sportsSeasonId, ev.bracketTemplateId ?? null);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Batch-fetch QP totals for qualifying_points participants
|
|
const qpMap = new Map<string, number>(); // participantId → totalQP
|
|
if (qpParticipantIds.size > 0 && qpSeasonIds.size > 0) {
|
|
const totals = await db.query.seasonParticipantQualifyingTotals.findMany({
|
|
where: and(
|
|
inArray(schema.seasonParticipantQualifyingTotals.participantId, [...qpParticipantIds]),
|
|
inArray(schema.seasonParticipantQualifyingTotals.sportsSeasonId, [...qpSeasonIds])
|
|
),
|
|
columns: { participantId: true, totalQualifyingPoints: true },
|
|
});
|
|
for (const row of totals) {
|
|
qpMap.set(row.participantId, parseFloat(row.totalQualifyingPoints));
|
|
}
|
|
}
|
|
|
|
// Assemble result grouped by sportsSeasonId
|
|
const result = new Map<string, DraftedParticipantWithPoints[]>();
|
|
|
|
for (const pick of picks) {
|
|
const { id, name, sportsSeasonId } = pick.participant;
|
|
const pattern = pick.participant.sportsSeason.scoringPattern;
|
|
const resultRow = pick.participant.results[0] ?? null;
|
|
|
|
let earnedPoints: number | null = null;
|
|
let currentQP: number | null = null;
|
|
|
|
if (pattern === "qualifying_points" && (resultRow?.finalPosition === null || resultRow?.finalPosition === undefined)) {
|
|
// Active QP season: show accumulated qualifying points
|
|
currentQP = qpMap.get(id) ?? null;
|
|
} else if (resultRow?.finalPosition !== null && resultRow?.finalPosition !== undefined) {
|
|
// Finalized result for any pattern (including finalized QP seasons)
|
|
earnedPoints = pattern === "playoff_bracket"
|
|
? calculateBracketPoints(
|
|
resultRow.finalPosition,
|
|
scoringRules,
|
|
bracketTemplateMap.get(sportsSeasonId) ?? null
|
|
)
|
|
: calculateFantasyPoints(resultRow.finalPosition, scoringRules);
|
|
}
|
|
|
|
const arr = result.get(sportsSeasonId) ?? [];
|
|
result.set(sportsSeasonId, arr);
|
|
arr.push({ id, name, earnedPoints, currentQP });
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
export async function deleteAllDraftPicks(seasonId: string) {
|
|
const db = database();
|
|
await db
|
|
.delete(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId));
|
|
}
|
|
|
|
/**
|
|
* Get all draft picks for a season with participant and sport information
|
|
* Used for draft eligibility calculations
|
|
*/
|
|
export async function getDraftPicksWithSports(seasonId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const results = await db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
teamId: schema.draftPicks.teamId,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
participantId: schema.seasonParticipants.id,
|
|
participantName: schema.seasonParticipants.name,
|
|
sportId: schema.sports.id,
|
|
sportName: schema.sports.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(
|
|
schema.seasonParticipants,
|
|
eq(schema.draftPicks.participantId, schema.seasonParticipants.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sportsSeasons,
|
|
eq(schema.seasonParticipants.sportsSeasonId, schema.sportsSeasons.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sports,
|
|
eq(schema.sportsSeasons.sportId, schema.sports.id)
|
|
)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
|
|
// Transform to expected format
|
|
return results.map((r) => ({
|
|
teamId: r.teamId,
|
|
participant: {
|
|
id: r.participantId,
|
|
sport: {
|
|
id: r.sportId,
|
|
name: r.sportName,
|
|
},
|
|
},
|
|
}));
|
|
}
|
|
|
|
/**
|
|
* Get team's draft picks with participant and sport information
|
|
*/
|
|
export async function getTeamDraftPicksWithSports(teamId: string, seasonId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const results = await db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
teamId: schema.draftPicks.teamId,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
participantId: schema.seasonParticipants.id,
|
|
participantName: schema.seasonParticipants.name,
|
|
sportId: schema.sports.id,
|
|
sportName: schema.sports.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(
|
|
schema.seasonParticipants,
|
|
eq(schema.draftPicks.participantId, schema.seasonParticipants.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sportsSeasons,
|
|
eq(schema.seasonParticipants.sportsSeasonId, schema.sportsSeasons.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sports,
|
|
eq(schema.sportsSeasons.sportId, schema.sports.id)
|
|
)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.teamId, teamId),
|
|
eq(schema.draftPicks.seasonId, seasonId)
|
|
)
|
|
)
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
|
|
// Transform to expected format
|
|
return results.map((r) => ({
|
|
teamId: r.teamId,
|
|
participant: {
|
|
id: r.participantId,
|
|
sport: {
|
|
id: r.sportId,
|
|
name: r.sportName,
|
|
},
|
|
},
|
|
}));
|
|
}
|
|
|
|
export async function getDraftPicksForSeason(seasonId: string) {
|
|
const db = database();
|
|
return await db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
round: schema.draftPicks.round,
|
|
pickInRound: schema.draftPicks.pickInRound,
|
|
timeUsed: schema.draftPicks.timeUsed,
|
|
team: schema.teams,
|
|
participant: schema.seasonParticipants,
|
|
sport: schema.sports,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(schema.teams, eq(schema.draftPicks.teamId, schema.teams.id))
|
|
.innerJoin(schema.seasonParticipants, eq(schema.draftPicks.participantId, schema.seasonParticipants.id))
|
|
.innerJoin(schema.sportsSeasons, eq(schema.seasonParticipants.sportsSeasonId, schema.sportsSeasons.id))
|
|
.innerJoin(schema.sports, eq(schema.sportsSeasons.sportId, schema.sports.id))
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
.orderBy(asc(schema.draftPicks.pickNumber));
|
|
}
|