2026-03-02 00:35:23 -08:00
|
|
|
import { database } from "~/database/context";
|
|
|
|
|
import * as schema from "~/database/schema";
|
|
|
|
|
import { eq, inArray } from "drizzle-orm";
|
|
|
|
|
import { calculatePickInfo } from "~/models/draft-utils";
|
Optimize user data fetching with batch queries and centralize display name logic (#176)
* Fall back to displayName when username is null for Discord webhook
Users who sign up via OAuth (Google, GitHub, etc.) without setting a
Clerk username have a null `username` field but always have a `displayName`
(computed from firstName+lastName or email). Previously, `usernameByClerkId`
was filtered to only include users with a non-null username, causing those
owners to appear without any identifier in Discord standings messages
(e.g. "Liverpool def. Galatasaray" instead of "Liverpool def. Galatasaray (Madmike)").
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Extract getUserDisplayName helper and use consistently throughout
Add a single getUserDisplayName(user) function to app/models/user.ts that
encapsulates the username → displayName fallback logic. Replace 9 scattered
inline expressions across the codebase (owner-map, scoring-calculator,
league routes, settings, invite flow, draft API, Clerk webhook) with calls
to the shared helper.
No behaviour change — all existing logic preserved, just centralised.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Fix N+1 user queries in league loader and settings loader
Add findUsersByClerkIds() batch function to the user model and replace two
separate Promise.all+findUserByClerkId loops (one for owners, one for
commissioners) with a single inArray query in both $leagueId.server.ts and
$leagueId.settings.tsx. The merged query covers both owner and commissioner
IDs in one round-trip.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Fix N+1 user queries in buildOwnerMap
Replace the Promise.all+findUserByClerkId loop with a single
findUsersByClerkIds batch query, consistent with the league loader
and settings loader fixes.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
---------
Co-authored-by: Claude <noreply@anthropic.com>
2026-03-18 16:46:07 -07:00
|
|
|
import { getUserDisplayName } from "~/models/user";
|
2026-03-02 00:35:23 -08:00
|
|
|
|
|
|
|
|
import type { LoaderFunctionArgs } from "react-router";
|
|
|
|
|
|
|
|
|
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
|
|
|
|
|
|
|
|
export async function loader({ params }: LoaderFunctionArgs) {
|
|
|
|
|
const { seasonId } = params;
|
|
|
|
|
|
|
|
|
|
// Fix #1: validate UUID format up front so malformed IDs return 400, not a DB error
|
|
|
|
|
if (!seasonId || !UUID_RE.test(seasonId)) {
|
|
|
|
|
return Response.json({ error: "Invalid season ID" }, { status: 400 });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const db = database();
|
|
|
|
|
|
|
|
|
|
const season = await db.query.seasons.findFirst({
|
|
|
|
|
where: eq(schema.seasons.id, seasonId),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if (!season) {
|
|
|
|
|
return Response.json({ error: "Season not found" }, { status: 404 });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const draftSlots = await db.query.draftSlots.findMany({
|
|
|
|
|
where: eq(schema.draftSlots.seasonId, seasonId),
|
|
|
|
|
orderBy: schema.draftSlots.draftOrder,
|
|
|
|
|
with: { team: true },
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const totalTeams = draftSlots.length;
|
|
|
|
|
const totalPicks = totalTeams * season.draftRounds;
|
|
|
|
|
const currentPickNumber = season.currentPickNumber ?? 1;
|
|
|
|
|
const isDraftComplete = season.status === "active" || season.status === "completed";
|
|
|
|
|
|
|
|
|
|
// Fix #4: guard against totalTeams === 0 before calling calculatePickInfo
|
|
|
|
|
let onTheClockSlot: (typeof draftSlots)[number] | null = null;
|
|
|
|
|
if (season.status === "draft" && totalTeams > 0) {
|
|
|
|
|
const { pickInRound } = calculatePickInfo(currentPickNumber, totalTeams);
|
|
|
|
|
onTheClockSlot = draftSlots.find((slot) => slot.draftOrder === pickInRound) ?? null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// All picks with participant + sport + team owner info
|
|
|
|
|
const picksRaw = await db
|
|
|
|
|
.select({
|
|
|
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
|
|
|
round: schema.draftPicks.round,
|
|
|
|
|
teamName: schema.teams.name,
|
|
|
|
|
teamOwnerId: schema.teams.ownerId,
|
|
|
|
|
participantName: schema.participants.name,
|
|
|
|
|
sport: schema.sports.name,
|
|
|
|
|
})
|
|
|
|
|
.from(schema.draftPicks)
|
|
|
|
|
.innerJoin(schema.teams, eq(schema.draftPicks.teamId, schema.teams.id))
|
|
|
|
|
.innerJoin(schema.participants, eq(schema.draftPicks.participantId, schema.participants.id))
|
|
|
|
|
.innerJoin(schema.sportsSeasons, eq(schema.participants.sportsSeasonId, schema.sportsSeasons.id))
|
|
|
|
|
.innerJoin(schema.sports, eq(schema.sportsSeasons.sportId, schema.sports.id))
|
|
|
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
|
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
|
|
|
|
|
|
|
|
// Fix #2: include the on-the-clock owner in the batch so we never make a separate user query
|
|
|
|
|
const picksOwnerIds = picksRaw.map((p) => p.teamOwnerId).filter(Boolean) as string[];
|
|
|
|
|
const clockOwnerId = onTheClockSlot?.team.ownerId ?? null;
|
|
|
|
|
const allOwnerIds = [...new Set([...picksOwnerIds, ...(clockOwnerId ? [clockOwnerId] : [])])];
|
|
|
|
|
|
|
|
|
|
const usernameByClerkId = new Map<string, string | null>();
|
|
|
|
|
if (allOwnerIds.length > 0) {
|
|
|
|
|
const owners = await db
|
|
|
|
|
.select({
|
|
|
|
|
clerkId: schema.users.clerkId,
|
|
|
|
|
username: schema.users.username,
|
|
|
|
|
displayName: schema.users.displayName,
|
|
|
|
|
})
|
|
|
|
|
.from(schema.users)
|
|
|
|
|
.where(inArray(schema.users.clerkId, allOwnerIds));
|
|
|
|
|
for (const owner of owners) {
|
Optimize user data fetching with batch queries and centralize display name logic (#176)
* Fall back to displayName when username is null for Discord webhook
Users who sign up via OAuth (Google, GitHub, etc.) without setting a
Clerk username have a null `username` field but always have a `displayName`
(computed from firstName+lastName or email). Previously, `usernameByClerkId`
was filtered to only include users with a non-null username, causing those
owners to appear without any identifier in Discord standings messages
(e.g. "Liverpool def. Galatasaray" instead of "Liverpool def. Galatasaray (Madmike)").
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Extract getUserDisplayName helper and use consistently throughout
Add a single getUserDisplayName(user) function to app/models/user.ts that
encapsulates the username → displayName fallback logic. Replace 9 scattered
inline expressions across the codebase (owner-map, scoring-calculator,
league routes, settings, invite flow, draft API, Clerk webhook) with calls
to the shared helper.
No behaviour change — all existing logic preserved, just centralised.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Fix N+1 user queries in league loader and settings loader
Add findUsersByClerkIds() batch function to the user model and replace two
separate Promise.all+findUserByClerkId loops (one for owners, one for
commissioners) with a single inArray query in both $leagueId.server.ts and
$leagueId.settings.tsx. The merged query covers both owner and commissioner
IDs in one round-trip.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
* Fix N+1 user queries in buildOwnerMap
Replace the Promise.all+findUserByClerkId loop with a single
findUsersByClerkIds batch query, consistent with the league loader
and settings loader fixes.
https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH
---------
Co-authored-by: Claude <noreply@anthropic.com>
2026-03-18 16:46:07 -07:00
|
|
|
usernameByClerkId.set(owner.clerkId, getUserDisplayName(owner));
|
2026-03-02 00:35:23 -08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fix #3: single helper so onTheClock and picks use identical null-fallback logic
|
|
|
|
|
const getUsername = (ownerId: string | null) =>
|
|
|
|
|
ownerId ? (usernameByClerkId.get(ownerId) ?? null) : null;
|
|
|
|
|
|
|
|
|
|
const onTheClock = onTheClockSlot
|
|
|
|
|
? { teamName: onTheClockSlot.team.name, username: getUsername(onTheClockSlot.team.ownerId) }
|
|
|
|
|
: null;
|
|
|
|
|
|
|
|
|
|
const picks = picksRaw.map((p) => ({
|
|
|
|
|
pickNumber: p.pickNumber,
|
|
|
|
|
round: p.round,
|
|
|
|
|
teamName: p.teamName,
|
|
|
|
|
username: getUsername(p.teamOwnerId),
|
|
|
|
|
participantName: p.participantName,
|
|
|
|
|
sport: p.sport,
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
return Response.json({
|
|
|
|
|
seasonId,
|
|
|
|
|
status: season.status,
|
|
|
|
|
currentPickNumber,
|
|
|
|
|
totalPicks,
|
|
|
|
|
isDraftComplete,
|
|
|
|
|
isPaused: season.draftPaused,
|
|
|
|
|
onTheClock,
|
|
|
|
|
picks,
|
|
|
|
|
});
|
|
|
|
|
}
|