Compare commits

..
18 changed files with 1377 additions and 143 deletions

No files matched your search

@@ -459,6 +459,91 @@ describe('AuctionService', () => {
expect(auction.save).not.toHaveBeenCalled();
});
it('rejects bids that do not reserve minimum points for remaining team slots', async () => {
const matchId = new mongoose.Types.ObjectId();
const auction = {
_id: new mongoose.Types.ObjectId(),
matchId,
phase: 'bidding',
teams: [
{
teamIndex: 1,
captainUserId: new mongoose.Types.ObjectId(),
points: 1000,
members: [],
},
],
currentBid: 100,
currentDeadline: new Date(),
maxTimerSeconds: 30,
bidExtensionSeconds: 5,
bids: [],
save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
await expect(
service.placeBid({
matchId,
teamIndex: 1,
amount: 980,
}),
).rejects.toThrow('Bid must reserve minimum points for remaining slots.');
expect(auction.save).not.toHaveBeenCalled();
});
it('allows bids up to the maximum after reserving minimum points', async () => {
const matchId = new mongoose.Types.ObjectId();
const captainUserId = new mongoose.Types.ObjectId();
const auction = {
_id: new mongoose.Types.ObjectId(),
matchId,
phase: 'bidding',
teams: [
{
teamIndex: 1,
captainUserId,
points: 1000,
members: [],
},
],
currentBid: 100,
currentDeadline: new Date(),
maxTimerSeconds: 30,
bidExtensionSeconds: 5,
bids: [],
save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
await service.placeBid({
matchId,
teamIndex: 1,
amount: 970,
});
expect(auction.currentBid).toBe(970);
expect(auction.currentBidderTeamIndex).toBe(1);
expect(auction.bids).toEqual([
expect.objectContaining({
teamIndex: 1,
amount: 970,
bidderUserId: captainUserId,
}),
]);
expect(auction.save).toHaveBeenCalledTimes(1);
});
it('extends a short bid deadline using the configured bid extension seconds', async () => {
const now = new Date('2026-05-02T00:00:00.000Z');
jest.useFakeTimers().setSystemTime(now);
@@ -26,6 +26,7 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
import { TournamentResultService } from '../tournament-result/tournament-result.service';
const AUCTION_MAX_TEAM_SIZE = 5;
const AUCTION_MIN_BID_POINTS = 10;
const AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY = 1;
const AUCTION_ENRICHMENT_COOLDOWN_MS = 3 * 60 * 60 * 1000;
const AUCTION_CHAT_MAX_MESSAGES = 200;
@@ -318,6 +319,11 @@ export class AuctionService {
throw new BadRequestException('Bid exceeds team points.');
}
this.assertTeamHasSlot(team);
if (params.amount > this.calculateMaxBidForTeam(team)) {
throw new BadRequestException(
'Bid must reserve minimum points for remaining slots.',
);
}
// 임시 운영용: 클라이언트에서 선택한 팀장 모드를 신뢰하고 실제 로그인 사용자 검증은 건너뛴다.
await this.recordSnapshot(auction, 'bid', params.bidderUserId);
@@ -809,6 +815,16 @@ export class AuctionService {
}
}
private calculateMaxBidForTeam(team: AuctionTeam): number {
const remainingSlotsAfterCurrentBid = Math.max(
0,
AUCTION_MAX_TEAM_SIZE - this.countTeamMembersIncludingCaptain(team) - 1,
);
const reservedPoints =
remainingSlotsAfterCurrentBid * AUCTION_MIN_BID_POINTS;
return Math.max(0, team.points - reservedPoints);
}
private countTeamMembersIncludingCaptain(team: AuctionTeam): number {
const userIds = new Set<string>([team.captainUserId.toString()]);
for (const member of team.members) {
@@ -1225,7 +1225,6 @@ export const TournamentCodeSchema = new Schema<TournamentCode>(
type: String,
required: true,
trim: true,
uppercase: true,
},
region: { type: String, required: true, default: 'kr' },
mapType: {
@@ -0,0 +1,111 @@
import {
SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
TournamentCodeAutoProvisionService,
} from './tournament-code-auto-provision.service';
import { TournamentCodeService } from './tournament-code.service';
import { TournamentCodeVendorService } from './tournament-code-vendor.service';
describe('TournamentCodeAutoProvisionService', () => {
function createFixture(params?: {
availableCounts?: number[];
vendorCodes?: string[];
}) {
const availableCounts = [...(params?.availableCounts ?? [30])];
const vendorCodes = [...(params?.vendorCodes ?? [])];
const tournamentCodeService = {
countUsableAvailable: jest.fn().mockImplementation(async () => {
return availableCounts.shift() ?? 30;
}),
bulkUpload: jest.fn().mockResolvedValue({
inserted: 1,
duplicates: [],
invalid: [],
}),
} as unknown as jest.Mocked<TournamentCodeService>;
const vendorService = {
fetchTournamentCode: jest.fn().mockImplementation(async () => {
const code = vendorCodes.shift();
if (!code) throw new Error('No vendor code');
return code;
}),
} as unknown as jest.Mocked<TournamentCodeVendorService>;
const service = new TournamentCodeAutoProvisionService(
tournamentCodeService,
vendorService,
);
jest
.spyOn(
service as unknown as { sleepBeforeVendorRequest(): Promise<void> },
'sleepBeforeVendorRequest',
)
.mockResolvedValue(undefined);
return { service, tournamentCodeService, vendorService };
}
it('does nothing when the usable pool already meets the target', async () => {
const { service, tournamentCodeService, vendorService } = createFixture({
availableCounts: [30],
});
await expect(service.ensurePool()).resolves.toMatchObject({
target: 30,
before: 30,
after: 30,
requested: 0,
inserted: 0,
});
expect(vendorService.fetchTournamentCode).not.toHaveBeenCalled();
expect(tournamentCodeService.bulkUpload).not.toHaveBeenCalled();
});
it('requests vendor codes until the pool reaches 30', async () => {
const { service, tournamentCodeService, vendorService } = createFixture({
availableCounts: [28, 29, 30],
vendorCodes: ['KR05090-aBc', 'KR05090-dEf'],
});
const result = await service.ensurePool();
expect(result).toMatchObject({
target: 30,
before: 28,
after: 30,
requested: 2,
inserted: 2,
});
expect(vendorService.fetchTournamentCode).toHaveBeenCalledTimes(2);
expect(
(
service as unknown as {
sleepBeforeVendorRequest: jest.Mock;
}
).sleepBeforeVendorRequest,
).toHaveBeenCalledTimes(2);
expect(tournamentCodeService.bulkUpload).toHaveBeenCalledWith({
uploadedBy: SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
codes: [
expect.objectContaining({
code: 'KR05090-aBc',
source: 'deeplol-vendor',
spectatorType: 'ALL',
}),
],
});
});
it('shares an in-flight refill instead of starting overlapping vendor loops', async () => {
const { service, vendorService } = createFixture({
availableCounts: [29, 30],
vendorCodes: ['KR05090-aBc'],
});
const [left, right] = await Promise.all([
service.ensurePool(),
service.ensurePool(),
]);
expect(left).toBe(right);
expect(vendorService.fetchTournamentCode).toHaveBeenCalledTimes(1);
});
});
@@ -0,0 +1,128 @@
import { Injectable, Logger } from '@nestjs/common';
import mongoose from 'mongoose';
import { TOURNAMENT_CODE_EXPIRY_MARGIN_MS } from './tournament-code.constants';
import { TournamentCodeService } from './tournament-code.service';
import {
resolveVendorRequestDelayMs,
TournamentCodeVendorService,
} from './tournament-code-vendor.service';
const DEFAULT_POOL_TARGET = 30;
const DEFAULT_VENDOR_CODE_EXPIRES_IN_MS = 14 * 24 * 60 * 60 * 1000;
const MAX_REFILL_ATTEMPTS_MULTIPLIER = 2;
export const SYSTEM_TOURNAMENT_CODE_UPLOADED_BY = new mongoose.Types.ObjectId(
'000000000000000000000000',
);
export interface TournamentCodeAutoProvisionResult {
target: number;
before: number;
after: number;
requested: number;
inserted: number;
duplicates: number;
invalid: number;
}
@Injectable()
export class TournamentCodeAutoProvisionService {
private readonly logger = new Logger(TournamentCodeAutoProvisionService.name);
private inFlight?: Promise<TournamentCodeAutoProvisionResult>;
constructor(
private readonly tournamentCodeService: TournamentCodeService,
private readonly vendorService: TournamentCodeVendorService,
) {}
public async ensurePool(): Promise<TournamentCodeAutoProvisionResult> {
if (this.inFlight) return this.inFlight;
this.inFlight = this.refillPool().finally(() => {
this.inFlight = undefined;
});
return this.inFlight;
}
public async sleepBeforeVendorRequest(): Promise<void> {
await sleep(resolveVendorRequestDelayMs());
}
private async refillPool(): Promise<TournamentCodeAutoProvisionResult> {
const target = resolvePoolTarget();
const before = await this.tournamentCodeService.countUsableAvailable();
let after = before;
let requested = 0;
let inserted = 0;
let duplicates = 0;
let invalid = 0;
const maxAttempts = Math.max(
1,
(target - before) * MAX_REFILL_ATTEMPTS_MULTIPLIER,
);
while (after < target && requested < maxAttempts) {
await this.sleepBeforeVendorRequest();
const code = await this.vendorService.fetchTournamentCode();
requested += 1;
const uploadResult = await this.tournamentCodeService.bulkUpload({
uploadedBy: SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
codes: [
{
code,
expiresAt: resolveVendorCodeExpiresAt().toISOString(),
spectatorType: 'ALL',
source: 'deeplol-vendor',
notes: 'auto-provisioned from Deeplol vendor',
},
],
});
inserted += uploadResult.inserted;
duplicates += uploadResult.duplicates.length;
invalid += uploadResult.invalid.length;
after = await this.tournamentCodeService.countUsableAvailable();
}
if (inserted > 0 || before < target) {
this.logger.log(
`Tournament code pool refill: before=${before} after=${after} target=${target} requested=${requested} inserted=${inserted} duplicates=${duplicates} invalid=${invalid}`,
);
}
return {
target,
before,
after,
requested,
inserted,
duplicates,
invalid,
};
}
}
function resolvePoolTarget(): number {
const configured = Number(process.env.TOURNAMENT_CODE_POOL_TARGET);
return Number.isInteger(configured) && configured > 0
? configured
: DEFAULT_POOL_TARGET;
}
function resolveVendorCodeExpiresAt(): Date {
const configuredHours = Number(
process.env.TOURNAMENT_CODE_VENDOR_EXPIRES_IN_HOURS,
);
const expiresInMs =
Number.isFinite(configuredHours) && configuredHours > 0
? configuredHours * 60 * 60 * 1000
: DEFAULT_VENDOR_CODE_EXPIRES_IN_MS;
return new Date(
Date.now() + Math.max(expiresInMs, TOURNAMENT_CODE_EXPIRY_MARGIN_MS),
);
}
function sleep(ms: number): Promise<void> {
return new Promise((resolve) => setTimeout(resolve, ms));
}
@@ -0,0 +1,95 @@
import {
buildDeeplolTournamentCodeRequest,
resolveVendorRequestDelayMs,
TournamentCodeVendorService,
} from './tournament-code-vendor.service';
describe('TournamentCodeVendorService', () => {
const originalFetch = global.fetch;
afterEach(() => {
global.fetch = originalFetch;
jest.restoreAllMocks();
});
it('builds the Deeplol request URL and browser-like headers', () => {
const request = buildDeeplolTournamentCodeRequest();
expect(request.url.toString()).toBe(
'https://b2c-api.deeplol.gg/tournament/tournament_code?server_id=212&server_name=%EB%A1%A4%EB%A6%BC%ED%91%B8%EC%8A%A4&server_comment=LPS_%EB%82%B4%EC%A0%84&spectator_type=ALL&pick_type=TOURNAMENT_DRAFT&map_name=SUMMONERS_RIFT&platform_id=KR',
);
expect(request.headers).toMatchObject({
accept: '*/*',
'accept-encoding': 'gzip, deflate, br, zstd',
'accept-language': 'ko,en;q=0.9,en-US;q=0.8',
'cache-control': 'no-cache',
host: 'b2c-api.deeplol.gg',
origin: 'https://clash.deeplol.gg',
pragma: 'no-cache',
priority: 'u=1, i',
referer: 'https://clash.deeplol.gg/',
'sec-ch-ua':
'"Microsoft Edge";v="149", "Chromium";v="149", "Not)A;Brand";v="24"',
'sec-ch-ua-mobile': '?0',
'sec-ch-ua-platform': '"Windows"',
'sec-fetch-dest': 'empty',
'sec-fetch-mode': 'cors',
'sec-fetch-site': 'same-site',
'user-agent':
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36 Edg/149.0.0.0',
});
expect(Object.keys(request.headers)).not.toContain(':authority');
});
it('fetches the first tournament code from the vendor response', async () => {
global.fetch = jest.fn().mockResolvedValue({
ok: true,
status: 200,
json: jest.fn().mockResolvedValue({
tournament_code_list: [
'KR05090-85d64e26-0a7d-438b-9ada-11784e46add3',
],
}),
});
const service = new TournamentCodeVendorService();
await expect(service.fetchTournamentCode()).resolves.toBe(
'KR05090-85d64e26-0a7d-438b-9ada-11784e46add3',
);
expect(global.fetch).toHaveBeenCalledWith(
expect.stringContaining(
'https://b2c-api.deeplol.gg/tournament/tournament_code?',
),
expect.objectContaining({
method: 'GET',
headers: expect.objectContaining({
origin: 'https://clash.deeplol.gg',
referer: 'https://clash.deeplol.gg/',
}),
signal: expect.any(AbortSignal),
}),
);
});
it('rejects malformed vendor responses', async () => {
global.fetch = jest.fn().mockResolvedValue({
ok: true,
status: 200,
json: jest.fn().mockResolvedValue({
tournament_code_list: [null],
}),
});
const service = new TournamentCodeVendorService();
await expect(service.fetchTournamentCode()).rejects.toThrow(
'Vendor tournament code response is malformed.',
);
});
it('generates mostly near-5-second delays with occasional extra delay', () => {
expect(resolveVendorRequestDelayMs(() => 0.1)).toBe(5_050);
expect(resolveVendorRequestDelayMs(() => 0.84)).toBe(5_420);
expect(resolveVendorRequestDelayMs(() => 0.9)).toBe(8_700);
expect(resolveVendorRequestDelayMs(() => 0)).toBeGreaterThanOrEqual(5_000);
});
});
@@ -0,0 +1,152 @@
import { Injectable } from '@nestjs/common';
const DEFAULT_VENDOR_URL =
'https://b2c-api.deeplol.gg/tournament/tournament_code';
const DEFAULT_FETCH_TIMEOUT_MS = 10_000;
const MIN_REQUEST_DELAY_MS = 5_000;
const DEFAULT_QUERY_PARAMS = {
server_id: '212',
server_name: '롤림푸스',
server_comment: 'LPS_내전',
spectator_type: 'ALL',
pick_type: 'TOURNAMENT_DRAFT',
map_name: 'SUMMONERS_RIFT',
platform_id: 'KR',
} as const;
const BROWSER_LIKE_HEADERS = {
accept: '*/*',
'accept-encoding': 'gzip, deflate, br, zstd',
'accept-language': 'ko,en;q=0.9,en-US;q=0.8',
'cache-control': 'no-cache',
host: 'b2c-api.deeplol.gg',
origin: 'https://clash.deeplol.gg',
pragma: 'no-cache',
priority: 'u=1, i',
referer: 'https://clash.deeplol.gg/',
'sec-ch-ua':
'"Microsoft Edge";v="149", "Chromium";v="149", "Not)A;Brand";v="24"',
'sec-ch-ua-mobile': '?0',
'sec-ch-ua-platform': '"Windows"',
'sec-fetch-dest': 'empty',
'sec-fetch-mode': 'cors',
'sec-fetch-site': 'same-site',
'user-agent':
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36 Edg/149.0.0.0',
} as const;
interface DeeplolTournamentCodeResponse {
tournament_code_list?: unknown;
}
export interface DeeplolTournamentCodeRequest {
url: URL;
headers: Record<string, string>;
}
@Injectable()
export class TournamentCodeVendorService {
public async fetchTournamentCode(): Promise<string> {
const request = buildDeeplolTournamentCodeRequest();
const controller = new AbortController();
const timeout = setTimeout(() => {
controller.abort();
}, resolveFetchTimeoutMs());
try {
const response = await fetch(request.url.toString(), {
method: 'GET',
headers: request.headers,
signal: controller.signal,
});
if (!response.ok) {
throw new Error(
`Vendor tournament code request failed (${response.status}).`,
);
}
const payload = (await response.json()) as DeeplolTournamentCodeResponse;
return parseVendorTournamentCode(payload);
} finally {
clearTimeout(timeout);
}
}
}
export function buildDeeplolTournamentCodeRequest(
env: NodeJS.ProcessEnv = process.env,
): DeeplolTournamentCodeRequest {
const url = new URL(
env.TOURNAMENT_CODE_VENDOR_URL?.trim() || DEFAULT_VENDOR_URL,
);
const params = {
server_id:
env.TOURNAMENT_CODE_VENDOR_SERVER_ID ?? DEFAULT_QUERY_PARAMS.server_id,
server_name:
env.TOURNAMENT_CODE_VENDOR_SERVER_NAME ??
DEFAULT_QUERY_PARAMS.server_name,
server_comment:
env.TOURNAMENT_CODE_VENDOR_SERVER_COMMENT ??
DEFAULT_QUERY_PARAMS.server_comment,
spectator_type:
env.TOURNAMENT_CODE_VENDOR_SPECTATOR_TYPE ??
DEFAULT_QUERY_PARAMS.spectator_type,
pick_type:
env.TOURNAMENT_CODE_VENDOR_PICK_TYPE ?? DEFAULT_QUERY_PARAMS.pick_type,
map_name:
env.TOURNAMENT_CODE_VENDOR_MAP_NAME ?? DEFAULT_QUERY_PARAMS.map_name,
platform_id:
env.TOURNAMENT_CODE_VENDOR_PLATFORM_ID ??
DEFAULT_QUERY_PARAMS.platform_id,
};
for (const [key, value] of Object.entries(params)) {
url.searchParams.set(key, value);
}
return {
url,
headers: {
...BROWSER_LIKE_HEADERS,
host: url.host,
},
};
}
export function resolveVendorRequestDelayMs(
random: () => number = Math.random,
): number {
const roll = clampRandom(random());
if (roll < 0.85) {
return MIN_REQUEST_DELAY_MS + Math.round(roll * 500);
}
return MIN_REQUEST_DELAY_MS + 100 + Math.round(roll * 4_000);
}
function parseVendorTournamentCode(
payload: DeeplolTournamentCodeResponse,
): string {
const codes = payload.tournament_code_list;
if (
!Array.isArray(codes) ||
typeof codes[0] !== 'string' ||
!codes[0].trim()
) {
throw new Error('Vendor tournament code response is malformed.');
}
return codes[0].trim();
}
function resolveFetchTimeoutMs(): number {
const configured = Number(process.env.TOURNAMENT_CODE_VENDOR_TIMEOUT_MS);
return Number.isFinite(configured) && configured > 0
? configured
: DEFAULT_FETCH_TIMEOUT_MS;
}
function clampRandom(value: number): number {
if (!Number.isFinite(value)) return 0;
return Math.min(1, Math.max(0, value));
}
@@ -1,12 +1,19 @@
import { Module } from '@nestjs/common';
import { TournamentCodeController } from './tournament-code.controller';
import { TournamentCodeAutoProvisionService } from './tournament-code-auto-provision.service';
import { TournamentCodeReplacementController } from './tournament-code-replacement.controller';
import { TournamentCodeScheduler } from './tournament-code.scheduler';
import { TournamentCodeService } from './tournament-code.service';
import { TournamentCodeVendorService } from './tournament-code-vendor.service';
@Module({
controllers: [TournamentCodeController, TournamentCodeReplacementController],
providers: [TournamentCodeService, TournamentCodeScheduler],
providers: [
TournamentCodeService,
TournamentCodeVendorService,
TournamentCodeAutoProvisionService,
TournamentCodeScheduler,
],
exports: [TournamentCodeService],
})
export class TournamentCodeModule {}
@@ -1,4 +1,5 @@
import { Injectable, Logger, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
import { TournamentCodeAutoProvisionService } from './tournament-code-auto-provision.service';
import { TournamentCodeService } from './tournament-code.service';
@Injectable()
@@ -6,8 +7,12 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
private readonly logger = new Logger(TournamentCodeScheduler.name);
private attachTimer?: NodeJS.Timeout;
private expireTimer?: NodeJS.Timeout;
private refillTimer?: NodeJS.Timeout;
constructor(private readonly tournamentCodeService: TournamentCodeService) {}
constructor(
private readonly tournamentCodeService: TournamentCodeService,
private readonly autoProvisionService: TournamentCodeAutoProvisionService,
) {}
public onModuleInit() {
this.attachTimer = setInterval(() => {
@@ -16,16 +21,26 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
this.expireTimer = setInterval(() => {
void this.markExpired();
}, 60 * 60 * 1000);
if (isAutoProvisionEnabled()) {
this.refillTimer = setInterval(() => {
void this.ensureVendorPool();
}, 5 * 60 * 1000);
}
this.attachTimer.unref?.();
this.expireTimer.unref?.();
this.refillTimer?.unref?.();
void this.attachPending();
void this.markExpired();
if (isAutoProvisionEnabled()) {
void this.ensureVendorPool();
}
}
public onModuleDestroy() {
if (this.attachTimer) clearInterval(this.attachTimer);
if (this.expireTimer) clearInterval(this.expireTimer);
if (this.refillTimer) clearInterval(this.refillTimer);
}
private async attachPending() {
@@ -54,4 +69,23 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
);
}
}
private async ensureVendorPool() {
try {
await this.autoProvisionService.ensurePool();
} catch (error) {
this.logger.warn(
`Failed to auto-provision tournament codes: ${
error instanceof Error ? error.message : error
}`,
);
}
}
}
function isAutoProvisionEnabled(): boolean {
const raw = process.env.TOURNAMENT_CODE_AUTO_PROVISION_ENABLED
?.trim()
.toLowerCase();
return raw !== 'false' && raw !== '0' && raw !== 'off';
}
@@ -1,4 +1,7 @@
import type { MatchDocument } from '../global/database/schema';
import {
TournamentCodeSchema,
type MatchDocument,
} from '../global/database/schema';
import mongoose from 'mongoose';
import { TournamentCodeService } from './tournament-code.service';
@@ -14,6 +17,7 @@ type TournamentCodeServiceInternals = TournamentCodeService & {
matchId: mongoose.Types.ObjectId;
gameNumber: number;
}): Promise<unknown>;
attachPendingMatches(communityId?: mongoose.Types.ObjectId): Promise<number>;
};
function createService() {
@@ -318,6 +322,89 @@ describe('TournamentCodeService round-robin scheduling', () => {
});
});
describe('TournamentCodeService bulk upload', () => {
it('preserves tournament code casing at the schema layer', async () => {
const connection = mongoose.createConnection();
try {
const TournamentCodeModel = connection.model(
'TournamentCodeCasingSpec',
TournamentCodeSchema,
);
const code = new TournamentCodeModel({
code: ' AbC-12345 ',
expiresAt: new Date(Date.now() + 60 * 60 * 1000),
uploadedBy: new mongoose.Types.ObjectId(),
});
expect(code.code).toBe('AbC-12345');
} finally {
await connection.close();
}
});
it('stores tournament codes with the exact casing from input', async () => {
const insertMany = jest.fn().mockResolvedValue(undefined);
const TournamentCodeModel = {
find: jest.fn().mockReturnValue({
select: jest.fn().mockReturnValue({
lean: jest.fn().mockReturnValue({
exec: jest.fn().mockResolvedValue([]),
}),
}),
}),
insertMany,
};
const connectionService = {
getModel: jest.fn().mockResolvedValue(TournamentCodeModel),
};
const service = new TournamentCodeService(
connectionService as never,
) as unknown as TournamentCodeServiceInternals;
service.attachPendingMatches = jest.fn().mockResolvedValue(0);
await service.bulkUpload({
communityId: new mongoose.Types.ObjectId(),
uploadedBy: new mongoose.Types.ObjectId(),
codes: [
{
code: ' AbC-12345 ',
expiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
},
],
});
expect(insertMany).toHaveBeenCalledWith(
[
expect.objectContaining({
code: 'AbC-12345',
}),
],
{ ordered: false },
);
});
});
describe('TournamentCodeService pool stats', () => {
it('counts only available codes that are usable beyond the expiry margin', async () => {
const countDocuments = jest.fn().mockReturnValue({
exec: jest.fn().mockResolvedValue(12),
});
const connectionService = {
getModel: jest.fn().mockResolvedValue({ countDocuments }),
};
const service = new TournamentCodeService(connectionService as never);
await expect(service.countUsableAvailable()).resolves.toBe(12);
expect(countDocuments).toHaveBeenCalledWith({
state: 'available',
expiresAt: {
$gt: expect.any(Date),
},
});
});
});
describe('TournamentCodeService code replacement', () => {
function queryResult<T>(value: T) {
return { exec: jest.fn().mockResolvedValue(value) };
@@ -37,7 +37,7 @@ export class TournamentCodeService {
constructor(private readonly connectionService: ConnectionService) {}
public async bulkUpload(params: {
communityId: mongoose.Types.ObjectId;
communityId?: mongoose.Types.ObjectId;
uploadedBy: mongoose.Types.ObjectId;
codes: TournamentCodeUploadItem[];
}): Promise<BulkUploadTournamentCodesResponse> {
@@ -121,6 +121,17 @@ export class TournamentCodeService {
};
}
public async countUsableAvailable(): Promise<number> {
const TournamentCodeModel =
await this.connectionService.getModel('tournamentCode');
return TournamentCodeModel.countDocuments({
state: 'available',
expiresAt: {
$gt: new Date(Date.now() + TOURNAMENT_CODE_EXPIRY_MARGIN_MS),
},
}).exec();
}
public async list(params: {
state?: TournamentCodeState;
limit?: number;
@@ -492,7 +503,7 @@ export class TournamentCodeService {
}
private normalizeCode(code: string | undefined): string {
return (code ?? '').trim().toUpperCase();
return (code ?? '').trim();
}
private replaceTournamentCodeId(
@@ -101,6 +101,180 @@ describe('TournamentResultService round-robin scheduling', () => {
});
});
describe('TournamentResultService tournament code polling', () => {
function queryResult<T>(value: T) {
return { exec: jest.fn().mockResolvedValue(value) };
}
function sortedQueryResult<T>(value: T) {
return {
sort: jest.fn().mockReturnValue(queryResult(value)),
};
}
function createPollFixture(params: {
storedCode: string;
riotTournamentCode: string;
}) {
const communityId = new mongoose.Types.ObjectId();
const matchId = new mongoose.Types.ObjectId();
const codeId = new mongoose.Types.ObjectId();
const users = Array.from({ length: 10 }, (_, index) => ({
userId: new mongoose.Types.ObjectId(),
puuid: `poll-puuid-${index + 1}`,
}));
const match = {
_id: matchId,
communityId,
status: 'team-built',
teamBuiltAt: new Date('2026-05-03T10:00:00.000Z'),
gameCount: 1,
gameMode: 'pair',
tournamentCodeIds: [codeId],
gameSchedule: [],
resultPollState: {
startedAt: new Date(),
matchedCount: 0,
expandedToAllPuuids: true,
state: 'polling',
},
participants: users.map((user) => ({
userId: user.userId,
puuid: user.puuid,
excluded: false,
})),
teams: [
{
teamIndex: 1,
members: users.slice(0, 5).map((user) => ({ userId: user.userId })),
},
{
teamIndex: 2,
members: users.slice(5).map((user) => ({ userId: user.userId })),
},
],
save: jest.fn().mockResolvedValue(undefined),
} as unknown as MatchDocument & {
save: jest.Mock;
result?: MatchDocument['result'];
};
const code = {
_id: codeId,
code: params.storedCode,
state: 'reserved',
gameNumber: 1,
riotMatchId: undefined,
save: jest.fn().mockResolvedValue(undefined),
};
const detail = {
metadata: {
matchId: 'KR_9876543210',
participants: users.map((user) => user.puuid),
},
info: {
tournamentCode: params.riotTournamentCode,
gameCreation: Date.parse('2026-05-03T10:30:00.000Z'),
gameEndTimestamp: Date.parse('2026-05-03T11:00:00.000Z'),
gameDuration: 1800,
participants: users.map((user, index) => ({
puuid: user.puuid,
teamId: index < 5 ? 100 : 200,
championId: 1,
kills: 1,
deaths: 1,
assists: 1,
win: index < 5,
})),
teams: [
{ teamId: 100, win: true },
{ teamId: 200, win: false },
],
},
} as unknown as RiotMatchDto;
const TournamentCodeModel = {
find: jest
.fn()
.mockReturnValueOnce(sortedQueryResult([code]))
.mockReturnValueOnce(sortedQueryResult([code])),
exists: jest.fn().mockResolvedValue(null),
};
const RiotMatchModel = {
findOne: jest.fn().mockReturnValue(queryResult(null)),
updateOne: jest.fn().mockReturnValue(queryResult(undefined)),
};
const CommunityModel = {
findById: jest.fn().mockReturnValue({
select: jest.fn().mockReturnValue({
lean: jest.fn().mockReturnValue(queryResult({ riotRegion: 'asia' })),
}),
}),
};
const connectionService = {
getModel: jest.fn().mockImplementation(async (name: string) => {
if (name === 'match') {
return { findById: jest.fn().mockResolvedValue(match) };
}
if (name === 'tournamentCode') return TournamentCodeModel;
if (name === 'community') return CommunityModel;
if (name === 'riotMatch') return RiotMatchModel;
throw new Error(`Unexpected model: ${name}`);
}),
};
const riotMatchService = {
getMatchIdsByPuuid: jest.fn().mockResolvedValue(['KR_9876543210']),
getMatch: jest.fn().mockResolvedValue(detail),
};
const riotJobQueueService = {
enqueueTournamentResultPoll: jest.fn().mockResolvedValue(undefined),
};
const service = new TournamentResultService(
connectionService as never,
riotMatchService as never,
riotJobQueueService as never,
{ invalidateCommunity: jest.fn().mockResolvedValue(undefined) } as never,
{ buildAndUpsert: jest.fn().mockResolvedValue(undefined) } as never,
);
return { service, match, code };
}
it('matches Riot tournament codes using exact casing', async () => {
const { service, match, code } = createPollFixture({
storedCode: 'AbC-12345',
riotTournamentCode: 'AbC-12345',
});
await service.processPollJob({
matchId: match._id.toString(),
attempt: 1,
expandedToAllPuuids: true,
});
expect(code.state).toBe('used');
expect(code.riotMatchId).toBe('KR_9876543210');
expect(code.save).toHaveBeenCalled();
expect(match.result?.games).toHaveLength(1);
});
it('does not match tournament codes when casing differs', async () => {
const { service, match, code } = createPollFixture({
storedCode: 'ABC-12345',
riotTournamentCode: 'abc-12345',
});
await service.processPollJob({
matchId: match._id.toString(),
attempt: 1,
expandedToAllPuuids: true,
});
expect(code.state).toBe('reserved');
expect(code.riotMatchId).toBeUndefined();
expect(code.save).not.toHaveBeenCalled();
expect(match.result?.games).toBeUndefined();
});
});
describe('TournamentResultService manual result collection', () => {
function createManualFixture() {
const communityId = new mongoose.Types.ObjectId();
@@ -262,7 +262,7 @@ export class TournamentResultService {
);
continue;
}
const tournamentCode = detail.info.tournamentCode?.trim().toUpperCase();
const tournamentCode = detail.info.tournamentCode?.trim();
if (!tournamentCode) continue;
const code = unmatchedByCode.get(tournamentCode);
+1 -1
View File
@@ -1,4 +1,4 @@
VITE_API_BASE_URL=http://localhost:3000
VITE_API_BASE_URL=http://126.dahyeon.us:3000
VITE_DEFAULT_COMMUNITY_ID=69ebe0adf627c11be2f020a1
VITE_MSAL_CLIENT_ID=15fb5a20-47e0-44fa-9a41-b50ca9d0e7e3
VITE_MSAL_AUTHORITY=https://login.microsoftonline.com/5ef88004-e953-4b04-93db-64bbf49c6863
+28 -14
View File
@@ -36,6 +36,9 @@ export interface TeamParticipantView extends ParticipantView {
export interface TeamView {
teamIndex: number;
name: string;
captainUserId?: string;
captainName?: string;
captainTag?: string;
participants: TeamParticipantView[];
}
@@ -413,21 +416,32 @@ export function mapApiMatchToMatchDetail(match: ApiMatch): MatchDetailView {
participants.map((participant) => [participant.userId, participant]),
);
const teams = match.teams.map((team) => ({
teamIndex: team.teamIndex,
name: teamIndexLabel(team.teamIndex, team.name),
participants: team.members.map((member) => {
const participant =
participantLookup.get(member.userId) ??
createFallbackParticipant(member.userId);
const teams = match.teams.map((team) => {
const captain = team.captainUserId
? participantLookup.get(team.captainUserId)
: undefined;
return {
...participant,
assignedPosition: member.assignedPosition,
cost: member.cost,
};
}),
}));
return {
teamIndex: team.teamIndex,
name: teamIndexLabel(team.teamIndex, team.name),
captainUserId: team.captainUserId,
captainName:
captain?.summonerName ??
(team.captainUserId ? `User ${team.captainUserId.slice(-4)}` : undefined),
captainTag: captain?.tag,
participants: team.members.map((member) => {
const participant =
participantLookup.get(member.userId) ??
createFallbackParticipant(member.userId);
return {
...participant,
assignedPosition: member.assignedPosition,
cost: member.cost,
};
}),
};
});
const winnerTeam = match.result?.winnerTeamIndex
? teams.find((team) => team.teamIndex === match.result?.winnerTeamIndex)
+18
View File
@@ -30,6 +30,11 @@ interface ResetPayload {
matchId?: string;
}
interface TickPayload {
deadline?: string;
serverTime?: string;
}
const MAX_CHAT_MESSAGES = 200;
function mergeChatMessages(
@@ -55,6 +60,7 @@ export function useAuctionSocket(matchId: string | undefined) {
const [connectionStatus, setConnectionStatus] =
useState<ConnectionStatus>('idle');
const [error, setError] = useState<string | null>(null);
const [serverTimeOffsetMs, setServerTimeOffsetMs] = useState(0);
useEffect(() => {
if (!matchId) {
@@ -100,6 +106,16 @@ export function useAuctionSocket(matchId: string | undefined) {
setError(null);
});
socket.on('tick', (payload: TickPayload) => {
const serverTime =
typeof payload?.serverTime === 'string'
? Date.parse(payload.serverTime)
: NaN;
if (Number.isFinite(serverTime)) {
setServerTimeOffsetMs(serverTime - Date.now());
}
});
socket.on('chat-history', (payload: ChatHistoryPayload) => {
setChatMessages(mergeChatMessages([], payload.messages ?? []));
});
@@ -129,6 +145,7 @@ export function useAuctionSocket(matchId: string | undefined) {
socket?.disconnect();
socketRef.current = null;
setConnectionStatus('idle');
setServerTimeOffsetMs(0);
};
}, [authUserId, matchId]);
@@ -160,6 +177,7 @@ export function useAuctionSocket(matchId: string | undefined) {
resetAt,
connectionStatus: visibleConnectionStatus,
error,
serverTimeOffsetMs: matchId ? serverTimeOffsetMs : 0,
placeBid(payload: BidPayload) {
emit('bid', payload);
},
+93 -25
View File
@@ -48,6 +48,7 @@ import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge';
import type {
ApiAuction,
ApiAuctionChatMessage,
ApiTierHistoryEntry,
ApiRiotLaneStats,
ApiUser,
Position,
@@ -125,6 +126,7 @@ function pickLatestAuction(
}
const AUCTION_MAX_TEAM_SIZE = 5;
const AUCTION_MIN_BID_POINTS = 10;
const LANE_ROWS: Position[] = ['TOP', 'JGL', 'MID', 'ADC', 'SUP'];
const POSITION_TO_RIOT_LANE = {
TOP: 'TOP',
@@ -134,6 +136,28 @@ const POSITION_TO_RIOT_LANE = {
SUP: 'UTILITY',
} as const;
function getAuctionTeamSize(team: AuctionStateView['teams'][number]) {
return team.members.length + 1;
}
function getReservedPointsAfterCurrentBid(
team: AuctionStateView['teams'][number],
) {
const remainingSlotsAfterCurrentBid = Math.max(
0,
AUCTION_MAX_TEAM_SIZE - getAuctionTeamSize(team) - 1,
);
return remainingSlotsAfterCurrentBid * AUCTION_MIN_BID_POINTS;
}
function getMaxBidForTeam(team: AuctionStateView['teams'][number]) {
return Math.max(0, team.points - getReservedPointsAfterCurrentBid(team));
}
function getSoloTierHistory(entries: ApiTierHistoryEntry[]) {
return entries.filter((entry) => entry.queueType === 'RANKED_SOLO_5x5');
}
function PosBadge({ pos }: { pos: Position }) {
return (
<span className="inline-flex items-center gap-1.5 text-xs font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
@@ -291,7 +315,7 @@ function TeamPanel({
}) {
const { data: ddragon } = useDdragonManifest();
const tone = teamIndexColorClasses(team.teamIndex);
const teamSize = team.members.length + 1;
const teamSize = getAuctionTeamSize(team);
const isFull = teamSize >= AUCTION_MAX_TEAM_SIZE;
return (
@@ -389,16 +413,19 @@ function PlayerSpotlight({
}) {
const { data: ddragon } = useDdragonManifest();
const player = state.currentPlayer;
const snapshotSoloTierHistory = player
? getSoloTierHistory(player.tierHistory)
: [];
const historyProfileQuery = useUserHistoryProfile(
player?.userId,
DEFAULT_COMMUNITY_ID,
Boolean(player && player.tierHistory.length === 0),
Boolean(player && snapshotSoloTierHistory.length === 0),
);
if (!player) return null;
const tierHistory =
player.tierHistory.length > 0
? player.tierHistory
: (historyProfileQuery.data?.tierHistory ?? []);
snapshotSoloTierHistory.length > 0
? snapshotSoloTierHistory
: getSoloTierHistory(historyProfileQuery.data?.tierHistory ?? []);
return (
<div className="border border-base-content/10 bg-base-100">
@@ -453,6 +480,7 @@ function PlayerSpotlight({
}
>
<TierHistoryChart
key={`${player.userId}-solo-tier-history`}
entries={tierHistory}
className="border-b border-base-content/8 bg-base-100 overflow-hidden"
summaryVariant="inline"
@@ -553,16 +581,22 @@ function BidControls({
onBid: (teamIndex: number, amount: number) => void;
}) {
const [bidAmount, setBidAmount] = useState(100);
const minBid = state.currentBid + 10;
const minBid = state.currentBid + AUCTION_MIN_BID_POINTS;
const activeTeam = captainRole
? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
: null;
const activeTeamSize = activeTeam ? activeTeam.members.length + 1 : 0;
const activeTeamSize = activeTeam ? getAuctionTeamSize(activeTeam) : 0;
const isActiveTeamFull = activeTeamSize >= AUCTION_MAX_TEAM_SIZE;
const reservedPoints = activeTeam
? getReservedPointsAfterCurrentBid(activeTeam)
: 0;
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
useEffect(() => {
setBidAmount(Math.max(minBid, Math.ceil(minBid / 10) * 10));
}, [state.currentBid, minBid]);
const nextBid = Math.max(minBid, Math.ceil(minBid / 10) * 10);
setBidAmount(activeTeam ? Math.min(maxBid, nextBid) : nextBid);
}, [activeTeam, maxBid, minBid]);
if (state.phase !== 'bidding') return null;
@@ -578,16 +612,40 @@ function BidControls({
return (
<div className="border border-base-content/10 bg-base-100 p-4">
<div className="mb-3 grid grid-cols-2 gap-2 text-xs sm:grid-cols-3">
<div className="border border-base-content/10 px-2.5 py-2">
<div className="text-base-content/30">보유</div>
<div className="mt-0.5 font-bold tabular-nums text-base-content">
{formatPoints(activeTeam.points)}P
</div>
</div>
<div className="border border-primary/20 bg-primary/5 px-2.5 py-2">
<div className="text-primary/70">이번 최대</div>
<div className="mt-0.5 font-black tabular-nums text-primary">
{formatPoints(maxBid)}P
</div>
</div>
<div
className="border border-base-content/10 px-2.5 py-2 text-base-content/45"
title={`현재 선수를 낙찰받은 뒤 남은 자리를 채우도록 자리당 ${AUCTION_MIN_BID_POINTS}P씩 보존합니다.`}
aria-label={`보존 ${reservedPoints}P. 현재 선수를 낙찰받은 뒤 남은 자리를 채우도록 자리당 ${AUCTION_MIN_BID_POINTS}P씩 보존합니다.`}
>
<div>보존</div>
<div className="mt-0.5 font-bold tabular-nums">
{formatPoints(reservedPoints)}P
</div>
</div>
</div>
<div className="flex items-center gap-2 mb-3 flex-wrap">
{presets.map((preset) => (
<button
key={preset}
onClick={() => setBidAmount(Math.max(minBid, preset))}
disabled={isActiveTeamFull}
onClick={() => setBidAmount(Math.min(maxBid, Math.max(minBid, preset)))}
disabled={!canAffordNextBid || Math.max(minBid, preset) > maxBid}
className={`text-xs px-2.5 py-1 border transition-colors ${
bidAmount === preset
? 'border-primary/40 bg-primary/10 text-primary'
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20'
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20 disabled:opacity-30 disabled:cursor-not-allowed'
}`}
>
{preset}P
@@ -597,18 +655,19 @@ function BidControls({
type="number"
value={bidAmount}
onChange={(event) =>
setBidAmount(Math.max(minBid, Number(event.target.value)))
setBidAmount(Math.min(maxBid, Math.max(minBid, Number(event.target.value))))
}
min={minBid}
disabled={isActiveTeamFull}
max={maxBid}
disabled={!canAffordNextBid}
className="w-24 text-xs px-2 py-1 border border-base-content/10 bg-transparent text-base-content tabular-nums text-right focus:outline-none focus:border-primary/30"
/>
</div>
<button
onClick={() => onBid(activeTeam.teamIndex, bidAmount)}
disabled={
isActiveTeamFull ||
bidAmount > activeTeam.points ||
!canAffordNextBid ||
bidAmount > maxBid ||
bidAmount <= state.currentBid
}
className={`w-full py-2 text-xs font-bold uppercase tracking-wide border transition-colors disabled:opacity-30 disabled:cursor-not-allowed ${
@@ -617,6 +676,8 @@ function BidControls({
>
{isActiveTeamFull
? `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 정원 완료 (${activeTeamSize}/${AUCTION_MAX_TEAM_SIZE})`
: !canAffordNextBid
? `입찰 불가 (다음 ${formatPoints(minBid)}P · 최대 ${formatPoints(maxBid)}P)`
: `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 입찰 (${formatPoints(bidAmount)}P)`}
</button>
</div>
@@ -624,10 +685,12 @@ function BidControls({
}
function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
const endRef = useRef<HTMLDivElement>(null);
const scrollRef = useRef<HTMLDivElement>(null);
useEffect(() => {
endRef.current?.scrollIntoView({ behavior: 'smooth' });
const scrollContainer = scrollRef.current;
if (!scrollContainer) return;
scrollContainer.scrollTop = scrollContainer.scrollHeight;
}, [bids.length]);
if (bids.length === 0) return null;
@@ -639,7 +702,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
입찰 기록
</span>
</div>
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
<div ref={scrollRef} className="max-h-28 overflow-y-auto p-2 space-y-0.5">
{bids.map((bid, index) => (
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-xs">
<span
@@ -653,7 +716,6 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
</span>
</div>
))}
<div ref={endRef} />
</div>
</div>
);
@@ -719,9 +781,14 @@ export default function AuctionPage() {
}, [showCancelModal]);
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
const syncedNow = now + socket.serverTimeOffsetMs;
const auctionState =
liveAuction && matchQuery.data
? mapApiAuctionToAuctionState(liveAuction, matchQuery.data, new Date(now))
? mapApiAuctionToAuctionState(
liveAuction,
matchQuery.data,
new Date(syncedNow),
)
: null;
const availableTeamIndexes = useMemo(() => {
const indexes = new Set((auctionState?.teams ?? []).map((team) => team.teamIndex));
@@ -1391,13 +1458,15 @@ function ChatPanel({
className?: string;
}) {
const [draft, setDraft] = useState('');
const messagesEndRef = useRef<HTMLDivElement | null>(null);
const messagesScrollRef = useRef<HTMLDivElement | null>(null);
const trimmedDraft = draft.trim();
const isConnected = connectionStatus === 'connected';
const canSend = isConnected && trimmedDraft.length > 0;
useEffect(() => {
messagesEndRef.current?.scrollIntoView({ block: 'end' });
const scrollContainer = messagesScrollRef.current;
if (!scrollContainer) return;
scrollContainer.scrollTop = scrollContainer.scrollHeight;
}, [messages.length]);
function handleSubmit(event: FormEvent<HTMLFormElement>) {
@@ -1439,7 +1508,7 @@ function ChatPanel({
</span>
</div>
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
<div ref={messagesScrollRef} className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
{messages.length === 0 ? (
<div className="flex h-full items-center justify-center text-center text-xs text-base-content/25">
아직 메시지가 없습니다
@@ -1463,7 +1532,6 @@ function ChatPanel({
))}
</ol>
)}
<div ref={messagesEndRef} />
</div>
<form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">
+331 -96
View File
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { AlertTriangle, Search, X } from "lucide-react";
import { AlertTriangle, ChevronRight, Search, X } from "lucide-react";
import { Link, useLocation, useNavigate, useParams } from "react-router";
import {
useAuction,
@@ -29,7 +29,6 @@ import { profileIconUrl } from "../lib/ddragon";
import {
POSITION_ORDER,
positionLabel,
sideShortLabel,
teamIndexColorClasses,
teamIndexLabel,
} from "../lib/league";
@@ -44,7 +43,6 @@ import type {
ManualTournamentResultCollectResponse,
MatchGameMode,
Position,
TeamSide,
TournamentCodeSlotView,
} from "../api/types";
@@ -1311,21 +1309,33 @@ function TeamCard({
<div
className={`${tone.bg} px-4 py-2 flex items-center justify-between border-b ${tone.border}`}
>
<div className="flex items-center gap-2">
<span
className={`text-xs font-bold uppercase tracking-wide ${tone.text}`}
>
{team.name}
</span>
{isWinner && (
<span className="inline-flex items-center text-xs font-bold px-1.5 py-0.5 bg-accent/15 text-amber-400 border border-accent/20">
WIN
<div className="min-w-0">
<div className="flex items-center gap-2">
<span
className={`text-xs font-bold uppercase tracking-wide ${tone.text}`}
>
{team.name}
</span>
{isWinner && (
<span className="inline-flex items-center text-xs font-bold px-1.5 py-0.5 bg-accent/15 text-amber-400 border border-accent/20">
WIN
</span>
)}
</div>
{team.captainName && (
<div className="mt-0.5 truncate text-xs text-base-content/35">
팀장 {team.captainName}
{team.captainTag ? (
<span className="ml-1 text-base-content/20">
#{team.captainTag}
</span>
) : null}
</div>
)}
</div>
<Link
to={`/match/${matchId}/team/${team.teamIndex}`}
className="text-xs font-bold text-base-content/35 hover:text-primary"
className="shrink-0 text-xs font-bold text-base-content/35 hover:text-primary"
>
진행 페이지
</Link>
@@ -1621,28 +1631,64 @@ function PoolStatsHint({ enabled }: { enabled: boolean }) {
);
}
function formatGameDuration(seconds: number) {
const minutes = Math.floor(seconds / 60);
const rest = seconds % 60;
return `${minutes}:${String(rest).padStart(2, "0")}`;
const KST_GAME_START_FORMATTER = new Intl.DateTimeFormat("ko-KR", {
timeZone: "Asia/Seoul",
month: "numeric",
day: "numeric",
hour: "numeric",
minute: "2-digit",
hour12: true,
});
function formatGameStartKst(timestamp: number) {
const date = new Date(timestamp);
if (Number.isNaN(date.getTime())) return "-";
const parts = KST_GAME_START_FORMATTER.formatToParts(date);
const value = (type: Intl.DateTimeFormatPartTypes) =>
parts.find((part) => part.type === type)?.value ?? "";
const month = value("month");
const day = value("day");
const dayPeriod = value("dayPeriod");
const hour = value("hour");
const minute = value("minute");
return `${month}/${day} ${dayPeriod} ${hour}:${minute}`.trim();
}
function resultSideClass(side: "blue" | "red") {
return side === "blue" ? "text-blue-400" : "text-red-400";
}
function resultSideLabel(side: TeamSide) {
return sideShortLabel(side);
function resolveMatchTeam(match: MatchDetailView, teamIndex: number) {
return match.teams.find((item) => item.teamIndex === teamIndex);
}
function resolveMatchTeamName(match: MatchDetailView, teamIndex: number) {
const team = match.teams.find((item) => item.teamIndex === teamIndex);
const team = resolveMatchTeam(match, teamIndex);
return teamIndexLabel(teamIndex, team?.name);
}
function resolveMatchCaptainName(match: MatchDetailView, teamIndex: number) {
return resolveMatchTeam(match, teamIndex)?.captainName ?? "팀장 미지정";
}
function getMatchResultGameCapacity(match: MatchDetailView) {
return Math.max(
match.gameCount,
match.tournamentCodes.length,
...(match.result?.games.map((game) => game.gameNumber) ?? []),
);
}
type RoundRobinStandingResult = {
gameNumber: number;
opponentTeamIndex: number;
opponentName: string;
won: boolean;
};
type RoundRobinStanding = {
teamIndex: number;
name: string;
captainName?: string;
captainTag?: string;
seriesWins: number;
seriesLosses: number;
gameWins: number;
@@ -1653,6 +1699,7 @@ type RoundRobinStanding = {
assists: number;
kdaScore: number;
winRate: number;
matchResults: RoundRobinStandingResult[];
};
function formatRecordRate(value: number) {
@@ -1661,7 +1708,12 @@ function formatRecordRate(value: number) {
}
function formatSignedNumber(value: number) {
return String(value);
return value > 0 ? `+${value}` : String(value);
}
function formatWinRate(value: number) {
if (!Number.isFinite(value)) return "-";
return `${Math.round(value * 100)}%`;
}
function formatKda(standing: RoundRobinStanding) {
@@ -1679,10 +1731,13 @@ function buildRoundRobinStandings(
const getStanding = (teamIndex: number) => {
const existing = standings.get(teamIndex);
if (existing) return existing;
const team = resolveMatchTeam(match, teamIndex);
const standing: RoundRobinStanding = {
teamIndex,
name: resolveMatchTeamName(match, teamIndex),
captainName: team?.captainName,
captainTag: team?.captainTag,
seriesWins: 0,
seriesLosses: 0,
gameWins: 0,
@@ -1693,6 +1748,7 @@ function buildRoundRobinStandings(
assists: 0,
kdaScore: 0,
winRate: 0,
matchResults: [],
};
standings.set(teamIndex, standing);
return standing;
@@ -1730,6 +1786,21 @@ function buildRoundRobinStandings(
});
match.result?.games.forEach((game) => {
const blueTeam = getStanding(game.blueTeamIndex);
const redTeam = getStanding(game.redTeamIndex);
blueTeam.matchResults.push({
gameNumber: game.gameNumber,
opponentTeamIndex: game.redTeamIndex,
opponentName: redTeam.name,
won: game.winnerTeamIndex === game.blueTeamIndex,
});
redTeam.matchResults.push({
gameNumber: game.gameNumber,
opponentTeamIndex: game.blueTeamIndex,
opponentName: blueTeam.name,
won: game.winnerTeamIndex === game.redTeamIndex,
});
game.participants.forEach((participant) => {
const standing = getStanding(participant.teamIndex);
standing.kills += participant.kills;
@@ -1746,6 +1817,9 @@ function buildRoundRobinStandings(
standing.deaths > 0
? (standing.kills + standing.assists) / standing.deaths
: standing.kills + standing.assists;
standing.matchResults.sort(
(left, right) => left.gameNumber - right.gameNumber,
);
});
return [...standings.values()].sort((left, right) => {
@@ -1771,6 +1845,45 @@ function buildRoundRobinStandings(
});
}
function StandingResultChips({
results,
limit = 4,
}: {
results: RoundRobinStandingResult[];
limit?: number;
}) {
if (results.length === 0) {
return <span className="text-xs text-base-content/25">경기 없음</span>;
}
const visibleResults = results.slice(0, limit);
const hiddenCount = Math.max(0, results.length - visibleResults.length);
return (
<div className="flex min-w-0 flex-wrap gap-1.5">
{visibleResults.map((result) => (
<span
key={`${result.gameNumber}-${result.opponentTeamIndex}`}
className={`inline-flex items-center gap-1 border px-1.5 py-0.5 text-[11px] font-semibold ${
result.won
? "border-primary/20 bg-primary/5 text-primary"
: "border-base-content/10 bg-base-200/35 text-base-content/45"
}`}
>
<span className="font-black">{result.won ? "W" : "L"}</span>
<span className="text-base-content/35">vs</span>
<span className="max-w-16 truncate">{result.opponentName}</span>
</span>
))}
{hiddenCount > 0 && (
<span className="inline-flex items-center border border-base-content/8 px-1.5 py-0.5 text-[11px] font-semibold text-base-content/35">
+{hiddenCount}
</span>
)}
</div>
);
}
function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
const standings = buildRoundRobinStandings(match);
@@ -1796,21 +1909,108 @@ function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
</div>
)}
</div>
<div className="mt-4 overflow-x-auto border border-base-content/8">
<table className="min-w-[760px] w-full text-xs">
<div className="mt-4 space-y-3 md:hidden">
{standings.map((standing, index) => {
const tone = teamIndexColorClasses(standing.teamIndex);
const isWinner = match.result?.winnerTeamIndex === standing.teamIndex;
return (
<div
key={standing.teamIndex}
className={`relative border bg-base-100 p-3 ${
isWinner ? "border-primary/25" : "border-base-content/8"
}`}
>
<span
className={`absolute left-0 top-0 h-full w-0.5 ${tone.bar}`}
aria-hidden="true"
/>
<div className="flex items-start justify-between gap-3">
<div className="min-w-0">
<div className="flex items-center gap-2">
<span className="inline-flex h-7 w-7 items-center justify-center bg-base-200 text-sm font-black text-base-content">
{index + 1}
</span>
<div className="min-w-0">
<div className="truncate text-sm font-black text-base-content">
{standing.name}
</div>
<div className="truncate text-xs text-base-content/35">
팀장 {standing.captainName ?? "미지정"}
{standing.captainTag ? (
<span className="ml-1 text-base-content/20">
#{standing.captainTag}
</span>
) : null}
</div>
</div>
</div>
</div>
{isWinner && (
<span className="shrink-0 border border-primary/20 bg-primary/5 px-1.5 py-0.5 text-[11px] font-bold text-primary">
1위
</span>
)}
</div>
<div className="mt-3 grid grid-cols-4 gap-2 text-center text-xs">
<div className="bg-base-200/35 px-2 py-2">
<div className="text-base-content/30">전적</div>
<div className="mt-0.5 font-black text-base-content">
{standing.seriesWins}승 {standing.seriesLosses}패
</div>
</div>
<div className="bg-base-200/35 px-2 py-2">
<div className="text-base-content/30">세트</div>
<div className="mt-0.5 font-bold tabular-nums text-base-content/75">
{standing.gameWins}-{standing.gameLosses}
</div>
</div>
<div className="bg-base-200/35 px-2 py-2">
<div className="text-base-content/30">득실</div>
<div className="mt-0.5 font-bold tabular-nums text-base-content/75">
{formatSignedNumber(standing.gameDiff)}
</div>
</div>
<div className="bg-base-200/35 px-2 py-2">
<div className="text-base-content/30">승률</div>
<div className="mt-0.5 font-bold tabular-nums text-base-content/75">
{formatWinRate(standing.winRate)}
</div>
</div>
</div>
<div className="mt-3">
<div className="mb-1 text-xs font-bold text-base-content/35">
경기 흐름
</div>
<StandingResultChips results={standing.matchResults} limit={5} />
</div>
<div className="mt-3 flex items-center justify-between border-t border-base-content/8 pt-2 text-xs">
<span className="text-base-content/35">K/D/A</span>
<span className="font-mono text-base-content/70">
{standing.kills} / {standing.deaths} / {standing.assists}
</span>
<span className="font-mono font-bold text-base-content/70">
KDA {formatKda(standing)}
</span>
</div>
</div>
);
})}
</div>
<div className="mt-4 hidden overflow-x-auto border border-base-content/8 md:block">
<table className="min-w-[920px] w-full text-xs">
<thead className="bg-base-100 text-xs text-base-content/45">
<tr className="border-b border-base-content/8">
<th className="h-9 px-3 text-left font-semibold">팀 순위</th>
<th className="h-9 px-3 text-left font-semibold">팀 / 팀장</th>
<th className="h-9 px-3 text-center font-semibold bg-primary/5 text-primary">
승
전적
</th>
<th className="h-9 px-3 text-center font-semibold">패</th>
<th className="h-9 px-3 text-center font-semibold">득실차</th>
<th className="h-9 px-3 text-center font-semibold">세트</th>
<th className="h-9 px-3 text-center font-semibold">득실</th>
<th className="h-9 px-3 text-center font-semibold">승률</th>
<th className="h-9 px-3 text-left font-semibold">경기 흐름</th>
<th className="h-9 px-3 text-center font-semibold">K/D/A</th>
<th className="h-9 px-3 text-center font-semibold">KDA</th>
<th className="h-9 px-3 text-center font-semibold">킬</th>
<th className="h-9 px-3 text-center font-semibold">데스</th>
<th className="h-9 px-3 text-center font-semibold">어시스트</th>
</tr>
</thead>
<tbody className="divide-y divide-base-content/8 bg-base-100/60">
@@ -1833,35 +2033,49 @@ function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
className={`h-6 w-1 shrink-0 ${tone.bar}`}
aria-hidden="true"
/>
<span className="min-w-0 truncate font-semibold text-base-content/85">
{standing.name}
</span>
<div className="min-w-0">
<div className="flex min-w-0 items-center gap-2">
<span className="min-w-0 truncate font-semibold text-base-content/85">
{standing.name}
</span>
{isWinner && (
<span className="shrink-0 border border-primary/20 bg-primary/5 px-1 py-0.5 text-[10px] font-bold text-primary">
1위
</span>
)}
</div>
<div className="mt-0.5 truncate text-xs text-base-content/35">
팀장 {standing.captainName ?? "미지정"}
{standing.captainTag ? (
<span className="ml-1 text-base-content/20">
#{standing.captainTag}
</span>
) : null}
</div>
</div>
</div>
</td>
<td className="h-14 px-3 text-center font-black tabular-nums bg-primary/5 text-primary">
{standing.seriesWins}
{standing.seriesWins}승 {standing.seriesLosses}패
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{standing.seriesLosses}
{standing.gameWins}-{standing.gameLosses}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{formatSignedNumber(standing.gameDiff)}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{formatRecordRate(standing.winRate)}
{formatWinRate(standing.winRate)}
</td>
<td className="h-14 px-3 text-left">
<StandingResultChips results={standing.matchResults} />
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{standing.kills} / {standing.deaths} / {standing.assists}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{formatKda(standing)}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{standing.kills}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{standing.deaths}
</td>
<td className="h-14 px-3 text-center tabular-nums text-base-content/70">
{standing.assists}
</td>
</tr>
);
})}
@@ -1875,11 +2089,7 @@ function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
function MatchStandingsSection({ match }: { match: MatchDetailView }) {
if (!match.result) return null;
const maxGameNumber = Math.max(
match.gameCount,
match.tournamentCodes.length,
...match.result.games.map((game) => game.gameNumber),
);
const maxGameNumber = getMatchResultGameCapacity(match);
const seriesResults = match.result.seriesResults ?? [];
const primarySeries = seriesResults[0];
const showRoundRobinStandings =
@@ -1957,56 +2167,62 @@ function MatchGameListSection({ match }: { match: MatchDetailView }) {
const gamesByNumber = new Map(
match.result.games.map((game) => [game.gameNumber, game]),
);
const maxGameNumber = Math.max(
match.gameCount,
match.tournamentCodes.length,
...match.result.games.map((game) => game.gameNumber),
);
const maxGameNumber = getMatchResultGameCapacity(match);
const gameNumbers = Array.from(
{ length: maxGameNumber },
(_, index) => index + 1,
);
return (
<div className="border border-base-content/8 divide-y divide-base-content/8">
<div className="border border-base-content/8 divide-y divide-base-content/8 bg-base-100">
{gameNumbers.map((gameNumber) => {
const game = gamesByNumber.get(gameNumber);
const rowClass =
"grid grid-cols-[56px_1fr_auto] gap-3 items-center px-3 py-2.5 text-xs";
"grid grid-cols-[52px_minmax(0,1fr)_auto] gap-3 px-3 py-3 text-sm";
const content = (
<>
<span className="text-base-content/35 font-bold">
<span className="pt-0.5 text-xs font-bold text-base-content/35">
{gameNumber}경기
</span>
{game ? (
<div className="min-w-0">
<span
className={`font-black ${resultSideClass(game.winnerSide)}`}
>
{resolveMatchTeamName(match, game.winnerTeamIndex)} 승
</span>
<span className="ml-1 text-base-content/35">
({resultSideLabel(game.winnerSide)} 진영)
</span>
<span className="ml-2 text-base-content/35 font-mono">
{game.riotMatchId}
</span>
<div className="min-w-0 space-y-1">
<div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">
<TeamNameChip match={match} teamIndex={game.blueTeamIndex} />
<span className="text-[10px] font-black text-base-content/25">
VS
</span>
<TeamNameChip match={match} teamIndex={game.redTeamIndex} />
<span className="inline-flex items-center border border-amber-500/20 bg-amber-500/8 px-1.5 py-0.5 text-[11px] font-bold text-amber-500">
{resolveMatchTeamName(match, game.winnerTeamIndex)} 승
</span>
</div>
<div className="flex min-w-0 flex-wrap gap-x-3 gap-y-1 text-xs text-base-content/35">
<span className="min-w-0 truncate">
팀장 {resolveMatchCaptainName(match, game.blueTeamIndex)} vs{" "}
{resolveMatchCaptainName(match, game.redTeamIndex)}
</span>
<span className="font-mono text-[11px] text-base-content/25">
{game.riotMatchId}
</span>
</div>
</div>
) : (
<span className="text-base-content/25">대기 중</span>
<div className="min-w-0 text-base-content/30">대기 중</div>
)}
{game ? (
<span className="flex shrink-0 items-center justify-end gap-3 pt-0.5">
<span className="whitespace-nowrap text-right text-xs font-medium text-base-content/45">
{formatGameStartKst(game.gameCreation)}
</span>
<span className="inline-flex h-7 w-7 items-center justify-center text-primary/70 transition-colors group-hover:text-primary">
<ChevronRight className="h-4 w-4 transition-transform group-hover:translate-x-0.5" />
</span>
</span>
) : (
<span className="shrink-0 pt-0.5 text-right text-xs text-base-content/25">
-
</span>
)}
<span className="text-right text-base-content/35 font-mono">
{game ? (
<>
{formatGameDuration(game.gameDuration)}
<span className="ml-2 font-sans font-bold text-primary opacity-0 transition-opacity group-hover:opacity-100">
상세
</span>
</>
) : (
"-"
)}
</span>
</>
);
@@ -2015,8 +2231,8 @@ function MatchGameListSection({ match }: { match: MatchDetailView }) {
<Link
key={gameNumber}
to={`/match/${match.id}/game/${gameNumber}`}
className={`${rowClass} group transition-colors hover:bg-primary/5`}
aria-label={`${gameNumber}경기 상세 보기`}
className={`${rowClass} group transition-colors hover:bg-primary/5 focus-visible:bg-primary/8 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary`}
aria-label={`${gameNumber}경기 ${resolveMatchTeamName(match, game.blueTeamIndex)} 대 ${resolveMatchTeamName(match, game.redTeamIndex)} 상세 보기`}
>
{content}
</Link>
@@ -2033,14 +2249,33 @@ function MatchGameListSection({ match }: { match: MatchDetailView }) {
);
}
function TeamNameChip({
match,
teamIndex,
}: {
match: MatchDetailView;
teamIndex: number;
}) {
const tone = teamIndexColorClasses(teamIndex);
return (
<span className="inline-flex min-w-0 items-center gap-1.5 font-semibold text-base-content/75">
<span className={`h-1.5 w-1.5 shrink-0 rounded-full ${tone.bar}`} />
<span className="truncate">{resolveMatchTeamName(match, teamIndex)}</span>
</span>
);
}
function MatchResultPanel({ match }: { match: MatchDetailView }) {
if (!match.result) return null;
return (
<div className="mb-6 border border-base-content/10 bg-base-content/[0.02] p-5">
<MatchStandingsSection match={match} />
<div className="mt-5">
<MatchGameListSection match={match} />
<div className="mb-6 space-y-4">
<div className="border border-base-content/10 bg-base-content/[0.02] p-5">
<MatchStandingsSection match={match} />
<div className="mt-5">
<MatchGameListSection match={match} />
</div>
</div>
</div>
);
@@ -2070,10 +2305,10 @@ function FinishedMatchTabs({ match }: { match: MatchDetailView }) {
key={item.id}
type="button"
onClick={() => setResultTab(item.id)}
className={`min-w-[7.5rem] border-r border-base-content/8 px-4 py-3 text-xs font-black transition-colors last:border-r-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary ${
className={`min-w-[7.5rem] border-r border-b-2 border-base-content/8 px-4 py-3 text-xs font-bold transition-colors last:border-r-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary ${
activeTab === item.id
? "bg-primary text-primary-content"
: "text-base-content/45 hover:bg-base-content/[0.03] hover:text-base-content"
? "border-b-primary bg-base-200/50 text-base-content"
: "border-b-transparent text-base-content/45 hover:bg-base-content/[0.03] hover:text-base-content"
}`}
>
{item.label}