* Add Discord draft pick announcements Posts a message to the league Discord webhook each time a pick is made, announcing the picked participant and pinging the next team on the clock if their owner has opted into Discord notifications. Enabled via a separate toggle in league settings (independent from standings update notifications). https://claude.ai/code/session_01Tvwsv3LfL9JUqxoLct8dTn * Address code review feedback on Discord pick announcements - Fix "on the clock" timing: read currentPickNumber fresh from DB post-autodraft-chain (matches sendOnTheClockEmail guarantee) - Remove outer try/catch from notifyPickMadeOnDiscord so callers' .catch() is not dead code - Add missing draft-discord.server.test.ts with 12 tests covering all early-exit and happy paths - Fix silent empty-string fallback for missing pickedSlot: warn and skip instead - Eliminate sequential season→league DB queries by accepting leagueId as a direct param - Show "save webhook URL to configure options" hint when URL is typed but not yet saved - Remove block-scope braces at both call sites (plain const declarations) - Remove redundant "Round N, Pick M" description line (title already carries this info) - Inline pickInRoundFor helper to avoid circular import with draft-utils https://claude.ai/code/session_01Tvwsv3LfL9JUqxoLct8dTn * Fix lint errors from review fixes - Remove unused logger import (no longer needed after removing try/catch) - Remove unused OWNER_ID constant in test fixture - Use toSorted() instead of sort() in sendDraftOrderNotification https://claude.ai/code/session_01Tvwsv3LfL9JUqxoLct8dTn --------- Co-authored-by: Claude <noreply@anthropic.com>
135 lines
3.9 KiB
TypeScript
135 lines
3.9 KiB
TypeScript
import { eq, 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,
|
|
discordPicksAnnouncementEnabled: schema.leagues.discordPicksAnnouncementEnabled,
|
|
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()].toSorted(
|
|
(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;
|
|
}
|