* 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>
337 lines
14 KiB
TypeScript
337 lines
14 KiB
TypeScript
import { Form, useLoaderData, useActionData, useNavigation, Link } from 'react-router';
|
||
import type { Route } from './+types/admin.sports-seasons.$id.events.$eventId.cs2-setup';
|
||
|
||
import { findSportsSeasonById } from '~/models/sports-season';
|
||
import { getScoringEventById } from '~/models/scoring-event';
|
||
import { findParticipantsBySportsSeasonId } from '~/models/season-participant';
|
||
import {
|
||
getCs2StageResultsForEvent,
|
||
upsertCs2StageAssignments,
|
||
markCs2StageEliminations,
|
||
clearCs2StageAssignments,
|
||
} from '~/models/cs2-major-stage';
|
||
import { Button } from '~/components/ui/button';
|
||
import {
|
||
Card,
|
||
CardContent,
|
||
CardDescription,
|
||
CardHeader,
|
||
CardTitle,
|
||
} from '~/components/ui/card';
|
||
import { Badge } from '~/components/ui/badge';
|
||
import { ArrowLeft, Save, Trash2, CheckCircle2 } from 'lucide-react';
|
||
import { useState } from 'react';
|
||
|
||
export function meta({ data }: Route.MetaArgs): Route.MetaDescriptors {
|
||
return [{ title: `CS2 Stage Setup — ${data?.event?.name ?? "Event"} - Brackt Admin` }];
|
||
}
|
||
|
||
export async function loader({ params }: Route.LoaderArgs) {
|
||
const sportsSeasonId = params.id;
|
||
const eventId = params.eventId;
|
||
|
||
const [sportsSeason, event] = await Promise.all([
|
||
findSportsSeasonById(sportsSeasonId),
|
||
getScoringEventById(eventId),
|
||
]);
|
||
|
||
if (!sportsSeason) throw new Response('Sports season not found', { status: 404 });
|
||
if (!event) throw new Response('Event not found', { status: 404 });
|
||
|
||
const [participants, stageResults] = await Promise.all([
|
||
findParticipantsBySportsSeasonId(sportsSeasonId),
|
||
getCs2StageResultsForEvent(eventId),
|
||
]);
|
||
|
||
return { sportsSeason, event, participants, stageResults };
|
||
}
|
||
|
||
interface ActionData {
|
||
success?: boolean;
|
||
message?: string;
|
||
}
|
||
|
||
export async function action({ request, params }: Route.ActionArgs) {
|
||
const eventId = params.eventId;
|
||
const formData = await request.formData();
|
||
const intent = formData.get('intent') as string;
|
||
|
||
if (intent === 'reset') {
|
||
await clearCs2StageAssignments(eventId);
|
||
return { success: true, message: 'Stage assignments cleared.' };
|
||
}
|
||
|
||
if (intent === 'assign') {
|
||
const assignments: Array<{ scoringEventId: string; participantId: string; stageEntry: number }> = [];
|
||
for (const [key, value] of formData.entries()) {
|
||
if (key.startsWith('stage_')) {
|
||
const participantId = key.slice('stage_'.length);
|
||
const stageEntry = parseInt(value as string, 10);
|
||
if (!isNaN(stageEntry) && stageEntry >= 1 && stageEntry <= 3) {
|
||
assignments.push({ scoringEventId: eventId, participantId, stageEntry });
|
||
}
|
||
}
|
||
}
|
||
|
||
if (assignments.length === 0) {
|
||
return { success: false, message: 'No stage assignments submitted.' };
|
||
}
|
||
|
||
await upsertCs2StageAssignments(assignments);
|
||
return { success: true, message: `Saved ${assignments.length} stage assignments.` };
|
||
}
|
||
|
||
if (intent === 'mark-eliminations') {
|
||
// Parse elimination data: elim_{participantId} = winsAtElimination (0, 1, or 2)
|
||
const eliminations: Array<{ participantId: string; winsAtElimination: number }> = [];
|
||
for (const [key, value] of formData.entries()) {
|
||
if (key.startsWith('elim_')) {
|
||
const participantId = key.slice('elim_'.length);
|
||
const wins = parseInt(value as string, 10);
|
||
if (!isNaN(wins) && wins >= 0 && wins <= 2) {
|
||
eliminations.push({ participantId, winsAtElimination: wins });
|
||
}
|
||
}
|
||
}
|
||
|
||
await markCs2StageEliminations(eventId, eliminations);
|
||
return { success: true, message: `Marked ${eliminations.length} eliminations.` };
|
||
}
|
||
|
||
return { success: false, message: 'Unknown action.' };
|
||
}
|
||
|
||
const STAGE_LABELS: Record<number, { label: string; description: string; maxTeams: number; badgeVariant: 'default' | 'secondary' | 'outline' }> = {
|
||
1: { label: 'Stage 1', description: 'Opening Stage (16 teams, Bo1 Swiss)', maxTeams: 16, badgeVariant: 'outline' },
|
||
2: { label: 'Stage 2', description: 'Elimination Stage (8 Challengers, Bo1/Bo3 Swiss)', maxTeams: 8, badgeVariant: 'secondary' },
|
||
3: { label: 'Stage 3', description: 'Decider Stage (8 Legends, all Bo3 Swiss)', maxTeams: 8, badgeVariant: 'default' },
|
||
};
|
||
|
||
const RECORD_OPTIONS = [
|
||
{ value: '2', label: '2-3 (advanced furthest)' },
|
||
{ value: '1', label: '1-3' },
|
||
{ value: '0', label: '0-3 (earliest exit)' },
|
||
];
|
||
|
||
export default function AdminCs2Setup() {
|
||
const { sportsSeason, event, participants, stageResults } = useLoaderData<typeof loader>();
|
||
const actionData = useActionData<ActionData>();
|
||
const navigation = useNavigation();
|
||
const isSubmitting = navigation.state === 'submitting';
|
||
|
||
// Stage assignment state (local, submitted via form)
|
||
const [stageSelections, setStageSelections] = useState<Record<string, string>>(() => {
|
||
const initial: Record<string, string> = {};
|
||
stageResults.forEach(r => { initial[r.participantId] = r.stageEntry.toString(); });
|
||
return initial;
|
||
});
|
||
|
||
// Elimination checkbox state — tracks which teams are checked as eliminated
|
||
const [eliminatedChecked, setEliminatedChecked] = useState<Record<string, boolean>>(() => {
|
||
const initial: Record<string, boolean> = {};
|
||
stageResults.forEach(r => { initial[r.participantId] = r.stageEliminated !== null; });
|
||
return initial;
|
||
});
|
||
|
||
// Group participants by stage for display
|
||
const byStage: Record<number, typeof stageResults> = { 1: [], 2: [], 3: [] };
|
||
for (const r of stageResults) {
|
||
byStage[r.stageEntry]?.push(r);
|
||
}
|
||
|
||
const stageCounts = Object.fromEntries(
|
||
Object.entries(byStage).map(([k, v]) => [k, v.length])
|
||
);
|
||
|
||
return (
|
||
<div className="container mx-auto py-8">
|
||
<div className="mb-6">
|
||
<Link
|
||
to={`/admin/sports-seasons/${sportsSeason.id}/events/${event.id}`}
|
||
className="flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground mb-4"
|
||
>
|
||
<ArrowLeft className="h-4 w-4" />
|
||
Back to event
|
||
</Link>
|
||
<h1 className="text-3xl font-bold mb-1">CS2 Stage Setup</h1>
|
||
<p className="text-muted-foreground">{event.name} — {sportsSeason.name}</p>
|
||
</div>
|
||
|
||
{actionData?.message && (
|
||
<div className={`mb-4 p-3 rounded-md text-sm ${actionData.success ? 'bg-emerald-500/10 text-emerald-400 border border-emerald-500/30' : 'bg-destructive/10 text-destructive border border-destructive/30'}`}>
|
||
{actionData.message}
|
||
</div>
|
||
)}
|
||
|
||
{/* Stage Assignment */}
|
||
<Card className="mb-6">
|
||
<CardHeader>
|
||
<CardTitle className="flex items-center justify-between">
|
||
Stage Assignments
|
||
{stageResults.length > 0 && (
|
||
<Form method="post">
|
||
<input type="hidden" name="intent" value="reset" />
|
||
<Button type="submit" variant="ghost" size="sm" className="text-destructive">
|
||
<Trash2 className="h-4 w-4 mr-1" />
|
||
Reset all
|
||
</Button>
|
||
</Form>
|
||
)}
|
||
</CardTitle>
|
||
<CardDescription>
|
||
Assign each team to their starting stage. Stage 1 = 16 Opening Stage teams,
|
||
Stage 2 = 8 Challengers (skip Stage 1), Stage 3 = 8 Legends (skip Stages 1 and 2).
|
||
Total: 32 teams across all three stages.
|
||
</CardDescription>
|
||
</CardHeader>
|
||
<CardContent>
|
||
<Form method="post" className="space-y-6">
|
||
<input type="hidden" name="intent" value="assign" />
|
||
|
||
{/* Stage summary badges */}
|
||
<div className="flex gap-3 flex-wrap">
|
||
{[1, 2, 3].map(stage => (
|
||
<div key={stage} className="flex items-center gap-2 text-sm">
|
||
<Badge variant={STAGE_LABELS[stage].badgeVariant}>{STAGE_LABELS[stage].label}</Badge>
|
||
<span className="text-muted-foreground">
|
||
{stageCounts[stage] ?? 0}/{STAGE_LABELS[stage].maxTeams} teams
|
||
</span>
|
||
</div>
|
||
))}
|
||
</div>
|
||
|
||
{/* Teams listed with stage selectors */}
|
||
<div className="space-y-1">
|
||
<div className="grid grid-cols-[1fr_160px] gap-x-3 text-xs font-medium text-muted-foreground px-1 mb-2">
|
||
<span>Team</span>
|
||
<span>Starting Stage</span>
|
||
</div>
|
||
{participants.map(participant => (
|
||
<div key={participant.id} className="grid grid-cols-[1fr_160px] gap-x-3 items-center py-1 border-b border-border/40 last:border-0">
|
||
<span className="text-sm">{participant.name}</span>
|
||
<select
|
||
name={`stage_${participant.id}`}
|
||
value={stageSelections[participant.id] ?? ''}
|
||
onChange={e => setStageSelections(prev => ({ ...prev, [participant.id]: e.target.value }))}
|
||
className="h-8 text-sm rounded-md border border-input bg-background px-2"
|
||
>
|
||
<option value="">— not assigned —</option>
|
||
<option value="1">Stage 1 (Opening)</option>
|
||
<option value="2">Stage 2 (Elimination)</option>
|
||
<option value="3">Stage 3 (Decider)</option>
|
||
</select>
|
||
</div>
|
||
))}
|
||
</div>
|
||
|
||
<Button type="submit" disabled={isSubmitting}>
|
||
<Save className="h-4 w-4 mr-2" />
|
||
{isSubmitting ? 'Saving...' : 'Save Stage Assignments'}
|
||
</Button>
|
||
</Form>
|
||
</CardContent>
|
||
</Card>
|
||
|
||
{/* Advancement Tracking (only shown when stage assignments exist) */}
|
||
{stageResults.length > 0 && (
|
||
<Card className="mb-6">
|
||
<CardHeader>
|
||
<CardTitle>Stage Advancement Tracking</CardTitle>
|
||
<CardDescription>
|
||
Record which teams were eliminated and their W-L record at elimination.
|
||
Teams not listed as eliminated are assumed to have advanced (or are still playing).
|
||
Stage 3 W-L records determine QP sub-placements (9–16).
|
||
</CardDescription>
|
||
</CardHeader>
|
||
<CardContent>
|
||
<Form method="post" className="space-y-6">
|
||
<input type="hidden" name="intent" value="mark-eliminations" />
|
||
|
||
{[1, 2, 3].map(stage => {
|
||
const teamsInStage = byStage[stage];
|
||
if (teamsInStage.length === 0) return null;
|
||
|
||
return (
|
||
<div key={stage}>
|
||
<h3 className="text-sm font-semibold mb-3 flex items-center gap-2">
|
||
<Badge variant={STAGE_LABELS[stage].badgeVariant}>{STAGE_LABELS[stage].label}</Badge>
|
||
{STAGE_LABELS[stage].description}
|
||
</h3>
|
||
<div className="space-y-1">
|
||
{teamsInStage.map(r => {
|
||
const isEliminated = eliminatedChecked[r.participantId] ?? false;
|
||
return (
|
||
<div key={r.participantId} className="grid grid-cols-[1fr_auto_200px] gap-x-3 items-center py-1 border-b border-border/40 last:border-0">
|
||
<span className="text-sm flex items-center gap-2">
|
||
{r.participantName}
|
||
{r.stageEliminated !== null && (
|
||
<Badge variant="outline" className="text-xs">
|
||
eliminated {r.stageEliminatedWins}-3
|
||
</Badge>
|
||
)}
|
||
</span>
|
||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||
<input
|
||
type="checkbox"
|
||
checked={isEliminated}
|
||
onChange={e =>
|
||
setEliminatedChecked(prev => ({
|
||
...prev,
|
||
[r.participantId]: e.target.checked,
|
||
}))
|
||
}
|
||
className="rounded"
|
||
/>
|
||
Eliminated
|
||
</label>
|
||
{isEliminated && (
|
||
<select
|
||
name={`elim_${r.participantId}`}
|
||
defaultValue={r.stageEliminatedWins?.toString() ?? '0'}
|
||
className="h-8 w-full text-sm rounded-md border border-input bg-background px-2"
|
||
>
|
||
{RECORD_OPTIONS.map(opt => (
|
||
<option key={opt.value} value={opt.value}>{opt.label}</option>
|
||
))}
|
||
</select>
|
||
)}
|
||
{!isEliminated && <div />}
|
||
</div>
|
||
);
|
||
})}
|
||
</div>
|
||
</div>
|
||
);
|
||
})}
|
||
|
||
<Button type="submit" disabled={isSubmitting}>
|
||
<CheckCircle2 className="h-4 w-4 mr-2" />
|
||
{isSubmitting ? 'Saving...' : 'Save Eliminations'}
|
||
</Button>
|
||
</Form>
|
||
</CardContent>
|
||
</Card>
|
||
)}
|
||
|
||
{/* Champions Stage link */}
|
||
{stageResults.length > 0 && (
|
||
<Card>
|
||
<CardHeader>
|
||
<CardTitle>Champions Stage (Playoffs)</CardTitle>
|
||
<CardDescription>
|
||
The 8-team single-elimination bracket. Use the bracket admin to track
|
||
Quarterfinals, Semifinals, and Grand Final results.
|
||
</CardDescription>
|
||
</CardHeader>
|
||
<CardContent>
|
||
<Link to={`/admin/sports-seasons/${sportsSeason.id}/events/${event.id}/bracket`}>
|
||
<Button variant="outline">
|
||
Open Bracket Admin →
|
||
</Button>
|
||
</Link>
|
||
</CardContent>
|
||
</Card>
|
||
)}
|
||
</div>
|
||
);
|
||
}
|