## Summary - **Timer bank broadcasts**: emit `timer-bank-updated` after every pick so all clients immediately see the updated bank instead of waiting for the next `timer-pick-started` - **Increment accuracy**: capture `pickMadeAt` at route entry (before auth/DB overhead) and use `Math.ceil` so credited seconds always match the client countdown display - **Race condition fix**: hold `schedulingInProgress` lock for the full timer callback to prevent the recovery interval from scheduling a duplicate timeout mid-pick - **force-autopick fix**: call `rescheduleTimer` so the next team's clock starts immediately instead of waiting for the old timeout to naturally expire - **adjust-time-bank fix**: for on-clock teams, shift `picksExpiresAt` by the adjustment and reschedule so the client countdown updates; block adjustments that would reduce the bank to zero - **New socket events**: `timer-pick-started`, `timer-overnight-paused`, `timer-bank-updated` with full type definitions; removed dead `timer-update` event - **Reconnect sync**: `draft-state-sync` now includes `expiresAt` for the active timer and `isOvernightPause` state so reconnecting clients see accurate countdown and pause banner immediately without a page reload - **Room closure countdown**: capture client-side timestamp when draft completes so the "Room closes in X" countdown actually ticks down before the loader revalidates with `draftCompletedAt` - **Countdown interval**: run at 500ms with `Math.ceil` to prevent skipped seconds under event loop pressure - **Overnight pause UX**: `canPick` only blocks on commissioner pause — overnight pause freezes the timer but the on-clock player can still pick early - **Overnight pause refactor**: extract `checkOvernightPause` to `server/overnight-pause-check.ts`, breaking the `timer↔socket` circular import and sharing the timezone cache across both callers with correct eviction - **PostgreSQL type fix**: cast `varchar` owner ID to `uuid` in `getTeamTimezone` join ## Test plan - [ ] Manual pick: all clients see bank increment immediately after pick - [ ] Timeout pick: all clients see bank update (0 → increment); next clock starts within ~1s - [ ] Force-autopick: next team's clock starts immediately; no "Pick already made" log - [ ] Force-manual-pick: all clients see bank increment - [ ] Pause while clock running: countdown freezes on all clients - [ ] Resume: clock continues from frozen value - [ ] adjust-time-bank on on-clock team: countdown shifts immediately - [ ] adjust-time-bank to zero: returns 400 error - [ ] Reconnect (socket disconnect/connect): countdown resumes for correct team - [ ] Hard refresh mid-draft: on-clock indicator and countdown correct immediately - [ ] Draft complete: "Room closes in X" counts down - [ ] Overnight pause: banner shows, pick buttons still enabled, timer frozen - [ ] `npm run test:run` — all 158 files / 2351 tests pass 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Chris Parsons <chrisparsons1127@gmail.com> Reviewed-on: #72
374 lines
14 KiB
TypeScript
374 lines
14 KiB
TypeScript
/**
|
|
* Tests for draft.make-pick timer behavior across chess_clock and standard modes.
|
|
*
|
|
* chess_clock: after ANY pick (owner, commissioner, admin), bank += increment
|
|
* standard: after ANY pick, bank resets to exactly draftIncrementTime
|
|
*/
|
|
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
import type { RouterContextProvider } from "react-router";
|
|
import { action } from "~/routes/api/draft.make-pick";
|
|
import { rescheduleTimer } from "~/server/timer";
|
|
|
|
const ctx = {} as unknown as RouterContextProvider;
|
|
|
|
vi.mock("~/database/context");
|
|
vi.mock("~/server/socket", () => ({
|
|
getSocketIO: vi.fn(),
|
|
scheduleDraftRoomClosure: vi.fn(),
|
|
}));
|
|
vi.mock("~/lib/auth.server", () => ({
|
|
auth: { api: { getSession: vi.fn() } },
|
|
}));
|
|
vi.mock("~/models/draft-pick", () => ({
|
|
getDraftPicksWithSports: vi.fn(),
|
|
getTeamDraftPicksWithSports: vi.fn(),
|
|
}));
|
|
vi.mock("~/models/season-participant", () => ({
|
|
getParticipantsForSeasonWithSports: vi.fn(),
|
|
}));
|
|
vi.mock("~/models/season-sport", () => ({
|
|
getSeasonSportsSimple: vi.fn(),
|
|
}));
|
|
vi.mock("~/lib/draft-eligibility", () => ({
|
|
calculateDraftEligibility: vi.fn(),
|
|
}));
|
|
vi.mock("~/models/draft-utils", () => ({
|
|
checkAndTriggerNextAutodraft: vi.fn(),
|
|
calculatePickInfo: vi.fn().mockReturnValue({ round: 1, pickInRound: 1, teamIndex: 0 }),
|
|
pruneIneligibleQueueItems: vi.fn().mockResolvedValue([]),
|
|
}));
|
|
vi.mock("~/models/user", () => ({
|
|
isUserAdmin: vi.fn(),
|
|
}));
|
|
vi.mock("~/server/timer", () => ({
|
|
rescheduleTimer: vi.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
// ── Fixtures ──────────────────────────────────────────────────────────────────
|
|
|
|
const SEASON_ID = "season-1";
|
|
const TEAM_ID = "team-1";
|
|
const NEXT_TEAM_ID = "team-2";
|
|
const PARTICIPANT_ID = "participant-1";
|
|
const OWNER_ID = "owner-user-1";
|
|
const COMMISSIONER_ID = "commissioner-user-1";
|
|
const ADMIN_ID = "admin-user-1";
|
|
const SPORT_ID = "sport-nfl";
|
|
|
|
const mockParticipant = {
|
|
id: PARTICIPANT_ID,
|
|
name: "Patrick Mahomes",
|
|
sportsSeason: {
|
|
id: "sports-season-1",
|
|
sport: { id: SPORT_ID, name: "NFL" },
|
|
},
|
|
};
|
|
|
|
const mockDraftPick = {
|
|
id: "pick-1",
|
|
seasonId: SEASON_ID,
|
|
teamId: TEAM_ID,
|
|
participantId: PARTICIPANT_ID,
|
|
pickNumber: 1,
|
|
round: 1,
|
|
pickInRound: 1,
|
|
pickedByUserId: OWNER_ID,
|
|
pickedByType: "owner",
|
|
};
|
|
|
|
// Two-team draft; team-1 picks first.
|
|
const mockDraftSlots = [
|
|
{
|
|
id: "slot-1",
|
|
seasonId: SEASON_ID,
|
|
teamId: TEAM_ID,
|
|
draftOrder: 1,
|
|
team: { id: TEAM_ID, name: "Team 1", seasonId: SEASON_ID, ownerId: OWNER_ID },
|
|
},
|
|
{
|
|
id: "slot-2",
|
|
seasonId: SEASON_ID,
|
|
teamId: NEXT_TEAM_ID,
|
|
draftOrder: 2,
|
|
team: { id: NEXT_TEAM_ID, name: "Team 2", seasonId: SEASON_ID, ownerId: "owner-2" },
|
|
},
|
|
];
|
|
|
|
function makeSeason(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
id: SEASON_ID,
|
|
leagueId: "league-1",
|
|
status: "draft",
|
|
draftRounds: 3,
|
|
draftInitialTime: 120,
|
|
draftIncrementTime: 30,
|
|
draftTimerMode: "chess_clock",
|
|
currentPickNumber: 1,
|
|
draftPaused: false,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeRequest() {
|
|
const formData = new FormData();
|
|
formData.append("seasonId", SEASON_ID);
|
|
formData.append("participantId", PARTICIPANT_ID);
|
|
return new Request("http://localhost/api/draft/make-pick", {
|
|
method: "POST",
|
|
body: formData,
|
|
});
|
|
}
|
|
|
|
// ── Tests ──────────────────────────────────────────────────────────────────────
|
|
|
|
describe("draft.make-pick action — timer mode behavior", () => {
|
|
let mockDb: any;
|
|
let mockSocketIO: any;
|
|
|
|
beforeEach(async () => {
|
|
vi.clearAllMocks();
|
|
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: OWNER_ID } } as any);
|
|
|
|
const { isUserAdmin } = await import("~/models/user");
|
|
vi.mocked(isUserAdmin).mockResolvedValue(false);
|
|
|
|
mockSocketIO = { to: vi.fn().mockReturnThis(), emit: vi.fn() };
|
|
const socketModule = await import("~/server/socket");
|
|
vi.mocked(socketModule.getSocketIO).mockReturnValue(mockSocketIO);
|
|
|
|
const { getDraftPicksWithSports, getTeamDraftPicksWithSports } = await import("~/models/draft-pick");
|
|
vi.mocked(getDraftPicksWithSports).mockResolvedValue([]);
|
|
vi.mocked(getTeamDraftPicksWithSports).mockResolvedValue([]);
|
|
|
|
const { getParticipantsForSeasonWithSports } = await import("~/models/season-participant");
|
|
vi.mocked(getParticipantsForSeasonWithSports).mockResolvedValue([]);
|
|
|
|
const { getSeasonSportsSimple } = await import("~/models/season-sport");
|
|
vi.mocked(getSeasonSportsSimple).mockResolvedValue([]);
|
|
|
|
const { calculateDraftEligibility } = await import("~/lib/draft-eligibility");
|
|
vi.mocked(calculateDraftEligibility).mockReturnValue({
|
|
eligibleSportIds: new Set([SPORT_ID]),
|
|
ineligibleReasons: {},
|
|
} as any);
|
|
|
|
const { checkAndTriggerNextAutodraft } = await import("~/models/draft-utils");
|
|
vi.mocked(checkAndTriggerNextAutodraft).mockResolvedValue(undefined);
|
|
|
|
mockDb = {
|
|
query: {
|
|
seasons: { findFirst: vi.fn() },
|
|
commissioners: { findFirst: vi.fn().mockResolvedValue(null) },
|
|
draftPicks: { findFirst: vi.fn().mockResolvedValue(null) },
|
|
seasonParticipants: { findFirst: vi.fn().mockResolvedValue(mockParticipant) },
|
|
draftSlots: { findMany: vi.fn().mockResolvedValue(mockDraftSlots) },
|
|
draftTimers: { findFirst: vi.fn().mockResolvedValue({ id: "timer-1", timeRemaining: 75 }) },
|
|
draftQueue: { findMany: vi.fn().mockResolvedValue([]) },
|
|
},
|
|
insert: vi.fn().mockReturnThis(),
|
|
values: vi.fn().mockReturnThis(),
|
|
returning: vi.fn().mockResolvedValue([mockDraftPick]),
|
|
update: vi.fn().mockReturnThis(),
|
|
set: vi.fn().mockReturnThis(),
|
|
where: vi.fn().mockReturnThis(),
|
|
delete: vi.fn().mockReturnThis(),
|
|
};
|
|
|
|
const { database } = await import("~/database/context");
|
|
vi.mocked(database).mockReturnValue(mockDb);
|
|
});
|
|
|
|
// ── chess_clock mode ────────────────────────────────────────────────────────
|
|
|
|
describe("chess_clock mode", () => {
|
|
beforeEach(() => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "chess_clock", draftInitialTime: 120, draftIncrementTime: 30 })
|
|
);
|
|
});
|
|
|
|
describe("owner pick", () => {
|
|
// Auth default is OWNER_ID (team owner), no extra setup needed.
|
|
|
|
it("stores bank + increment in DB timer and calls rescheduleTimer", async () => {
|
|
// Pre-pick bank: 75s (no picksExpiresAt, falls back to timeRemaining). 75 + 30 = 105.
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 105, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("accumulates a larger bank when more time was remaining", async () => {
|
|
// 100 + 30 = 130
|
|
mockDb.query.draftTimers.findFirst.mockResolvedValue({ id: "timer-1", timeRemaining: 100 });
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 130, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("writes the timer update to the DB", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: expect.any(Number), picksExpiresAt: null, updatedAt: expect.any(Date) })
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("commissioner pick", () => {
|
|
beforeEach(async () => {
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: COMMISSIONER_ID } } as any);
|
|
|
|
mockDb.query.commissioners.findFirst.mockResolvedValue({ id: "c-1", userId: COMMISSIONER_ID });
|
|
// Commissioner does not own the team on the clock
|
|
mockDb.query.draftSlots.findMany.mockResolvedValue([
|
|
{
|
|
...mockDraftSlots[0],
|
|
team: { ...mockDraftSlots[0].team, ownerId: "someone-else" },
|
|
},
|
|
mockDraftSlots[1],
|
|
]);
|
|
});
|
|
|
|
it("stores bank + increment in DB timer and calls rescheduleTimer", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 105, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("writes the timer update to the DB", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: expect.any(Number), picksExpiresAt: null, updatedAt: expect.any(Date) })
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("admin pick", () => {
|
|
beforeEach(async () => {
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: ADMIN_ID } } as any);
|
|
|
|
const { isUserAdmin } = await import("~/models/user");
|
|
vi.mocked(isUserAdmin).mockResolvedValue(true);
|
|
|
|
// Admin does not own the team on the clock
|
|
mockDb.query.draftSlots.findMany.mockResolvedValue([
|
|
{
|
|
...mockDraftSlots[0],
|
|
team: { ...mockDraftSlots[0].team, ownerId: "someone-else" },
|
|
},
|
|
mockDraftSlots[1],
|
|
]);
|
|
});
|
|
|
|
it("stores bank + increment in DB timer and calls rescheduleTimer", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 105, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("writes the timer update to the DB", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: expect.any(Number), picksExpiresAt: null, updatedAt: expect.any(Date) })
|
|
);
|
|
});
|
|
});
|
|
});
|
|
|
|
// ── standard mode ───────────────────────────────────────────────────────────
|
|
|
|
describe("standard mode", () => {
|
|
beforeEach(() => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "standard", draftInitialTime: 30, draftIncrementTime: 30 })
|
|
);
|
|
});
|
|
|
|
it("owner pick — resets bank to exactly draftIncrementTime", async () => {
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 30, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("owner pick — fast picker does NOT accumulate time (bank never exceeds increment)", async () => {
|
|
// Team had 25s left (picked quickly); standard mode ignores prior balance
|
|
mockDb.query.draftTimers.findFirst.mockResolvedValue({ id: "timer-1", timeRemaining: 25 });
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 30, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
});
|
|
|
|
it("commissioner pick — resets bank to exactly draftIncrementTime", async () => {
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: COMMISSIONER_ID } } as any);
|
|
mockDb.query.commissioners.findFirst.mockResolvedValue({ id: "c-1", userId: COMMISSIONER_ID });
|
|
mockDb.query.draftSlots.findMany.mockResolvedValue([
|
|
{ ...mockDraftSlots[0], team: { ...mockDraftSlots[0].team, ownerId: "someone-else" } },
|
|
mockDraftSlots[1],
|
|
]);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 30, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("admin pick — resets bank to exactly draftIncrementTime", async () => {
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: ADMIN_ID } } as any);
|
|
const { isUserAdmin } = await import("~/models/user");
|
|
vi.mocked(isUserAdmin).mockResolvedValue(true);
|
|
mockDb.query.draftSlots.findMany.mockResolvedValue([
|
|
{ ...mockDraftSlots[0], team: { ...mockDraftSlots[0].team, ownerId: "someone-else" } },
|
|
mockDraftSlots[1],
|
|
]);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 30, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
|
|
it("uses custom draftIncrementTime when configured", async () => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "standard", draftInitialTime: 90, draftIncrementTime: 90 })
|
|
);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
expect(mockDb.set).toHaveBeenCalledWith(
|
|
expect.objectContaining({ timeRemaining: 90, picksExpiresAt: null, picksStartedAt: null })
|
|
);
|
|
expect(vi.mocked(rescheduleTimer)).toHaveBeenCalledWith(SEASON_ID);
|
|
});
|
|
});
|
|
});
|