release/86 #2

Merged
dahyeon merged 108 commits from release/86 into main 2026-07-15 08:56:05 +00:00
3 changed files with 39 additions and 54 deletions
Showing only changes of commit ade5735dc2 - Show all commits

No files matched your search

@@ -10,9 +10,9 @@ type TournamentCodeServiceInternals = TournamentCodeService & {
ensureGameSchedule(match: MatchDocument): void;
};
function createService(connectionService = {} as never) {
function createService() {
return new TournamentCodeService(
connectionService,
{} as never,
) as unknown as TournamentCodeServiceInternals;
}
@@ -28,7 +28,6 @@ interface MatchOverrides {
teamAIndex: number;
teamBIndex: number;
}>;
tournamentCodeIds?: unknown[];
}
function createMatch(overrides: MatchOverrides): MatchDocument {
@@ -218,7 +217,7 @@ describe('TournamentCodeService round-robin scheduling', () => {
}
});
it('rebuilds legacy round-robin schedules without round numbers before reservation', () => {
it('leaves legacy round-robin schedules without round numbers unchanged', () => {
const service = createService();
const roundRobin = createMatch({
gameMode: 'round-robin',
@@ -226,7 +225,6 @@ describe('TournamentCodeService round-robin scheduling', () => {
teams: Array.from({ length: 6 }, (_, index) => ({
teamIndex: index + 1,
})),
tournamentCodeIds: [],
gameSchedule: [
{ gameNumber: 1, teamAIndex: 2, teamBIndex: 5 },
{ gameNumber: 2, teamAIndex: 1, teamBIndex: 2 },
@@ -237,26 +235,22 @@ describe('TournamentCodeService round-robin scheduling', () => {
],
});
const persisted = [...roundRobin.gameSchedule];
service.ensureGameSchedule(roundRobin);
for (const roundNumber of [1, 2, 3, 4, 5]) {
const round = roundRobin.gameSchedule.filter(
(game) => game.roundNumber === roundNumber,
);
expect(round).toHaveLength(3);
expect(new Set(round.flatMap((game) => [game.teamAIndex, game.teamBIndex])).size)
.toBe(6);
}
expect(roundRobin.gameSchedule).toEqual(persisted);
});
it('uses regenerated round refs for pending legacy round-robin slots', async () => {
it('does not expose round numbers for legacy round-robin slots', async () => {
const codeFindExec = jest.fn().mockResolvedValue([]);
const connectionService = {
getModel: jest.fn().mockResolvedValue({
find: jest.fn().mockReturnValue({ exec: codeFindExec }),
}),
};
const service = createService(connectionService as never);
const service = new TournamentCodeService(
connectionService as never,
) as unknown as TournamentCodeServiceInternals;
const slots = await service.buildSlots(
createMatch({
@@ -265,7 +259,6 @@ describe('TournamentCodeService round-robin scheduling', () => {
teams: Array.from({ length: 6 }, (_, index) => ({
teamIndex: index + 1,
})),
tournamentCodeIds: [],
gameSchedule: [
{ gameNumber: 1, teamAIndex: 2, teamBIndex: 5 },
{ gameNumber: 2, teamAIndex: 1, teamBIndex: 2 },
@@ -286,12 +279,16 @@ describe('TournamentCodeService round-robin scheduling', () => {
}),
);
for (const roundNumber of [1, 2, 3, 4, 5]) {
const round = slots.filter((slot) => slot.roundNumber === roundNumber);
expect(round).toHaveLength(3);
expect(new Set(round.flatMap((slot) => [slot.teamAIndex, slot.teamBIndex])).size)
.toBe(6);
}
expect(slots).toHaveLength(15);
expect(slots[0]).toEqual(
expect.objectContaining({
gameNumber: 1,
roundNumber: undefined,
teamAIndex: 2,
teamBIndex: 5,
}),
);
expect(slots.every((slot) => slot.roundNumber === undefined)).toBe(true);
});
it('does not expose fallback round-robin slots before the schedule is persisted', async () => {
@@ -395,7 +395,7 @@ export class TournamentCodeService {
const gameMode = match.gameMode ?? 'pair';
if (gameMode === 'round-robin') {
if (this.shouldUsePersistedRoundRobinSchedule(match)) {
if ((match.gameSchedule?.length ?? 0) > 0) {
return match.gameSchedule.length;
}
return this.buildRoundRobinGameSchedule(match).length;
@@ -422,12 +422,10 @@ export class TournamentCodeService {
(entry) => entry.gameNumber === gameNumber,
);
if (persisted) {
if (this.shouldUsePersistedRoundRobinSchedule(match)) {
return {
teamAIndex: persisted.teamAIndex,
teamBIndex: persisted.teamBIndex,
};
}
return {
teamAIndex: persisted.teamAIndex,
teamBIndex: persisted.teamBIndex,
};
}
const fallback = this.buildRoundRobinGameSchedule(match).find(
@@ -454,10 +452,10 @@ export class TournamentCodeService {
private ensureGameSchedule(match: MatchDocument): void {
if ((match.gameMode ?? 'pair') !== 'round-robin') return;
if ((match.gameSchedule?.length ?? 0) > 0) return;
const teamCount = resolveRoundRobinTeamCount(match);
if (teamCount < 2) return;
if (this.shouldUsePersistedRoundRobinSchedule(match)) return;
match.gameSchedule = this.buildRoundRobinGameSchedule(match);
}
@@ -471,33 +469,13 @@ export class TournamentCodeService {
const persisted = match.gameSchedule?.find(
(entry) => entry.gameNumber === gameNumber,
);
if (persisted) {
if (persisted.roundNumber) return persisted.roundNumber;
if (this.shouldUsePersistedRoundRobinSchedule(match)) return undefined;
}
if (persisted) return persisted.roundNumber;
return this.buildRoundRobinGameSchedule(match).find(
(entry) => entry.gameNumber === gameNumber,
)?.roundNumber;
}
private shouldUsePersistedRoundRobinSchedule(match: MatchDocument): boolean {
const schedule = match.gameSchedule ?? [];
if (schedule.length === 0) return false;
if (schedule.every((entry) => typeof entry.roundNumber === 'number')) {
return true;
}
return !this.canRegenerateRoundRobinSchedule(match);
}
private canRegenerateRoundRobinSchedule(match: MatchDocument): boolean {
return (
(match.tournamentCodeIds?.length ?? 0) === 0 &&
(match.result?.games?.length ?? 0) === 0
);
}
private buildRoundRobinGameSchedule(
match: MatchDocument,
shuffleTeams = false,
+13 -3
View File
@@ -41,6 +41,7 @@ import type {
ApiPositionPreference,
ApiTierInfo,
ManualTournamentResultCollectResponse,
MatchGameMode,
Position,
TeamSide,
TournamentCodeSlotView,
@@ -1458,7 +1459,13 @@ function TournamentCodeDisplay({ slot }: { slot: TournamentCodeSlotView }) {
);
}
function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
function TournamentCodeList({
slots,
gameMode,
}: {
slots: TournamentCodeSlotView[];
gameMode: MatchGameMode;
}) {
if (slots.length === 0) {
return (
<div className="border border-dashed border-base-content/10 px-3 py-3 text-xs text-base-content/30">
@@ -1469,7 +1476,7 @@ function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
function renderSlot(slot: TournamentCodeSlotView) {
const shouldShowTeamLabel =
Boolean(slot.roundNumber) || slot.teamAIndex > 1 || slot.teamBIndex > 2;
gameMode === "round-robin" || slot.teamAIndex > 1 || slot.teamBIndex > 2;
return (
<div key={slot.gameNumber} className="flex items-start gap-2">
@@ -2829,7 +2836,10 @@ export default function MatchDetailPage() {
{(match.status === "team-built" ||
match.status === "in-progress") && (
<SideCard title="토너먼트 코드">
<TournamentCodeList slots={match.tournamentCodes} />
<TournamentCodeList
slots={match.tournamentCodes}
gameMode={match.gameMode}
/>
<PoolStatsHint enabled={canManageAuction} />
</SideCard>
)}