* Grant sitewide admins commissioner-level access in leagues - `isCommissioner()` now returns true for site admins, covering all commissioner-gated loaders (league home, settings, sport season detail) and draft API routes (start, pause, resume, rollback, replace-pick, force-autopick, force-manual-pick, adjust-time-bank, make-pick) - Added `hasCommissionerRecord()` (DB-only, no admin bypass) for the "already a commissioner" duplicate-entry check in the settings action, preventing a false positive when adding a site admin as commissioner - `isCommissioner()` now runs the admin check and DB query in parallel via Promise.all to avoid a serial roundtrip on every check - Added "admin" to the `picked_by_type` enum (migration 0049) so picks forced by a site admin are recorded accurately in the audit log rather than as "commissioner" - 8 unit tests covering both isCommissioner and hasCommissionerRecord Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix draft.force-manual-pick tests broken by isUserAdminByClerkId The route now calls isUserAdminByClerkId which hits database().query.users, but the test's mock DB had no query.users entry. Add a vi.mock for ~/models/user and default isUserAdminByClerkId to false in beforeEach. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
99 lines
2.7 KiB
TypeScript
99 lines
2.7 KiB
TypeScript
import { eq, and } from "drizzle-orm";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { isUserAdminByClerkId } from "~/models/user";
|
|
|
|
export type Commissioner = typeof schema.commissioners.$inferSelect;
|
|
export type NewCommissioner = typeof schema.commissioners.$inferInsert;
|
|
|
|
export async function createCommissioner(
|
|
data: NewCommissioner
|
|
): Promise<Commissioner> {
|
|
const db = database();
|
|
const [commissioner] = await db
|
|
.insert(schema.commissioners)
|
|
.values(data)
|
|
.returning();
|
|
return commissioner;
|
|
}
|
|
|
|
export async function findCommissionersByLeagueId(
|
|
leagueId: string
|
|
): Promise<Commissioner[]> {
|
|
const db = database();
|
|
return await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.leagueId, leagueId),
|
|
orderBy: (commissioners, { asc }) => [asc(commissioners.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function findCommissionersByUserId(
|
|
userId: string
|
|
): Promise<Commissioner[]> {
|
|
const db = database();
|
|
return await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.userId, userId),
|
|
orderBy: (commissioners, { desc }) => [desc(commissioners.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function hasCommissionerRecord(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<boolean> {
|
|
const db = database();
|
|
const commissioner = await db.query.commissioners.findFirst({
|
|
where: and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
),
|
|
});
|
|
return !!commissioner;
|
|
}
|
|
|
|
export async function isCommissioner(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<boolean> {
|
|
const db = database();
|
|
const [isAdmin, commissioner] = await Promise.all([
|
|
isUserAdminByClerkId(userId),
|
|
db.query.commissioners.findFirst({
|
|
where: and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
),
|
|
}),
|
|
]);
|
|
return isAdmin || !!commissioner;
|
|
}
|
|
|
|
export async function countCommissionersByLeagueId(
|
|
leagueId: string
|
|
): Promise<number> {
|
|
const db = database();
|
|
const commissioners = await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.leagueId, leagueId),
|
|
});
|
|
return commissioners.length;
|
|
}
|
|
|
|
export async function deleteCommissioner(id: string): Promise<void> {
|
|
const db = database();
|
|
await db.delete(schema.commissioners).where(eq(schema.commissioners.id, id));
|
|
}
|
|
|
|
export async function removeCommissionerByLeagueAndUser(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<void> {
|
|
const db = database();
|
|
await db
|
|
.delete(schema.commissioners)
|
|
.where(
|
|
and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
)
|
|
);
|
|
}
|