- Round qpEarned and qpTotal with Math.round() so fractional tie-split
values display as integers ("+2 QP" not "+1.5 QP")
- Swap embed colors: standings → gold (0xffd700), QP → blurple (0x5865f2)
- Add logger.error in cs2-major-stage.ts to match scoring-calculator.ts
error handling pattern (replaces silent .catch(() => {}))
- Fix cumulative CS2 re-announcement: snapshot existing QP before writing
and only notify participants whose QP is new or changed in this call;
add participantIdFilter parameter to notifyQualifyingPointsUpdate
- Batch all pre-loop queries in notifyQualifyingPointsUpdate (seasons,
draftPicks, participantNames, users, Discord IDs) to eliminate N+1
queries across league iterations
- Add unit tests for notifyQualifyingPointsUpdate covering early-return
paths, per-league filtering, Discord ID resolution, and participantIdFilter
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NnJP1NTYXHxL2kbE4fZaD6
145 lines
5.3 KiB
TypeScript
145 lines
5.3 KiB
TypeScript
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, inArray } from "drizzle-orm";
|
|
import { findDiscordIdsByUserIds } from "~/models/account";
|
|
import { getUserDisplayName } from "~/models/user";
|
|
import {
|
|
sendQualifyingPointsUpdateNotification,
|
|
type QPEventEntry,
|
|
} from "~/services/discord";
|
|
|
|
export async function notifyQualifyingPointsUpdate(
|
|
sportsSeasonId: string,
|
|
scoringEventId: string,
|
|
db: ReturnType<typeof database>,
|
|
participantIdFilter?: Set<string>
|
|
): Promise<void> {
|
|
const event = await db.query.scoringEvents.findFirst({
|
|
where: eq(schema.scoringEvents.id, scoringEventId),
|
|
with: {
|
|
sportsSeason: {
|
|
with: { sport: true },
|
|
},
|
|
},
|
|
});
|
|
if (!event) return;
|
|
|
|
const eventName = event.name;
|
|
const sportName = event.sportsSeason?.sport?.name;
|
|
|
|
const seasonSports = await db.query.seasonSports.findMany({
|
|
where: eq(schema.seasonSports.sportsSeasonId, sportsSeasonId),
|
|
});
|
|
if (seasonSports.length === 0) return;
|
|
|
|
// QP earned in this specific event (optionally scoped to participants new/changed in this call)
|
|
const eventResultRows = await db.query.eventResults.findMany({
|
|
where: eq(schema.eventResults.scoringEventId, scoringEventId),
|
|
});
|
|
const qpEarnedById = new Map<string, number>(
|
|
eventResultRows
|
|
.filter((r) => r.qualifyingPointsAwarded !== null)
|
|
.filter((r) => !participantIdFilter || participantIdFilter.has(r.seasonParticipantId))
|
|
.map((r) => [r.seasonParticipantId, parseFloat(r.qualifyingPointsAwarded!)])
|
|
);
|
|
|
|
if (qpEarnedById.size === 0) return;
|
|
|
|
// Current running QP totals for the season
|
|
const qpTotals = await db.query.seasonParticipantQualifyingTotals.findMany({
|
|
where: eq(schema.seasonParticipantQualifyingTotals.sportsSeasonId, sportsSeasonId),
|
|
});
|
|
const qpTotalById = new Map<string, number>(
|
|
qpTotals.map((t) => [t.participantId, parseFloat(t.totalQualifyingPoints)])
|
|
);
|
|
|
|
const seasonIds = seasonSports.map((s) => s.seasonId);
|
|
|
|
// Batch-fetch all season + league metadata in one query
|
|
const seasons = await db.query.seasons.findMany({
|
|
where: inArray(schema.seasons.id, seasonIds),
|
|
with: { league: true },
|
|
});
|
|
const seasonMap = new Map(seasons.map((s) => [s.id, s]));
|
|
|
|
// Batch-fetch all draft picks for all leagues at once, grouped by season
|
|
const allPicks = await db.query.draftPicks.findMany({
|
|
where: inArray(schema.draftPicks.seasonId, seasonIds),
|
|
with: { team: true },
|
|
});
|
|
const picksBySeasonId = new Map<string, (typeof allPicks)[number][]>();
|
|
for (const pick of allPicks) {
|
|
if (!picksBySeasonId.has(pick.seasonId)) picksBySeasonId.set(pick.seasonId, []);
|
|
picksBySeasonId.get(pick.seasonId)!.push(pick);
|
|
}
|
|
|
|
// Batch-fetch participant display names once (same participants across all leagues)
|
|
const allParticipantIds = [...qpEarnedById.keys()];
|
|
const participants = await db.query.seasonParticipants.findMany({
|
|
where: inArray(schema.seasonParticipants.id, allParticipantIds),
|
|
});
|
|
const participantNameById = new Map(participants.map((p) => [p.id, p.name]));
|
|
|
|
// Batch-fetch all team owners and their Discord IDs in two queries (not N per league)
|
|
const allOwnerIds = new Set<string>();
|
|
for (const pick of allPicks) {
|
|
if (pick.team.ownerId) allOwnerIds.add(pick.team.ownerId);
|
|
}
|
|
const allUsers =
|
|
allOwnerIds.size > 0
|
|
? await db.query.users.findMany({ where: inArray(schema.users.id, [...allOwnerIds]) })
|
|
: [];
|
|
const usernameByUserId = new Map(
|
|
allUsers
|
|
.map((u) => [u.id, getUserDisplayName(u)] as [string, string | null])
|
|
.filter((entry): entry is [string, string] => entry[1] !== null)
|
|
);
|
|
const optedInUserIds = allUsers.filter((u) => u.discordPingEnabled).map((u) => u.id);
|
|
const discordIdByUserId = await findDiscordIdsByUserIds(optedInUserIds);
|
|
|
|
for (const { seasonId } of seasonSports) {
|
|
const season = seasonMap.get(seasonId);
|
|
const webhookUrl = season?.league?.discordWebhookUrl;
|
|
if (!webhookUrl) continue;
|
|
|
|
const seasonName = `${season!.league!.name} ${season!.year}`;
|
|
|
|
const picks = picksBySeasonId.get(seasonId) ?? [];
|
|
const teamByParticipantId = new Map<
|
|
string,
|
|
{ teamName: string; ownerId: string | null }
|
|
>();
|
|
for (const pick of picks) {
|
|
teamByParticipantId.set(pick.participantId, {
|
|
teamName: pick.team.name,
|
|
ownerId: pick.team.ownerId,
|
|
});
|
|
}
|
|
|
|
// Only include participants that appear in both the event and this league's draft
|
|
const relevantParticipantIds = [...qpEarnedById.keys()].filter((id) =>
|
|
teamByParticipantId.has(id)
|
|
);
|
|
if (relevantParticipantIds.length === 0) continue;
|
|
|
|
const entries: QPEventEntry[] = relevantParticipantIds.map((participantId) => {
|
|
const teamInfo = teamByParticipantId.get(participantId)!;
|
|
const ownerId = teamInfo.ownerId;
|
|
return {
|
|
participantName: participantNameById.get(participantId) ?? participantId,
|
|
qpEarned: qpEarnedById.get(participantId) ?? 0,
|
|
qpTotal: qpTotalById.get(participantId) ?? 0,
|
|
ownerUsername: ownerId ? (usernameByUserId.get(ownerId) ?? undefined) : undefined,
|
|
ownerDiscordUserId: ownerId ? discordIdByUserId.get(ownerId) : undefined,
|
|
};
|
|
});
|
|
|
|
await sendQualifyingPointsUpdateNotification({
|
|
webhookUrl,
|
|
seasonName,
|
|
sportName,
|
|
eventName,
|
|
entries,
|
|
});
|
|
}
|
|
}
|