* Fix no-shadow and consistent-function-scoping lint violations
Resolves all 11 no-shadow and 16 consistent-function-scoping oxlint
warnings and promotes both rules to errors in .oxlintrc.json.
no-shadow: renamed Drizzle callback params (sports→s, matches→m,
seasons→s) to avoid shadowing outer imports; removed shadowed
destructures (eq, inArray) from where callbacks; renamed inner
template→bracketTemplate, prev→currentTimers, season→ss, name→teamName
(with name: teamName fix to preserve semantics).
consistent-function-scoping: moved formatDate, getRankBadge,
getMovementIndicator, getPositionBadge, getStatusBadge, toDateStr,
elo (×2), weightedPick, sortByMatchNumber (×2) to module scope;
moved formatTime (×2), isValidLeagueName, getDraftTimes,
makeSeasonQueues to file scope in test files.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fix no-non-null-assertion lint violations and promote to error
Eliminates all 208 no-non-null-assertion warnings across 38 files.
Promotes typescript/no-non-null-assertion from warn to error in
.oxlintrc.json.
Fix patterns applied:
- Map.get(key)! after .has() check → extract with get() + null guard
- Map.get(key)! on pre-populated count maps → ?? 0 default
- .set(id, map.get(id)! + 1) increment → ?? 0 before adding
- participant1Id!/participant2Id! on DB matches → ?? "" fallback
- array.find()! in tests → guard + throw or expect().toBeDefined()
- bracketTemplateCache.get(id)! → null guard extract
- Various nullable field accesses → optional chain or ?? default
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fix prefer-add-event-listener, no-unassigned-import, require-module-specifiers
Resolves all 9 remaining non-console lint warnings and promotes all
three rules to errors in .oxlintrc.json.
- prefer-add-event-listener: converted onchange/onclick/onload
assignments to addEventListener in useDraftNotifications.ts and
admin.data-sync.tsx; stored changeHandler ref for proper cleanup
with removeEventListener
- no-unassigned-import: configured rule with allow list for legitimate
side-effect imports (*.css, @testing-library/jest-dom,
@testing-library/cypress/add-commands)
- require-module-specifiers: removed redundant `export {}` from
cypress/support/e2e.ts (file already has an import)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fix TypeScript errors from no-non-null-assertion fixes
Two fixes introduced by the non-null assertion cleanup produced type
errors:
- scoring-event.ts: `?? ""` was wrong type for a participant object map;
restructured to explicit null guards so TypeScript can narrow correctly
- standings-sync/index.ts: `?? null` after name-match lookup lost the
truthy guarantee, causing TS18047 on the write-back block; added
`participant &&` guard before accessing its properties
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Add npm run typecheck as Stop hook in Claude settings
Runs a full project typecheck at the end of each Claude turn so type
errors surface as feedback before the next message.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
205 lines
5.6 KiB
TypeScript
205 lines
5.6 KiB
TypeScript
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and } from "drizzle-orm";
|
|
|
|
export async function createDraftPick(data: {
|
|
seasonId: string;
|
|
teamId: string;
|
|
participantId: string;
|
|
pickNumber: number;
|
|
round: number;
|
|
pickInRound: number;
|
|
pickedByUserId: string;
|
|
pickedByType: "owner" | "commissioner" | "auto";
|
|
timeUsed: number;
|
|
}) {
|
|
const db = database();
|
|
const [pick] = await db.insert(schema.draftPicks).values(data).returning();
|
|
return pick;
|
|
}
|
|
|
|
export async function getDraftPicks(seasonId: string) {
|
|
const db = database();
|
|
return await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
}
|
|
|
|
export async function getDraftPickByNumber(seasonId: string, pickNumber: number) {
|
|
const db = database();
|
|
const [pick] = await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.pickNumber, pickNumber)
|
|
)
|
|
);
|
|
return pick;
|
|
}
|
|
|
|
export async function getTeamDraftPicks(teamId: string) {
|
|
const db = database();
|
|
return await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.teamId, teamId))
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
}
|
|
|
|
export async function isParticipantDrafted(seasonId: string, participantId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const [pick] = await db
|
|
.select()
|
|
.from(schema.draftPicks)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.participantId, participantId)
|
|
)
|
|
);
|
|
return !!pick;
|
|
}
|
|
|
|
/**
|
|
* Get a team's drafted participants grouped by sports season.
|
|
* Returns a map of sportsSeasonId → [{id, name}].
|
|
*/
|
|
export async function getDraftedParticipantsBySportsSeason(
|
|
teamId: string,
|
|
seasonId: string,
|
|
providedDb?: ReturnType<typeof database>
|
|
): Promise<Map<string, Array<{ id: string; name: string }>>> {
|
|
const db = providedDb || database();
|
|
|
|
const results = await db
|
|
.select({
|
|
sportsSeasonId: schema.participants.sportsSeasonId,
|
|
participantId: schema.participants.id,
|
|
participantName: schema.participants.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(
|
|
schema.participants,
|
|
eq(schema.draftPicks.participantId, schema.participants.id)
|
|
)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.teamId, teamId),
|
|
eq(schema.draftPicks.seasonId, seasonId)
|
|
)
|
|
);
|
|
|
|
const map = new Map<string, Array<{ id: string; name: string }>>();
|
|
for (const row of results) {
|
|
if (!map.has(row.sportsSeasonId)) {
|
|
map.set(row.sportsSeasonId, []);
|
|
}
|
|
map.get(row.sportsSeasonId)?.push({ id: row.participantId, name: row.participantName });
|
|
}
|
|
return map;
|
|
}
|
|
|
|
export async function deleteAllDraftPicks(seasonId: string) {
|
|
const db = database();
|
|
await db
|
|
.delete(schema.draftPicks)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId));
|
|
}
|
|
|
|
/**
|
|
* Get all draft picks for a season with participant and sport information
|
|
* Used for draft eligibility calculations
|
|
*/
|
|
export async function getDraftPicksWithSports(seasonId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const results = await db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
teamId: schema.draftPicks.teamId,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
participantId: schema.participants.id,
|
|
participantName: schema.participants.name,
|
|
sportId: schema.sports.id,
|
|
sportName: schema.sports.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.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);
|
|
|
|
// Transform to expected format
|
|
return results.map((r) => ({
|
|
teamId: r.teamId,
|
|
participant: {
|
|
id: r.participantId,
|
|
sport: {
|
|
id: r.sportId,
|
|
name: r.sportName,
|
|
},
|
|
},
|
|
}));
|
|
}
|
|
|
|
/**
|
|
* Get team's draft picks with participant and sport information
|
|
*/
|
|
export async function getTeamDraftPicksWithSports(teamId: string, seasonId: string, providedDb?: ReturnType<typeof database>) {
|
|
const db = providedDb || database();
|
|
const results = await db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
teamId: schema.draftPicks.teamId,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
participantId: schema.participants.id,
|
|
participantName: schema.participants.name,
|
|
sportId: schema.sports.id,
|
|
sportName: schema.sports.name,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.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(
|
|
and(
|
|
eq(schema.draftPicks.teamId, teamId),
|
|
eq(schema.draftPicks.seasonId, seasonId)
|
|
)
|
|
)
|
|
.orderBy(schema.draftPicks.pickNumber);
|
|
|
|
// Transform to expected format
|
|
return results.map((r) => ({
|
|
teamId: r.teamId,
|
|
participant: {
|
|
id: r.participantId,
|
|
sport: {
|
|
id: r.sportId,
|
|
name: r.sportName,
|
|
},
|
|
},
|
|
}));
|
|
}
|