Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f526257d9c | ||
|
|
34a47c053e | ||
|
|
e3f39fd8b8 | ||
|
|
4385ba7b8b | ||
|
|
9cd5850d43 | ||
|
|
79534cf43c | ||
|
|
03be85d07b | ||
|
|
d269bdd92b | ||
|
|
2bac89d3dc | ||
|
|
760da1cbea | ||
|
|
ca786fd80a | ||
|
|
ac0d2b53f0 | ||
|
|
a4215f86fb | ||
|
|
a24726d7da | ||
|
|
bb68be14fa | ||
|
|
9e2f2c61e7 | ||
|
|
1f75c6318a | ||
|
|
8ec9edc35f | ||
|
|
61f1db0e6a | ||
|
|
c155f26272 |
No files matched your search
@@ -28,6 +28,8 @@ website/LICENSE
|
||||
!AGENTS.md
|
||||
!docs/specs/internal-match-game-analysis.md
|
||||
!docs/plans/internal-match-game-analysis-p0-p1.md
|
||||
!docs/specs/double-elimination-connector-routing.md
|
||||
!docs/plans/double-elimination-connector-routing.md
|
||||
!agents/**/*.md
|
||||
!skills/**/*.md
|
||||
/tmp/
|
||||
|
||||
@@ -29,20 +29,20 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@lolympus/contracts": "workspace:*",
|
||||
"@nestjs/common": "^11.0.1",
|
||||
"@nestjs/common": "^11.1.28",
|
||||
"@nestjs/config": "^4.0.4",
|
||||
"@nestjs/core": "^11.0.1",
|
||||
"@nestjs/platform-express": "^11.0.1",
|
||||
"@nestjs/platform-socket.io": "^11.1.19",
|
||||
"@nestjs/swagger": "^11.2.7",
|
||||
"@nestjs/websockets": "^11.1.19",
|
||||
"@nestjs/core": "^11.1.28",
|
||||
"@nestjs/platform-express": "^11.1.28",
|
||||
"@nestjs/platform-socket.io": "^11.1.28",
|
||||
"@nestjs/swagger": "^11.4.6",
|
||||
"@nestjs/websockets": "^11.1.28",
|
||||
"@socket.io/redis-adapter": "^8.3.0",
|
||||
"class-transformer": "^0.5.1",
|
||||
"class-validator": "^0.15.1",
|
||||
"jose": "^6.2.2",
|
||||
"mongoose": "^9.4.1",
|
||||
"mongoose": "9.4.1",
|
||||
"nats": "^2.29.3",
|
||||
"newrelic": "^14.3.0",
|
||||
"newrelic": "^14.3.3",
|
||||
"redis": "^5.12.1",
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"rxjs": "^7.8.1",
|
||||
|
||||
@@ -2,6 +2,30 @@ import mongoose from 'mongoose';
|
||||
import { AuctionService } from './auction.service';
|
||||
|
||||
describe('AuctionService', () => {
|
||||
function requireRecord(
|
||||
value: unknown,
|
||||
label: string,
|
||||
): Record<string, unknown> {
|
||||
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
||||
throw new Error(`${label} must be an object.`);
|
||||
}
|
||||
return value as Record<string, unknown>;
|
||||
}
|
||||
|
||||
function requireArray(value: unknown, label: string): unknown[] {
|
||||
if (!Array.isArray(value)) {
|
||||
throw new Error(`${label} must be an array.`);
|
||||
}
|
||||
return value as unknown[];
|
||||
}
|
||||
|
||||
function parseJsonRecord(value: unknown, label: string) {
|
||||
if (typeof value !== 'string') {
|
||||
throw new Error(`${label} must be a JSON string.`);
|
||||
}
|
||||
return requireRecord(JSON.parse(value) as unknown, label);
|
||||
}
|
||||
|
||||
function createService(models: Record<string, unknown>) {
|
||||
const auctionHistoryModel = {
|
||||
findOne: jest.fn().mockReturnValue({
|
||||
@@ -1007,7 +1031,12 @@ describe('AuctionService', () => {
|
||||
);
|
||||
const transitionInput =
|
||||
auctionRedisCommandService.applyTransition.mock.calls[0][1];
|
||||
expect(JSON.parse(transitionInput.durabilityPayloadJson)).toMatchObject({
|
||||
expect(
|
||||
parseJsonRecord(
|
||||
transitionInput.durabilityPayloadJson,
|
||||
'durabilityPayloadJson',
|
||||
),
|
||||
).toMatchObject({
|
||||
afterAuctionMongoProjection: expect.objectContaining({
|
||||
phase: 'bidding',
|
||||
revision: 2,
|
||||
@@ -1178,17 +1207,40 @@ describe('AuctionService', () => {
|
||||
|
||||
const transitionInput =
|
||||
auctionRedisCommandService.applyTransition.mock.calls[0][1];
|
||||
const durabilityPayload = JSON.parse(transitionInput.durabilityPayloadJson);
|
||||
expect(durabilityPayload.snapshotBefore).toMatchObject({
|
||||
const durabilityPayload = parseJsonRecord(
|
||||
transitionInput.durabilityPayloadJson,
|
||||
'durabilityPayloadJson',
|
||||
);
|
||||
const snapshotBefore = requireRecord(
|
||||
durabilityPayload.snapshotBefore,
|
||||
'snapshotBefore',
|
||||
);
|
||||
const snapshotBeforeTeams = requireArray(
|
||||
snapshotBefore.auctionTeams,
|
||||
'snapshotBefore.auctionTeams',
|
||||
);
|
||||
const snapshotBeforeTeam = requireRecord(
|
||||
snapshotBeforeTeams[0],
|
||||
'snapshotBefore.auctionTeams[0]',
|
||||
);
|
||||
const afterAuctionMongoProjection = requireRecord(
|
||||
durabilityPayload.afterAuctionMongoProjection,
|
||||
'afterAuctionMongoProjection',
|
||||
);
|
||||
const projectedTeams = requireArray(
|
||||
afterAuctionMongoProjection.auctionTeams,
|
||||
'afterAuctionMongoProjection.auctionTeams',
|
||||
);
|
||||
const projectedTeam = requireRecord(
|
||||
projectedTeams[0],
|
||||
'afterAuctionMongoProjection.auctionTeams[0]',
|
||||
);
|
||||
expect(snapshotBefore).toMatchObject({
|
||||
phase: 'bidding',
|
||||
revision: 4,
|
||||
});
|
||||
expect(durabilityPayload.snapshotBefore.auctionTeams[0].members).toEqual(
|
||||
[],
|
||||
);
|
||||
expect(
|
||||
durabilityPayload.afterAuctionMongoProjection.auctionTeams[0].members,
|
||||
).toEqual([
|
||||
expect(snapshotBeforeTeam.members).toEqual([]);
|
||||
expect(projectedTeam.members).toEqual([
|
||||
expect.objectContaining({
|
||||
memberAcquisitionBidPointAmount: 120,
|
||||
userId: playerUserId.toString(),
|
||||
@@ -1396,7 +1448,12 @@ describe('AuctionService', () => {
|
||||
});
|
||||
const [, transitionInput] =
|
||||
auctionRedisCommandService.applyTransition.mock.calls.at(-1) ?? [];
|
||||
expect(JSON.parse(transitionInput.durabilityPayloadJson)).toMatchObject({
|
||||
expect(
|
||||
parseJsonRecord(
|
||||
transitionInput.durabilityPayloadJson,
|
||||
'durabilityPayloadJson',
|
||||
),
|
||||
).toMatchObject({
|
||||
afterAuctionMongoProjection: {
|
||||
matchSideEffectStatus: 'pending',
|
||||
phase: 'complete',
|
||||
@@ -2567,7 +2624,10 @@ describe('AuctionService', () => {
|
||||
durationSeconds: 30,
|
||||
mode: 'set-relative',
|
||||
});
|
||||
const durabilityPayload = JSON.parse(transitionInput.durabilityPayloadJson);
|
||||
const durabilityPayload = parseJsonRecord(
|
||||
transitionInput.durabilityPayloadJson,
|
||||
'durabilityPayloadJson',
|
||||
);
|
||||
expect(durabilityPayload).toMatchObject({
|
||||
auctionActionType: 'undo',
|
||||
historyMutation: {
|
||||
|
||||
@@ -429,8 +429,14 @@ export function applyCompetitionDomainInvariantIndexes(
|
||||
}
|
||||
}
|
||||
|
||||
export type CompetitionModelName =
|
||||
| 'competition'
|
||||
| 'competitionFact'
|
||||
| 'competitionOutbox'
|
||||
| 'tournamentCodeAssignment';
|
||||
|
||||
export const competitionModelDefinitions: Array<{
|
||||
name: string;
|
||||
name: CompetitionModelName;
|
||||
schema: mongoose.Schema;
|
||||
schemaName: string;
|
||||
}> = [
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
import { projectCompetition } from './competition-projector';
|
||||
import {
|
||||
CompetitionDomainError,
|
||||
type CompetitionDomainErrorCode,
|
||||
} from './domain-error';
|
||||
import { generateSeriesGraph } from './series-graph';
|
||||
|
||||
describe('projectCompetition', () => {
|
||||
@@ -323,20 +327,18 @@ describe('projectCompetition', () => {
|
||||
'team-1',
|
||||
);
|
||||
|
||||
expect(() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [{ ...accepted, seriesId: 'series-does-not-exist' }],
|
||||
}),
|
||||
).toThrow(
|
||||
expect.objectContaining({
|
||||
code: 'GAME_SERIES_MISMATCH',
|
||||
}),
|
||||
expectCompetitionDomainError(
|
||||
() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [{ ...accepted, seriesId: 'series-does-not-exist' }],
|
||||
}),
|
||||
'GAME_SERIES_MISMATCH',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -356,20 +358,18 @@ describe('projectCompetition', () => {
|
||||
'team-1',
|
||||
);
|
||||
|
||||
expect(() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [{ ...accepted, gameSlotId: 'slot-does-not-exist' }],
|
||||
}),
|
||||
).toThrow(
|
||||
expect.objectContaining({
|
||||
code: 'GAME_SLOT_INVALID',
|
||||
}),
|
||||
expectCompetitionDomainError(
|
||||
() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [{ ...accepted, gameSlotId: 'slot-does-not-exist' }],
|
||||
}),
|
||||
'GAME_SLOT_INVALID',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -382,36 +382,34 @@ describe('projectCompetition', () => {
|
||||
};
|
||||
const seriesGraph = generateSeriesGraph({ competitionId, teams, format });
|
||||
|
||||
expect(() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [
|
||||
{
|
||||
id: 'fact-unknown-adjudication-series',
|
||||
type: 'series-adjudicated',
|
||||
competitionId,
|
||||
revision: 1,
|
||||
ordinalWithinRevision: 1,
|
||||
commandId: 'command-unknown-adjudication-series',
|
||||
schemaVersion: 1,
|
||||
actor: { type: 'user' },
|
||||
occurredAt: new Date('2026-07-12T00:00:01.000Z'),
|
||||
recordedAt: new Date('2026-07-12T00:00:02.000Z'),
|
||||
seriesId: 'series-does-not-exist',
|
||||
decision: { type: 'administrative', winnerTeamId: 'team-1' },
|
||||
reason: 'Manual correction',
|
||||
},
|
||||
],
|
||||
}),
|
||||
).toThrow(
|
||||
expect.objectContaining({
|
||||
code: 'ADJUDICATION_INVALID',
|
||||
}),
|
||||
expectCompetitionDomainError(
|
||||
() =>
|
||||
projectCompetition({
|
||||
competitionId,
|
||||
revision: 1,
|
||||
projectorVersion: 1,
|
||||
teams,
|
||||
format,
|
||||
seriesGraph,
|
||||
facts: [
|
||||
{
|
||||
id: 'fact-unknown-adjudication-series',
|
||||
type: 'series-adjudicated',
|
||||
competitionId,
|
||||
revision: 1,
|
||||
ordinalWithinRevision: 1,
|
||||
commandId: 'command-unknown-adjudication-series',
|
||||
schemaVersion: 1,
|
||||
actor: { type: 'user' },
|
||||
occurredAt: new Date('2026-07-12T00:00:01.000Z'),
|
||||
recordedAt: new Date('2026-07-12T00:00:02.000Z'),
|
||||
seriesId: 'series-does-not-exist',
|
||||
decision: { type: 'administrative', winnerTeamId: 'team-1' },
|
||||
reason: 'Manual correction',
|
||||
},
|
||||
],
|
||||
}),
|
||||
'ADJUDICATION_INVALID',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -617,3 +615,23 @@ interface GameSlotLike {
|
||||
id: string;
|
||||
ordinal: number;
|
||||
}
|
||||
|
||||
function expectCompetitionDomainError(
|
||||
action: () => unknown,
|
||||
expectedCode: CompetitionDomainErrorCode,
|
||||
): void {
|
||||
let thrown: unknown;
|
||||
try {
|
||||
action();
|
||||
} catch (error: unknown) {
|
||||
thrown = error;
|
||||
}
|
||||
|
||||
expect(thrown).toBeInstanceOf(CompetitionDomainError);
|
||||
if (!(thrown instanceof CompetitionDomainError)) {
|
||||
throw new Error(
|
||||
`Expected CompetitionDomainError, received ${String(thrown)}`,
|
||||
);
|
||||
}
|
||||
expect(thrown.code).toBe(expectedCode);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import {
|
||||
assertReversalPreview,
|
||||
buildReversalFacts,
|
||||
CompetitionReversalError,
|
||||
previewSeriesReversal,
|
||||
} from './competition-reversal';
|
||||
|
||||
@@ -19,18 +20,18 @@ describe('Competition reversal planning', () => {
|
||||
];
|
||||
|
||||
it('rejects strict reversal when a descendant has result activity', () => {
|
||||
expect(() =>
|
||||
previewSeriesReversal({
|
||||
competitionId: 'competition-1',
|
||||
revision: 2,
|
||||
seriesId: 'series-parent',
|
||||
mode: 'strict',
|
||||
graph,
|
||||
facts,
|
||||
assignments,
|
||||
}),
|
||||
).toThrow(
|
||||
expect.objectContaining({ code: 'REVERSAL_DESCENDANT_ACTIVITY' }),
|
||||
expectCompetitionReversalError(
|
||||
() =>
|
||||
previewSeriesReversal({
|
||||
competitionId: 'competition-1',
|
||||
revision: 2,
|
||||
seriesId: 'series-parent',
|
||||
mode: 'strict',
|
||||
graph,
|
||||
facts,
|
||||
assignments,
|
||||
}),
|
||||
'REVERSAL_DESCENDANT_ACTIVITY',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -105,20 +106,22 @@ describe('Competition reversal planning', () => {
|
||||
assignments,
|
||||
});
|
||||
|
||||
expect(() =>
|
||||
assertReversalPreview(
|
||||
{
|
||||
competitionId: 'competition-1',
|
||||
revision: 3,
|
||||
seriesId: 'series-parent',
|
||||
mode: 'cascade',
|
||||
graph,
|
||||
facts,
|
||||
assignments,
|
||||
},
|
||||
preview.impactHash,
|
||||
),
|
||||
).toThrow(expect.objectContaining({ code: 'REVERSAL_PREVIEW_STALE' }));
|
||||
expectCompetitionReversalError(
|
||||
() =>
|
||||
assertReversalPreview(
|
||||
{
|
||||
competitionId: 'competition-1',
|
||||
revision: 3,
|
||||
seriesId: 'series-parent',
|
||||
mode: 'cascade',
|
||||
graph,
|
||||
facts,
|
||||
assignments,
|
||||
},
|
||||
preview.impactHash,
|
||||
),
|
||||
'REVERSAL_PREVIEW_STALE',
|
||||
);
|
||||
});
|
||||
|
||||
it('emits one append-only reversal fact for every active result fact', () => {
|
||||
@@ -160,6 +163,26 @@ describe('Competition reversal planning', () => {
|
||||
});
|
||||
});
|
||||
|
||||
function expectCompetitionReversalError(
|
||||
action: () => unknown,
|
||||
expectedCode: CompetitionReversalError['code'],
|
||||
): void {
|
||||
let thrown: unknown;
|
||||
try {
|
||||
action();
|
||||
} catch (error: unknown) {
|
||||
thrown = error;
|
||||
}
|
||||
|
||||
expect(thrown).toBeInstanceOf(CompetitionReversalError);
|
||||
if (!(thrown instanceof CompetitionReversalError)) {
|
||||
throw new Error(
|
||||
`Expected CompetitionReversalError, received ${String(thrown)}`,
|
||||
);
|
||||
}
|
||||
expect(thrown.code).toBe(expectedCode);
|
||||
}
|
||||
|
||||
function series(id: string, sources: Array<Record<string, unknown>>) {
|
||||
return {
|
||||
id,
|
||||
|
||||
@@ -22,6 +22,33 @@ function makeHandler(params: {
|
||||
}
|
||||
|
||||
describe('MatchListHandler', () => {
|
||||
afterEach(() => {
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
it('queries only matches scheduled at or after command processing time', async () => {
|
||||
const now = new Date('2026-07-25T07:30:00.000Z');
|
||||
jest.useFakeTimers().setSystemTime(now);
|
||||
const communityId = objectId('111111111111111111111111');
|
||||
const list = jest.fn().mockResolvedValue([]);
|
||||
const handler = makeHandler({
|
||||
matchService: { list },
|
||||
});
|
||||
|
||||
await handler.handle({
|
||||
communityId,
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
});
|
||||
|
||||
expect(list).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
status: 'recruiting',
|
||||
scheduledFrom: now,
|
||||
limit: 10,
|
||||
});
|
||||
});
|
||||
|
||||
it('prints short codes, compact KST dates, and short links', async () => {
|
||||
const match = {
|
||||
_id: objectId('333333333333333333333333'),
|
||||
|
||||
@@ -19,9 +19,11 @@ export class MatchListHandler {
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
}): Promise<DakaoSegment[]> {
|
||||
const scheduledFrom = new Date();
|
||||
const matches = await this.matchService.list({
|
||||
communityId: params.communityId,
|
||||
status: 'recruiting',
|
||||
scheduledFrom,
|
||||
limit: 10,
|
||||
});
|
||||
|
||||
|
||||
@@ -2,7 +2,10 @@ import { Injectable, Logger, Scope, OnModuleInit } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { applyMongoosePerformancePlugin } from '../observability/mongoose-performance.plugin';
|
||||
import { SecretService } from '../secret/secret.service';
|
||||
import { tournamentModelDefinitions, TournamentModelTypes } from './schema';
|
||||
import {
|
||||
tournamentModelDefinitions,
|
||||
type TournamentModelTypes,
|
||||
} from './schema';
|
||||
|
||||
export function resolveMongoDbName(nodeEnv = process.env.NODE_ENV): string {
|
||||
if (nodeEnv === 'prod') return 'lolympus';
|
||||
@@ -42,7 +45,8 @@ export class ConnectionService implements OnModuleInit {
|
||||
private connectionPromise: Promise<mongoose.Connection> | null = null;
|
||||
constructor(private readonly secretService: SecretService) {}
|
||||
|
||||
private tournamentModels: Map<string, mongoose.Model<any>> | null = null;
|
||||
private tournamentModels: Map<keyof TournamentModelTypes, unknown> | null =
|
||||
null;
|
||||
|
||||
public async getConnection(): Promise<mongoose.Connection> {
|
||||
if (
|
||||
@@ -89,14 +93,18 @@ export class ConnectionService implements OnModuleInit {
|
||||
modelKey: K,
|
||||
): Promise<mongoose.Model<TournamentModelTypes[K]>> {
|
||||
const connection = await this.getConnection();
|
||||
if (this.tournamentModels)
|
||||
return this.tournamentModels.get(modelKey) as mongoose.Model<
|
||||
TournamentModelTypes[K]
|
||||
>;
|
||||
if (this.tournamentModels) {
|
||||
return this.requireTournamentModel(this.tournamentModels, modelKey);
|
||||
}
|
||||
|
||||
const models = new Map<K, mongoose.Model<TournamentModelTypes[K]>>();
|
||||
const models = new Map<keyof TournamentModelTypes, unknown>();
|
||||
|
||||
tournamentModelDefinitions.forEach((modelDefinition) => {
|
||||
if (!(modelDefinition.schema instanceof mongoose.Schema)) {
|
||||
throw new Error(
|
||||
`Invalid Mongoose schema for model ${modelDefinition.name}.`,
|
||||
);
|
||||
}
|
||||
applyMongoosePerformancePlugin(modelDefinition.schema);
|
||||
// 이미 생성된 경우 컴파일 스킵.
|
||||
if (
|
||||
@@ -106,14 +114,14 @@ export class ConnectionService implements OnModuleInit {
|
||||
)
|
||||
) {
|
||||
models.set(
|
||||
modelDefinition.name as K,
|
||||
modelDefinition.name,
|
||||
connection.models[modelDefinition.name],
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
models.set(
|
||||
modelDefinition.name as K,
|
||||
connection.model<TournamentModelTypes[K]>(
|
||||
modelDefinition.name,
|
||||
connection.model(
|
||||
modelDefinition.name,
|
||||
modelDefinition.schema,
|
||||
modelDefinition.schemaName,
|
||||
@@ -123,7 +131,18 @@ export class ConnectionService implements OnModuleInit {
|
||||
});
|
||||
|
||||
this.tournamentModels = models;
|
||||
return models.get(modelKey) as mongoose.Model<TournamentModelTypes[K]>;
|
||||
return this.requireTournamentModel(models, modelKey);
|
||||
}
|
||||
|
||||
private requireTournamentModel<K extends keyof TournamentModelTypes>(
|
||||
models: ReadonlyMap<keyof TournamentModelTypes, unknown>,
|
||||
modelKey: K,
|
||||
): mongoose.Model<TournamentModelTypes[K]> {
|
||||
const model = models.get(modelKey);
|
||||
if (model === undefined) {
|
||||
throw new Error(`Mongoose model ${modelKey} is not registered.`);
|
||||
}
|
||||
return model as mongoose.Model<TournamentModelTypes[K]>;
|
||||
}
|
||||
|
||||
public async createSession(
|
||||
|
||||
@@ -253,9 +253,7 @@ function migrateResult(result: Record<string, unknown>) {
|
||||
seriesResults.length > 0 ? seriesResults : buildSeries(games);
|
||||
|
||||
if (typeof migrated.winnerTeamIndex !== 'number') {
|
||||
const migratedSeriesResults = Array.isArray(migrated.seriesResults)
|
||||
? migrated.seriesResults
|
||||
: [];
|
||||
const migratedSeriesResults = asArray(migrated.seriesResults);
|
||||
migrated.winnerTeamIndex =
|
||||
resolveWinnerTeamIndex(migratedSeriesResults) ??
|
||||
(isSide(migrated.winnerSide)
|
||||
|
||||
+3
-1
@@ -117,7 +117,9 @@ function createDb(params: {
|
||||
function matchesFilter(doc: Doc, filter: Record<string, unknown>): boolean {
|
||||
const clauses = filter.$or;
|
||||
if (Array.isArray(clauses)) {
|
||||
return clauses.some((clause) => matchesFilter(doc, clause));
|
||||
return (clauses as unknown[]).some(
|
||||
(clause) => isRecord(clause) && matchesFilter(doc, clause),
|
||||
);
|
||||
}
|
||||
|
||||
return Object.entries(filter).every(([key, value]) => {
|
||||
|
||||
+6
-2
@@ -11,7 +11,11 @@ import {
|
||||
} from '../../../double-elimination/double-elimination.util';
|
||||
import { TOURNAMENT_CODE_EXPIRY_MARGIN_MS } from '../../../tournament-code/tournament-code.constants';
|
||||
import { ConnectionService } from '../connection.service';
|
||||
import type { MatchDocument, TournamentCodeDocument } from '../schema';
|
||||
import type {
|
||||
MatchDocument,
|
||||
TournamentCode,
|
||||
TournamentCodeDocument,
|
||||
} from '../schema';
|
||||
import { SecretModule } from '../../secret/secret.module';
|
||||
|
||||
interface CliOptions {
|
||||
@@ -334,7 +338,7 @@ function printPlan(plan: MatchRepairPlan) {
|
||||
async function applyPlan(
|
||||
match: MatchDocument,
|
||||
plan: MatchRepairPlan,
|
||||
TournamentCodeModel: mongoose.Model<any>,
|
||||
TournamentCodeModel: mongoose.Model<TournamentCode>,
|
||||
session: mongoose.ClientSession,
|
||||
) {
|
||||
if (plan.skippedReason) return;
|
||||
|
||||
@@ -2485,7 +2485,9 @@ MatchStatsSchema.index({ communityId: 1, userIds: 1 });
|
||||
MatchStatsSchema.index({ communityId: 1, userIds: 1, scheduledAt: -1 });
|
||||
MatchStatsSchema.index({ communityId: 1, championIds: 1 });
|
||||
|
||||
export const tournamentModelDefinitions: ModelDefinition[] = [
|
||||
export const tournamentModelDefinitions: Array<
|
||||
ModelDefinition & { name: keyof TournamentModelTypes }
|
||||
> = [
|
||||
...competitionModelDefinitions,
|
||||
{ name: 'identity', schema: IdentitySchema, schemaName: 'identity' },
|
||||
{ name: 'community', schema: CommunitySchema, schemaName: 'community' },
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
export interface ModelDefinition {
|
||||
name: string;
|
||||
schema: mongoose.Schema<any>;
|
||||
schema: unknown;
|
||||
schemaName?: string;
|
||||
}
|
||||
@@ -34,10 +34,13 @@ type SchemaWithPerformanceMarker = mongoose.Schema & {
|
||||
[PERFORMANCE_PLUGIN_APPLIED]?: boolean;
|
||||
};
|
||||
|
||||
export function applyMongoosePerformancePlugin(schema: mongoose.Schema): void {
|
||||
const markedSchema = schema as SchemaWithPerformanceMarker;
|
||||
if (markedSchema[PERFORMANCE_PLUGIN_APPLIED]) return;
|
||||
markedSchema[PERFORMANCE_PLUGIN_APPLIED] = true;
|
||||
export function applyMongoosePerformancePlugin(schemaValue: unknown): void {
|
||||
if (!(schemaValue instanceof mongoose.Schema)) {
|
||||
throw new TypeError('Mongoose performance plugin requires a Schema.');
|
||||
}
|
||||
const schema = schemaValue as SchemaWithPerformanceMarker;
|
||||
if (schema[PERFORMANCE_PLUGIN_APPLIED]) return;
|
||||
schema[PERFORMANCE_PLUGIN_APPLIED] = true;
|
||||
|
||||
schema.pre(QUERY_OPERATION_REGEX, function () {
|
||||
const query = this as QueryWithPerformanceState;
|
||||
|
||||
@@ -5,10 +5,12 @@ describe('MatchService', () => {
|
||||
function createServiceWithCreateModels() {
|
||||
const createdPayloads: Record<string, unknown>[] = [];
|
||||
const MatchModel = {
|
||||
create: jest.fn().mockImplementation(async (payload) => {
|
||||
createdPayloads.push(payload);
|
||||
return payload;
|
||||
}),
|
||||
create: jest
|
||||
.fn()
|
||||
.mockImplementation(async (payload: Record<string, unknown>) => {
|
||||
createdPayloads.push(payload);
|
||||
return payload;
|
||||
}),
|
||||
exists: jest.fn().mockResolvedValue(null),
|
||||
};
|
||||
const CommunityModel = {
|
||||
|
||||
@@ -53,6 +53,7 @@ function makeScheduler() {
|
||||
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||
const enrichmentService = {
|
||||
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
||||
refreshRiotIdentity: jest.fn().mockResolvedValue('unchanged'),
|
||||
enrichRiotAccount: jest.fn().mockResolvedValue(successResult()),
|
||||
} as unknown as jest.Mocked<RiotAccountEnrichmentService>;
|
||||
const staleAccountRepository = {
|
||||
@@ -134,7 +135,7 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('marks and enriches each stale candidate without background precharge', async () => {
|
||||
it('marks, refreshes identity, and enriches each stale candidate without background precharge', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, enrichmentService, staleAccountRepository } =
|
||||
makeScheduler();
|
||||
@@ -149,11 +150,21 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
candidates[0].userId,
|
||||
'puuid-1',
|
||||
);
|
||||
expect(enrichmentService.refreshRiotIdentity).toHaveBeenNthCalledWith(1, {
|
||||
userId: candidates[0].userId,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
expect(enrichmentService.refreshRiotIdentity).toHaveBeenCalledTimes(2);
|
||||
expect(enrichmentService.enrichRiotAccount).toHaveBeenNthCalledWith(2, {
|
||||
userId: candidates[1].userId,
|
||||
puuid: 'puuid-2',
|
||||
options: { force: false },
|
||||
});
|
||||
expect(
|
||||
enrichmentService.refreshRiotIdentity.mock.invocationCallOrder[0],
|
||||
).toBeLessThan(
|
||||
enrichmentService.enrichRiotAccount.mock.invocationCallOrder[0],
|
||||
);
|
||||
});
|
||||
|
||||
it('stops the candidate loop when the refresh gate closes mid-tick', async () => {
|
||||
@@ -202,6 +213,27 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it('continues statistics enrichment without a failure counter when identity refresh fails', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
||||
makeScheduler();
|
||||
const account = candidate('puuid-1');
|
||||
staleAccountRepository.findStaleAccounts.mockResolvedValue([account]);
|
||||
enrichmentService.refreshRiotIdentity.mockResolvedValueOnce('failed');
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(enrichmentService.refreshRiotIdentity).toHaveBeenCalledWith({
|
||||
userId: account.userId,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledTimes(1);
|
||||
expect(rawClient.sendCommand).not.toHaveBeenCalledWith([
|
||||
'INCR',
|
||||
'riot:bg:fail:puuid-1',
|
||||
]);
|
||||
});
|
||||
|
||||
it('skips candidates already in failure backoff', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, redis, enrichmentService, staleAccountRepository } =
|
||||
@@ -217,6 +249,7 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
await scheduler.tick();
|
||||
|
||||
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
||||
expect(enrichmentService.refreshRiotIdentity).not.toHaveBeenCalled();
|
||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -15,7 +15,10 @@ import {
|
||||
} from '../global/redis/distributed-lock.service';
|
||||
import { RedisService } from '../global/redis/redis.service';
|
||||
import { isInKstBackgroundWindow } from './kst-window.util';
|
||||
import { StaleAccountRepository } from './stale-account.repository';
|
||||
import {
|
||||
type StaleAccountCandidate,
|
||||
StaleAccountRepository,
|
||||
} from './stale-account.repository';
|
||||
|
||||
const TICK_INTERVAL_MS = 60_000;
|
||||
const LEADER_LOCK_KEY = 'distributed-lock:riot-background-refresh:leader';
|
||||
@@ -133,6 +136,7 @@ export class BackgroundRefreshScheduler
|
||||
candidate.userId,
|
||||
candidate.puuid,
|
||||
);
|
||||
await this.refreshRiotIdentity(candidate);
|
||||
|
||||
try {
|
||||
const result = await this.enrichmentService.enrichRiotAccount({
|
||||
@@ -165,6 +169,28 @@ export class BackgroundRefreshScheduler
|
||||
);
|
||||
}
|
||||
|
||||
private async refreshRiotIdentity(
|
||||
candidate: StaleAccountCandidate,
|
||||
): Promise<void> {
|
||||
try {
|
||||
const result = await this.enrichmentService.refreshRiotIdentity({
|
||||
userId: candidate.userId,
|
||||
puuid: candidate.puuid,
|
||||
});
|
||||
if (result !== 'failed') return;
|
||||
|
||||
this.logger.warn(
|
||||
`Background Riot identity refresh failed for ${candidate.puuid}.`,
|
||||
);
|
||||
} catch (err) {
|
||||
this.logger.warn(
|
||||
`Background Riot identity refresh failed for ${candidate.puuid}: ${
|
||||
err instanceof Error ? err.message : String(err)
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private currentRefreshGatePolicy(): RefreshGatePolicy {
|
||||
const isDawn = isInKstBackgroundWindow();
|
||||
return {
|
||||
|
||||
@@ -62,6 +62,7 @@ function makeWorker() {
|
||||
processMemberJob: jest.fn(),
|
||||
} as unknown as jest.Mocked<LegacyImportService>;
|
||||
const enrichmentService = {
|
||||
refreshRiotIdentity: jest.fn().mockResolvedValue('unchanged'),
|
||||
refreshLeagueEntries: jest.fn().mockResolvedValue('updated'),
|
||||
} as unknown as jest.Mocked<RiotAccountEnrichmentService>;
|
||||
|
||||
@@ -116,9 +117,14 @@ describe('RiotJobWorkerService', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('refreshes league entries while processing user history refresh jobs', async () => {
|
||||
const { worker, enrichmentService, recentMatchesService, redisService } =
|
||||
makeWorker();
|
||||
it('refreshes Riot identity and league entries while processing user history refresh jobs', async () => {
|
||||
const {
|
||||
worker,
|
||||
enrichmentService,
|
||||
recentMatchesService,
|
||||
redisService,
|
||||
jobQueueService,
|
||||
} = makeWorker();
|
||||
const userId = new mongoose.Types.ObjectId().toString();
|
||||
const job: RiotRefreshSubJob = {
|
||||
jobId: 'job-1',
|
||||
@@ -146,11 +152,19 @@ describe('RiotJobWorkerService', () => {
|
||||
});
|
||||
|
||||
expect(recentMatchesService.ensureFreshForQueue).toHaveBeenCalledTimes(2);
|
||||
expect(enrichmentService.refreshRiotIdentity).toHaveBeenCalledWith({
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
puuid: 'puuid-1',
|
||||
region: 'asia',
|
||||
});
|
||||
expect(enrichmentService.refreshLeagueEntries).toHaveBeenCalledWith({
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
expect(
|
||||
enrichmentService.refreshRiotIdentity.mock.invocationCallOrder[0],
|
||||
).toBeLessThan(jobQueueService.markCompleted.mock.invocationCallOrder[0]);
|
||||
expect(redisService.acknowledgeStream).toHaveBeenCalledWith(
|
||||
'riot:queue:high',
|
||||
RIOT_JOB_GROUP,
|
||||
@@ -167,6 +181,45 @@ describe('RiotJobWorkerService', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('completes successful match refresh work when Riot identity lookup throws', async () => {
|
||||
const { worker, enrichmentService, jobQueueService, refreshGateway } =
|
||||
makeWorker();
|
||||
enrichmentService.refreshRiotIdentity.mockRejectedValueOnce(
|
||||
new Error('Account-V1 unavailable'),
|
||||
);
|
||||
const job: RiotRefreshSubJob = {
|
||||
jobId: 'job-1',
|
||||
parentJobId: 'parent-1',
|
||||
userId: new mongoose.Types.ObjectId().toString(),
|
||||
puuid: 'puuid-1',
|
||||
region: 'asia',
|
||||
platform: 'kr',
|
||||
queueGroup: 'summoners-rift',
|
||||
queueIds: [420],
|
||||
requestedAt: Date.now(),
|
||||
priority: 'high',
|
||||
};
|
||||
|
||||
await (
|
||||
worker as unknown as {
|
||||
processEntry: (
|
||||
stream: string,
|
||||
entry: { id: string; message: Record<string, string> },
|
||||
) => Promise<void>;
|
||||
}
|
||||
).processEntry('riot:queue:high', {
|
||||
id: '1-0',
|
||||
message: { job: JSON.stringify(job) },
|
||||
});
|
||||
|
||||
expect(enrichmentService.refreshRiotIdentity).toHaveBeenCalledTimes(1);
|
||||
expect(jobQueueService.markCompleted).toHaveBeenCalledWith(job);
|
||||
expect(jobQueueService.markFailed).not.toHaveBeenCalled();
|
||||
expect(refreshGateway.broadcastRefreshEvent).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ state: 'completed' }),
|
||||
);
|
||||
});
|
||||
|
||||
it('leaves a stream entry pending when another worker owns the job processing lock', async () => {
|
||||
const { worker, distributedLockService, redisService } = makeWorker();
|
||||
distributedLockService.runWithRenewedLock.mockResolvedValueOnce(null);
|
||||
|
||||
@@ -156,6 +156,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
queueId,
|
||||
});
|
||||
}
|
||||
await this.refreshRiotIdentity(job);
|
||||
await this.refreshLeagueEntries(job);
|
||||
await this.markUserFetchedAt(job);
|
||||
const event = await this.jobQueueService.markCompleted(job);
|
||||
@@ -211,6 +212,26 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
}
|
||||
}
|
||||
|
||||
private async refreshRiotIdentity(job: RiotRefreshSubJob): Promise<void> {
|
||||
try {
|
||||
const result = await this.enrichmentService.refreshRiotIdentity({
|
||||
userId: new mongoose.Types.ObjectId(job.userId),
|
||||
puuid: job.puuid,
|
||||
region: job.region,
|
||||
});
|
||||
if (result !== 'failed') return;
|
||||
this.logger.warn(
|
||||
`Riot identity refresh failed ${job.jobId}: puuid=${job.puuid}`,
|
||||
);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Riot identity refresh failed ${job.jobId}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async refreshLeagueEntries(job: RiotRefreshSubJob): Promise<void> {
|
||||
try {
|
||||
const result = await this.enrichmentService.refreshLeagueEntries({
|
||||
|
||||
@@ -12,9 +12,12 @@ import { RiotLeagueService } from './riot-league.service';
|
||||
import { RiotRecentMatchesService } from './riot-recent-matches.service';
|
||||
import { RiotRecentStatsService } from './riot-recent-stats.service';
|
||||
import { RiotSummonerService } from './riot-summoner.service';
|
||||
import { type RiotPlatformRoute, type RiotRegionalRoute } from './riot.types';
|
||||
|
||||
interface FakeAccount {
|
||||
puuid: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
profileIconId: number;
|
||||
revisionDate: number;
|
||||
summonerLevel: number;
|
||||
@@ -56,6 +59,8 @@ interface FakeAccount {
|
||||
function makeAccount(overrides: Partial<FakeAccount> = {}): FakeAccount {
|
||||
return {
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'OldName',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 0,
|
||||
revisionDate: 0,
|
||||
summonerLevel: 0,
|
||||
@@ -82,6 +87,11 @@ function makeUser(account: FakeAccount) {
|
||||
|
||||
function makeService(overrides?: {
|
||||
user?: any;
|
||||
community?: {
|
||||
riotPlatform?: RiotPlatformRoute;
|
||||
riotRegion?: RiotRegionalRoute;
|
||||
seasonStartedAt?: Date;
|
||||
};
|
||||
account?: Partial<RiotAccountService>;
|
||||
summoner?: Partial<RiotSummonerService>;
|
||||
league?: Partial<RiotLeagueService>;
|
||||
@@ -98,10 +108,12 @@ function makeService(overrides?: {
|
||||
select: () => ({
|
||||
lean: () => ({
|
||||
exec: () =>
|
||||
Promise.resolve({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
Promise.resolve(
|
||||
overrides?.community ?? {
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
},
|
||||
),
|
||||
}),
|
||||
}),
|
||||
});
|
||||
@@ -130,6 +142,7 @@ function makeService(overrides?: {
|
||||
...overrides?.summoner,
|
||||
} as unknown as RiotSummonerService;
|
||||
const accountService = {
|
||||
getByPuuid: jest.fn(),
|
||||
getRegionByPuuid: jest.fn(),
|
||||
...overrides?.account,
|
||||
} as unknown as RiotAccountService;
|
||||
@@ -177,6 +190,205 @@ function makeService(overrides?: {
|
||||
}
|
||||
|
||||
describe('RiotAccountEnrichmentService', () => {
|
||||
it('updates a changed Riot ID resolved from the stored PUUID', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service, accountService } = makeService({
|
||||
user,
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'NewName',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
region: 'europe',
|
||||
});
|
||||
|
||||
expect(result).toBe('updated');
|
||||
expect(account.gameName).toBe('NewName');
|
||||
expect(account.tagLine).toBe('KR1');
|
||||
expect(user.save).toHaveBeenCalledTimes(1);
|
||||
expect(accountService.getByPuuid).toHaveBeenCalledWith('puuid-1', {
|
||||
region: 'europe',
|
||||
});
|
||||
});
|
||||
|
||||
it('updates a changed Riot tag line resolved from the stored PUUID', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service } = makeService({
|
||||
user,
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'OldName',
|
||||
tagLine: 'NEW',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(result).toBe('updated');
|
||||
expect(account.gameName).toBe('OldName');
|
||||
expect(account.tagLine).toBe('NEW');
|
||||
expect(user.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('resolves the Riot region from the user community when none is provided', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service, accountService } = makeService({
|
||||
user,
|
||||
community: {
|
||||
riotPlatform: 'na1',
|
||||
riotRegion: 'americas',
|
||||
},
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'NewName',
|
||||
tagLine: 'NA1',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(accountService.getByPuuid).toHaveBeenCalledWith('puuid-1', {
|
||||
region: 'americas',
|
||||
});
|
||||
});
|
||||
|
||||
it('falls back to the default Riot region when the community has no region', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service, accountService } = makeService({
|
||||
user,
|
||||
community: {
|
||||
riotPlatform: 'kr',
|
||||
},
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'NewName',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(accountService.getByPuuid).toHaveBeenCalledWith('puuid-1', {
|
||||
region: 'asia',
|
||||
});
|
||||
});
|
||||
|
||||
it('does not save when the Riot ID has not changed', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service } = makeService({
|
||||
user,
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'OldName',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(result).toBe('unchanged');
|
||||
expect(user.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each([
|
||||
{
|
||||
name: 'a mismatched PUUID',
|
||||
response: {
|
||||
puuid: 'different-puuid',
|
||||
gameName: 'NewName',
|
||||
tagLine: 'NEW',
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'a missing game name',
|
||||
response: {
|
||||
puuid: 'puuid-1',
|
||||
gameName: null,
|
||||
tagLine: 'NEW',
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'a blank tag line',
|
||||
response: {
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'NewName',
|
||||
tagLine: ' ',
|
||||
},
|
||||
},
|
||||
])('preserves the stored Riot ID for $name', async ({ response }) => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service } = makeService({
|
||||
user,
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockResolvedValue(response),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(result).toBe('failed');
|
||||
expect(account.gameName).toBe('OldName');
|
||||
expect(account.tagLine).toBe('KR1');
|
||||
expect(user.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('preserves the stored Riot ID when Account-V1 lookup fails', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
const { service } = makeService({
|
||||
user,
|
||||
account: {
|
||||
getByPuuid: jest.fn().mockRejectedValue(new Error('Riot unavailable')),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.refreshRiotIdentity({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
});
|
||||
|
||||
expect(result).toBe('failed');
|
||||
expect(account.gameName).toBe('OldName');
|
||||
expect(account.tagLine).toBe('KR1');
|
||||
expect(user.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('returns failed for unknown user', async () => {
|
||||
const { service } = makeService();
|
||||
const result = await service.enrichRiotAccount({
|
||||
|
||||
@@ -59,6 +59,7 @@ export interface EnrichResult {
|
||||
}
|
||||
|
||||
export type RefreshLeagueEntriesResult = 'updated' | 'failed';
|
||||
export type RefreshRiotIdentityResult = 'updated' | 'unchanged' | 'failed';
|
||||
|
||||
@Injectable()
|
||||
export class RiotAccountEnrichmentService {
|
||||
@@ -87,6 +88,67 @@ export class RiotAccountEnrichmentService {
|
||||
).exec();
|
||||
}
|
||||
|
||||
public async refreshRiotIdentity(params: {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
region?: RiotRegionalRoute;
|
||||
}): Promise<RefreshRiotIdentityResult> {
|
||||
try {
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findById(params.userId).exec();
|
||||
if (!user) return 'failed';
|
||||
|
||||
const account = user.riotAccounts.find(
|
||||
(candidate) => candidate.puuid === params.puuid,
|
||||
);
|
||||
if (!account) return 'failed';
|
||||
|
||||
let region = params.region;
|
||||
if (!region) {
|
||||
const CommunityModel =
|
||||
await this.connectionService.getModel('community');
|
||||
const community = await CommunityModel.findById(user.communityId)
|
||||
.select({ riotRegion: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
region = community?.riotRegion ?? DEFAULT_REGION;
|
||||
}
|
||||
|
||||
const identity = await this.accountService.getByPuuid(params.puuid, {
|
||||
region,
|
||||
});
|
||||
if (
|
||||
identity.puuid !== params.puuid ||
|
||||
!identity.gameName?.trim() ||
|
||||
!identity.tagLine?.trim()
|
||||
) {
|
||||
this.logger.warn(
|
||||
`Riot identity response was incomplete or mismatched for ${params.puuid}.`,
|
||||
);
|
||||
return 'failed';
|
||||
}
|
||||
|
||||
if (
|
||||
account.gameName === identity.gameName &&
|
||||
account.tagLine === identity.tagLine
|
||||
) {
|
||||
return 'unchanged';
|
||||
}
|
||||
|
||||
account.gameName = identity.gameName;
|
||||
account.tagLine = identity.tagLine;
|
||||
await user.save();
|
||||
return 'updated';
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Riot identity refresh failed for ${params.puuid}: ${
|
||||
error instanceof Error ? error.message : String(error)
|
||||
}`,
|
||||
);
|
||||
return 'failed';
|
||||
}
|
||||
}
|
||||
|
||||
public async enrichRiotAccount(params: {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@lolympus/contracts": "workspace:*",
|
||||
"@azure/msal-browser": "^5.8.0",
|
||||
"@azure/msal-react": "^5.3.1",
|
||||
"@newrelic/browser-agent": "^1.316.0",
|
||||
"@lolympus/contracts": "workspace:*",
|
||||
"@newrelic/browser-agent": "^1.318.0",
|
||||
"@tanstack/react-query": "^5.100.1",
|
||||
"lucide-react": "^1.14.0",
|
||||
"react": "^19.2.4",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-router": "^7.14.0",
|
||||
"react": "^19.2.8",
|
||||
"react-dom": "^19.2.8",
|
||||
"react-router": "^8.3.0",
|
||||
"recharts": "^3.8.1",
|
||||
"socket.io-client": "^4.8.3"
|
||||
},
|
||||
@@ -46,7 +46,7 @@
|
||||
"tailwindcss": "^4.2.2",
|
||||
"typescript": "~6.0.2",
|
||||
"typescript-eslint": "^8.58.0",
|
||||
"vite": "^8.0.4",
|
||||
"wrangler": "^4.85.0"
|
||||
"vite": "^8.1.5",
|
||||
"wrangler": "^4.114.0"
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { io, type Socket } from 'socket.io-client';
|
||||
import { API_BASE_URL, useAuthUserId } from '../config';
|
||||
import { acquireAccessToken } from '../lib/auth/token-provider';
|
||||
@@ -140,6 +140,9 @@ function mergeChatMessages(
|
||||
|
||||
export function useAuctionSocket(matchId: string | undefined) {
|
||||
const authUserId = useAuthUserId();
|
||||
const connectionKey = matchId
|
||||
? JSON.stringify([matchId, authUserId ?? null])
|
||||
: null;
|
||||
const socketRef = useRef<Socket | null>(null);
|
||||
const pendingBidTimeoutsRef = useRef<
|
||||
Record<string, ReturnType<typeof setTimeout>>
|
||||
@@ -166,9 +169,14 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
Record<string, { action: string }>
|
||||
>({});
|
||||
const [resetAt, setResetAt] = useState<number | null>(null);
|
||||
const [connectionStatus, setConnectionStatus] =
|
||||
useState<ConnectionStatus>('idle');
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [connectionState, setConnectionState] = useState<{
|
||||
key: string;
|
||||
status: ConnectionStatus;
|
||||
}>({ key: '', status: 'idle' });
|
||||
const [errorState, setErrorState] = useState<{
|
||||
key: string;
|
||||
message: string | null;
|
||||
}>({ key: '', message: null });
|
||||
const [serverTimeOffsetMs, setServerTimeOffsetMs] = useState(0);
|
||||
const [serverRoundTripMs, setServerRoundTripMs] = useState<number | null>(
|
||||
null,
|
||||
@@ -176,53 +184,50 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
const [bidLatencyDiagnostics, setBidLatencyDiagnostics] =
|
||||
useState<BidLatencyDiagnostics | null>(null);
|
||||
|
||||
function syncLatestConfirmedBidPointAmountFromAuction(
|
||||
nextAuction: ApiAuction,
|
||||
) {
|
||||
latestConfirmedBidPointAmountRef.current =
|
||||
resolveCurrentBidPointAmount(nextAuction);
|
||||
}
|
||||
const commitAuctionState = useCallback(
|
||||
(nextAuction: ApiAuction, source = 'socket-state'): boolean => {
|
||||
const currentAuction = latestAuctionRef.current;
|
||||
const applied = shouldApplyIncomingAuctionState(
|
||||
currentAuction,
|
||||
nextAuction,
|
||||
);
|
||||
const currentRevision =
|
||||
typeof currentAuction?.revision === 'number'
|
||||
? currentAuction.revision
|
||||
: -1;
|
||||
const incomingRevision =
|
||||
typeof nextAuction?.revision === 'number' ? nextAuction.revision : -1;
|
||||
// 단조성을 깨고 적용되는 경우(=revision이 같거나 뒤로 가는데도 반영됨).
|
||||
// force-resync/lifecycle 교체로만 발생하며, "2~3 버전 롤백"의 직접 증거가 된다.
|
||||
const isBackwardApply =
|
||||
applied &&
|
||||
currentRevision >= 0 &&
|
||||
incomingRevision >= 0 &&
|
||||
incomingRevision <= currentRevision;
|
||||
addNewRelicPageAction('AuctionClientStateApply', {
|
||||
matchId: matchId ?? 'none',
|
||||
source,
|
||||
applied,
|
||||
isBackwardApply,
|
||||
revisionDelta: incomingRevision - currentRevision,
|
||||
...describeAuctionForTelemetry('current', currentAuction),
|
||||
...describeAuctionForTelemetry('incoming', nextAuction),
|
||||
});
|
||||
|
||||
function commitAuctionState(
|
||||
nextAuction: ApiAuction,
|
||||
source = 'socket-state',
|
||||
): boolean {
|
||||
const currentAuction = latestAuctionRef.current;
|
||||
const applied = shouldApplyIncomingAuctionState(currentAuction, nextAuction);
|
||||
const currentRevision =
|
||||
typeof currentAuction?.revision === 'number'
|
||||
? currentAuction.revision
|
||||
: -1;
|
||||
const incomingRevision =
|
||||
typeof nextAuction?.revision === 'number' ? nextAuction.revision : -1;
|
||||
// 단조성을 깨고 적용되는 경우(=revision이 같거나 뒤로 가는데도 반영됨).
|
||||
// force-resync/lifecycle 교체로만 발생하며, "2~3 버전 롤백"의 직접 증거가 된다.
|
||||
const isBackwardApply =
|
||||
applied &&
|
||||
currentRevision >= 0 &&
|
||||
incomingRevision >= 0 &&
|
||||
incomingRevision <= currentRevision;
|
||||
addNewRelicPageAction('AuctionClientStateApply', {
|
||||
matchId: matchId ?? 'none',
|
||||
source,
|
||||
applied,
|
||||
isBackwardApply,
|
||||
revisionDelta: incomingRevision - currentRevision,
|
||||
...describeAuctionForTelemetry('current', currentAuction),
|
||||
...describeAuctionForTelemetry('incoming', nextAuction),
|
||||
});
|
||||
if (!applied) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!applied) {
|
||||
return false;
|
||||
}
|
||||
latestAuctionRef.current = nextAuction;
|
||||
latestConfirmedBidPointAmountRef.current =
|
||||
resolveCurrentBidPointAmount(nextAuction);
|
||||
setAuction(nextAuction);
|
||||
return true;
|
||||
},
|
||||
[matchId],
|
||||
);
|
||||
|
||||
latestAuctionRef.current = nextAuction;
|
||||
syncLatestConfirmedBidPointAmountFromAuction(nextAuction);
|
||||
setAuction(nextAuction);
|
||||
return true;
|
||||
}
|
||||
|
||||
function commitBidDelta(payload: BidDeltaPayload): boolean {
|
||||
const commitBidDelta = useCallback((payload: BidDeltaPayload): boolean => {
|
||||
const currentAuction = latestAuctionRef.current;
|
||||
const nextAuction = applyBidDelta(currentAuction, payload);
|
||||
if (!nextAuction || nextAuction === currentAuction) {
|
||||
@@ -230,10 +235,18 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
}
|
||||
|
||||
latestAuctionRef.current = nextAuction;
|
||||
syncLatestConfirmedBidPointAmountFromAuction(nextAuction);
|
||||
latestConfirmedBidPointAmountRef.current =
|
||||
resolveCurrentBidPointAmount(nextAuction);
|
||||
setAuction(nextAuction);
|
||||
return true;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const setError = useCallback(
|
||||
(message: string | null) => {
|
||||
setErrorState({ key: connectionKey ?? '', message });
|
||||
},
|
||||
[connectionKey],
|
||||
);
|
||||
|
||||
function applyFallbackServerTimestamp(currentServerTimestampMS?: number) {
|
||||
if (hasSyncedServerTimeRef.current) return;
|
||||
@@ -345,14 +358,47 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
});
|
||||
}
|
||||
|
||||
const clearPendingBidRequest = useCallback((bidRequestId: string) => {
|
||||
const timeoutId = pendingBidTimeoutsRef.current[bidRequestId];
|
||||
if (timeoutId) clearTimeout(timeoutId);
|
||||
delete pendingBidTimeoutsRef.current[bidRequestId];
|
||||
setPendingBidRequests((current) => {
|
||||
const next = { ...current };
|
||||
delete next[bidRequestId];
|
||||
return next;
|
||||
});
|
||||
}, []);
|
||||
|
||||
const clearPendingActionRequest = useCallback(
|
||||
(auctionActionRequestId: string) => {
|
||||
const timeoutId =
|
||||
pendingActionTimeoutsRef.current[auctionActionRequestId];
|
||||
if (timeoutId) clearTimeout(timeoutId);
|
||||
delete pendingActionTimeoutsRef.current[auctionActionRequestId];
|
||||
setPendingActionRequests((current) => {
|
||||
const next = { ...current };
|
||||
delete next[auctionActionRequestId];
|
||||
return next;
|
||||
});
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
const clearPendingActionRequests = useCallback(() => {
|
||||
Object.values(pendingActionTimeoutsRef.current).forEach((timeoutId) =>
|
||||
clearTimeout(timeoutId),
|
||||
);
|
||||
pendingActionTimeoutsRef.current = {};
|
||||
setPendingActionRequests({});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!matchId) {
|
||||
if (!matchId || !connectionKey) {
|
||||
return;
|
||||
}
|
||||
|
||||
const activeConnectionKey = connectionKey;
|
||||
let disposed = false;
|
||||
setConnectionStatus('connecting');
|
||||
setError(null);
|
||||
|
||||
void (async () => {
|
||||
const accessToken = await acquireAccessToken().catch((error) => {
|
||||
@@ -373,7 +419,11 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
socketRef.current = socket;
|
||||
|
||||
socket.on('connect', () => {
|
||||
setConnectionStatus('connected');
|
||||
setConnectionState({
|
||||
key: activeConnectionKey,
|
||||
status: 'connected',
|
||||
});
|
||||
setError(null);
|
||||
socket.emit('join', { matchId });
|
||||
requestServerTimeSync(socket);
|
||||
if (timeSyncIntervalRef.current) {
|
||||
@@ -387,7 +437,10 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
clearTimeSyncTimers();
|
||||
setConnectionStatus('disconnected');
|
||||
setConnectionState({
|
||||
key: activeConnectionKey,
|
||||
status: 'disconnected',
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('state', (nextAuction: ApiAuction) => {
|
||||
@@ -520,42 +573,20 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
hasSyncedServerTimeRef.current = false;
|
||||
setPendingBidRequests({});
|
||||
setPendingActionRequests({});
|
||||
setConnectionStatus('idle');
|
||||
setServerTimeOffsetMs(0);
|
||||
setServerRoundTripMs(null);
|
||||
setBidLatencyDiagnostics(null);
|
||||
};
|
||||
}, [authUserId, matchId]);
|
||||
|
||||
function clearPendingBidRequest(bidRequestId: string) {
|
||||
const timeoutId = pendingBidTimeoutsRef.current[bidRequestId];
|
||||
if (timeoutId) clearTimeout(timeoutId);
|
||||
delete pendingBidTimeoutsRef.current[bidRequestId];
|
||||
setPendingBidRequests((current) => {
|
||||
const next = { ...current };
|
||||
delete next[bidRequestId];
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
function clearPendingActionRequest(auctionActionRequestId: string) {
|
||||
const timeoutId = pendingActionTimeoutsRef.current[auctionActionRequestId];
|
||||
if (timeoutId) clearTimeout(timeoutId);
|
||||
delete pendingActionTimeoutsRef.current[auctionActionRequestId];
|
||||
setPendingActionRequests((current) => {
|
||||
const next = { ...current };
|
||||
delete next[auctionActionRequestId];
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
function clearPendingActionRequests() {
|
||||
Object.values(pendingActionTimeoutsRef.current).forEach((timeoutId) =>
|
||||
clearTimeout(timeoutId),
|
||||
);
|
||||
pendingActionTimeoutsRef.current = {};
|
||||
setPendingActionRequests({});
|
||||
}
|
||||
}, [
|
||||
authUserId,
|
||||
clearPendingActionRequests,
|
||||
clearPendingBidRequest,
|
||||
commitAuctionState,
|
||||
commitBidDelta,
|
||||
connectionKey,
|
||||
matchId,
|
||||
setError,
|
||||
]);
|
||||
|
||||
function emit(eventName: string, payload?: unknown) {
|
||||
const socket = socketRef.current;
|
||||
@@ -737,9 +768,16 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
const currentAuction = auction;
|
||||
const visibleAuction =
|
||||
currentAuction && currentAuction.matchId === matchId ? currentAuction : null;
|
||||
const visibleConnectionStatus: ConnectionStatus = matchId
|
||||
? connectionStatus
|
||||
: 'idle';
|
||||
const visibleConnectionStatus: ConnectionStatus =
|
||||
connectionKey === null
|
||||
? 'idle'
|
||||
: connectionState.key === connectionKey
|
||||
? connectionState.status
|
||||
: 'connecting';
|
||||
const visibleError =
|
||||
connectionKey !== null && errorState.key === connectionKey
|
||||
? errorState.message
|
||||
: null;
|
||||
|
||||
return {
|
||||
auction: visibleAuction,
|
||||
@@ -750,7 +788,7 @@ export function useAuctionSocket(matchId: string | undefined) {
|
||||
pendingBidRequests,
|
||||
resetAt,
|
||||
connectionStatus: visibleConnectionStatus,
|
||||
error,
|
||||
error: visibleError,
|
||||
bidLatencyDiagnostics,
|
||||
serverRoundTripMs: matchId ? serverRoundTripMs : null,
|
||||
serverTimeOffsetMs: matchId ? serverTimeOffsetMs : 0,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { io, type Socket } from 'socket.io-client';
|
||||
import { io } from 'socket.io-client';
|
||||
import { API_BASE_URL } from '../config';
|
||||
import type { ApiRiotRefreshEvent } from './types';
|
||||
|
||||
@@ -19,37 +19,43 @@ export function useRiotRefreshSocket({
|
||||
parentJobId?: string;
|
||||
onEvent: (event: ApiRiotRefreshEvent) => void;
|
||||
}) {
|
||||
const socketRef = useRef<Socket | null>(null);
|
||||
const subscriptionKey =
|
||||
puuid || parentJobId ? JSON.stringify([puuid, parentJobId]) : null;
|
||||
const onEventRef = useRef(onEvent);
|
||||
const [connectionStatus, setConnectionStatus] =
|
||||
useState<ConnectionStatus>('idle');
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [connectionState, setConnectionState] = useState<{
|
||||
key: string;
|
||||
status: ConnectionStatus;
|
||||
error: string | null;
|
||||
}>({ key: '', status: 'idle', error: null });
|
||||
|
||||
useEffect(() => {
|
||||
onEventRef.current = onEvent;
|
||||
}, [onEvent]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!puuid && !parentJobId) {
|
||||
setConnectionStatus('idle');
|
||||
if (!subscriptionKey) {
|
||||
return;
|
||||
}
|
||||
|
||||
setConnectionStatus('connecting');
|
||||
setError(null);
|
||||
|
||||
const socket = io(`${API_BASE_URL}/riot-refresh`, {
|
||||
transports: ['websocket'],
|
||||
});
|
||||
socketRef.current = socket;
|
||||
|
||||
socket.on('connect', () => {
|
||||
setConnectionStatus('connected');
|
||||
setConnectionState({
|
||||
key: subscriptionKey,
|
||||
status: 'connected',
|
||||
error: null,
|
||||
});
|
||||
socket.emit('subscribe', { puuid, parentJobId });
|
||||
});
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
setConnectionStatus('disconnected');
|
||||
setConnectionState((current) => ({
|
||||
key: subscriptionKey,
|
||||
status: 'disconnected',
|
||||
error: current.key === subscriptionKey ? current.error : null,
|
||||
}));
|
||||
});
|
||||
|
||||
socket.on('riot-refresh', (event: ApiRiotRefreshEvent) => {
|
||||
@@ -57,17 +63,29 @@ export function useRiotRefreshSocket({
|
||||
});
|
||||
|
||||
socket.on('error', (payload: { message?: string }) => {
|
||||
setConnectionStatus('error');
|
||||
setError(payload.message ?? '전적 갱신 소켓 연결 중 오류가 발생했습니다.');
|
||||
setConnectionState({
|
||||
key: subscriptionKey,
|
||||
status: 'error',
|
||||
error:
|
||||
payload.message ?? '전적 갱신 소켓 연결 중 오류가 발생했습니다.',
|
||||
});
|
||||
});
|
||||
|
||||
return () => {
|
||||
socket.removeAllListeners();
|
||||
socket.disconnect();
|
||||
socketRef.current = null;
|
||||
setConnectionStatus('idle');
|
||||
};
|
||||
}, [parentJobId, puuid]);
|
||||
}, [parentJobId, puuid, subscriptionKey]);
|
||||
|
||||
return { connectionStatus, error };
|
||||
const hasCurrentConnection =
|
||||
subscriptionKey !== null && connectionState.key === subscriptionKey;
|
||||
return {
|
||||
connectionStatus:
|
||||
subscriptionKey === null
|
||||
? 'idle'
|
||||
: hasCurrentConnection
|
||||
? connectionState.status
|
||||
: 'connecting',
|
||||
error: hasCurrentConnection ? connectionState.error : null,
|
||||
};
|
||||
}
|
||||
@@ -1,20 +1,30 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useState } from 'react';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { setAuthUserId, useAuthUserId } from '../config';
|
||||
|
||||
export default function DevAuthSwitcher() {
|
||||
const authUserId = useAuthUserId();
|
||||
const queryClient = useQueryClient();
|
||||
const [inputValue, setInputValue] = useState(authUserId ?? '');
|
||||
|
||||
useEffect(() => {
|
||||
setInputValue(authUserId ?? '');
|
||||
}, [authUserId]);
|
||||
|
||||
if (!import.meta.env.DEV) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<DevAuthSwitcherForm
|
||||
key={authUserId ?? 'no-auth-user'}
|
||||
authUserId={authUserId}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function DevAuthSwitcherForm({
|
||||
authUserId,
|
||||
}: {
|
||||
authUserId: string | null;
|
||||
}) {
|
||||
const queryClient = useQueryClient();
|
||||
const [inputValue, setInputValue] = useState(authUserId ?? '');
|
||||
|
||||
function updateAuthUserId(nextValue: string | null) {
|
||||
setAuthUserId(nextValue);
|
||||
void queryClient.invalidateQueries();
|
||||
|
||||
@@ -1,21 +1,9 @@
|
||||
import type { ApiTierInfo } from "../api/types";
|
||||
import { formatRankBadge, formatRankDetail } from "./rankBadgeUtils";
|
||||
|
||||
type RankBadgeSize = "sm" | "md";
|
||||
type RankBadgeTooltipPlacement = "left" | "bottom";
|
||||
|
||||
const TIER_NAMES: Record<string, string> = {
|
||||
IRON: "아이언",
|
||||
BRONZE: "브론즈",
|
||||
SILVER: "실버",
|
||||
GOLD: "골드",
|
||||
PLATINUM: "플래티넘",
|
||||
EMERALD: "에메랄드",
|
||||
DIAMOND: "다이아몬드",
|
||||
MASTER: "마스터",
|
||||
GRANDMASTER: "그랜드마스터",
|
||||
CHALLENGER: "챌린저",
|
||||
};
|
||||
|
||||
const SIZE_CLASSES: Record<RankBadgeSize, string> = {
|
||||
sm: "h-[17px] min-w-[18px]",
|
||||
md: "h-[18px] min-w-[20px]",
|
||||
@@ -26,21 +14,6 @@ const TOOLTIP_CLASSES: Record<RankBadgeTooltipPlacement, string> = {
|
||||
bottom: "tooltip-bottom",
|
||||
};
|
||||
|
||||
function normalizeRank(rank: string | undefined) {
|
||||
switch (rank) {
|
||||
case "I":
|
||||
return "1";
|
||||
case "II":
|
||||
return "2";
|
||||
case "III":
|
||||
return "3";
|
||||
case "IV":
|
||||
return "4";
|
||||
default:
|
||||
return rank;
|
||||
}
|
||||
}
|
||||
|
||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
||||
switch (tier?.tier) {
|
||||
case "CHALLENGER":
|
||||
@@ -68,22 +41,6 @@ function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
||||
}
|
||||
}
|
||||
|
||||
export function formatRankBadge(tier: ApiTierInfo | undefined) {
|
||||
if (!tier) return "U";
|
||||
const tierInitial =
|
||||
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
||||
const rank = normalizeRank(tier.rank);
|
||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
||||
}
|
||||
|
||||
export function formatRankDetail(tier: ApiTierInfo | undefined) {
|
||||
if (!tier) return "랭크 정보 없음";
|
||||
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
|
||||
const rank = normalizeRank(tier.rank);
|
||||
const label = rank ? `${tierName} ${rank}` : tierName;
|
||||
return `${label} - ${tier.leaguePoints} LP`;
|
||||
}
|
||||
|
||||
export function RankBadge({
|
||||
tier,
|
||||
size = "md",
|
||||
|
||||
@@ -67,6 +67,7 @@ const TIER_COMPACT_NAMES: Record<string, string> = {
|
||||
};
|
||||
|
||||
type PeriodKey = "30" | "90" | "all";
|
||||
type PeriodFilter = { key: PeriodKey; cutoffTimestamp: number };
|
||||
type SummaryVariant = "footer" | "inline";
|
||||
type SummaryDirection = "up" | "down" | "flat";
|
||||
|
||||
@@ -314,18 +315,17 @@ export default function TierHistoryChart({
|
||||
const [queue, setQueue] = useState(
|
||||
availableQueues[0] ?? "RANKED_SOLO_5x5",
|
||||
);
|
||||
const [period, setPeriod] = useState<PeriodKey>("all");
|
||||
const [periodFilter, setPeriodFilter] = useState<PeriodFilter>({
|
||||
key: "all",
|
||||
cutoffTimestamp: 0,
|
||||
});
|
||||
const period = periodFilter.key;
|
||||
|
||||
const activeQueue = availableQueues.includes(queue)
|
||||
? queue
|
||||
: (availableQueues[0] ?? "RANKED_SOLO_5x5");
|
||||
|
||||
const points = useMemo<ChartPoint[]>(() => {
|
||||
const periodDays =
|
||||
PERIOD_OPTIONS.find((option) => option.key === period)?.days ?? null;
|
||||
const cutoff =
|
||||
periodDays === null ? 0 : Date.now() - periodDays * 24 * 60 * 60 * 1000;
|
||||
|
||||
return entries
|
||||
.filter((entry) => entry.queueType === activeQueue)
|
||||
.map((entry) => ({
|
||||
@@ -337,9 +337,9 @@ export default function TierHistoryChart({
|
||||
wins: entry.wins,
|
||||
losses: entry.losses,
|
||||
}))
|
||||
.filter((point) => point.ts >= cutoff)
|
||||
.filter((point) => point.ts >= periodFilter.cutoffTimestamp)
|
||||
.sort((left, right) => left.ts - right.ts);
|
||||
}, [entries, activeQueue, period]);
|
||||
}, [entries, activeQueue, periodFilter.cutoffTimestamp]);
|
||||
|
||||
// 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만.
|
||||
const tierLines = useMemo(() => {
|
||||
@@ -408,7 +408,19 @@ export default function TierHistoryChart({
|
||||
<select
|
||||
className="h-7 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
|
||||
value={period}
|
||||
onChange={(event) => setPeriod(event.target.value as PeriodKey)}
|
||||
onChange={(event) => {
|
||||
const nextPeriod = event.target.value as PeriodKey;
|
||||
const days =
|
||||
PERIOD_OPTIONS.find((option) => option.key === nextPeriod)
|
||||
?.days ?? null;
|
||||
setPeriodFilter({
|
||||
key: nextPeriod,
|
||||
cutoffTimestamp:
|
||||
days === null
|
||||
? 0
|
||||
: Date.now() - days * 24 * 60 * 60 * 1000,
|
||||
});
|
||||
}}
|
||||
>
|
||||
{PERIOD_OPTIONS.map((option) => (
|
||||
<option key={option.key} value={option.key}>
|
||||
|
||||
@@ -104,7 +104,11 @@ export function SeriesScoreCard({
|
||||
{presentation.label}
|
||||
</span>
|
||||
</header>
|
||||
<div className="divide-y divide-base-content/8">
|
||||
<div
|
||||
className={
|
||||
isBracket ? "relative" : "divide-y divide-base-content/8"
|
||||
}
|
||||
>
|
||||
{series.entries.map((entry) => {
|
||||
const team = entry.teamId ? teamById.get(entry.teamId) : undefined;
|
||||
const isWinner = isSeriesEntryWinner(series, entry.teamId);
|
||||
@@ -129,6 +133,13 @@ export function SeriesScoreCard({
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{isBracket && (
|
||||
<span
|
||||
className="pointer-events-none absolute inset-x-0 border-t border-base-content/8"
|
||||
style={{ top: SERIES_SCORE_CARD_GEOMETRY.entryHeight }}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</article>
|
||||
);
|
||||
|
||||
@@ -17,6 +17,8 @@ export const DOUBLE_ELIMINATION_BRACKET_GEOMETRY = {
|
||||
boardPadding: 12,
|
||||
columnWidth: 228,
|
||||
columnGap: 40,
|
||||
// Matches the widest focused connector underlay so parallel routes stay legible.
|
||||
connectorRailClearance: 5,
|
||||
cardBorderWidth: SERIES_SCORE_CARD_GEOMETRY.borderWidth,
|
||||
cardHeight: SERIES_SCORE_CARD_GEOMETRY.height,
|
||||
cardHeaderHeight: SERIES_SCORE_CARD_GEOMETRY.headerHeight,
|
||||
@@ -109,6 +111,29 @@ interface NormalizedRound {
|
||||
seriesIds: SeriesId[];
|
||||
}
|
||||
|
||||
interface ConnectorRoute {
|
||||
connector: SeriesConnectorView;
|
||||
key: string;
|
||||
kind: BracketConnectorKind;
|
||||
targetColumn: number;
|
||||
targetNodeY: number;
|
||||
sourceX: number;
|
||||
sourceY: number;
|
||||
targetX: number;
|
||||
targetY: number;
|
||||
}
|
||||
|
||||
interface SeparateWinnerRailChoice {
|
||||
verticalXs: [number, number];
|
||||
crossings: number;
|
||||
distanceFromBaseline: number;
|
||||
distanceFromCenter: number;
|
||||
}
|
||||
|
||||
type OrthogonalSegment =
|
||||
| { orientation: "horizontal"; fixed: number; start: number; end: number }
|
||||
| { orientation: "vertical"; fixed: number; start: number; end: number };
|
||||
|
||||
const STAGE_ORDER: Record<BracketStage, number> = {
|
||||
upper: 0,
|
||||
lower: 1,
|
||||
@@ -126,6 +151,9 @@ const CONNECTOR_SELECTION_ORDER: Record<
|
||||
"slot-b": 3,
|
||||
};
|
||||
|
||||
// A focused 5px underlay extends 2.5px from its centerline.
|
||||
const CONNECTOR_RAIL_EDGE_INSET = 3;
|
||||
|
||||
export function createDoubleEliminationBracketLayout(
|
||||
projection: DoubleEliminationCompetitionProjection,
|
||||
configuration: DoubleEliminationBracketConfiguration,
|
||||
@@ -540,56 +568,53 @@ function buildConnectors(
|
||||
nodeById: Map<SeriesId, BracketNodeLayout>,
|
||||
): BracketConnectorLayout[] | null {
|
||||
const geometry = DOUBLE_ELIMINATION_BRACKET_GEOMETRY;
|
||||
const connectorsByTargetColumn = new Map<
|
||||
number,
|
||||
Array<{
|
||||
connector: SeriesConnectorView;
|
||||
source: BracketNodeLayout;
|
||||
target: BracketNodeLayout;
|
||||
}>
|
||||
>();
|
||||
const routes: ConnectorRoute[] = [];
|
||||
const routesByTargetColumn = new Map<number, ConnectorRoute[]>();
|
||||
for (const connector of projection.connectors) {
|
||||
const source = nodeById.get(connector.from.seriesId);
|
||||
const target = nodeById.get(connector.to.seriesId);
|
||||
if (!source || !target || target.column <= source.column) return null;
|
||||
const routes = connectorsByTargetColumn.get(target.column) ?? [];
|
||||
routes.push({ connector, source, target });
|
||||
connectorsByTargetColumn.set(target.column, routes);
|
||||
const route = {
|
||||
connector,
|
||||
key: connectorKey(connector),
|
||||
kind: connectorKind(connector.from.select),
|
||||
targetColumn: target.column,
|
||||
targetNodeY: target.y,
|
||||
sourceX: source.x + source.width,
|
||||
sourceY: connectorAnchorY(source, connector.from.select),
|
||||
targetX: target.x,
|
||||
targetY: targetSlotY(target, connector.to.slot),
|
||||
} satisfies ConnectorRoute;
|
||||
routes.push(route);
|
||||
const columnRoutes = routesByTargetColumn.get(target.column) ?? [];
|
||||
columnRoutes.push(route);
|
||||
routesByTargetColumn.set(target.column, columnRoutes);
|
||||
}
|
||||
|
||||
const verticalXByConnector = new Map<string, number>();
|
||||
for (const routes of connectorsByTargetColumn.values()) {
|
||||
routes.sort(
|
||||
for (const columnRoutes of routesByTargetColumn.values()) {
|
||||
columnRoutes.sort(
|
||||
(left, right) =>
|
||||
connectorAnchorY(right.source, right.connector.from.select) -
|
||||
connectorAnchorY(left.source, left.connector.from.select) ||
|
||||
targetSlotY(right.target, right.connector.to.slot) -
|
||||
targetSlotY(left.target, left.connector.to.slot) ||
|
||||
connectorKey(left.connector).localeCompare(connectorKey(right.connector)),
|
||||
right.sourceY - left.sourceY ||
|
||||
right.targetY - left.targetY ||
|
||||
left.key.localeCompare(right.key),
|
||||
);
|
||||
routes.forEach(({ connector, target }, index) => {
|
||||
columnRoutes.forEach(({ key, targetX }, index) => {
|
||||
verticalXByConnector.set(
|
||||
connectorKey(connector),
|
||||
target.x -
|
||||
key,
|
||||
targetX -
|
||||
geometry.columnGap +
|
||||
(geometry.columnGap * (index + 1)) / (routes.length + 1),
|
||||
(geometry.columnGap * (index + 1)) / (columnRoutes.length + 1),
|
||||
);
|
||||
});
|
||||
}
|
||||
if (!alignWinnerBundleRails(routes, verticalXByConnector)) return null;
|
||||
|
||||
const result: BracketConnectorLayout[] = [];
|
||||
for (const connector of projection.connectors) {
|
||||
const source = nodeById.get(connector.from.seriesId);
|
||||
const target = nodeById.get(connector.to.seriesId);
|
||||
if (!source || !target || target.column <= source.column) return null;
|
||||
|
||||
const sourceX = source.x + source.width;
|
||||
const targetX = target.x;
|
||||
const sourceY = connectorAnchorY(source, connector.from.select);
|
||||
const targetY = targetSlotY(target, connector.to.slot);
|
||||
const verticalX = verticalXByConnector.get(connectorKey(connector));
|
||||
for (const route of routes) {
|
||||
const { connector, key, kind, sourceX, sourceY, targetX, targetY } = route;
|
||||
const verticalX = verticalXByConnector.get(key);
|
||||
if (verticalX === undefined) return null;
|
||||
const kind = connectorKind(connector.from.select);
|
||||
result.push({
|
||||
fromSeriesId: connector.from.seriesId,
|
||||
select: connector.from.select,
|
||||
@@ -622,6 +647,324 @@ function buildConnectors(
|
||||
);
|
||||
}
|
||||
|
||||
function alignWinnerBundleRails(
|
||||
routes: readonly ConnectorRoute[],
|
||||
verticalXByConnector: Map<string, number>,
|
||||
): boolean {
|
||||
const winnersByTarget = new Map<SeriesId, ConnectorRoute[]>();
|
||||
for (const route of routes) {
|
||||
if (route.kind !== "winner") continue;
|
||||
const winners = winnersByTarget.get(route.connector.to.seriesId) ?? [];
|
||||
winners.push(route);
|
||||
winnersByTarget.set(route.connector.to.seriesId, winners);
|
||||
}
|
||||
|
||||
const bundles = [...winnersByTarget.values()]
|
||||
.filter(
|
||||
(winners) =>
|
||||
winners.length === 2 &&
|
||||
winners[0].connector.to.slot !== winners[1].connector.to.slot,
|
||||
)
|
||||
.sort(
|
||||
(left, right) =>
|
||||
left[0].targetColumn - right[0].targetColumn ||
|
||||
left[0].targetNodeY - right[0].targetNodeY ||
|
||||
left[0].key.localeCompare(right[0].key),
|
||||
);
|
||||
|
||||
for (const bundle of bundles) {
|
||||
const preferredX =
|
||||
bundle[0].targetX - DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap / 2;
|
||||
if (
|
||||
intervalsOverlap(
|
||||
bundle[0].sourceY,
|
||||
bundle[0].targetY,
|
||||
bundle[1].sourceY,
|
||||
bundle[1].targetY,
|
||||
)
|
||||
) {
|
||||
const assignment = chooseSeparateWinnerRails(
|
||||
bundle,
|
||||
routes,
|
||||
verticalXByConnector,
|
||||
preferredX,
|
||||
);
|
||||
if (!assignment) return false;
|
||||
for (const [key, verticalX] of assignment) {
|
||||
verticalXByConnector.set(key, verticalX);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
const verticalX = chooseWinnerBundleRail(
|
||||
bundle,
|
||||
routes,
|
||||
verticalXByConnector,
|
||||
preferredX,
|
||||
);
|
||||
if (verticalX === null) return false;
|
||||
for (const route of bundle) verticalXByConnector.set(route.key, verticalX);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function chooseWinnerBundleRail(
|
||||
bundle: readonly ConnectorRoute[],
|
||||
routes: readonly ConnectorRoute[],
|
||||
verticalXByConnector: Map<string, number>,
|
||||
preferredX: number,
|
||||
): number | null {
|
||||
const previousRails = bundle.map((route) =>
|
||||
verticalXByConnector.get(route.key),
|
||||
);
|
||||
if (previousRails.some((verticalX) => verticalX === undefined)) return null;
|
||||
const previousScore = connectorConflictScore(routes, verticalXByConnector);
|
||||
// Keep the existing crossing budget, then favor stroke-clear rails nearest center.
|
||||
let best:
|
||||
| {
|
||||
verticalX: number;
|
||||
crossings: number;
|
||||
clearanceConflicts: number;
|
||||
distanceFromCenter: number;
|
||||
}
|
||||
| null = null;
|
||||
|
||||
for (const candidateX of winnerRailCandidates(preferredX)) {
|
||||
for (const route of bundle) {
|
||||
verticalXByConnector.set(route.key, candidateX);
|
||||
}
|
||||
const score = connectorConflictScore(routes, verticalXByConnector);
|
||||
if (
|
||||
score.overlaps !== 0 ||
|
||||
score.crossings > previousScore.crossings ||
|
||||
score.clearanceConflicts > previousScore.clearanceConflicts
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
const distanceFromCenter = Math.abs(candidateX - preferredX);
|
||||
if (
|
||||
!best ||
|
||||
score.clearanceConflicts < best.clearanceConflicts ||
|
||||
(score.clearanceConflicts === best.clearanceConflicts &&
|
||||
(score.crossings < best.crossings ||
|
||||
(score.crossings === best.crossings &&
|
||||
distanceFromCenter < best.distanceFromCenter)))
|
||||
) {
|
||||
best = {
|
||||
verticalX: candidateX,
|
||||
crossings: score.crossings,
|
||||
clearanceConflicts: score.clearanceConflicts,
|
||||
distanceFromCenter,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
if (best) return best.verticalX;
|
||||
|
||||
bundle.forEach((route, index) => {
|
||||
const previousX = previousRails[index];
|
||||
if (previousX !== undefined) {
|
||||
verticalXByConnector.set(route.key, previousX);
|
||||
}
|
||||
});
|
||||
return null;
|
||||
}
|
||||
|
||||
function winnerRailCandidates(preferredX: number): number[] {
|
||||
const geometry = DOUBLE_ELIMINATION_BRACKET_GEOMETRY;
|
||||
const maximumOffset =
|
||||
geometry.columnGap / 2 - CONNECTOR_RAIL_EDGE_INSET;
|
||||
const candidates = [preferredX];
|
||||
for (let offset = 1; offset <= maximumOffset; offset += 1) {
|
||||
candidates.push(preferredX - offset, preferredX + offset);
|
||||
}
|
||||
return candidates;
|
||||
}
|
||||
|
||||
function chooseSeparateWinnerRails(
|
||||
bundle: readonly ConnectorRoute[],
|
||||
routes: readonly ConnectorRoute[],
|
||||
verticalXByConnector: Map<string, number>,
|
||||
preferredX: number,
|
||||
): Map<string, number> | null {
|
||||
const orderedBundle = [...bundle].sort(
|
||||
(left, right) =>
|
||||
left.sourceY - right.sourceY ||
|
||||
left.targetY - right.targetY ||
|
||||
left.key.localeCompare(right.key),
|
||||
);
|
||||
const previousRails: number[] = [];
|
||||
for (const route of orderedBundle) {
|
||||
const previousX = verticalXByConnector.get(route.key);
|
||||
if (previousX === undefined) return null;
|
||||
previousRails.push(previousX);
|
||||
}
|
||||
|
||||
const previousScore = connectorConflictScore(routes, verticalXByConnector);
|
||||
const bundleKeys = new Set(orderedBundle.map(({ key }) => key));
|
||||
const candidates = [
|
||||
...new Set([...previousRails, ...winnerRailCandidates(preferredX)]),
|
||||
];
|
||||
let best: SeparateWinnerRailChoice | null = null;
|
||||
|
||||
for (const firstX of candidates) {
|
||||
for (const secondX of candidates) {
|
||||
if (firstX === secondX) continue;
|
||||
verticalXByConnector.set(orderedBundle[0].key, firstX);
|
||||
verticalXByConnector.set(orderedBundle[1].key, secondX);
|
||||
|
||||
const bundleScore = connectorConflictScore(
|
||||
routes,
|
||||
verticalXByConnector,
|
||||
bundleKeys,
|
||||
);
|
||||
const score = connectorConflictScore(routes, verticalXByConnector);
|
||||
if (
|
||||
bundleScore.overlaps !== 0 ||
|
||||
bundleScore.clearanceConflicts !== 0 ||
|
||||
score.overlaps !== 0 ||
|
||||
score.crossings > previousScore.crossings
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const distanceFromBaseline =
|
||||
Math.abs(firstX - previousRails[0]) +
|
||||
Math.abs(secondX - previousRails[1]);
|
||||
const distanceFromCenter =
|
||||
Math.abs(firstX - preferredX) + Math.abs(secondX - preferredX);
|
||||
const candidate: SeparateWinnerRailChoice = {
|
||||
verticalXs: [firstX, secondX],
|
||||
crossings: score.crossings,
|
||||
distanceFromBaseline,
|
||||
distanceFromCenter,
|
||||
};
|
||||
if (!best || compareSeparateWinnerRailChoices(candidate, best) < 0) {
|
||||
best = candidate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
orderedBundle.forEach((route, index) => {
|
||||
verticalXByConnector.set(route.key, previousRails[index]);
|
||||
});
|
||||
if (!best) return null;
|
||||
return new Map(
|
||||
orderedBundle.map((route, index) => [route.key, best.verticalXs[index]]),
|
||||
);
|
||||
}
|
||||
|
||||
function compareSeparateWinnerRailChoices(
|
||||
left: SeparateWinnerRailChoice,
|
||||
right: SeparateWinnerRailChoice,
|
||||
): number {
|
||||
return (
|
||||
left.crossings - right.crossings ||
|
||||
left.distanceFromBaseline - right.distanceFromBaseline ||
|
||||
left.distanceFromCenter - right.distanceFromCenter ||
|
||||
left.verticalXs[0] - right.verticalXs[0] ||
|
||||
left.verticalXs[1] - right.verticalXs[1]
|
||||
);
|
||||
}
|
||||
|
||||
function connectorConflictScore(
|
||||
routes: readonly ConnectorRoute[],
|
||||
verticalXByConnector: ReadonlyMap<string, number>,
|
||||
focusedRouteKeys?: ReadonlySet<string>,
|
||||
): { crossings: number; overlaps: number; clearanceConflicts: number } {
|
||||
let crossings = 0;
|
||||
let overlaps = 0;
|
||||
let clearanceConflicts = 0;
|
||||
for (let leftIndex = 0; leftIndex < routes.length; leftIndex += 1) {
|
||||
const leftX = verticalXByConnector.get(routes[leftIndex].key);
|
||||
if (leftX === undefined) continue;
|
||||
const leftSegments = connectorRouteSegments(routes[leftIndex], leftX);
|
||||
for (
|
||||
let rightIndex = leftIndex + 1;
|
||||
rightIndex < routes.length;
|
||||
rightIndex += 1
|
||||
) {
|
||||
if (
|
||||
focusedRouteKeys &&
|
||||
!focusedRouteKeys.has(routes[leftIndex].key) &&
|
||||
!focusedRouteKeys.has(routes[rightIndex].key)
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
const rightX = verticalXByConnector.get(routes[rightIndex].key);
|
||||
if (rightX === undefined) continue;
|
||||
const rightSegments = connectorRouteSegments(routes[rightIndex], rightX);
|
||||
for (const left of leftSegments) {
|
||||
for (const right of rightSegments) {
|
||||
if (left.orientation === right.orientation) {
|
||||
const overlapLength =
|
||||
Math.min(left.end, right.end) - Math.max(left.start, right.start);
|
||||
if (left.fixed === right.fixed && overlapLength > 0) {
|
||||
overlaps += 1;
|
||||
} else if (
|
||||
left.orientation === "vertical" &&
|
||||
overlapLength > 0 &&
|
||||
Math.abs(left.fixed - right.fixed) <
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.connectorRailClearance
|
||||
) {
|
||||
clearanceConflicts += 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
const horizontal =
|
||||
left.orientation === "horizontal" ? left : right;
|
||||
const vertical = left.orientation === "vertical" ? left : right;
|
||||
if (
|
||||
vertical.fixed > horizontal.start &&
|
||||
vertical.fixed < horizontal.end &&
|
||||
horizontal.fixed > vertical.start &&
|
||||
horizontal.fixed < vertical.end
|
||||
) {
|
||||
crossings += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return { crossings, overlaps, clearanceConflicts };
|
||||
}
|
||||
|
||||
function connectorRouteSegments(
|
||||
route: ConnectorRoute,
|
||||
verticalX: number,
|
||||
): OrthogonalSegment[] {
|
||||
return [
|
||||
orthogonalSegment("horizontal", route.sourceY, route.sourceX, verticalX),
|
||||
orthogonalSegment("vertical", verticalX, route.sourceY, route.targetY),
|
||||
orthogonalSegment("horizontal", route.targetY, verticalX, route.targetX),
|
||||
];
|
||||
}
|
||||
|
||||
function orthogonalSegment(
|
||||
orientation: OrthogonalSegment["orientation"],
|
||||
fixed: number,
|
||||
first: number,
|
||||
second: number,
|
||||
): OrthogonalSegment {
|
||||
return {
|
||||
orientation,
|
||||
fixed,
|
||||
start: Math.min(first, second),
|
||||
end: Math.max(first, second),
|
||||
};
|
||||
}
|
||||
|
||||
function intervalsOverlap(
|
||||
firstStart: number,
|
||||
firstEnd: number,
|
||||
secondStart: number,
|
||||
secondEnd: number,
|
||||
): boolean {
|
||||
return (
|
||||
Math.min(firstStart, firstEnd) < Math.max(secondStart, secondEnd) &&
|
||||
Math.min(secondStart, secondEnd) < Math.max(firstStart, firstEnd)
|
||||
);
|
||||
}
|
||||
|
||||
function connectorLabel(
|
||||
connector: SeriesConnectorView,
|
||||
graph: ValidatedGraph,
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import type { ApiTierInfo } from "../api/types";
|
||||
|
||||
const TIER_NAMES: Record<string, string> = {
|
||||
IRON: "아이언",
|
||||
BRONZE: "브론즈",
|
||||
SILVER: "실버",
|
||||
GOLD: "골드",
|
||||
PLATINUM: "플래티넘",
|
||||
EMERALD: "에메랄드",
|
||||
DIAMOND: "다이아몬드",
|
||||
MASTER: "마스터",
|
||||
GRANDMASTER: "그랜드마스터",
|
||||
CHALLENGER: "챌린저",
|
||||
};
|
||||
|
||||
function normalizeRank(rank: string | undefined) {
|
||||
switch (rank) {
|
||||
case "I":
|
||||
return "1";
|
||||
case "II":
|
||||
return "2";
|
||||
case "III":
|
||||
return "3";
|
||||
case "IV":
|
||||
return "4";
|
||||
default:
|
||||
return rank;
|
||||
}
|
||||
}
|
||||
|
||||
export function formatRankBadge(tier: ApiTierInfo | undefined) {
|
||||
if (!tier) return "U";
|
||||
const tierInitial =
|
||||
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
||||
const rank = normalizeRank(tier.rank);
|
||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
||||
}
|
||||
|
||||
export function formatRankDetail(tier: ApiTierInfo | undefined) {
|
||||
if (!tier) return "랭크 정보 없음";
|
||||
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
|
||||
const rank = normalizeRank(tier.rank);
|
||||
const label = rank ? `${tierName} ${rank}` : tierName;
|
||||
return `${label} - ${tier.leaguePoints} LP`;
|
||||
}
|
||||
@@ -2,6 +2,7 @@ import {
|
||||
lazy,
|
||||
memo,
|
||||
Suspense,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
@@ -51,7 +52,8 @@ import {
|
||||
teamIndexLabel,
|
||||
} from "../lib/league";
|
||||
import { internalMatchGamePath } from "../lib/internal-match-routes";
|
||||
import { formatRankDetail, RankBadge } from "../components/RankBadge";
|
||||
import { RankBadge } from "../components/RankBadge";
|
||||
import { formatRankDetail } from "../components/rankBadgeUtils";
|
||||
import type {
|
||||
ApiAuction,
|
||||
ApiAuctionChatMessage,
|
||||
@@ -1616,7 +1618,6 @@ function BidControls({
|
||||
serverTimeOffsetMs: number;
|
||||
onBid: (teamIndex: number, amount: number) => void;
|
||||
}) {
|
||||
const [bidAmount, setBidAmount] = useState(100);
|
||||
const minBid = state.currentBid + AUCTION_MIN_BID_POINTS;
|
||||
const activeTeam = captainRole
|
||||
? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
|
||||
@@ -1627,6 +1628,23 @@ function BidControls({
|
||||
? getReservedPointsAfterCurrentBid(activeTeam)
|
||||
: 0;
|
||||
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
|
||||
const defaultBidAmount = Math.max(minBid, Math.ceil(minBid / 10) * 10);
|
||||
const bidContextKey = `${activeTeam?.teamIndex ?? "spectator"}:${maxBid}:${minBid}`;
|
||||
const [bidDraft, setBidDraft] = useState({
|
||||
contextKey: bidContextKey,
|
||||
amount: activeTeam
|
||||
? Math.min(maxBid, defaultBidAmount)
|
||||
: defaultBidAmount,
|
||||
});
|
||||
const bidAmount =
|
||||
bidDraft.contextKey === bidContextKey
|
||||
? bidDraft.amount
|
||||
: activeTeam
|
||||
? Math.min(maxBid, defaultBidAmount)
|
||||
: defaultBidAmount;
|
||||
const setBidAmount = (amount: number) => {
|
||||
setBidDraft({ contextKey: bidContextKey, amount });
|
||||
};
|
||||
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
|
||||
const isBidExpired = useIsDeadlineExpired(
|
||||
state.deadline,
|
||||
@@ -1637,11 +1655,6 @@ function BidControls({
|
||||
? Math.min(maxBid, Math.max(minBid, bidAmount))
|
||||
: Math.max(minBid, bidAmount);
|
||||
|
||||
useEffect(() => {
|
||||
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;
|
||||
|
||||
if (!activeTeam) {
|
||||
@@ -1843,7 +1856,10 @@ export default function AuctionPage() {
|
||||
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
|
||||
const socket = useAuctionSocket(id);
|
||||
const captainTeamIndex = useDevCaptainTeamIndex();
|
||||
const [assignedPosition, setAssignedPosition] = useState<Position>("MID");
|
||||
const [assignedPositionDraft, setAssignedPositionDraft] = useState<{
|
||||
playerId: string | null;
|
||||
position: Position;
|
||||
}>({ playerId: null, position: "MID" });
|
||||
const [showCancelModal, setShowCancelModal] = useState(false);
|
||||
const [cancelConfirmText, setCancelConfirmText] = useState("");
|
||||
const [undoTargetSequence, setUndoTargetSequence] = useState<number | null>(
|
||||
@@ -1853,7 +1869,7 @@ export default function AuctionPage() {
|
||||
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||
const canConfirmAuctionCancel = cancelConfirmText.trim() === "예";
|
||||
|
||||
async function clearAuctionDataAfterCancel() {
|
||||
const clearAuctionDataAfterCancel = useCallback(async () => {
|
||||
if (!id) return;
|
||||
const auctionQueryKey = ["auction", DEFAULT_COMMUNITY_ID, id] as const;
|
||||
const auctionHistoryQueryKey = [
|
||||
@@ -1878,7 +1894,7 @@ export default function AuctionPage() {
|
||||
queryKey: ["match", DEFAULT_COMMUNITY_ID, id],
|
||||
exact: true,
|
||||
});
|
||||
}
|
||||
}, [id, queryClient]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!showCancelModal) return;
|
||||
@@ -1893,6 +1909,14 @@ export default function AuctionPage() {
|
||||
: null,
|
||||
[liveAuction, matchQuery.data],
|
||||
);
|
||||
const currentPlayerId = auctionState?.currentPlayer?.id ?? null;
|
||||
const assignedPosition =
|
||||
assignedPositionDraft.playerId === currentPlayerId
|
||||
? assignedPositionDraft.position
|
||||
: (auctionState?.currentPlayer?.mainPosition ?? "MID");
|
||||
const setAssignedPosition = (position: Position) => {
|
||||
setAssignedPositionDraft({ playerId: currentPlayerId, position });
|
||||
};
|
||||
const availableTeamIndexes = useMemo(() => {
|
||||
const indexes = new Set(
|
||||
(auctionState?.teams ?? []).map((team) => team.teamIndex),
|
||||
@@ -1907,12 +1931,6 @@ export default function AuctionPage() {
|
||||
};
|
||||
const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole);
|
||||
|
||||
useEffect(() => {
|
||||
if (auctionState?.currentPlayer) {
|
||||
setAssignedPosition(auctionState.currentPlayer.mainPosition);
|
||||
}
|
||||
}, [auctionState?.currentPlayer?.id]);
|
||||
|
||||
useEffect(() => {
|
||||
if (availableTeamIndexes.length === 0) return;
|
||||
if (
|
||||
@@ -1928,7 +1946,7 @@ export default function AuctionPage() {
|
||||
void clearAuctionDataAfterCancel().finally(() => {
|
||||
navigate(`/match/${id}`, { replace: true });
|
||||
});
|
||||
}, [id, navigate, socket.resetAt]);
|
||||
}, [clearAuctionDataAfterCancel, id, navigate, socket.resetAt]);
|
||||
|
||||
if (!DEFAULT_COMMUNITY_ID) {
|
||||
return (
|
||||
|
||||
@@ -85,7 +85,6 @@ function HistoryTableColGroup() {
|
||||
<col className="w-[88px]" />
|
||||
<col className="w-[132px]" />
|
||||
<col className="w-[72px]" />
|
||||
<col className="w-[116px]" />
|
||||
</colgroup>
|
||||
);
|
||||
}
|
||||
@@ -99,7 +98,6 @@ function HistoryTableHeader() {
|
||||
<th className="py-2.5 px-4 font-semibold">상태</th>
|
||||
<th className="py-2.5 px-4 font-semibold">맵</th>
|
||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
||||
</tr>
|
||||
</thead>
|
||||
);
|
||||
@@ -156,14 +154,6 @@ function HistoryRecordsSkeleton({
|
||||
10명
|
||||
</SkeletonText>
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
<SkeletonText
|
||||
className="truncate"
|
||||
skeletonClassName="h-[1em] w-14"
|
||||
>
|
||||
1팀 승리
|
||||
</SkeletonText>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
@@ -205,10 +195,6 @@ function HistoryRecordsSkeleton({
|
||||
<SkeletonText skeletonClassName="h-[1em] w-8">
|
||||
10명
|
||||
</SkeletonText>
|
||||
<span className="invisible text-base-content/20">·</span>
|
||||
<SkeletonText skeletonClassName="h-[1em] w-14">
|
||||
1팀 승리
|
||||
</SkeletonText>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -682,20 +668,12 @@ export default function HomePage() {
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
{match.participants.length}명
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
<Link
|
||||
to={`/match/${match.id}`}
|
||||
className="font-semibold text-base-content/45 hover:text-primary"
|
||||
>
|
||||
공식 결과
|
||||
</Link>
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
) : (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={6}
|
||||
colSpan={5}
|
||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||
>
|
||||
아직 내전 기록이 없습니다.
|
||||
|
||||
@@ -127,21 +127,6 @@ function formatRefreshError(error: unknown) {
|
||||
return error instanceof Error ? error.message : "갱신 요청에 실패했습니다.";
|
||||
}
|
||||
|
||||
function socketStatusMeta(status: string): { tone: string; label: string } {
|
||||
switch (status) {
|
||||
case "connected":
|
||||
return { tone: "bg-emerald-400", label: "실시간 연결됨" };
|
||||
case "connecting":
|
||||
return { tone: "bg-amber-400", label: "연결 중" };
|
||||
case "error":
|
||||
return { tone: "bg-red-400", label: "연결 오류" };
|
||||
case "disconnected":
|
||||
return { tone: "bg-base-content/30", label: "연결 끊김" };
|
||||
default:
|
||||
return { tone: "bg-base-content/20", label: "대기 중" };
|
||||
}
|
||||
}
|
||||
|
||||
function ratioClass(value: number) {
|
||||
if (value >= 55) return "text-blue-400";
|
||||
if (value >= 50) return "text-amber-400";
|
||||
@@ -1329,7 +1314,6 @@ export default function UserHistoryPage() {
|
||||
);
|
||||
}
|
||||
|
||||
const socketStatus = socketStatusMeta(refreshSocket.connectionStatus);
|
||||
const refreshNoticeIsError =
|
||||
Boolean(refreshSocket.error) ||
|
||||
Boolean(refreshNotice?.startsWith("갱신 실패"));
|
||||
@@ -1386,12 +1370,6 @@ export default function UserHistoryPage() {
|
||||
? "요청 중..."
|
||||
: "정보 갱신"}
|
||||
</button>
|
||||
{!isInternalQueue && (
|
||||
<div className="flex items-center gap-1.5 text-[11px] text-base-content/30 sm:justify-end">
|
||||
<span className={`h-1.5 w-1.5 ${socketStatus.tone}`} />
|
||||
{socketStatus.label}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
{(refreshNotice || refreshSocket.error) && (
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import {
|
||||
@@ -8,11 +8,17 @@ import {
|
||||
useMe,
|
||||
useStartLegacyImport,
|
||||
} from '../../api/hooks';
|
||||
import type { LegacyImportJob, StartLegacyImportRequest } from '../../api/types';
|
||||
import type {
|
||||
LegacyImportJob,
|
||||
LegacyImportMemberWindow,
|
||||
StartLegacyImportRequest,
|
||||
} from '../../api/types';
|
||||
import { DEFAULT_COMMUNITY_ID } from '../../config';
|
||||
|
||||
const DEFAULT_START = '2024-05-01T00:00:00.000Z';
|
||||
|
||||
type MemberWindowOverride = { startTime: string; endTime: string };
|
||||
|
||||
function toInputValue(value: string) {
|
||||
const date = new Date(value);
|
||||
const local = new Date(date.getTime() - date.getTimezoneOffset() * 60_000);
|
||||
@@ -44,6 +50,15 @@ function progress(job: LegacyImportJob) {
|
||||
return Math.round((job.processedMembers / job.totalMembers) * 100);
|
||||
}
|
||||
|
||||
function defaultMemberOverride(
|
||||
member: LegacyImportMemberWindow,
|
||||
): MemberWindowOverride {
|
||||
return {
|
||||
startTime: toInputValue(member.startTime),
|
||||
endTime: toInputValue(member.endTime),
|
||||
};
|
||||
}
|
||||
|
||||
function JobCard({
|
||||
job,
|
||||
onCancel,
|
||||
@@ -111,7 +126,7 @@ export default function LegacyImportPage() {
|
||||
const [windowEnd, setWindowEnd] = useState('');
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [overrides, setOverrides] = useState<
|
||||
Record<string, { startTime: string; endTime: string }>
|
||||
Record<string, MemberWindowOverride>
|
||||
>({});
|
||||
const currentUser =
|
||||
meQuery.data?.memberships.find(
|
||||
@@ -131,20 +146,6 @@ export default function LegacyImportPage() {
|
||||
const cancelMutation = useCancelLegacyImport(communityId);
|
||||
const members = membersQuery.data?.members ?? [];
|
||||
|
||||
useEffect(() => {
|
||||
setOverrides(
|
||||
Object.fromEntries(
|
||||
members.map((member) => [
|
||||
member.userId,
|
||||
{
|
||||
startTime: toInputValue(member.startTime),
|
||||
endTime: toInputValue(member.endTime),
|
||||
},
|
||||
]),
|
||||
),
|
||||
);
|
||||
}, [members]);
|
||||
|
||||
const manageableMemberships =
|
||||
meQuery.data?.memberships.filter((membership) => {
|
||||
const role = membership.user.role;
|
||||
@@ -180,11 +181,15 @@ export default function LegacyImportPage() {
|
||||
const payload: StartLegacyImportRequest = {
|
||||
windowStart: fromInputValue(windowStart),
|
||||
windowEnd: fromInputValue(windowEnd),
|
||||
memberOverrides: members.map((member) => ({
|
||||
userId: member.userId,
|
||||
startTime: fromInputValue(overrides[member.userId]?.startTime ?? ''),
|
||||
endTime: fromInputValue(overrides[member.userId]?.endTime ?? ''),
|
||||
})),
|
||||
memberOverrides: members.map((member) => {
|
||||
const override =
|
||||
overrides[member.userId] ?? defaultMemberOverride(member);
|
||||
return {
|
||||
userId: member.userId,
|
||||
startTime: fromInputValue(override.startTime),
|
||||
endTime: fromInputValue(override.endTime),
|
||||
};
|
||||
}),
|
||||
};
|
||||
startMutation.mutate(payload, {
|
||||
onSuccess: async (result) => {
|
||||
@@ -323,53 +328,68 @@ export default function LegacyImportPage() {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{members.map((member) => (
|
||||
<tr key={member.userId} className="border-b border-base-content/5">
|
||||
<td className="px-3 py-2 text-sm font-bold">
|
||||
{member.displayName}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs text-base-content/45">
|
||||
{member.gameName}#{member.tagLine}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs">
|
||||
{member.isActivated ? '활성' : '비활성'}
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={overrides[member.userId]?.startTime ?? ''}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => ({
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...current[member.userId],
|
||||
startTime: event.target.value,
|
||||
endTime: current[member.userId]?.endTime ?? '',
|
||||
},
|
||||
}))
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={overrides[member.userId]?.endTime ?? ''}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => ({
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...current[member.userId],
|
||||
startTime: current[member.userId]?.startTime ?? '',
|
||||
endTime: event.target.value,
|
||||
},
|
||||
}))
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
{members.map((member) => {
|
||||
const override =
|
||||
overrides[member.userId] ?? defaultMemberOverride(member);
|
||||
return (
|
||||
<tr
|
||||
key={member.userId}
|
||||
className="border-b border-base-content/5"
|
||||
>
|
||||
<td className="px-3 py-2 text-sm font-bold">
|
||||
{member.displayName}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs text-base-content/45">
|
||||
{member.gameName}#{member.tagLine}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs">
|
||||
{member.isActivated ? '활성' : '비활성'}
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={override.startTime}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => {
|
||||
const currentOverride =
|
||||
current[member.userId] ??
|
||||
defaultMemberOverride(member);
|
||||
return {
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...currentOverride,
|
||||
startTime: event.target.value,
|
||||
},
|
||||
};
|
||||
})
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={override.endTime}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => {
|
||||
const currentOverride =
|
||||
current[member.userId] ??
|
||||
defaultMemberOverride(member);
|
||||
return {
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...currentOverride,
|
||||
endTime: event.target.value,
|
||||
},
|
||||
};
|
||||
})
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
{members.length === 0 && (
|
||||
<tr>
|
||||
<td colSpan={5} className="px-4 py-8 text-center text-sm text-base-content/35">
|
||||
|
||||
@@ -367,6 +367,7 @@ test("orders mobile groups as winners, losers, grand final, then reset final", (
|
||||
shuffledLayout.mobileGroups.map((group) => group.seriesIds),
|
||||
orderedLayout.mobileGroups.map((group) => group.seriesIds),
|
||||
);
|
||||
assert.deepEqual(shuffledLayout.connectors, orderedLayout.connectors);
|
||||
assert.deepEqual(
|
||||
shuffledLayout.mobileGroups.flatMap((group) => group.seriesIds).sort(),
|
||||
shuffled.projection.series.map((series) => series.seriesId).sort(),
|
||||
@@ -474,11 +475,10 @@ test("returns null instead of throwing for an unknown connector discriminator",
|
||||
);
|
||||
});
|
||||
|
||||
test("keeps connector rails distinct and outside intervening card rectangles", () => {
|
||||
test("keeps connector rails finite and outside intervening card rectangles", () => {
|
||||
const { projection } = eightTeamProjection();
|
||||
const layout = requireLayout(projection, EIGHT_TEAM_LAYOUT);
|
||||
const nodes = new Map(layout.nodes.map((node) => [node.seriesId, node]));
|
||||
const routesByTargetColumn = new Map<number, number[]>();
|
||||
|
||||
for (const route of layout.connectors) {
|
||||
const source = nodes.get(route.fromSeriesId);
|
||||
@@ -511,23 +511,256 @@ test("keeps connector rails distinct and outside intervening card rectangles", (
|
||||
false,
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const rails = routesByTargetColumn.get(target.column) ?? [];
|
||||
rails.push(route.verticalX);
|
||||
routesByTargetColumn.set(target.column, rails);
|
||||
test("aligns paired winner bends on one shared rail", () => {
|
||||
const fourTeam = fourTeamProjection();
|
||||
const fourTeamLayout = requireLayout(fourTeam.projection, FOUR_TEAM_LAYOUT);
|
||||
for (const targetSeriesId of [fourTeam.ids.WB_FINAL, fourTeam.ids.GF]) {
|
||||
const routes = winnerRoutesTo(fourTeamLayout, targetSeriesId);
|
||||
assert.equal(routes.length, 2);
|
||||
assert.equal(routes[0].verticalX, routes[1].verticalX);
|
||||
}
|
||||
|
||||
for (const rails of routesByTargetColumn.values()) {
|
||||
assert.equal(new Set(rails).size, rails.length);
|
||||
const { projection, ids } = eightTeamProjection();
|
||||
const layout = requireLayout(projection, EIGHT_TEAM_LAYOUT);
|
||||
|
||||
for (const targetSeriesId of [
|
||||
ids.WB_R2_M1,
|
||||
ids.WB_R2_M2,
|
||||
ids.WB_FINAL,
|
||||
ids.LB_R3_M1,
|
||||
ids.GF,
|
||||
]) {
|
||||
const routes = winnerRoutesTo(layout, targetSeriesId);
|
||||
assert.equal(routes.length, 2);
|
||||
assert.equal(
|
||||
routes[0].verticalX,
|
||||
routes[1].verticalX,
|
||||
`${targetSeriesId} winner routes must share one bend rail`,
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test("keeps reversed winner slots on deterministic non-overlapping rails", () => {
|
||||
const { projection, ids } = fourTeamProjection();
|
||||
const reversed = cloneProjection(projection);
|
||||
const firstWinner = reversed.connectors.find(
|
||||
({ from, to }) =>
|
||||
from.seriesId === ids.WB_R1_M1 &&
|
||||
from.select === "winner" &&
|
||||
to.seriesId === ids.WB_FINAL,
|
||||
);
|
||||
const secondWinner = reversed.connectors.find(
|
||||
({ from, to }) =>
|
||||
from.seriesId === ids.WB_R1_M2 &&
|
||||
from.select === "winner" &&
|
||||
to.seriesId === ids.WB_FINAL,
|
||||
);
|
||||
assert.ok(firstWinner);
|
||||
assert.ok(secondWinner);
|
||||
firstWinner.to = { seriesId: ids.WB_FINAL, slot: "B" };
|
||||
secondWinner.to = { seriesId: ids.WB_FINAL, slot: "A" };
|
||||
|
||||
const orderedLayout = requireLayout(reversed, FOUR_TEAM_LAYOUT);
|
||||
const shuffled = cloneProjection(reversed);
|
||||
shuffled.connectors = shuffledCopy(shuffled.connectors);
|
||||
const shuffledLayout = requireLayout(shuffled, FOUR_TEAM_LAYOUT);
|
||||
const routes = winnerRoutesTo(orderedLayout, ids.WB_FINAL);
|
||||
|
||||
assert.equal(routes.length, 2);
|
||||
assert.equal(new Set(routes.map(({ verticalX }) => verticalX)).size, 2);
|
||||
assert.equal(countCollinearConnectorOverlaps(orderedLayout.connectors), 0);
|
||||
assert.deepEqual(shuffledLayout.connectors, orderedLayout.connectors);
|
||||
});
|
||||
|
||||
test("moves reversed winner rails clear of overlapping connector underlays", () => {
|
||||
const { projection, ids } = eightTeamProjection();
|
||||
const reversed = cloneProjection(projection);
|
||||
const firstWinner = reversed.connectors.find(
|
||||
({ from, to }) =>
|
||||
from.seriesId === ids.WB_R1_M1 &&
|
||||
from.select === "winner" &&
|
||||
to.seriesId === ids.WB_R2_M1,
|
||||
);
|
||||
const secondWinner = reversed.connectors.find(
|
||||
({ from, to }) =>
|
||||
from.seriesId === ids.WB_R1_M2 &&
|
||||
from.select === "winner" &&
|
||||
to.seriesId === ids.WB_R2_M1,
|
||||
);
|
||||
assert.ok(firstWinner);
|
||||
assert.ok(secondWinner);
|
||||
firstWinner.to = { seriesId: ids.WB_R2_M1, slot: "B" };
|
||||
secondWinner.to = { seriesId: ids.WB_R2_M1, slot: "A" };
|
||||
|
||||
const layout = requireLayout(reversed, EIGHT_TEAM_LAYOUT);
|
||||
const shuffled = cloneProjection(reversed);
|
||||
shuffled.connectors = shuffledCopy(shuffled.connectors);
|
||||
const shuffledLayout = requireLayout(shuffled, EIGHT_TEAM_LAYOUT);
|
||||
const winners = winnerRoutesTo(layout, ids.WB_R2_M1);
|
||||
|
||||
assert.equal(winners.length, 2);
|
||||
for (const winner of winners) {
|
||||
for (const route of layout.connectors) {
|
||||
if (
|
||||
route === winner ||
|
||||
!intervalsStrictlyOverlap(
|
||||
winner.sourceY,
|
||||
winner.targetY,
|
||||
route.sourceY,
|
||||
route.targetY,
|
||||
)
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
assert.ok(
|
||||
Math.abs(winner.verticalX - route.verticalX) >=
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.connectorRailClearance,
|
||||
`${winner.fromSeriesId} winner rail ${winner.verticalX} is too close to ${route.fromSeriesId} ${route.kind} rail ${route.verticalX}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
assert.deepEqual(shuffledLayout.connectors, layout.connectors);
|
||||
});
|
||||
|
||||
test("centers conflict-free paired winner bends in the routing gap", () => {
|
||||
const fourTeam = fourTeamProjection();
|
||||
const fourTeamLayout = requireLayout(fourTeam.projection, FOUR_TEAM_LAYOUT);
|
||||
const fourTeamGrandFinal = nodeFor(fourTeamLayout, fourTeam.ids.GF);
|
||||
assert.deepEqual(
|
||||
winnerRoutesTo(fourTeamLayout, fourTeam.ids.GF).map(
|
||||
({ verticalX }) => verticalX,
|
||||
),
|
||||
[
|
||||
fourTeamGrandFinal.x -
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap / 2,
|
||||
fourTeamGrandFinal.x -
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap / 2,
|
||||
],
|
||||
);
|
||||
|
||||
const { projection, ids } = eightTeamProjection();
|
||||
const layout = requireLayout(projection, EIGHT_TEAM_LAYOUT);
|
||||
|
||||
for (const targetSeriesId of [ids.LB_R3_M1, ids.GF]) {
|
||||
const target = nodeFor(layout, targetSeriesId);
|
||||
const expectedVerticalX =
|
||||
target.x - DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap / 2;
|
||||
const routes = winnerRoutesTo(layout, targetSeriesId);
|
||||
|
||||
assert.equal(routes.length, 2);
|
||||
assert.deepEqual(
|
||||
routes.map(({ verticalX }) => verticalX),
|
||||
[expectedVerticalX, expectedVerticalX],
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test("preserves baseline rails for loser and reset paths", () => {
|
||||
const { projection } = eightTeamProjection({ resetFinal: true });
|
||||
const layout = requireLayout(projection, EIGHT_TEAM_RESET_LAYOUT);
|
||||
const nodes = new Map(layout.nodes.map((node) => [node.seriesId, node]));
|
||||
const routesByTargetColumn = new Map<number, ConnectorLayout[]>();
|
||||
|
||||
for (const route of layout.connectors) {
|
||||
const target = nodes.get(route.toSeriesId);
|
||||
assert.ok(target);
|
||||
const routes = routesByTargetColumn.get(target.column) ?? [];
|
||||
routes.push(route);
|
||||
routesByTargetColumn.set(target.column, routes);
|
||||
}
|
||||
|
||||
for (const routes of routesByTargetColumn.values()) {
|
||||
routes.sort(
|
||||
(left, right) =>
|
||||
right.sourceY - left.sourceY ||
|
||||
right.targetY - left.targetY ||
|
||||
connectorLayoutKey(left).localeCompare(connectorLayoutKey(right)),
|
||||
);
|
||||
routes.forEach((route, index) => {
|
||||
if (route.kind === "winner") return;
|
||||
assert.equal(
|
||||
route.verticalX,
|
||||
route.targetX -
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap +
|
||||
(DOUBLE_ELIMINATION_BRACKET_GEOMETRY.columnGap * (index + 1)) /
|
||||
(routes.length + 1),
|
||||
);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test("keeps paired winner rails clear of overlapping loser paths", () => {
|
||||
const fourTeam = fourTeamProjection();
|
||||
const eightTeam = eightTeamProjection();
|
||||
const fixtures = [
|
||||
{
|
||||
layout: requireLayout(fourTeam.projection, FOUR_TEAM_LAYOUT),
|
||||
pairedWinnerTargets: new Set<SeriesId>([
|
||||
fourTeam.ids.WB_FINAL,
|
||||
fourTeam.ids.GF,
|
||||
]),
|
||||
},
|
||||
{
|
||||
layout: requireLayout(eightTeam.projection, EIGHT_TEAM_LAYOUT),
|
||||
pairedWinnerTargets: new Set<SeriesId>([
|
||||
eightTeam.ids.WB_R2_M1,
|
||||
eightTeam.ids.WB_R2_M2,
|
||||
eightTeam.ids.WB_FINAL,
|
||||
eightTeam.ids.LB_R3_M1,
|
||||
eightTeam.ids.GF,
|
||||
]),
|
||||
},
|
||||
];
|
||||
|
||||
for (const { layout, pairedWinnerTargets } of fixtures) {
|
||||
for (const winner of layout.connectors) {
|
||||
if (
|
||||
winner.kind !== "winner" ||
|
||||
!pairedWinnerTargets.has(winner.toSeriesId)
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
for (const loser of layout.connectors) {
|
||||
if (
|
||||
loser.kind !== "loser" ||
|
||||
!intervalsStrictlyOverlap(
|
||||
winner.sourceY,
|
||||
winner.targetY,
|
||||
loser.sourceY,
|
||||
loser.targetY,
|
||||
)
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
assert.ok(
|
||||
Math.abs(winner.verticalX - loser.verticalX) >=
|
||||
DOUBLE_ELIMINATION_BRACKET_GEOMETRY.connectorRailClearance,
|
||||
`${winner.fromSeriesId} winner rail ${winner.verticalX} is too close to ${loser.fromSeriesId} loser rail ${loser.verticalX}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test("minimizes connector crossings without introducing segment overlaps", () => {
|
||||
const { projection } = eightTeamProjection();
|
||||
const layout = requireLayout(projection, EIGHT_TEAM_LAYOUT);
|
||||
const fourTeam = fourTeamProjection();
|
||||
const fourTeamReset = fourTeamProjection({ resetFinal: true });
|
||||
const eightTeam = eightTeamProjection();
|
||||
const eightTeamReset = eightTeamProjection({ resetFinal: true });
|
||||
const layouts = [
|
||||
requireLayout(fourTeam.projection, FOUR_TEAM_LAYOUT),
|
||||
requireLayout(fourTeamReset.projection, FOUR_TEAM_RESET_LAYOUT),
|
||||
requireLayout(eightTeam.projection, EIGHT_TEAM_LAYOUT),
|
||||
requireLayout(eightTeamReset.projection, EIGHT_TEAM_RESET_LAYOUT),
|
||||
];
|
||||
|
||||
assert.equal(countStrictConnectorCrossings(layout.connectors), 12);
|
||||
assert.equal(countCollinearConnectorOverlaps(layout.connectors), 0);
|
||||
assert.ok(countStrictConnectorCrossings(layouts[2].connectors) <= 12);
|
||||
for (const layout of layouts) {
|
||||
assert.equal(countCollinearConnectorOverlaps(layout.connectors), 0);
|
||||
}
|
||||
});
|
||||
|
||||
test("aligns connector endpoints with the A and B entry row centers", () => {
|
||||
@@ -921,6 +1154,18 @@ function segment(
|
||||
};
|
||||
}
|
||||
|
||||
function intervalsStrictlyOverlap(
|
||||
firstStart: number,
|
||||
firstEnd: number,
|
||||
secondStart: number,
|
||||
secondEnd: number,
|
||||
): boolean {
|
||||
return (
|
||||
Math.min(firstStart, firstEnd) < Math.max(secondStart, secondEnd) &&
|
||||
Math.min(secondStart, secondEnd) < Math.max(firstStart, firstEnd)
|
||||
);
|
||||
}
|
||||
|
||||
function countStrictConnectorCrossings(routes: readonly ConnectorLayout[]): number {
|
||||
let crossings = 0;
|
||||
for (let leftIndex = 0; leftIndex < routes.length; leftIndex += 1) {
|
||||
@@ -1009,6 +1254,16 @@ function nodeFor(
|
||||
return node;
|
||||
}
|
||||
|
||||
function winnerRoutesTo(
|
||||
layout: NonNullable<ReturnType<typeof createDoubleEliminationBracketLayout>>,
|
||||
targetSeriesId: SeriesId,
|
||||
) {
|
||||
return layout.connectors.filter(
|
||||
(route) =>
|
||||
route.kind === "winner" && route.toSeriesId === targetSeriesId,
|
||||
);
|
||||
}
|
||||
|
||||
function routeFrom(
|
||||
layout: NonNullable<ReturnType<typeof createDoubleEliminationBracketLayout>>,
|
||||
id: SeriesId,
|
||||
@@ -1036,6 +1291,10 @@ function connectorIdentity(
|
||||
};
|
||||
}
|
||||
|
||||
function connectorLayoutKey(connector: ConnectorLayout): string {
|
||||
return `${connector.fromSeriesId}:${connector.select}:${connector.toSeriesId}:${connector.toSlot}`;
|
||||
}
|
||||
|
||||
function mobileGroupKeys(
|
||||
layout: NonNullable<ReturnType<typeof createDoubleEliminationBracketLayout>>,
|
||||
) {
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
|
||||
const homePageSource = await readFile(
|
||||
new URL("../src/pages/HomePage.tsx", import.meta.url),
|
||||
"utf8",
|
||||
);
|
||||
|
||||
test("keeps past match history focused on the five summary columns", () => {
|
||||
const colGroup = sourceForFunction("HistoryTableColGroup");
|
||||
const header = sourceForFunction("HistoryTableHeader");
|
||||
const skeleton = sourceForFunction("HistoryRecordsSkeleton");
|
||||
|
||||
assert.equal(colGroup.match(/<col(?:\s|\/|>)/g)?.length, 5);
|
||||
assert.doesNotMatch(header, />결과<\/th>/);
|
||||
assert.doesNotMatch(homePageSource, /공식 결과/);
|
||||
assert.doesNotMatch(skeleton, /1팀 승리/);
|
||||
assert.match(homePageSource, /colSpan=\{5\}/);
|
||||
});
|
||||
|
||||
function sourceForFunction(name: string): string {
|
||||
const start = homePageSource.indexOf(`function ${name}(`);
|
||||
assert.notEqual(start, -1, `${name} should exist`);
|
||||
|
||||
const nextFunction = homePageSource.indexOf("\nfunction ", start + 1);
|
||||
assert.notEqual(nextFunction, -1, `${name} should have a following function`);
|
||||
return homePageSource.slice(start, nextFunction);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import { SERIES_SCORE_CARD_GEOMETRY } from "../src/components/competition/series-score-card-geometry.ts";
|
||||
|
||||
const component = await readFile(
|
||||
new URL(
|
||||
"../src/components/competition/SeriesScoreCard.tsx",
|
||||
import.meta.url,
|
||||
),
|
||||
"utf8",
|
||||
);
|
||||
|
||||
test("keeps bracket entry rows equal by overlaying their divider", () => {
|
||||
assert.equal(
|
||||
SERIES_SCORE_CARD_GEOMETRY.height -
|
||||
SERIES_SCORE_CARD_GEOMETRY.borderWidth * 2 -
|
||||
SERIES_SCORE_CARD_GEOMETRY.headerHeight,
|
||||
SERIES_SCORE_CARD_GEOMETRY.entryHeight * 2,
|
||||
);
|
||||
assert.match(
|
||||
component,
|
||||
/className=\{\s*isBracket\s*\?\s*"relative"\s*:\s*"divide-y divide-base-content\/8"\s*\}/,
|
||||
);
|
||||
assert.match(
|
||||
component,
|
||||
/className="pointer-events-none absolute inset-x-0 border-t border-base-content\/8"/,
|
||||
);
|
||||
assert.match(
|
||||
component,
|
||||
/style=\{\{ top: SERIES_SCORE_CARD_GEOMETRY\.entryHeight \}\}/,
|
||||
);
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
|
||||
const userHistoryPageSource = await readFile(
|
||||
new URL("../src/pages/UserHistoryPage.tsx", import.meta.url),
|
||||
"utf8",
|
||||
);
|
||||
|
||||
test("hides the temporary real-time connection status indicator", () => {
|
||||
assert.doesNotMatch(userHistoryPageSource, /실시간 연결됨/);
|
||||
assert.doesNotMatch(userHistoryPageSource, /refreshSocket\.connectionStatus/);
|
||||
});
|
||||
@@ -0,0 +1,84 @@
|
||||
# Implementation Plan: Double-Elimination Connector Routing
|
||||
|
||||
## Overview
|
||||
|
||||
Replace per-edge winner rail staggering with deterministic, collision-aware winner
|
||||
bundles while retaining the existing target-corridor `H-V-H` path model and the
|
||||
current loser/reset routing behavior.
|
||||
|
||||
## Architecture Decisions
|
||||
|
||||
- Keep routing as a pure layout calculation; the React renderer consumes unchanged
|
||||
`BracketConnectorLayout` paths.
|
||||
- Allocate baseline rails first, then choose one rail for each same-target winner
|
||||
bundle while leaving loser/reset coordinates unchanged.
|
||||
- Score complete candidate paths by parallel-stroke clearance, strict crossings,
|
||||
and distance from the corridor midpoint.
|
||||
- Permit shared `verticalX` only when the participating vertical intervals do not
|
||||
overlap; otherwise search the same corridor for the nearest deterministic pair
|
||||
of separate rails with focused-stroke clearance.
|
||||
|
||||
## Task List
|
||||
|
||||
### Phase 1: Regression Contract
|
||||
|
||||
- [x] Add tests proving quiet winner bundles use the corridor midpoint and all
|
||||
shareable same-target winner paths remain aligned.
|
||||
- [x] Replace target-column rail uniqueness with interval-aware segment assertions.
|
||||
- [x] Cover reversed A/B input where overlapping vertical spans require the
|
||||
deterministic separate-rail fallback.
|
||||
- [x] Confirm the focused test fails with the current allocator.
|
||||
|
||||
### Checkpoint: RED
|
||||
|
||||
- [x] The new behavioral assertion fails for the expected unequal `verticalX`.
|
||||
- [x] Existing tests remain unchanged except where their invariant is obsolete.
|
||||
|
||||
### Phase 2: Bundle-Aware Allocator
|
||||
|
||||
- [x] Represent connector routing inputs with precomputed source/target anchors.
|
||||
- [x] Retain stable independent rails for loser/reset routes.
|
||||
- [x] Group the two winners entering each target and select the nearest safe shared
|
||||
rail without card penetration, forbidden overlap, or avoidable added crossings.
|
||||
- [x] Fall back to the nearest deterministic, stroke-clear separate rails only
|
||||
when the pair's own vertical intervals overlap and cannot safely share a rail.
|
||||
|
||||
### Checkpoint: GREEN
|
||||
|
||||
- [x] Focused layout tests pass for four-team, eight-team, reset-final, and shuffled
|
||||
input fixtures.
|
||||
- [x] Strict crossing, collinear-overlap, and 5px parallel-clearance safeguards pass.
|
||||
|
||||
### Phase 3: Verification and Review
|
||||
|
||||
- [x] Run the full web suite, lint, and production build; document the unrelated
|
||||
pre-existing full-lint failures while verifying changed files separately.
|
||||
- [x] Inspect the diff for correctness, simplicity, security, performance, and
|
||||
adherence to the approved spec.
|
||||
- [x] Perform an independent review and address all required findings.
|
||||
|
||||
### Checkpoint: Complete
|
||||
|
||||
- [x] All success criteria in the spec are verified.
|
||||
- [x] No unrelated files are modified.
|
||||
|
||||
## Risks and Mitigations
|
||||
|
||||
| Risk | Impact | Mitigation |
|
||||
|---|---|---|
|
||||
| Blind midpoint alignment adds crossings in busy upper rounds | High | Score complete candidate paths and move the winner bundle together to the nearest safe rail. |
|
||||
| Shared rails create overlapping vertical segments | High | Check interval overlap before allowing a shared `verticalX`; search deterministic fallback rails with 5px clearance otherwise. |
|
||||
| Visually parallel rails pass exact-coordinate tests but overlap at stroke width | High | Require 5px clearance across overlapping vertical runs and cover it for 4/8-team fixtures. |
|
||||
| Routing changes depend on input array order | Medium | Sort routes and bundles by graph display order and retain shuffled-fixture equality tests. |
|
||||
| A long connector bends through an intermediate card | High | Restrict every candidate to the target corridor and retain card-penetration assertions. |
|
||||
| Reset-final slot carry-over is accidentally treated as a winner pair | Medium | Bundle only connectors whose computed kind is `winner`; keep reset paths independent. |
|
||||
|
||||
## Dependencies
|
||||
|
||||
```text
|
||||
Regression contract -> bundle-aware rail allocator -> full verification -> review
|
||||
```
|
||||
|
||||
## Open Questions
|
||||
|
||||
None.
|
||||
@@ -0,0 +1,121 @@
|
||||
# Implementation Plan: Refresh Riot ID by PUUID
|
||||
|
||||
## Overview
|
||||
|
||||
Deliver the behavior in three backend slices. First add and prove the safe
|
||||
Account-V1-to-user persistence operation. Then invoke it from the existing
|
||||
personal-history refresh worker before completion is broadcast. Finally reuse it
|
||||
from stale-account background refresh with community-aware region resolution and
|
||||
failure isolation. No database or frontend contract change is required.
|
||||
|
||||
## Task List
|
||||
|
||||
### Phase 1: Identity Refresh Boundary
|
||||
|
||||
- [x] Add failing tests for changed, unchanged, incomplete, mismatched, and failed
|
||||
PUUID identity lookups.
|
||||
- Acceptance: tests describe state outcomes and fail because the focused method
|
||||
is not implemented.
|
||||
- Verify:
|
||||
`pnpm --filter api exec jest --runInBand riot-account-enrichment.service.spec.ts`
|
||||
- Files:
|
||||
`apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts`
|
||||
- [x] Implement `refreshRiotIdentity` using `RiotAccountService.getByPuuid`.
|
||||
- Acceptance: valid changed values persist together; invalid results preserve
|
||||
existing values; unchanged values avoid a write.
|
||||
- Verify: the Phase 1 focused test passes.
|
||||
- Files:
|
||||
`apps/api/src/modules/riot/riot-account-enrichment.service.ts`
|
||||
|
||||
### Checkpoint: Phase 1
|
||||
|
||||
- [x] The enrichment service has a typed three-state result and all focused tests
|
||||
pass.
|
||||
- [x] No schema, endpoint, queue payload, or frontend changes exist.
|
||||
|
||||
### Phase 2: Refresh Worker Integration
|
||||
|
||||
- [x] Add a failing worker test proving that a user-history job requests identity
|
||||
refresh with its user ID, PUUID, and region.
|
||||
- Acceptance: the test fails before worker orchestration is updated.
|
||||
- Verify:
|
||||
`pnpm --filter api exec jest --runInBand riot-job-worker.service.spec.ts`
|
||||
- Files: `apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts`
|
||||
- [x] Invoke best-effort identity refresh before job completion.
|
||||
- Acceptance: the worker logs identity failure without aborting successful match
|
||||
refresh work, and broadcasts completion only after identity refresh returns.
|
||||
- Verify: the Phase 2 focused test passes.
|
||||
- Files: `apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts`
|
||||
|
||||
### Checkpoint: Complete
|
||||
|
||||
- [x] Focused API suites pass without skipped tests.
|
||||
- [x] API lint and build pass.
|
||||
- [x] Web lint and production build pass, confirming the existing profile
|
||||
invalidation integration remains compatible.
|
||||
- [x] Final diff contains only the specification, plan, enrichment service, worker,
|
||||
and their tests.
|
||||
|
||||
### Phase 3: Background Refresh Integration
|
||||
|
||||
- [x] Add a failing enrichment-service test proving that an omitted region is
|
||||
resolved from the user's community.
|
||||
- Acceptance: a non-Asia community route reaches Account-V1 without changing the
|
||||
public method signature.
|
||||
- Verify:
|
||||
`pnpm --filter api exec jest --runInBand riot-account-enrichment.service.spec.ts`
|
||||
- Files:
|
||||
`apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts`
|
||||
- [x] Resolve the community Riot region for region-less identity refresh calls.
|
||||
- Acceptance: explicit caller regions remain unchanged; missing community routes
|
||||
use the existing `asia` fallback.
|
||||
- Verify: the focused enrichment-service test passes.
|
||||
- Files:
|
||||
`apps/api/src/modules/riot/riot-account-enrichment.service.ts`
|
||||
- [x] Add failing background scheduler tests for identity refresh ordering and
|
||||
failure isolation.
|
||||
- Acceptance: stale accounts request identity refresh before statistics
|
||||
enrichment, while identity rejection does not increment failure counters.
|
||||
- Verify:
|
||||
`pnpm --filter api exec jest --runInBand background-refresh.scheduler.spec.ts`
|
||||
- Files:
|
||||
`apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts`
|
||||
- [x] Invoke best-effort identity refresh from the stale-account loop.
|
||||
- Acceptance: each processed candidate gets one PUUID identity lookup, statistics
|
||||
enrichment still determines processed/failed/backoff state, and no new Redis or
|
||||
database contract is added.
|
||||
- Verify: the focused background scheduler tests pass.
|
||||
- Files:
|
||||
`apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts`
|
||||
|
||||
### Checkpoint: Background Refresh Complete
|
||||
|
||||
- [x] Focused identity, manual worker, and background scheduler suites pass.
|
||||
- [x] API lint, full tests, and build pass.
|
||||
- [x] Final diff remains limited to the existing feature documents, identity
|
||||
service/tests, and background scheduler/tests.
|
||||
|
||||
## Risks and Mitigations
|
||||
|
||||
| Risk | Impact | Mitigation |
|
||||
|---|---|---|
|
||||
| Account-V1 returns an incomplete identity | High | Require matching PUUID and two non-empty Riot ID fields before mutation. |
|
||||
| Riot Account-V1 is temporarily unavailable | Medium | Preserve stored identity, log the failure, and retain existing best-effort job semantics. |
|
||||
| Multiple queue groups repeat identity lookup | Low | The personal page requests one queue group; avoid a new dedup mechanism until a measured need exists. |
|
||||
| Background community uses a non-Asia Riot route | High | Resolve omitted regions from the user's community before falling back to `asia`. |
|
||||
| Identity lookup failure triggers background backoff | Medium | Isolate identity exceptions and let existing statistics enrichment alone control failure counters. |
|
||||
| UI keeps the stale profile cached | High | Identity update completes before the existing completion event invalidates the profile query. |
|
||||
| Historical names are unexpectedly rewritten | Medium | Restrict persistence to the embedded Riot account and leave match snapshots untouched. |
|
||||
|
||||
## Dependencies
|
||||
|
||||
```text
|
||||
validated Account-V1 lookup
|
||||
-> focused identity persistence method
|
||||
-> manual refresh worker -> existing completion event -> profile invalidation
|
||||
-> background scheduler -> existing statistics enrichment and backoff policy
|
||||
```
|
||||
|
||||
## Open Questions
|
||||
|
||||
None. The user approved the specification and requested implementation.
|
||||
@@ -0,0 +1,32 @@
|
||||
# Dependency Audit Exceptions
|
||||
|
||||
## GHSA-mh99-v99m-4gvg
|
||||
|
||||
- Package: `brace-expansion`
|
||||
- Scope: development tooling only (`eslint`, `jest`, and `@nestjs/cli` through
|
||||
`minimatch`/`glob`)
|
||||
- Production exposure: none; `pnpm audit --prod --audit-level high` reports no
|
||||
high or critical findings
|
||||
- Reason: the only patched release is `brace-expansion@5.0.8`, whose CommonJS
|
||||
API is incompatible with the affected `minimatch@3` and `minimatch@9`
|
||||
consumers
|
||||
- Mitigation: repository-controlled glob patterns are trusted; no
|
||||
attacker-controlled input is passed to these development tools
|
||||
- Review date: 2026-08-25
|
||||
- Removal condition: remove the audit exception once the upstream toolchain
|
||||
supports `brace-expansion@5.0.8` or publishes compatible patched releases
|
||||
|
||||
## Tracked remediation
|
||||
|
||||
### GHSA-664h-wqgq-64gw
|
||||
|
||||
- Package: `mongoose@9.4.1`
|
||||
- Severity: moderate
|
||||
- Patched version: `>=9.7.2`
|
||||
- Status: not ignored; it remains visible in a full audit and does not fail the
|
||||
high-severity CI gate
|
||||
- Upgrade blocker: Mongoose 9.7.x tightens create and query types and currently
|
||||
causes API compilation failures across the model layer
|
||||
- Next action: migrate the affected model create/query types, then upgrade
|
||||
Mongoose in a dedicated change
|
||||
- Review date: 2026-08-25
|
||||
@@ -0,0 +1,67 @@
|
||||
# Spec: Dakao Upcoming Internal Match List
|
||||
|
||||
## Objective
|
||||
|
||||
When a user sends `!내전 일정`, return only recruiting matches whose scheduled
|
||||
start is not earlier than the command processing time. Matches that have already
|
||||
started must not consume the ten-result query limit or appear in the response.
|
||||
|
||||
## Approved Product Decisions
|
||||
|
||||
- Capture the command processing time once before querying matches.
|
||||
- Exclude `scheduledAt < now`.
|
||||
- Include `scheduledAt === now` and future matches.
|
||||
- Apply the boundary only to the Dakao `!내전 일정` command.
|
||||
- Preserve the existing recruiting status, result limit, ordering, formatting,
|
||||
short-code generation, and short-link behavior.
|
||||
|
||||
## Commands
|
||||
|
||||
- Focused test:
|
||||
`pnpm --filter api exec jest src/modules/dakao/handlers/match-list.handler.spec.ts --runInBand`
|
||||
- API lint:
|
||||
`pnpm --filter api exec eslint "{src,apps,libs,test}/**/*.ts" --max-warnings=0`
|
||||
- API build: `pnpm --filter api build`
|
||||
|
||||
## Project Structure
|
||||
|
||||
- `apps/api/src/modules/dakao/handlers/match-list.handler.ts` owns the command
|
||||
query and response formatting.
|
||||
- `apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts` verifies the
|
||||
command boundary and presentation.
|
||||
- `apps/api/src/modules/match/match.service.ts` translates `scheduledFrom` into a
|
||||
MongoDB `$gte` filter.
|
||||
|
||||
## Code Style
|
||||
|
||||
Pass the captured boundary through the existing list contract:
|
||||
|
||||
```ts
|
||||
const scheduledFrom = new Date();
|
||||
await matchService.list({ communityId, scheduledFrom });
|
||||
```
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
- Freeze the system clock in the handler unit test.
|
||||
- Assert that the exact frozen time is passed as `scheduledFrom`.
|
||||
- Rely on the existing `MatchService` test that verifies `scheduledFrom` becomes
|
||||
`{ scheduledAt: { $gte: scheduledFrom } }`.
|
||||
- Run the focused handler test, full API lint, and API build.
|
||||
|
||||
## Boundaries
|
||||
|
||||
- Always: filter before applying the result limit and use one captured time.
|
||||
- Ask first: change ordering, statuses, limit, or response wording.
|
||||
- Never: hide the requirement with an ESLint exception or filter only after the
|
||||
limited database query.
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- A match scheduled before command processing time is not queried.
|
||||
- A match scheduled exactly at command processing time remains eligible.
|
||||
- Existing command formatting and link tests continue to pass.
|
||||
|
||||
## Open Questions
|
||||
|
||||
None.
|
||||
@@ -0,0 +1,134 @@
|
||||
# Spec: Double-Elimination Connector Routing
|
||||
|
||||
## Objective
|
||||
|
||||
Make winner advancement lines in the desktop double-elimination bracket bend at a
|
||||
consistent horizontal position. Two winner lines entering the same match should
|
||||
read as one visual pair when their vertical spans can share a rail: use the center
|
||||
of the 40px inter-column corridor when it is safe, and move the pair together only
|
||||
when another connector would interfere. If an accepted A/B mapping reverses the
|
||||
source order and makes those spans overlap, preserve separate deterministic,
|
||||
stroke-clear rails instead of creating a collinear overlap.
|
||||
|
||||
The primary user is a participant or organizer tracing advancement through a busy
|
||||
eight-team bracket. Success means the solid coral winner paths are visually
|
||||
aligned without degrading the existing dashed loser paths, card placement, or
|
||||
keyboard-driven connector highlighting.
|
||||
|
||||
## Approved Product Decisions
|
||||
|
||||
- Treat the two `winner` connectors entering one Series as a semantic bundle.
|
||||
- Prefer `target.x - columnGap / 2` for a winner bundle.
|
||||
- If the preferred rail causes crossings, collinear overlap, or less than 5px of
|
||||
clearance from an overlapping parallel route, move a shareable bundle to the
|
||||
nearest safe rail. Retain separate rails only when the pair's own vertical spans
|
||||
overlap and therefore cannot safely share any rail; move those rails to the
|
||||
nearest deterministic positions needed to preserve the same 5px clearance.
|
||||
- Preserve the current loser/reset rail ordering unless moving one is required to
|
||||
maintain valid geometry.
|
||||
- Keep every connector as a separate `H-V-H` SVG path so focus highlighting and
|
||||
accessible labels remain independent.
|
||||
- Keep long-distance bends inside the corridor immediately before the target
|
||||
column; do not use the midpoint between source and target cards.
|
||||
|
||||
## Tech Stack
|
||||
|
||||
- React 19, TypeScript 6, Vite 8, Tailwind CSS 4, and daisyUI under `apps/web`
|
||||
- Node's built-in test runner for the pure bracket layout calculation
|
||||
|
||||
## Commands
|
||||
|
||||
- Focused layout tests: `pnpm --filter web exec node --test --experimental-strip-types test/double-elimination-bracket-layout.test.ts`
|
||||
- Full web tests: `pnpm --filter web test`
|
||||
- Web lint: `pnpm --filter web lint`
|
||||
- Web production build: `pnpm --filter web build:prod`
|
||||
- Development server: `pnpm --filter web start:dev`
|
||||
|
||||
## Project Structure
|
||||
|
||||
- `apps/web/src/components/competition/double-elimination-bracket-layout.ts`
|
||||
validates the bracket graph, positions cards, assigns connector rails, and emits
|
||||
SVG path geometry.
|
||||
- `apps/web/src/components/competition/DoubleEliminationBracket.tsx` renders the
|
||||
computed paths and must not need routing-specific changes.
|
||||
- `apps/web/test/double-elimination-bracket-layout.test.ts` contains canonical
|
||||
four-team, eight-team, and reset-final fixtures plus geometry assertions.
|
||||
|
||||
## Code Style
|
||||
|
||||
Keep routing deterministic and express geometry through small named helpers:
|
||||
|
||||
```ts
|
||||
const preferredX = target.x - geometry.columnGap / 2;
|
||||
const verticalX = nearestSafeRail(preferredX, bundle, occupiedRoutes);
|
||||
```
|
||||
|
||||
Use existing layout types and semantic connector kinds. Do not add a dependency,
|
||||
DOM measurement, mutable global state, or renderer-specific routing behavior.
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
- Add regression tests before implementation and confirm they fail against the
|
||||
current per-edge rail allocator.
|
||||
- Assert observable geometry: safe winner pairs share a rail, quiet corridors use
|
||||
their exact midpoint, busy corridors keep a pair aligned, and mixed
|
||||
winner/loser entries remain distinguishable.
|
||||
- Cover reversed A/B winner input explicitly: it remains deterministic and uses
|
||||
separate rails without collinear overlap or focused-stroke clearance conflicts
|
||||
because no shared H-V-H rail is safe.
|
||||
- Replace the obsolete "all rails in a target column are unique" assertion with
|
||||
interval-aware overlap and 5px focused-stroke clearance protection.
|
||||
- Preserve deterministic output for shuffled input, finite path coordinates,
|
||||
target-corridor bounds, card avoidance, endpoint alignment, and canonical graph
|
||||
validation.
|
||||
- Verify four-team, eight-team, and reset-final layouts; run the complete web test,
|
||||
lint, and production build commands.
|
||||
|
||||
## Boundaries
|
||||
|
||||
### Always
|
||||
|
||||
- Keep winner, loser, and reset connectors visually distinguishable by the existing
|
||||
solid/dashed patterns and brand tokens.
|
||||
- Keep connector rails strictly inside the target corridor.
|
||||
- Avoid strict segment crossings and collinear overlaps whenever a safe candidate
|
||||
exists.
|
||||
- Keep overlapping parallel winner and loser rails at least 5px apart, matching
|
||||
the widest focused connector underlay.
|
||||
- Produce the same layout regardless of projection input ordering.
|
||||
|
||||
### Ask First
|
||||
|
||||
- Add dependencies or change the public projection contract.
|
||||
- Change bracket card dimensions, round columns, or the 40px column gap.
|
||||
- Redesign mobile bracket presentation or connector interaction behavior.
|
||||
|
||||
### Never
|
||||
|
||||
- Route a connector through a match card.
|
||||
- Infer routing from Series codes; use canonical graph identity and topology.
|
||||
- Merge two logical connectors into one SVG path.
|
||||
- Modify unrelated competition or score-card behavior.
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- The two winner paths into `LB_R3_M1` bend at the corridor midpoint and share the
|
||||
same `verticalX`.
|
||||
- The winner paths into the grand final share the corridor midpoint when safe.
|
||||
- Every same-target winner pair whose vertical spans do not overlap shares one
|
||||
`verticalX`, using the nearest collision-safe rail when the midpoint is busy.
|
||||
- A reversed A/B pair with overlapping vertical spans retains deterministic
|
||||
separate rails, produces no collinear segment overlap, and remains at least 5px
|
||||
from every overlapping vertical route.
|
||||
- Loser/reset paths retain their baseline rails, and winner bundles remain at least
|
||||
5px away where their vertical runs overlap.
|
||||
- All rails remain inside their target corridors without card penetration or
|
||||
collinear overlap.
|
||||
- Canonical four-team, eight-team, reset-final, and shuffled-input tests pass.
|
||||
- Full web tests and production build pass; changed-file lint passes, and any
|
||||
unrelated full-lint baseline failures are documented.
|
||||
|
||||
## Open Questions
|
||||
|
||||
None. The user reviewed the proposed bundle-aware routing behavior and requested
|
||||
implementation.
|
||||
@@ -0,0 +1,175 @@
|
||||
# Spec: Refresh Riot ID by PUUID
|
||||
|
||||
## Objective
|
||||
|
||||
Whenever an account is refreshed manually from the personal match-history page
|
||||
or automatically by the stale-account background scheduler, resolve its current
|
||||
Riot ID through Riot Account-V1 using the stored PUUID. If the player changed
|
||||
either their game name or tag line, persist the latest values on the same embedded
|
||||
Riot account so the profile displays the new Riot ID.
|
||||
|
||||
The existing refresh job remains the single user-facing operation. It continues
|
||||
to refresh matches and ranked data, and additionally refreshes identity before
|
||||
emitting its completion event.
|
||||
|
||||
## Approved Product Decisions
|
||||
|
||||
- Use the stored PUUID as the stable identity key; never look up the account by
|
||||
the possibly stale game name and tag line.
|
||||
- Query Riot Account-V1 on every manually queued user-history refresh job and
|
||||
every selected stale-account background refresh rather than applying a name TTL.
|
||||
- Update `gameName` and `tagLine` together only when Riot returns a matching PUUID
|
||||
and both values are non-empty.
|
||||
- Preserve the previous Riot ID if the Account-V1 lookup fails or returns an
|
||||
incomplete or mismatched response.
|
||||
- Treat identity refresh as best effort, matching the existing ranked-data refresh
|
||||
policy: log a failure but allow successful match refresh work to complete.
|
||||
- When a caller does not already know the Riot regional route, resolve it from the
|
||||
user's community and fall back to `asia` only when the community has no route.
|
||||
- Do not increment the background failure counter or enter backoff solely because
|
||||
the identity lookup failed; background statistics enrichment retains its
|
||||
existing success and failure semantics.
|
||||
- Reuse the existing refresh completion event and profile-query invalidation; do
|
||||
not add a new endpoint, response field, socket event, or frontend state path.
|
||||
- Update only the embedded Riot account used by the personal profile. Historical
|
||||
match snapshots retain the names recorded by Riot for those games.
|
||||
|
||||
## Tech Stack
|
||||
|
||||
- NestJS 11, TypeScript 5, Mongoose 9, and Jest under `apps/api`
|
||||
- Riot Account-V1 through the existing `RiotAccountService`
|
||||
- Redis stream jobs through the existing `RiotJobWorkerService`
|
||||
- Scheduled stale-account refresh through `BackgroundRefreshScheduler`
|
||||
- React Query profile invalidation already present in `UserHistoryPage`
|
||||
|
||||
## Commands
|
||||
|
||||
- Focused tests:
|
||||
`pnpm --filter api exec jest --runInBand riot-account-enrichment.service.spec.ts riot-job-worker.service.spec.ts background-refresh.scheduler.spec.ts`
|
||||
- API lint: `pnpm --filter api lint`
|
||||
- API build: `pnpm --filter api build`
|
||||
- Web lint: `pnpm --filter web lint`
|
||||
- Web production build: `pnpm --filter web build:prod`
|
||||
|
||||
## Project Structure
|
||||
|
||||
- `apps/api/src/modules/riot/riot-account.service.ts` owns the validated
|
||||
Account-V1 PUUID lookup.
|
||||
- `apps/api/src/modules/riot/riot-account-enrichment.service.ts` owns the
|
||||
persistence boundary for the embedded Riot account.
|
||||
- `apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts` verifies
|
||||
update, no-op, and failure behavior.
|
||||
- `apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts` orchestrates
|
||||
identity, match, and ranked refresh work before completion.
|
||||
- `apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts` verifies
|
||||
that a personal-history refresh job requests the PUUID-based identity refresh.
|
||||
- `apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts`
|
||||
orchestrates best-effort identity refresh for stale accounts before statistics
|
||||
enrichment.
|
||||
- `apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts`
|
||||
verifies background invocation, ordering, and failure isolation.
|
||||
- `apps/web/src/pages/UserHistoryPage.tsx` already invalidates the profile query
|
||||
when the refresh socket reports completion and is not modified in this scope.
|
||||
|
||||
## Internal Contract
|
||||
|
||||
Add one focused method to `RiotAccountEnrichmentService`:
|
||||
|
||||
```ts
|
||||
type RefreshRiotIdentityResult = "updated" | "unchanged" | "failed";
|
||||
|
||||
refreshRiotIdentity(params: {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
region?: RiotRegionalRoute;
|
||||
}): Promise<RefreshRiotIdentityResult>;
|
||||
```
|
||||
|
||||
`updated` means both persisted Riot ID fields now match Account-V1. `unchanged`
|
||||
means the validated response matched the stored values and no database write was
|
||||
needed. `failed` means no stored account could be resolved or the external lookup
|
||||
could not safely provide a complete identity; stored values remain unchanged. If
|
||||
`region` is omitted, the service resolves the user's community and uses its
|
||||
configured `riotRegion`, falling back to `asia` only when unavailable.
|
||||
|
||||
## Code Style
|
||||
|
||||
Keep the external validation and persistence decision explicit:
|
||||
|
||||
```ts
|
||||
const identity = await this.accountService.getByPuuid(puuid, { region });
|
||||
if (identity.puuid !== puuid || !identity.gameName || !identity.tagLine) {
|
||||
return "failed";
|
||||
}
|
||||
```
|
||||
|
||||
Use existing single quotes, NestJS logging, Mongoose document mutation, and
|
||||
Prettier formatting. Do not add a generic identity abstraction or new dependency.
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
- Write the enrichment-service tests first and confirm they fail before adding
|
||||
the new method.
|
||||
- Verify a changed game name and tag line are persisted together.
|
||||
- Verify identical values return `unchanged` without saving.
|
||||
- Verify missing values, PUUID mismatch, and Riot lookup errors return `failed`
|
||||
without overwriting or saving the stored identity.
|
||||
- Write the worker orchestration expectation before calling the new method.
|
||||
- Verify a region-less identity refresh uses the user's configured community
|
||||
region.
|
||||
- Write background scheduler expectations before adding identity refresh to the
|
||||
stale-account loop.
|
||||
- Verify identity refresh happens before statistics enrichment and that a rejected
|
||||
identity lookup does not increment background failure counters.
|
||||
- Run focused API tests after each slice, then API lint/build and web lint/build
|
||||
to verify the existing client integration remains valid.
|
||||
|
||||
## Boundaries
|
||||
|
||||
### Always
|
||||
|
||||
- Use the stored PUUID for Account-V1 lookup and verify the returned PUUID.
|
||||
- Validate both Riot ID fields before mutating the database.
|
||||
- Preserve the current Riot ID on any unsafe or failed response.
|
||||
- Keep the existing refresh route, enqueue response, and socket event compatible.
|
||||
- Keep background identity failures independent from enrichment failure counters.
|
||||
- Run focused tests before broader lint and build verification.
|
||||
|
||||
### Ask First
|
||||
|
||||
- Add a database field or migration.
|
||||
- Change refresh failure semantics so an identity lookup failure fails the whole
|
||||
user-history job.
|
||||
- Update historical match snapshots or active match participant display names.
|
||||
- Add a new API response field, endpoint, dependency, or Redis job type.
|
||||
- Commit, push, deploy, or alter CI configuration.
|
||||
|
||||
### Never
|
||||
|
||||
- Resolve identity from the stale stored Riot ID.
|
||||
- Partially update only the game name or only the tag line.
|
||||
- Replace a valid stored identity with empty or mismatched Account-V1 data.
|
||||
- Expose Riot API errors or credentials to the browser.
|
||||
- Mix the change with the separate past-history result-column PR.
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- Clicking `정보 갱신` causes the queued worker to call Account-V1 by the stored
|
||||
PUUID.
|
||||
- Selecting a stale account for background refresh also calls Account-V1 by the
|
||||
stored PUUID before statistics enrichment.
|
||||
- A changed Riot game name or tag line is persisted on the matching embedded
|
||||
account before the completion event is broadcast.
|
||||
- The completion event triggers the existing profile-query invalidation, so the
|
||||
personal history header displays the latest `gameName#tagLine`.
|
||||
- Failed, incomplete, or mismatched Riot identity responses do not overwrite the
|
||||
existing Riot ID and do not prevent otherwise successful match refresh work.
|
||||
- Background identity lookup failures do not increment the account failure counter
|
||||
or prevent otherwise successful background enrichment.
|
||||
- Focused tests, API lint/build, and web lint/production build pass.
|
||||
|
||||
## Open Questions
|
||||
|
||||
None. The user approved this specification and requested implementation. The
|
||||
existing queue and UI invalidation paths support the behavior without a public
|
||||
contract change.
|
||||
+21
-1
@@ -26,6 +26,26 @@
|
||||
},
|
||||
"packageManager": "pnpm@10.4.1",
|
||||
"dependencies": {
|
||||
"@infisical/sdk": "^5.0.0"
|
||||
"@infisical/sdk": "^5.0.2"
|
||||
},
|
||||
"pnpm": {
|
||||
"auditConfig": {
|
||||
"ignoreGhsas": [
|
||||
"GHSA-mh99-v99m-4gvg"
|
||||
]
|
||||
},
|
||||
"overrides": {
|
||||
"@babel/core@7.29.0": "7.29.6",
|
||||
"brace-expansion@1.1.13": "1.1.16",
|
||||
"brace-expansion@2.0.3": "2.1.2",
|
||||
"brace-expansion@5.0.5": "5.0.8",
|
||||
"engine.io@6.6.6": "6.6.7",
|
||||
"fast-uri@3.1.0": "3.1.4",
|
||||
"form-data@4.0.5": "4.0.6",
|
||||
"js-yaml@4.1.1": "4.3.0",
|
||||
"js-yaml@5.2.1": "5.2.2",
|
||||
"qs@6.15.1": "6.15.2",
|
||||
"ws@8.18.3": "8.21.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+1662
-1630
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user