* 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>
348 lines
9.4 KiB
TypeScript
348 lines
9.4 KiB
TypeScript
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and, desc, sql } from "drizzle-orm";
|
|
|
|
/**
|
|
* Default qualifying point values (as specified in scoring-system.md)
|
|
*/
|
|
export const DEFAULT_QP_VALUES = [
|
|
{ placement: 1, points: 20 },
|
|
{ placement: 2, points: 14 },
|
|
{ placement: 3, points: 10 },
|
|
{ placement: 4, points: 8 },
|
|
{ placement: 5, points: 5 },
|
|
{ placement: 6, points: 5 },
|
|
{ placement: 7, points: 3 },
|
|
{ placement: 8, points: 3 },
|
|
{ placement: 9, points: 2 },
|
|
{ placement: 10, points: 2 },
|
|
{ placement: 11, points: 2 },
|
|
{ placement: 12, points: 2 },
|
|
{ placement: 13, points: 1 },
|
|
{ placement: 14, points: 1 },
|
|
{ placement: 15, points: 1 },
|
|
{ placement: 16, points: 1 },
|
|
];
|
|
|
|
export interface QualifyingPointConfigData {
|
|
placement: number;
|
|
points: number;
|
|
}
|
|
|
|
/**
|
|
* Initialize default qualifying point configuration for a sports season
|
|
*/
|
|
export async function initializeQPConfig(
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
// Check if config already exists
|
|
const existing = await db.query.qualifyingPointConfig.findMany({
|
|
where: eq(schema.qualifyingPointConfig.sportsSeasonId, sportsSeasonId),
|
|
});
|
|
|
|
if (existing.length > 0) {
|
|
return existing;
|
|
}
|
|
|
|
// Insert default config
|
|
const configs = await db
|
|
.insert(schema.qualifyingPointConfig)
|
|
.values(
|
|
DEFAULT_QP_VALUES.map((qp) => ({
|
|
sportsSeasonId,
|
|
placement: qp.placement,
|
|
points: qp.points.toString(),
|
|
}))
|
|
)
|
|
.returning();
|
|
|
|
return configs;
|
|
}
|
|
|
|
/**
|
|
* Get qualifying point configuration for a sports season
|
|
*/
|
|
export async function getQPConfig(
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
const configs = await db.query.qualifyingPointConfig.findMany({
|
|
where: eq(schema.qualifyingPointConfig.sportsSeasonId, sportsSeasonId),
|
|
orderBy: [schema.qualifyingPointConfig.placement],
|
|
});
|
|
|
|
// If no config exists, initialize with defaults
|
|
if (configs.length === 0) {
|
|
return await initializeQPConfig(sportsSeasonId, db);
|
|
}
|
|
|
|
return configs;
|
|
}
|
|
|
|
/**
|
|
* Update qualifying point configuration for a sports season
|
|
*/
|
|
export async function updateQPConfig(
|
|
sportsSeasonId: string,
|
|
configData: QualifyingPointConfigData[],
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
// Delete existing config
|
|
await db
|
|
.delete(schema.qualifyingPointConfig)
|
|
.where(eq(schema.qualifyingPointConfig.sportsSeasonId, sportsSeasonId));
|
|
|
|
// Insert new config
|
|
const configs = await db
|
|
.insert(schema.qualifyingPointConfig)
|
|
.values(
|
|
configData.map((qp) => ({
|
|
sportsSeasonId,
|
|
placement: qp.placement,
|
|
points: qp.points.toString(),
|
|
}))
|
|
)
|
|
.returning();
|
|
|
|
return configs;
|
|
}
|
|
|
|
/**
|
|
* Get qualifying points awarded for a specific placement
|
|
*/
|
|
export async function getQPForPlacement(
|
|
sportsSeasonId: string,
|
|
placement: number,
|
|
providedDb?: ReturnType<typeof database>
|
|
): Promise<number> {
|
|
const db = providedDb || database();
|
|
|
|
const config = await db.query.qualifyingPointConfig.findFirst({
|
|
where: and(
|
|
eq(schema.qualifyingPointConfig.sportsSeasonId, sportsSeasonId),
|
|
eq(schema.qualifyingPointConfig.placement, placement)
|
|
),
|
|
});
|
|
|
|
return config ? parseFloat(config.points) : 0;
|
|
}
|
|
|
|
/**
|
|
* Get or create participant qualifying total record
|
|
*/
|
|
export async function getOrCreateParticipantQPTotal(
|
|
participantId: string,
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
let total = await db.query.seasonParticipantQualifyingTotals.findFirst({
|
|
where: and(
|
|
eq(schema.seasonParticipantQualifyingTotals.participantId, participantId),
|
|
eq(schema.seasonParticipantQualifyingTotals.sportsSeasonId, sportsSeasonId)
|
|
),
|
|
});
|
|
|
|
if (!total) {
|
|
const [created] = await db
|
|
.insert(schema.seasonParticipantQualifyingTotals)
|
|
.values({
|
|
participantId,
|
|
sportsSeasonId,
|
|
totalQualifyingPoints: "0",
|
|
eventsScored: 0,
|
|
})
|
|
.returning();
|
|
total = created;
|
|
}
|
|
|
|
return total;
|
|
}
|
|
|
|
/**
|
|
* Add qualifying points to a participant's total
|
|
* NOTE: eventsScored is NOT updated here - it should be recalculated after processing events
|
|
*/
|
|
export async function addQualifyingPoints(
|
|
participantId: string,
|
|
sportsSeasonId: string,
|
|
pointsToAdd: number,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
// Get or create the total record
|
|
const total = await getOrCreateParticipantQPTotal(participantId, sportsSeasonId, db);
|
|
|
|
// Update with new points (do NOT increment eventsScored here)
|
|
const [updated] = await db
|
|
.update(schema.seasonParticipantQualifyingTotals)
|
|
.set({
|
|
totalQualifyingPoints: (parseFloat(total.totalQualifyingPoints) + pointsToAdd).toString(),
|
|
updatedAt: new Date(),
|
|
})
|
|
.where(eq(schema.seasonParticipantQualifyingTotals.id, total.id))
|
|
.returning();
|
|
|
|
return updated;
|
|
}
|
|
|
|
/**
|
|
* Recalculate total QP and eventsScored for a participant from scratch
|
|
* This is the source of truth - sums all event_results with QP awarded
|
|
*/
|
|
export async function recalculateParticipantQP(
|
|
participantId: string,
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
// Get all event results for this participant in this sports season
|
|
const eventResults = await db.query.eventResults.findMany({
|
|
where: eq(schema.eventResults.seasonParticipantId, participantId),
|
|
with: {
|
|
scoringEvent: true,
|
|
},
|
|
});
|
|
|
|
// Calculate totals from event_results
|
|
let totalQP = 0;
|
|
const uniqueEvents = new Set<string>();
|
|
|
|
for (const result of eventResults) {
|
|
if (
|
|
result.scoringEvent.sportsSeasonId === sportsSeasonId &&
|
|
result.qualifyingPointsAwarded
|
|
) {
|
|
const qp = parseFloat(result.qualifyingPointsAwarded);
|
|
if (qp > 0) {
|
|
totalQP += qp;
|
|
uniqueEvents.add(result.scoringEvent.id);
|
|
}
|
|
}
|
|
}
|
|
|
|
const eventsScored = uniqueEvents.size;
|
|
|
|
// Get or create the participant's QP total record
|
|
const total = await getOrCreateParticipantQPTotal(participantId, sportsSeasonId, db);
|
|
|
|
// Update with recalculated values
|
|
await db
|
|
.update(schema.seasonParticipantQualifyingTotals)
|
|
.set({
|
|
totalQualifyingPoints: totalQP.toString(),
|
|
eventsScored,
|
|
updatedAt: new Date(),
|
|
})
|
|
.where(eq(schema.seasonParticipantQualifyingTotals.id, total.id));
|
|
|
|
return { totalQP, eventsScored };
|
|
}
|
|
|
|
/**
|
|
* Recalculate eventsScored for a participant by counting unique events with QP awarded
|
|
* @deprecated Use recalculateParticipantQP instead for more accurate recalculation
|
|
*/
|
|
export async function recalculateEventsScored(
|
|
participantId: string,
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const result = await recalculateParticipantQP(participantId, sportsSeasonId, providedDb);
|
|
return result.eventsScored;
|
|
}
|
|
|
|
/**
|
|
* Get all qualifying totals for a sports season, ordered by points (highest first)
|
|
*/
|
|
export async function getQPStandings(
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
return await db.query.seasonParticipantQualifyingTotals.findMany({
|
|
where: eq(schema.seasonParticipantQualifyingTotals.sportsSeasonId, sportsSeasonId),
|
|
orderBy: [desc(sql`CAST(${schema.seasonParticipantQualifyingTotals.totalQualifyingPoints} AS DECIMAL)`)],
|
|
with: {
|
|
participant: true,
|
|
},
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Update final rankings for qualifying point standings (after finalization)
|
|
*/
|
|
export async function updateFinalRankings(
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
const standings = await getQPStandings(sportsSeasonId, db);
|
|
|
|
// Group participants by QP total to handle ties
|
|
const groupedByPoints = new Map<string, typeof standings>();
|
|
for (const standing of standings) {
|
|
const points = standing.totalQualifyingPoints;
|
|
if (!groupedByPoints.has(points)) {
|
|
groupedByPoints.set(points, []);
|
|
}
|
|
groupedByPoints.get(points)?.push(standing);
|
|
}
|
|
|
|
// Assign rankings, handling ties
|
|
let currentRank = 1;
|
|
const updates = [];
|
|
|
|
// Sort by points descending
|
|
const sortedGroups = Array.from(groupedByPoints.entries()).toSorted((a, b) => {
|
|
return parseFloat(b[0]) - parseFloat(a[0]);
|
|
});
|
|
|
|
for (const [_, group] of sortedGroups) {
|
|
// All participants in this group get the same rank
|
|
for (const standing of group) {
|
|
updates.push({
|
|
id: standing.id,
|
|
finalRanking: currentRank,
|
|
});
|
|
}
|
|
// Increment rank by the size of the group
|
|
currentRank += group.length;
|
|
}
|
|
|
|
// Update all rankings
|
|
for (const update of updates) {
|
|
await db
|
|
.update(schema.seasonParticipantQualifyingTotals)
|
|
.set({ finalRanking: update.finalRanking, updatedAt: new Date() })
|
|
.where(eq(schema.seasonParticipantQualifyingTotals.id, update.id));
|
|
}
|
|
|
|
return updates;
|
|
}
|
|
|
|
/**
|
|
* Reset qualifying points for a sports season (useful for testing or corrections)
|
|
*/
|
|
export async function resetQualifyingPoints(
|
|
sportsSeasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
) {
|
|
const db = providedDb || database();
|
|
|
|
await db
|
|
.delete(schema.seasonParticipantQualifyingTotals)
|
|
.where(eq(schema.seasonParticipantQualifyingTotals.sportsSeasonId, sportsSeasonId));
|
|
}
|