## Partial bracket scoring - `processMatchResult`: new exported function that scores a single match immediately (loser → final placement, winner → provisional floor). Called from `set-winner` and `set-round-winners` so points are awarded as soon as a winner is set, before the full round is complete. - `set-winner`: passes `eventName` to `processMatchResult`. - `set-round-winners`: batches side effects — calls `recalculateAffectedLeagues` and `updateProbabilitiesAfterResult` once after the loop instead of per-match (`skipSideEffects: true` per match). ## Code review fixes - **ROUND_CONFIG** (S1): extracted a `RoundScoringConfig` lookup table + `getRoundConfig()` helper, eliminating three parallel `if/else` chains in `processPlayoffEvent`, `processMatchResult`, and `getGuaranteedMinimumPosition`. AFL template overrides live in `TEMPLATE_ROUND_CONFIG` with an explanatory comment about why the `bracketTemplateId` guard is required. - **skipSideEffects** (C2): new param on `processMatchResult`; bracket server uses it to batch standings/probability recalc in `set-round-winners`. - **eventName** (W1): passed through `processMatchResult` → `recalculateAffectedLeagues`. - **Round validation** (W2): `set-round-winners` now guards `match.round === round` before processing each assignment. - **Comments** (C3/S3/W3): added notes on non-scoring loser assumption, `isScoring ?? true` default, and AFL Semi-Finals template requirement. ## PlayoffBracket eliminated-teams fix + tests - Fixed `computeEliminatedByRound` to track participant *appearances* (not just wins), so AFL QF losers who advance to Semi-Finals via double-chance are correctly excluded from the QF eliminated list. - Extracted the logic as an exported pure function for testability. - Added 4 tests: standard elimination, AFL QF loser → SF win, AFL QF loser → SF loss, and normal advancement not protecting a later loser. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
134 lines
3.8 KiB
TypeScript
134 lines
3.8 KiB
TypeScript
import { eq, desc, and } from "drizzle-orm";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
|
|
export type League = typeof schema.leagues.$inferSelect;
|
|
export type NewLeague = typeof schema.leagues.$inferInsert;
|
|
|
|
export async function createLeague(data: NewLeague): Promise<League> {
|
|
const db = database();
|
|
const [league] = await db
|
|
.insert(schema.leagues)
|
|
.values(data)
|
|
.returning();
|
|
return league;
|
|
}
|
|
|
|
export async function findLeagueById(id: string): Promise<League | undefined> {
|
|
const db = database();
|
|
return await db.query.leagues.findFirst({
|
|
where: eq(schema.leagues.id, id),
|
|
});
|
|
}
|
|
|
|
export async function findLeaguesByCreator(userId: string): Promise<League[]> {
|
|
const db = database();
|
|
return await db.query.leagues.findMany({
|
|
where: eq(schema.leagues.createdBy, userId),
|
|
orderBy: (leagues, { desc }) => [desc(leagues.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function updateLeague(
|
|
id: string,
|
|
data: Partial<NewLeague>
|
|
): Promise<League> {
|
|
const db = database();
|
|
const [league] = await db
|
|
.update(schema.leagues)
|
|
.set({ ...data, updatedAt: new Date() })
|
|
.where(eq(schema.leagues.id, id))
|
|
.returning();
|
|
return league;
|
|
}
|
|
|
|
export async function deleteLeague(id: string): Promise<void> {
|
|
const db = database();
|
|
await db.delete(schema.leagues).where(eq(schema.leagues.id, id));
|
|
}
|
|
|
|
export async function setCurrentSeason(
|
|
leagueId: string,
|
|
seasonId: string | null
|
|
): Promise<League> {
|
|
return await updateLeague(leagueId, { currentSeasonId: seasonId });
|
|
}
|
|
|
|
export async function listLeagues(options?: {
|
|
limit?: number;
|
|
offset?: number;
|
|
}): Promise<League[]> {
|
|
const db = database();
|
|
return await db.query.leagues.findMany({
|
|
limit: options?.limit,
|
|
offset: options?.offset,
|
|
orderBy: (leagues, { desc }) => [desc(leagues.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function findLeaguesWithActiveSeasonsByUserId(
|
|
userId: string
|
|
): Promise<League[]> {
|
|
const db = database();
|
|
|
|
const leagueFields = {
|
|
id: schema.leagues.id,
|
|
name: schema.leagues.name,
|
|
createdBy: schema.leagues.createdBy,
|
|
currentSeasonId: schema.leagues.currentSeasonId,
|
|
isPublicDraftBoard: schema.leagues.isPublicDraftBoard,
|
|
discordWebhookUrl: schema.leagues.discordWebhookUrl,
|
|
createdAt: schema.leagues.createdAt,
|
|
updatedAt: schema.leagues.updatedAt,
|
|
};
|
|
|
|
// Leagues where user has a team in the current season
|
|
const leaguesWithTeam = await db
|
|
.select(leagueFields)
|
|
.from(schema.leagues)
|
|
.innerJoin(schema.teams, eq(schema.teams.seasonId, schema.leagues.currentSeasonId))
|
|
.where(eq(schema.teams.ownerId, userId));
|
|
|
|
// Leagues where user is a commissioner (with or without a team)
|
|
const leaguesAsCommissioner = await db
|
|
.select(leagueFields)
|
|
.from(schema.leagues)
|
|
.innerJoin(schema.commissioners, eq(schema.commissioners.leagueId, schema.leagues.id))
|
|
.where(eq(schema.commissioners.userId, userId));
|
|
|
|
// Deduplicate by id in case user is both a commissioner and has a team, then sort
|
|
const leagueMap = new Map<string, League>();
|
|
for (const league of [...leaguesWithTeam, ...leaguesAsCommissioner]) {
|
|
leagueMap.set(league.id, league);
|
|
}
|
|
return [...leagueMap.values()].sort(
|
|
(a, b) => b.createdAt.getTime() - a.createdAt.getTime()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Check if a user is a member of a league (has a team in current season)
|
|
*/
|
|
export async function isUserLeagueMember(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<boolean> {
|
|
const db = database();
|
|
|
|
const league = await db.query.leagues.findFirst({
|
|
where: eq(schema.leagues.id, leagueId),
|
|
});
|
|
|
|
if (!league || !league.currentSeasonId) {
|
|
return false;
|
|
}
|
|
|
|
const team = await db.query.teams.findFirst({
|
|
where: and(
|
|
eq(schema.teams.seasonId, league.currentSeasonId),
|
|
eq(schema.teams.ownerId, userId)
|
|
),
|
|
});
|
|
|
|
return !!team;
|
|
}
|