* Add CS2 Major qualifying points simulator Implements a full CS2 Major tournament simulator with: - 3-stage Swiss format (Opening Bo1, Elimination Bo1/Bo3, Decider all Bo3) + Champions Stage 8-team single-elimination (QF Bo3, SF Bo3, GF Bo5) - Monte Carlo simulation (10,000 iterations) accumulating QP across 2 majors/season - Sampled 24-team field per iteration: top 12 guaranteed, remaining weighted by 1/rank - Stage 3 exits (placements 9-16) sub-ranked by W-L record (2-3 > 1-3 > 0-3) - Stage assignments stored per-event so actual field composition drives simulation - Admin CS Elo form for entering team Elo + HLTV world rankings - Admin CS2 stage setup page for assigning teams to stages and tracking advancement - Database migration: cs2_major_qualifying_points enum value + cs2_major_stage_results table - 24 unit tests covering all exported pure functions https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Consolidate Elo + ranking input into generic elo-ratings page The darts-elo and cs-elo pages were unreachable from the admin nav, which always links to the generic elo-ratings page. Extended elo-ratings to conditionally show world ranking fields for simulator types that need it (darts_bracket, cs2_major_qualifying_points), then deleted the redundant sport-specific pages. https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Consolidate server postgres connections into one shared pool Four separate postgres() clients were open simultaneously (app, timer, snapshots, socket), each defaulting to 10 connections, exhausting the database's max_connections limit. Replaced with a single shared lazy- initialized client in server/db.ts using a Proxy to defer the DATABASE_URL check until first use (preserving test compatibility). Also bumps the CS2 Champions Stage stochastic test from 200 → 1000 iterations to eliminate flakiness. https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Fix and() bug and add Swiss loop safety guard - cs2-major-stage.ts: markCs2StageEliminations and setCs2FinalPlacements were using JS && instead of Drizzle and(), causing WHERE to filter only by participantId (not scoringEventId), which would update rows across all events instead of just the target event - cs-major-simulator.ts: add break guard in simulateSwiss while loop to prevent infinite loop if pairGroups returns no pairs https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Fix all remaining code review issues - cs2-major-stage.ts: use schema column reference for stageEliminated in markCs2StageEliminations instead of raw SQL string - cs-major-simulator.ts: simulateOneMajor now locks in known stage results when a stage is complete (8 recorded eliminations), only simulating the remaining stages during live events - admin event page: add CS2 Stage Setup button for cs2_major_qualifying_points simulator types; expose simulatorType in server loader type cast - cs2-setup.tsx: replace document.getElementById DOM manipulation with React state (eliminatedChecked map) for checkbox show/hide logic; remove unused stageMap and unassignedParticipants variables https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Fix oxlint errors: non-null assertions, sort→toSorted, unused vars - cs-major-simulator.ts: replace 5 non-null assertions (!) with safe optional chaining / if-guards; replace 6 .sort() with .toSorted() - cs2-major-stage.ts: remove unused `inArray` import - cs2-setup.tsx: remove unused `assignedIds` variable https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR * Fix flaky Champions Stage stochastic test The makeTeams(8) helper creates only a 70-pt Elo spread (1800→1730). With the Champions Stage bracket math this gives team-0 a ~19.6% win rate — right at the 0.2 threshold, causing the test to fail ~63% of the time in CI despite 1000 iterations. Use 100-pt steps (1800→1100) instead, giving team-0 a ~40% win rate and raising the assertion threshold to 0.25 for a clear safety margin. https://claude.ai/code/session_019w21Nkf5TvTZHH6oVHaQXR --------- Co-authored-by: Claude <noreply@anthropic.com>
327 lines
10 KiB
TypeScript
327 lines
10 KiB
TypeScript
import type { Route } from "./+types/admin.sports-seasons.$id.events.$eventId";
|
|
import { logger } from "~/lib/logger";
|
|
import { findSportsSeasonById } from "~/models/sports-season";
|
|
import { findParticipantsBySportsSeasonId } from "~/models/participant";
|
|
import {
|
|
getScoringEventById,
|
|
completeScoringEvent,
|
|
updateScoringEvent,
|
|
} from "~/models/scoring-event";
|
|
import {
|
|
getEventResults,
|
|
createEventResult,
|
|
updateEventResult,
|
|
deleteEventResult,
|
|
type CreateEventResultData,
|
|
type UpdateEventResultData,
|
|
} from "~/models/event-result";
|
|
import { findParticipantResultsBySportsSeasonId } from "~/models/participant-result";
|
|
import {
|
|
upsertParticipantSeasonResult,
|
|
getSeasonResults,
|
|
} from "~/models/participant-season-result";
|
|
import { processSeasonStandings, processQualifyingEvent } from "~/models/scoring-calculator";
|
|
import { getQPStandings, getQPConfig } from "~/models/qualifying-points";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq } from "drizzle-orm";
|
|
|
|
export async function loader({ params }: Route.LoaderArgs) {
|
|
const sportsSeason = await findSportsSeasonById(params.id);
|
|
|
|
if (!sportsSeason) {
|
|
throw new Response("Sports season not found", { status: 404 });
|
|
}
|
|
|
|
const event = await getScoringEventById(params.eventId);
|
|
|
|
if (!event) {
|
|
throw new Response("Event not found", { status: 404 });
|
|
}
|
|
|
|
const participants = await findParticipantsBySportsSeasonId(params.id);
|
|
const results = await getEventResults(params.eventId);
|
|
const participantResults = await findParticipantResultsBySportsSeasonId(params.id);
|
|
|
|
// For final_standings events, also get season results
|
|
let seasonResults = null;
|
|
if (event.eventType === "final_standings") {
|
|
seasonResults = await getSeasonResults(params.id);
|
|
}
|
|
|
|
// For qualifying events, get QP config
|
|
let qpConfig = null;
|
|
if (event.isQualifyingEvent) {
|
|
qpConfig = await getQPConfig(params.id);
|
|
}
|
|
|
|
// For qualifying sports seasons, get QP standings
|
|
let qpStandings = null;
|
|
if (sportsSeason.scoringPattern === "qualifying_points") {
|
|
qpStandings = await getQPStandings(params.id);
|
|
}
|
|
|
|
return {
|
|
sportsSeason: sportsSeason as typeof sportsSeason & {
|
|
sport: { id: string; name: string; type: string; slug: string; simulatorType: string | null };
|
|
},
|
|
event,
|
|
participants,
|
|
results,
|
|
participantResults,
|
|
seasonResults,
|
|
qpConfig,
|
|
qpStandings,
|
|
};
|
|
}
|
|
|
|
export async function action({ request, params }: Route.ActionArgs) {
|
|
const formData = await request.formData();
|
|
const intent = formData.get("intent");
|
|
|
|
if (intent === "mark-qualifying") {
|
|
try {
|
|
const event = await getScoringEventById(params.eventId);
|
|
if (!event) {
|
|
return { error: "Event not found" };
|
|
}
|
|
|
|
// Update the event to mark it as a qualifying event
|
|
const db = database();
|
|
await db.update(schema.scoringEvents)
|
|
.set({ isQualifyingEvent: true })
|
|
.where(eq(schema.scoringEvents.id, params.eventId));
|
|
|
|
return { success: "Event marked as qualifying event!" };
|
|
} catch (error) {
|
|
logger.error("Error marking event as qualifying:", error);
|
|
return { error: "Failed to mark event as qualifying" };
|
|
}
|
|
}
|
|
|
|
if (intent === "process-qp") {
|
|
try {
|
|
await processQualifyingEvent(params.eventId);
|
|
return { success: "Qualifying points processed and awarded!" };
|
|
} catch (error) {
|
|
logger.error("Error processing qualifying points:", error);
|
|
return { error: error instanceof Error ? error.message : "Failed to process qualifying points" };
|
|
}
|
|
}
|
|
|
|
if (intent === "complete") {
|
|
try {
|
|
const event = await getScoringEventById(params.eventId);
|
|
if (!event) {
|
|
return { error: "Event not found" };
|
|
}
|
|
|
|
await completeScoringEvent(params.eventId);
|
|
|
|
// If this is a final_standings event, process season standings
|
|
if (event.eventType === "final_standings") {
|
|
await processSeasonStandings(params.id);
|
|
return { success: "Event completed and fantasy placements assigned to top 8!" };
|
|
}
|
|
|
|
// If this is a qualifying event, process qualifying points
|
|
if (event.isQualifyingEvent) {
|
|
await processQualifyingEvent(params.eventId);
|
|
return { success: "Event completed and qualifying points awarded!" };
|
|
}
|
|
|
|
return { success: "Event marked as completed" };
|
|
} catch (error) {
|
|
logger.error("Error completing event:", error);
|
|
return { error: "Failed to complete event" };
|
|
}
|
|
}
|
|
|
|
if (intent === "uncomplete") {
|
|
try {
|
|
await updateScoringEvent(params.eventId, { isComplete: false });
|
|
return { success: "Event marked as not updated" };
|
|
} catch (error) {
|
|
logger.error("Error uncompleting event:", error);
|
|
return { error: "Failed to update event" };
|
|
}
|
|
}
|
|
|
|
if (intent === "update-event") {
|
|
const name = formData.get("name");
|
|
const eventStartsAtRaw = formData.get("eventStartsAt");
|
|
|
|
if (typeof name !== "string" || !name.trim()) {
|
|
return { error: "Event name is required" };
|
|
}
|
|
|
|
// eventStartsAt is a UTC ISO string from the client; empty string means "clear it"
|
|
const eventStartsAt: Date | null | undefined =
|
|
typeof eventStartsAtRaw === "string"
|
|
? eventStartsAtRaw
|
|
? new Date(eventStartsAtRaw)
|
|
: null
|
|
: undefined;
|
|
|
|
// Derive eventDate from eventStartsAt; null when cleared
|
|
const eventDate: Date | null | undefined =
|
|
eventStartsAt !== undefined
|
|
? eventStartsAt
|
|
? new Date(eventStartsAt.toISOString().split("T")[0])
|
|
: null
|
|
: undefined;
|
|
|
|
try {
|
|
await updateScoringEvent(params.eventId, {
|
|
name: name.trim(),
|
|
eventDate,
|
|
eventStartsAt,
|
|
});
|
|
return { success: "Event updated" };
|
|
} catch (error) {
|
|
logger.error("Error updating event:", error);
|
|
return { error: "Failed to update event" };
|
|
}
|
|
}
|
|
|
|
if (intent === "add-result") {
|
|
const participantId = formData.get("participantId");
|
|
const placement = formData.get("placement");
|
|
|
|
if (typeof participantId !== "string" || !participantId) {
|
|
return { error: "Participant is required" };
|
|
}
|
|
|
|
if (typeof placement !== "string" || !placement) {
|
|
return { error: "Placement is required" };
|
|
}
|
|
|
|
const placementNum = parseInt(placement, 10);
|
|
if (isNaN(placementNum) || placementNum < 1 || placementNum > 100) {
|
|
return { error: "Placement must be between 1 and 100" };
|
|
}
|
|
|
|
const resultData: CreateEventResultData = {
|
|
scoringEventId: params.eventId,
|
|
participantId,
|
|
placement: placementNum,
|
|
};
|
|
|
|
try {
|
|
await createEventResult(resultData);
|
|
return { success: "Result added successfully" };
|
|
} catch (error) {
|
|
logger.error("Error adding result:", error);
|
|
return { error: "Failed to add result" };
|
|
}
|
|
}
|
|
|
|
if (intent === "update-result") {
|
|
const resultId = formData.get("resultId");
|
|
const placement = formData.get("placement");
|
|
|
|
if (typeof resultId !== "string" || !resultId) {
|
|
return { error: "Result ID is required" };
|
|
}
|
|
|
|
if (typeof placement !== "string" || !placement) {
|
|
return { error: "Placement is required" };
|
|
}
|
|
|
|
const placementNum = parseInt(placement, 10);
|
|
if (isNaN(placementNum) || placementNum < 1 || placementNum > 100) {
|
|
return { error: "Placement must be between 1 and 100" };
|
|
}
|
|
|
|
const updateData: UpdateEventResultData = {
|
|
placement: placementNum,
|
|
};
|
|
|
|
try {
|
|
await updateEventResult(resultId, updateData);
|
|
return { success: "Result updated successfully" };
|
|
} catch (error) {
|
|
logger.error("Error updating result:", error);
|
|
return { error: "Failed to update result" };
|
|
}
|
|
}
|
|
|
|
if (intent === "delete-result") {
|
|
const resultId = formData.get("resultId");
|
|
|
|
if (typeof resultId !== "string" || !resultId) {
|
|
return { error: "Result ID is required" };
|
|
}
|
|
|
|
try {
|
|
await deleteEventResult(resultId);
|
|
return { success: "Result deleted successfully" };
|
|
} catch (error) {
|
|
logger.error("Error deleting result:", error);
|
|
return { error: "Failed to delete result" };
|
|
}
|
|
}
|
|
|
|
if (intent === "update-standings") {
|
|
// Bulk update season standings for final_standings events
|
|
try {
|
|
// Parse all form fields and collect participants with points
|
|
const participantPoints: Array<{ participantId: string; points: number }> = [];
|
|
|
|
for (const [key, value] of formData.entries()) {
|
|
if (key.startsWith("points-")) {
|
|
const participantId = key.replace("points-", "");
|
|
const points = value ? parseFloat(value as string) : 0;
|
|
|
|
if (points > 0) {
|
|
participantPoints.push({ participantId, points });
|
|
}
|
|
}
|
|
}
|
|
|
|
// Sort by points descending to determine positions
|
|
participantPoints.sort((a, b) => b.points - a.points);
|
|
|
|
// Assign positions based on sorted order and update
|
|
for (let i = 0; i < participantPoints.length; i++) {
|
|
const { participantId, points } = participantPoints[i];
|
|
const position = i + 1; // Position is 1-based
|
|
|
|
await upsertParticipantSeasonResult(
|
|
{
|
|
participantId,
|
|
sportsSeasonId: params.id,
|
|
currentPoints: points,
|
|
currentPosition: position,
|
|
}
|
|
);
|
|
}
|
|
|
|
// Also update participants with 0 or no points (they don't have a position)
|
|
for (const [key, value] of formData.entries()) {
|
|
if (key.startsWith("points-")) {
|
|
const participantId = key.replace("points-", "");
|
|
const points = value ? parseFloat(value as string) : 0;
|
|
|
|
if (points === 0) {
|
|
await upsertParticipantSeasonResult(
|
|
{
|
|
participantId,
|
|
sportsSeasonId: params.id,
|
|
currentPoints: 0,
|
|
currentPosition: undefined,
|
|
}
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
return { success: `Updated standings for ${participantPoints.length} participants (positions auto-calculated from points)` };
|
|
} catch (error) {
|
|
logger.error("Error updating season standings:", error);
|
|
return { error: "Failed to update season standings" };
|
|
}
|
|
}
|
|
|
|
return { error: "Invalid action" };
|
|
}
|