This commit is contained in:
dahyeon committed 2026-05-02 04:05:35 -07:00
1 parent 4baea89f89
commit fd386ed202
32 files changed
+1128 -601

No files matched your search

@@ -39,8 +39,7 @@ export class AuctionController {
matchId, matchId,
communityId, communityId,
captains: body.captains.map((c) => ({ captains: body.captains.map((c) => ({
side: c.side, teamIndex: c.teamIndex,
groupIndex: c.groupIndex ?? 1,
userId: new mongoose.Types.ObjectId(c.userId), userId: new mongoose.Types.ObjectId(c.userId),
})), })),
initialPoints: body.initialPoints ?? 1000, initialPoints: body.initialPoints ?? 1000,
@@ -76,8 +75,7 @@ export class AuctionController {
) { ) {
return this.auctionService.placeBid({ return this.auctionService.placeBid({
matchId, matchId,
side: body.side, teamIndex: body.teamIndex,
groupIndex: body.groupIndex ?? 1,
amount: body.amount, amount: body.amount,
bidderUserId: this.resolveBidder(currentUser, body.bidderUserId), bidderUserId: this.resolveBidder(currentUser, body.bidderUserId),
}); });
@@ -19,7 +19,6 @@ import type {
AuctionDocument, AuctionDocument,
IdentityDocument, IdentityDocument,
Position, Position,
TeamSide,
UserDocument, UserDocument,
} from '../global/database/schema'; } from '../global/database/schema';
import { AuctionService } from './auction.service'; import { AuctionService } from './auction.service';
@@ -29,8 +28,7 @@ interface JoinAuctionPayload {
} }
interface BidPayload { interface BidPayload {
side: TeamSide; teamIndex: number;
groupIndex?: number;
amount: number; amount: number;
bidderUserId?: string; bidderUserId?: string;
} }
@@ -125,8 +123,7 @@ export class AuctionGateway
try { try {
const auction = await this.auctionService.placeBid({ const auction = await this.auctionService.placeBid({
matchId: new mongoose.Types.ObjectId(matchId), matchId: new mongoose.Types.ObjectId(matchId),
side: payload.side, teamIndex: payload.teamIndex,
groupIndex: payload.groupIndex ?? 1,
amount: payload.amount, amount: payload.amount,
bidderUserId, bidderUserId,
}); });
@@ -31,10 +31,9 @@ describe('AuctionService', () => {
}; };
} }
function createFullTeam(side: 'blue' | 'red') { function createFullTeam(teamIndex: number) {
return { return {
side, teamIndex,
groupIndex: 1,
captainUserId: new mongoose.Types.ObjectId(), captainUserId: new mongoose.Types.ObjectId(),
points: 100, points: 100,
members: Array.from({ length: 4 }, () => ({ members: Array.from({ length: 4 }, () => ({
@@ -49,7 +48,7 @@ describe('AuctionService', () => {
const matchId = new mongoose.Types.ObjectId(); const matchId = new mongoose.Types.ObjectId();
const auction = { const auction = {
phase: 'bidding', phase: 'bidding',
teams: [createFullTeam('blue'), createFullTeam('red')], teams: [createFullTeam(1), createFullTeam(2)],
currentBid: 10, currentBid: 10,
save: jest.fn().mockResolvedValue(undefined), save: jest.fn().mockResolvedValue(undefined),
}; };
@@ -62,8 +61,7 @@ describe('AuctionService', () => {
await expect( await expect(
service.placeBid({ service.placeBid({
matchId, matchId,
side: 'blue', teamIndex: 1,
groupIndex: 1,
amount: 20, amount: 20,
}), }),
).rejects.toThrow('Team already has maximum members.'); ).rejects.toThrow('Team already has maximum members.');
@@ -74,7 +72,7 @@ describe('AuctionService', () => {
const matchId = new mongoose.Types.ObjectId(); const matchId = new mongoose.Types.ObjectId();
const auction = { const auction = {
phase: 'bidding', phase: 'bidding',
currentBidder: 'blue', currentBidderTeamIndex: 1,
currentBid: 20, currentBid: 20,
currentIndex: 0, currentIndex: 0,
order: [ order: [
@@ -83,7 +81,7 @@ describe('AuctionService', () => {
preferredPositions: [{ position: 'ADC', priority: 1 }], preferredPositions: [{ position: 'ADC', priority: 1 }],
}, },
], ],
teams: [createFullTeam('blue'), createFullTeam('red')], teams: [createFullTeam(1), createFullTeam(2)],
save: jest.fn().mockResolvedValue(undefined), save: jest.fn().mockResolvedValue(undefined),
}; };
const { service } = createService({ const { service } = createService({
@@ -112,7 +110,7 @@ describe('AuctionService', () => {
order: [{ userId: blueMemberId }, { userId: redMemberId }], order: [{ userId: blueMemberId }, { userId: redMemberId }],
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
captainUserId: blueCaptainId, captainUserId: blueCaptainId,
points: 970, points: 970,
members: [ members: [
@@ -124,7 +122,7 @@ describe('AuctionService', () => {
], ],
}, },
{ {
side: 'red', teamIndex: 2,
captainUserId: redCaptainId, captainUserId: redCaptainId,
points: 940, points: 940,
members: [ members: [
@@ -178,9 +176,8 @@ describe('AuctionService', () => {
expect(match.save).toHaveBeenCalledTimes(1); expect(match.save).toHaveBeenCalledTimes(1);
expect(match.teams).toEqual([ expect(match.teams).toEqual([
{ {
side: 'blue', teamIndex: 1,
groupIndex: 1, name: '1팀',
name: '블루팀',
captainUserId: blueCaptainId, captainUserId: blueCaptainId,
members: [ members: [
{ {
@@ -196,9 +193,8 @@ describe('AuctionService', () => {
], ],
}, },
{ {
side: 'red', teamIndex: 2,
groupIndex: 1, name: '2팀',
name: '레드팀',
captainUserId: redCaptainId, captainUserId: redCaptainId,
members: [ members: [
{ {
@@ -233,9 +229,8 @@ describe('AuctionService', () => {
status: 'team-built', status: 'team-built',
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
groupIndex: 1, name: '1팀',
name: '블루팀',
members: [], members: [],
}, },
], ],
+36 -54
View File
@@ -15,7 +15,6 @@ import {
MatchTeamMember, MatchTeamMember,
Position, Position,
RiotAccount, RiotAccount,
TeamSide,
} from '../global/database/schema'; } from '../global/database/schema';
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service'; import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
import type { RiotPlatformRoute, RiotRegionalRoute } from '../riot/riot.types'; import type { RiotPlatformRoute, RiotRegionalRoute } from '../riot/riot.types';
@@ -30,8 +29,7 @@ interface StartAuctionParams {
matchId: mongoose.Types.ObjectId; matchId: mongoose.Types.ObjectId;
communityId: mongoose.Types.ObjectId; communityId: mongoose.Types.ObjectId;
captains: { captains: {
side: TeamSide; teamIndex: number;
groupIndex: number;
userId: mongoose.Types.ObjectId; userId: mongoose.Types.ObjectId;
}[]; }[];
initialPoints: number; initialPoints: number;
@@ -40,8 +38,7 @@ interface StartAuctionParams {
interface PlaceBidParams { interface PlaceBidParams {
matchId: mongoose.Types.ObjectId; matchId: mongoose.Types.ObjectId;
side: TeamSide; teamIndex: number;
groupIndex: number;
amount: number; amount: number;
bidderUserId?: mongoose.Types.ObjectId; bidderUserId?: mongoose.Types.ObjectId;
} }
@@ -90,13 +87,16 @@ export class AuctionService {
throw new BadRequestException('Not enough participants (need at least 10).'); throw new BadRequestException('Not enough participants (need at least 10).');
} }
const expectedCaptainCount = desiredAuctionCount / AUCTION_MAX_TEAM_SIZE; const expectedCaptainCount = desiredAuctionCount / AUCTION_MAX_TEAM_SIZE;
const groupCount = expectedCaptainCount / 2;
if (params.captains.length !== expectedCaptainCount) { if (params.captains.length !== expectedCaptainCount) {
throw new BadRequestException( throw new BadRequestException(
`Expected ${expectedCaptainCount} captains for ${desiredAuctionCount} participants.`, `Expected ${expectedCaptainCount} captains for ${desiredAuctionCount} participants.`,
); );
} }
this.assertCaptainAssignments(params.captains, activeParticipants, groupCount); this.assertCaptainAssignments(
params.captains,
activeParticipants,
expectedCaptainCount,
);
const captainUserIds = params.captains.map((c) => c.userId); const captainUserIds = params.captains.map((c) => c.userId);
const basePlayerUsers = await UserModel.find({ const basePlayerUsers = await UserModel.find({
@@ -158,8 +158,7 @@ export class AuctionService {
matchId: params.matchId, matchId: params.matchId,
phase: 'presenting', phase: 'presenting',
teams: params.captains.map((c) => ({ teams: params.captains.map((c) => ({
side: c.side, teamIndex: c.teamIndex,
groupIndex: c.groupIndex,
captainUserId: c.userId, captainUserId: c.userId,
points: params.initialPoints, points: params.initialPoints,
members: [], members: [],
@@ -206,8 +205,7 @@ export class AuctionService {
} }
auction.phase = 'bidding'; auction.phase = 'bidding';
auction.currentBid = 0; auction.currentBid = 0;
auction.currentBidder = undefined; auction.currentBidderTeamIndex = undefined;
auction.currentBidderGroupIndex = undefined;
auction.currentDeadline = this.createDeadline(auction.maxTimerSeconds); auction.currentDeadline = this.createDeadline(auction.maxTimerSeconds);
await auction.save(); await auction.save();
return auction; return auction;
@@ -218,7 +216,7 @@ export class AuctionService {
if (auction.phase !== 'bidding') { if (auction.phase !== 'bidding') {
throw new BadRequestException('Auction is not in bidding phase.'); throw new BadRequestException('Auction is not in bidding phase.');
} }
const team = this.findAuctionTeam(auction, params.side, params.groupIndex); const team = this.findAuctionTeamByIndex(auction, params.teamIndex);
if (!team) throw new BadRequestException('Unknown team.'); if (!team) throw new BadRequestException('Unknown team.');
if (params.amount <= auction.currentBid) { if (params.amount <= auction.currentBid) {
throw new BadRequestException('Bid must exceed current bid.'); throw new BadRequestException('Bid must exceed current bid.');
@@ -230,14 +228,12 @@ export class AuctionService {
// 임시 운영용: 클라이언트에서 선택한 팀장 모드를 신뢰하고 실제 로그인 사용자 검증은 건너뛴다. // 임시 운영용: 클라이언트에서 선택한 팀장 모드를 신뢰하고 실제 로그인 사용자 검증은 건너뛴다.
auction.currentBid = params.amount; auction.currentBid = params.amount;
auction.currentBidder = params.side; auction.currentBidderTeamIndex = params.teamIndex;
auction.currentBidderGroupIndex = params.groupIndex;
auction.currentDeadline = this.createDeadline( auction.currentDeadline = this.createDeadline(
this.resolveBidExtensionSeconds(auction), this.resolveBidExtensionSeconds(auction),
); );
auction.bids.push({ auction.bids.push({
side: params.side, teamIndex: params.teamIndex,
groupIndex: params.groupIndex,
amount: params.amount, amount: params.amount,
bidderUserId: team.captainUserId, bidderUserId: team.captainUserId,
timestamp: new Date(), timestamp: new Date(),
@@ -251,13 +247,12 @@ export class AuctionService {
if (auction.phase !== 'bidding') { if (auction.phase !== 'bidding') {
throw new BadRequestException('Auction is not in bidding phase.'); throw new BadRequestException('Auction is not in bidding phase.');
} }
if (!auction.currentBidder || auction.currentBid <= 0) { if (!auction.currentBidderTeamIndex || auction.currentBid <= 0) {
throw new BadRequestException('No bid to mark sold.'); throw new BadRequestException('No bid to mark sold.');
} }
const team = this.findAuctionTeam( const team = this.findAuctionTeamByIndex(
auction, auction,
auction.currentBidder, auction.currentBidderTeamIndex,
auction.currentBidderGroupIndex ?? 1,
); );
if (!team) throw new BadRequestException('Winning team not found.'); if (!team) throw new BadRequestException('Winning team not found.');
this.assertTeamHasSlot(team); this.assertTeamHasSlot(team);
@@ -293,8 +288,7 @@ export class AuctionService {
auction.currentIndex = nextIndex; auction.currentIndex = nextIndex;
auction.phase = 'presenting'; auction.phase = 'presenting';
auction.currentBid = 0; auction.currentBid = 0;
auction.currentBidder = undefined; auction.currentBidderTeamIndex = undefined;
auction.currentBidderGroupIndex = undefined;
} }
auction.currentDeadline = undefined; auction.currentDeadline = undefined;
await auction.save(); await auction.save();
@@ -372,18 +366,13 @@ export class AuctionService {
private assertCaptainAssignments( private assertCaptainAssignments(
captains: StartAuctionParams['captains'], captains: StartAuctionParams['captains'],
activeParticipants: Array<{ userId: mongoose.Types.ObjectId }>, activeParticipants: Array<{ userId: mongoose.Types.ObjectId }>,
groupCount: number, expectedCaptainCount: number,
): void { ): void {
const activeUserIds = new Set( const activeUserIds = new Set(
activeParticipants.map((participant) => participant.userId.toString()), activeParticipants.map((participant) => participant.userId.toString()),
); );
const captainUserIds = new Set<string>(); const captainUserIds = new Set<string>();
const teamKeys = new Set<string>(); const teamIndexes = new Set<number>();
const requiredKeys = new Set<string>();
for (let groupIndex = 1; groupIndex <= groupCount; groupIndex += 1) {
requiredKeys.add(`blue:${groupIndex}`);
requiredKeys.add(`red:${groupIndex}`);
}
for (const captain of captains) { for (const captain of captains) {
const userId = captain.userId.toString(); const userId = captain.userId.toString();
@@ -397,31 +386,31 @@ export class AuctionService {
} }
captainUserIds.add(userId); captainUserIds.add(userId);
if (captain.groupIndex < 1 || captain.groupIndex > groupCount) { if (
throw new BadRequestException('Captain groupIndex is out of range.'); !Number.isInteger(captain.teamIndex) ||
captain.teamIndex < 1 ||
captain.teamIndex > expectedCaptainCount
) {
throw new BadRequestException('Captain teamIndex is out of range.');
} }
const key = `${captain.side}:${captain.groupIndex}`; if (teamIndexes.has(captain.teamIndex)) {
if (teamKeys.has(key)) {
throw new BadRequestException('Duplicate captain team assignment.'); throw new BadRequestException('Duplicate captain team assignment.');
} }
teamKeys.add(key); teamIndexes.add(captain.teamIndex);
} }
for (const key of requiredKeys) { for (let teamIndex = 1; teamIndex <= expectedCaptainCount; teamIndex += 1) {
if (!teamKeys.has(key)) { if (!teamIndexes.has(teamIndex)) {
throw new BadRequestException('Each group needs one blue and one red captain.'); throw new BadRequestException('Each teamIndex needs one captain.');
} }
} }
} }
private findAuctionTeam( private findAuctionTeamByIndex(
auction: AuctionDocument, auction: AuctionDocument,
side: TeamSide, teamIndex: number,
groupIndex: number,
): AuctionTeam | undefined { ): AuctionTeam | undefined {
return auction.teams.find( return auction.teams.find((team) => team.teamIndex === teamIndex);
(team) => team.side === side && (team.groupIndex ?? 1) === groupIndex,
);
} }
private createDeadline(secondsFromNow: number): Date { private createDeadline(secondsFromNow: number): Date {
@@ -485,9 +474,8 @@ export class AuctionService {
]; ];
return { return {
side: team.side, teamIndex: team.teamIndex,
groupIndex: team.groupIndex ?? 1, name: this.resolveTeamName(team.teamIndex),
name: this.resolveTeamName(team.side, team.groupIndex ?? 1, auction.teams),
captainUserId: team.captainUserId, captainUserId: team.captainUserId,
members, members,
}; };
@@ -593,14 +581,8 @@ export class AuctionService {
}, 0); }, 0);
} }
private resolveTeamName( private resolveTeamName(teamIndex: number): string {
side: TeamSide, return `${teamIndex}팀`;
groupIndex: number,
teams: AuctionTeam[],
): string {
const groupCount = new Set(teams.map((team) => team.groupIndex ?? 1)).size;
const sideLabel = side === 'blue' ? '블루팀' : '레드팀';
return groupCount <= 1 ? sideLabel : `${groupIndex}조 ${sideLabel}`;
} }
} }
@@ -10,17 +10,11 @@ import {
Min, Min,
ValidateNested, ValidateNested,
} from 'class-validator'; } from 'class-validator';
import { TEAM_SIDES } from '../../global/database/schema';
import type { TeamSide } from '../../global/database/schema';
class CaptainAssignmentDto { class CaptainAssignmentDto {
@IsEnum(TEAM_SIDES)
side!: TeamSide;
@IsOptional()
@IsInt() @IsInt()
@Min(1) @Min(1)
groupIndex?: number; teamIndex!: number;
@IsMongoId() @IsMongoId()
userId!: string; userId!: string;
@@ -46,13 +40,9 @@ export class StartAuctionDto {
} }
export class PlaceBidDto { export class PlaceBidDto {
@IsEnum(TEAM_SIDES)
side!: TeamSide;
@IsOptional()
@IsInt() @IsInt()
@Min(1) @Min(1)
groupIndex?: number; teamIndex!: number;
@IsInt() @IsInt()
@Min(1) @Min(1)
@@ -47,6 +47,7 @@ interface InternalRecord {
userId: string; userId: string;
summonerName: string; summonerName: string;
profileIconId: number; profileIconId: number;
teamIndex: number;
side: TeamSide; side: TeamSide;
championId: number; championId: number;
championLevel: number; championLevel: number;
@@ -81,6 +82,7 @@ interface InternalGameDetail {
gameDuration: number; gameDuration: number;
winnerSide: TeamSide; winnerSide: TeamSide;
teams: Array<{ teams: Array<{
teamIndex: number;
side: TeamSide; side: TeamSide;
win: boolean; win: boolean;
objectives: { baron: number; dragon: number; tower: number }; objectives: { baron: number; dragon: number; tower: number };
@@ -237,12 +239,14 @@ export class CommunityStatsService {
gameCreation: game.gameCreation, gameCreation: game.gameCreation,
gameDuration: game.gameDuration, gameDuration: game.gameDuration,
teams: game.teams.map((team) => ({ teams: game.teams.map((team) => ({
teamIndex: team.teamIndex,
side: team.side, side: team.side,
win: team.win, win: team.win,
objectives: team.objectives, objectives: team.objectives,
participants: team.participants.map((record) => ({ participants: team.participants.map((record) => ({
userId: record.userId, userId: record.userId,
summonerName: record.summonerName, summonerName: record.summonerName,
teamIndex: record.teamIndex,
side: record.side, side: record.side,
teamPosition: record.teamPosition, teamPosition: record.teamPosition,
championId: record.championId, championId: record.championId,
@@ -454,17 +458,19 @@ export class CommunityStatsService {
scheduledAt: match.scheduledAt.toISOString(), scheduledAt: match.scheduledAt.toISOString(),
status: match.status === 'finished' ? 'finished' : 'in-progress', status: match.status === 'finished' ? 'finished' : 'in-progress',
gameCount: match.gameCount, gameCount: match.gameCount,
blueScore: match.result?.blueScore ?? 0, winnerTeamIndex: match.result?.winnerTeamIndex,
redScore: match.result?.redScore ?? 0, seriesResults: match.result?.seriesResults ?? [],
winnerSide: match.result?.winnerSide,
games: games.map((game) => ({ games: games.map((game) => ({
gameNumber: game.gameNumber, gameNumber: game.gameNumber,
riotMatchId: game.riotMatchId ?? null, riotMatchId: game.riotMatchId ?? null,
blueTeamIndex: game.blueTeamIndex,
redTeamIndex: game.redTeamIndex,
winnerTeamIndex: game.winnerTeamIndex ?? null,
winnerSide: game.winnerSide ?? null, winnerSide: game.winnerSide ?? null,
gameDuration: game.gameDuration, gameDuration: game.gameDuration,
})), })),
teams: match.teams.map((team) => ({ teams: match.teams.map((team) => ({
side: team.side, teamIndex: team.teamIndex,
name: team.name, name: team.name,
members: team.members.map((member) => { members: team.members.map((member) => {
const participant = participantById.get(member.userId.toString()); const participant = participantById.get(member.userId.toString());
@@ -508,6 +514,8 @@ export class CommunityStatsService {
gameDuration: game.gameDuration, gameDuration: game.gameDuration,
winnerSide: game.winnerSide, winnerSide: game.winnerSide,
teams: (['blue', 'red'] as TeamSide[]).map((side) => { teams: (['blue', 'red'] as TeamSide[]).map((side) => {
const teamIndex =
side === 'blue' ? game.blueTeamIndex : game.redTeamIndex;
const rawTeamId = rawTeamIdBySide.get(side); const rawTeamId = rawTeamIdBySide.get(side);
const rawTeam = raw.info.teams.find((team) => team.teamId === rawTeamId); const rawTeam = raw.info.teams.find((team) => team.teamId === rawTeamId);
const teamRawParticipants = raw.info.participants.filter( const teamRawParticipants = raw.info.participants.filter(
@@ -522,6 +530,7 @@ export class CommunityStatsService {
0, 0,
); );
return { return {
teamIndex,
side, side,
win: game.winnerSide === side, win: game.winnerSide === side,
objectives: { objectives: {
@@ -559,6 +568,7 @@ export class CommunityStatsService {
gameDuration: game.gameDuration, gameDuration: game.gameDuration,
winnerSide: game.winnerSide, winnerSide: game.winnerSide,
teams: (['blue', 'red'] as TeamSide[]).map((side) => ({ teams: (['blue', 'red'] as TeamSide[]).map((side) => ({
teamIndex: side === 'blue' ? game.blueTeamIndex : game.redTeamIndex,
side, side,
win: game.winnerSide === side, win: game.winnerSide === side,
objectives: { baron: 0, dragon: 0, tower: 0 }, objectives: { baron: 0, dragon: 0, tower: 0 },
@@ -621,6 +631,7 @@ export class CommunityStatsService {
rawParticipant?.summonerName ?? rawParticipant?.summonerName ??
'Unknown', 'Unknown',
profileIconId: snapshot?.profileIconId ?? 0, profileIconId: snapshot?.profileIconId ?? 0,
teamIndex: participant.teamIndex,
side: participant.side, side: participant.side,
championId: participant.championId, championId: participant.championId,
championLevel: rawParticipant?.champLevel ?? 0, championLevel: rawParticipant?.champLevel ?? 0,
@@ -22,17 +22,25 @@ export interface InternalMatchCardView {
scheduledAt: string; scheduledAt: string;
status: 'finished' | 'in-progress'; status: 'finished' | 'in-progress';
gameCount: number; gameCount: number;
blueScore: number; winnerTeamIndex?: number;
redScore: number; seriesResults: Array<{
winnerSide?: TeamSide; teamAIndex: number;
teamBIndex: number;
teamAWins: number;
teamBWins: number;
winnerTeamIndex?: number;
}>;
games: Array<{ games: Array<{
gameNumber: number; gameNumber: number;
riotMatchId: string | null; riotMatchId: string | null;
blueTeamIndex: number;
redTeamIndex: number;
winnerTeamIndex: number | null;
winnerSide: TeamSide | null; winnerSide: TeamSide | null;
gameDuration: number; gameDuration: number;
}>; }>;
teams: Array<{ teams: Array<{
side: TeamSide; teamIndex: number;
name: string; name: string;
members: Array<{ members: Array<{
userId: string; userId: string;
@@ -101,12 +109,14 @@ export interface InternalMatchDetailResponse {
gameCreation: number; gameCreation: number;
gameDuration: number; gameDuration: number;
teams: Array<{ teams: Array<{
teamIndex: number;
side: TeamSide; side: TeamSide;
win: boolean; win: boolean;
objectives: { baron: number; dragon: number; tower: number }; objectives: { baron: number; dragon: number; tower: number };
participants: Array<{ participants: Array<{
userId: string | null; userId: string | null;
summonerName: string; summonerName: string;
teamIndex: number;
side: TeamSide; side: TeamSide;
teamPosition: string; teamPosition: string;
championId: number; championId: number;
@@ -0,0 +1,160 @@
import { migrateTeamIndex } from './20260502-team-index';
function createDb(params: {
auctions?: Array<Record<string, unknown>>;
matches?: Array<Record<string, unknown>>;
}) {
const collections = {
auction: params.auctions ?? [],
match: params.matches ?? [],
};
return {
collections,
db: {
collection(name: string) {
const key = name === 'auction' ? 'auction' : 'match';
const docs = collections[key];
return {
find() {
return {
limit() {
return {
async *[Symbol.asyncIterator]() {
for (const doc of docs) yield doc;
},
};
},
};
},
async bulkWrite(writes: Array<{
updateOne: {
filter: { _id: unknown };
update: {
$set: Record<string, unknown>;
$unset: Record<string, ''>;
};
};
}>) {
for (const write of writes) {
const doc = docs.find((item) => item._id === write.updateOne.filter._id);
if (!doc) continue;
Object.assign(doc, write.updateOne.update.$set);
for (const key of Object.keys(write.updateOne.update.$unset)) {
delete doc[key];
}
}
},
};
},
},
};
}
describe('migrateTeamIndex', () => {
it('migrates auction and match team identity fields', async () => {
const { db, collections } = createDb({
auctions: [
{
_id: 'auction-1',
teams: [{ side: 'blue', groupIndex: 1 }, { side: 'red', groupIndex: 1 }],
bids: [{ side: 'red', groupIndex: 1, amount: 100 }],
currentBidder: 'red',
currentBidderGroupIndex: 1,
},
],
matches: [
{
_id: 'match-1',
teams: [{ side: 'blue', groupIndex: 1 }, { side: 'red', groupIndex: 1 }],
result: {
winnerSide: 'blue',
blueScore: 1,
redScore: 0,
games: [
{
gameNumber: 1,
riotMatchId: 'KR_1',
winnerSide: 'blue',
blueGroupIndex: 1,
redGroupIndex: 1,
participants: [
{ userId: 'u1', side: 'blue' },
{ userId: 'u2', side: 'red' },
],
},
],
seriesResults: [
{
blueGroupIndex: 1,
redGroupIndex: 1,
blueScore: 1,
redScore: 0,
winnerSide: 'blue',
},
],
},
},
],
});
const stats = await migrateTeamIndex(db, { dryRun: false });
expect(stats).toEqual({
scannedAuctions: 1,
changedAuctions: 1,
scannedMatches: 1,
changedMatches: 1,
});
expect(collections.auction[0]).toMatchObject({
teams: [{ teamIndex: 1 }, { teamIndex: 2 }],
bids: [{ teamIndex: 2, amount: 100 }],
currentBidderTeamIndex: 2,
});
expect(collections.match[0]).toMatchObject({
teams: [{ teamIndex: 1, name: '1팀' }, { teamIndex: 2, name: '2팀' }],
result: {
winnerTeamIndex: 1,
games: [
{
blueTeamIndex: 1,
redTeamIndex: 2,
winnerTeamIndex: 1,
participants: [
{ teamIndex: 1, side: 'blue' },
{ teamIndex: 2, side: 'red' },
],
},
],
seriesResults: [
{
teamAIndex: 1,
teamBIndex: 2,
teamAWins: 1,
teamBWins: 0,
winnerTeamIndex: 1,
},
],
},
});
expect(collections.auction[0]).not.toHaveProperty('currentBidder');
expect(collections.match[0].result).not.toHaveProperty('blueScore');
});
it('is idempotent after applying updates', async () => {
const { db } = createDb({
matches: [
{
_id: 'match-1',
teams: [{ side: 'blue', groupIndex: 1 }],
},
],
});
await migrateTeamIndex(db, { dryRun: false });
const stats = await migrateTeamIndex(db, { dryRun: false });
expect(stats.changedMatches).toBe(0);
expect(stats.changedAuctions).toBe(0);
});
});
@@ -0,0 +1,335 @@
type LegacySide = 'blue' | 'red';
interface MigrationCollection {
find(filter: Record<string, unknown>): {
limit(limit: number): AsyncIterable<AnyDoc>;
};
bulkWrite(
writes: Array<{
updateOne: {
filter: { _id: unknown };
update: { $set: Record<string, unknown>; $unset: Record<string, ''> };
};
}>,
options: { ordered: boolean },
): Promise<unknown>;
}
interface MigrationDb {
collection(name: string): MigrationCollection;
}
interface MigrationOptions {
dryRun?: boolean;
limit?: number;
}
interface MigrationStats {
scannedAuctions: number;
changedAuctions: number;
scannedMatches: number;
changedMatches: number;
}
type AnyDoc = Record<string, unknown> & { _id: unknown };
export async function migrateTeamIndex(
db: MigrationDb,
options: MigrationOptions = {},
): Promise<MigrationStats> {
const dryRun = options.dryRun ?? true;
const stats: MigrationStats = {
scannedAuctions: 0,
changedAuctions: 0,
scannedMatches: 0,
changedMatches: 0,
};
await migrateCollection(db.collection('auction'), options.limit, dryRun, stats, 'auction');
await migrateCollection(db.collection('match'), options.limit, dryRun, stats, 'match');
return stats;
}
async function migrateCollection(
collection: MigrationCollection,
limit: number | undefined,
dryRun: boolean,
stats: MigrationStats,
kind: 'auction' | 'match',
) {
const cursor = collection.find({}).limit(limit ?? 0);
const writes: Array<{
updateOne: {
filter: { _id: unknown };
update: { $set: Record<string, unknown>; $unset: Record<string, ''> };
};
}> = [];
for await (const doc of cursor) {
if (kind === 'auction') stats.scannedAuctions += 1;
if (kind === 'match') stats.scannedMatches += 1;
const update = kind === 'auction' ? migrateAuction(doc) : migrateMatch(doc);
if (!update) continue;
if (kind === 'auction') stats.changedAuctions += 1;
if (kind === 'match') stats.changedMatches += 1;
writes.push({
updateOne: {
filter: { _id: doc._id },
update,
},
});
}
if (!dryRun && writes.length > 0) {
await collection.bulkWrite(writes, { ordered: false });
}
}
function migrateAuction(doc: AnyDoc) {
const set: Record<string, unknown> = {};
const unset: Record<string, ''> = {};
let changed = false;
const teams = asArray(doc.teams).map((team) => {
const migrated = { ...team };
const teamIndex = readTeamIndex(migrated);
if (teamIndex !== undefined) migrated.teamIndex = teamIndex;
if ('side' in migrated || 'groupIndex' in migrated) changed = true;
delete migrated.side;
delete migrated.groupIndex;
return migrated;
});
if (changed) set.teams = teams;
const bids = asArray(doc.bids).map((bid) => {
const migrated = { ...bid };
const teamIndex = readTeamIndex(migrated);
if (teamIndex !== undefined) migrated.teamIndex = teamIndex;
if ('side' in migrated || 'groupIndex' in migrated) changed = true;
delete migrated.side;
delete migrated.groupIndex;
return migrated;
});
if (changed) set.bids = bids;
if (
typeof doc.currentBidderTeamIndex !== 'number' &&
isSide(doc.currentBidder)
) {
set.currentBidderTeamIndex = sideGroupToTeamIndex(
doc.currentBidder,
numberOrDefault(doc.currentBidderGroupIndex, 1),
);
changed = true;
}
if ('currentBidder' in doc || 'currentBidderGroupIndex' in doc) {
unset.currentBidder = '';
unset.currentBidderGroupIndex = '';
changed = true;
}
return changed ? { $set: set, $unset: unset } : null;
}
function migrateMatch(doc: AnyDoc) {
const set: Record<string, unknown> = {};
const unset: Record<string, ''> = {};
let changed = false;
const teams = asArray(doc.teams).map((team) => {
const migrated = { ...team };
const teamIndex = readTeamIndex(migrated);
if (teamIndex !== undefined) migrated.teamIndex = teamIndex;
if (!migrated.name && typeof teamIndex === 'number') migrated.name = `${teamIndex}팀`;
if ('side' in migrated || 'groupIndex' in migrated) changed = true;
delete migrated.side;
delete migrated.groupIndex;
return migrated;
});
if (changed) set.teams = teams;
const result = isRecord(doc.result) ? migrateResult(doc.result) : null;
if (result) {
set.result = result;
changed = true;
}
return changed ? { $set: set, $unset: unset } : null;
}
function migrateResult(result: Record<string, unknown>) {
let changed = false;
const migrated = { ...result };
const games = asArray(result.games).map((game) => {
const next = { ...game };
const blueTeamIndex =
numberOrUndefined(next.blueTeamIndex) ??
sideGroupToTeamIndex('blue', numberOrDefault(next.blueGroupIndex, 1));
const redTeamIndex =
numberOrUndefined(next.redTeamIndex) ??
sideGroupToTeamIndex('red', numberOrDefault(next.redGroupIndex, 1));
const winnerSide = isSide(next.winnerSide) ? next.winnerSide : undefined;
const winnerTeamIndex =
numberOrUndefined(next.winnerTeamIndex) ??
(winnerSide === 'blue'
? blueTeamIndex
: winnerSide === 'red'
? redTeamIndex
: undefined);
next.blueTeamIndex = blueTeamIndex;
next.redTeamIndex = redTeamIndex;
if (winnerTeamIndex !== undefined) next.winnerTeamIndex = winnerTeamIndex;
next.participants = asArray(next.participants).map((participant) => {
const migratedParticipant = { ...participant };
if (typeof migratedParticipant.teamIndex !== 'number') {
migratedParticipant.teamIndex =
migratedParticipant.side === 'blue' ? blueTeamIndex : redTeamIndex;
}
return migratedParticipant;
});
if ('blueGroupIndex' in next || 'redGroupIndex' in next) changed = true;
delete next.blueGroupIndex;
delete next.redGroupIndex;
return next;
});
migrated.games = games;
const seriesResults = asArray(result.seriesResults).map((series) => {
if (typeof series.teamAIndex === 'number' && typeof series.teamBIndex === 'number') {
return series;
}
changed = true;
const legacyBlueTeamIndex = sideGroupToTeamIndex(
'blue',
numberOrDefault(series.blueGroupIndex, 1),
);
const legacyRedTeamIndex = sideGroupToTeamIndex(
'red',
numberOrDefault(series.redGroupIndex, 1),
);
const teamAIndex = Math.min(legacyBlueTeamIndex, legacyRedTeamIndex);
const teamBIndex = Math.max(legacyBlueTeamIndex, legacyRedTeamIndex);
const blueScore = numberOrDefault(series.blueScore, 0);
const redScore = numberOrDefault(series.redScore, 0);
const winnerSide = isSide(series.winnerSide) ? series.winnerSide : undefined;
const winnerTeamIndex =
winnerSide === 'blue'
? legacyBlueTeamIndex
: winnerSide === 'red'
? legacyRedTeamIndex
: undefined;
return {
teamAIndex,
teamBIndex,
teamAWins: teamAIndex === legacyBlueTeamIndex ? blueScore : redScore,
teamBWins: teamBIndex === legacyBlueTeamIndex ? blueScore : redScore,
winnerTeamIndex,
};
});
migrated.seriesResults = seriesResults.length > 0 ? seriesResults : buildSeries(games);
if (typeof migrated.winnerTeamIndex !== 'number') {
const migratedSeriesResults = Array.isArray(migrated.seriesResults)
? migrated.seriesResults
: [];
migrated.winnerTeamIndex =
resolveWinnerTeamIndex(migratedSeriesResults) ??
(isSide(migrated.winnerSide)
? sideGroupToTeamIndex(migrated.winnerSide, 1)
: undefined);
}
if ('winnerSide' in migrated || 'blueScore' in migrated || 'redScore' in migrated) {
changed = true;
}
delete migrated.winnerSide;
delete migrated.blueScore;
delete migrated.redScore;
return changed ? migrated : null;
}
function buildSeries(games: Record<string, unknown>[]) {
const bySeries = new Map<
string,
{
teamAIndex: number;
teamBIndex: number;
teamAWins: number;
teamBWins: number;
winnerTeamIndex?: number;
}
>();
for (const game of games) {
const blueTeamIndex = numberOrDefault(game.blueTeamIndex, 1);
const redTeamIndex = numberOrDefault(game.redTeamIndex, 2);
const winnerTeamIndex = numberOrUndefined(game.winnerTeamIndex);
const teamAIndex = Math.min(blueTeamIndex, redTeamIndex);
const teamBIndex = Math.max(blueTeamIndex, redTeamIndex);
const key = `${teamAIndex}:${teamBIndex}`;
const current =
bySeries.get(key) ?? { teamAIndex, teamBIndex, teamAWins: 0, teamBWins: 0 };
if (winnerTeamIndex === teamAIndex) current.teamAWins += 1;
if (winnerTeamIndex === teamBIndex) current.teamBWins += 1;
current.winnerTeamIndex =
current.teamAWins > current.teamBWins
? teamAIndex
: current.teamBWins > current.teamAWins
? teamBIndex
: undefined;
bySeries.set(key, current);
}
return [...bySeries.values()];
}
function resolveWinnerTeamIndex(
seriesResults: Array<Record<string, unknown>>,
): number | undefined {
const wins = new Map<number, number>();
for (const series of seriesResults) {
const winnerTeamIndex = numberOrUndefined(series.winnerTeamIndex);
if (!winnerTeamIndex) continue;
wins.set(winnerTeamIndex, (wins.get(winnerTeamIndex) ?? 0) + 1);
}
const sorted = [...wins.entries()].sort((left, right) => right[1] - left[1]);
if (sorted.length === 0) return undefined;
if (sorted.length > 1 && sorted[0][1] === sorted[1][1]) return undefined;
return sorted[0][0];
}
function readTeamIndex(value: Record<string, unknown>): number | undefined {
if (typeof value.teamIndex === 'number') return value.teamIndex;
if (!isSide(value.side)) return undefined;
return sideGroupToTeamIndex(value.side, numberOrDefault(value.groupIndex, 1));
}
function sideGroupToTeamIndex(side: LegacySide, groupIndex: number) {
return (Math.max(1, groupIndex) - 1) * 2 + (side === 'blue' ? 1 : 2);
}
function asArray(value: unknown): Record<string, unknown>[] {
return Array.isArray(value)
? value.filter(isRecord).map((item) => ({ ...item }))
: [];
}
function isRecord(value: unknown): value is Record<string, unknown> {
return Boolean(value && typeof value === 'object' && !Array.isArray(value));
}
function isSide(value: unknown): value is LegacySide {
return value === 'blue' || value === 'red';
}
function numberOrDefault(value: unknown, fallback: number) {
return typeof value === 'number' && Number.isFinite(value) ? value : fallback;
}
function numberOrUndefined(value: unknown) {
return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
}
+28 -36
View File
@@ -340,8 +340,7 @@ export interface MatchTeamMember {
} }
export interface MatchTeam { export interface MatchTeam {
side: TeamSide; teamIndex: number;
groupIndex: number;
name: string; name: string;
captainUserId?: mongoose.Types.ObjectId; captainUserId?: mongoose.Types.ObjectId;
members: MatchTeamMember[]; members: MatchTeamMember[];
@@ -349,6 +348,7 @@ export interface MatchTeam {
export interface MatchGameResultParticipant { export interface MatchGameResultParticipant {
userId: mongoose.Types.ObjectId; userId: mongoose.Types.ObjectId;
teamIndex: number;
side: TeamSide; side: TeamSide;
championId: number; championId: number;
kills: number; kills: number;
@@ -360,26 +360,25 @@ export interface MatchGameResultParticipant {
export interface MatchGameResult { export interface MatchGameResult {
gameNumber: number; gameNumber: number;
riotMatchId: string; riotMatchId: string;
blueTeamIndex: number;
redTeamIndex: number;
winnerTeamIndex: number;
winnerSide: TeamSide; winnerSide: TeamSide;
blueGroupIndex: number;
redGroupIndex: number;
gameCreation: number; gameCreation: number;
gameDuration: number; gameDuration: number;
participants: MatchGameResultParticipant[]; participants: MatchGameResultParticipant[];
} }
export interface MatchSeriesResult { export interface MatchSeriesResult {
blueGroupIndex: number; teamAIndex: number;
redGroupIndex: number; teamBIndex: number;
blueScore: number; teamAWins: number;
redScore: number; teamBWins: number;
winnerSide?: TeamSide; winnerTeamIndex?: number;
} }
export interface MatchResult { export interface MatchResult {
winnerSide?: TeamSide; winnerTeamIndex?: number;
blueScore: number;
redScore: number;
mvpUserId?: mongoose.Types.ObjectId; mvpUserId?: mongoose.Types.ObjectId;
riotMatchIds: string[]; // 내전에서 플레이된 Riot matchId들 riotMatchIds: string[]; // 내전에서 플레이된 Riot matchId들
games: MatchGameResult[]; games: MatchGameResult[];
@@ -489,16 +488,14 @@ export interface AuctionTeamMember {
} }
export interface AuctionTeam { export interface AuctionTeam {
side: TeamSide; teamIndex: number;
groupIndex: number;
captainUserId: mongoose.Types.ObjectId; captainUserId: mongoose.Types.ObjectId;
points: number; points: number;
members: AuctionTeamMember[]; members: AuctionTeamMember[];
} }
export interface AuctionBid { export interface AuctionBid {
side: TeamSide; teamIndex: number;
groupIndex?: number;
amount: number; amount: number;
bidderUserId: mongoose.Types.ObjectId; bidderUserId: mongoose.Types.ObjectId;
timestamp: Date; timestamp: Date;
@@ -512,8 +509,7 @@ export interface Auction extends MongooseTimestamps {
currentIndex: number; currentIndex: number;
bids: AuctionBid[]; bids: AuctionBid[];
currentBid: number; currentBid: number;
currentBidder?: TeamSide; currentBidderTeamIndex?: number;
currentBidderGroupIndex?: number;
maxTimerSeconds: number; maxTimerSeconds: number;
currentDeadline?: Date; currentDeadline?: Date;
initialPoints: number; initialPoints: number;
@@ -920,8 +916,7 @@ const MatchTeamMemberSubSchema = new Schema<MatchTeamMember>(
const MatchTeamSubSchema = new Schema<MatchTeam>( const MatchTeamSubSchema = new Schema<MatchTeam>(
{ {
side: { type: String, enum: TEAM_SIDES, required: true }, teamIndex: { type: Number, required: true, min: 1 },
groupIndex: { type: Number, required: true, default: 1, min: 1 },
name: { type: String, required: true }, name: { type: String, required: true },
captainUserId: { type: Schema.Types.ObjectId, ref: 'user' }, captainUserId: { type: Schema.Types.ObjectId, ref: 'user' },
members: { type: [MatchTeamMemberSubSchema], required: true, default: [] }, members: { type: [MatchTeamMemberSubSchema], required: true, default: [] },
@@ -933,6 +928,7 @@ const MatchGameResultParticipantSubSchema =
new Schema<MatchGameResultParticipant>( new Schema<MatchGameResultParticipant>(
{ {
userId: { type: Schema.Types.ObjectId, ref: 'user', required: true }, userId: { type: Schema.Types.ObjectId, ref: 'user', required: true },
teamIndex: { type: Number, required: true, min: 1 },
side: { type: String, enum: TEAM_SIDES, required: true }, side: { type: String, enum: TEAM_SIDES, required: true },
championId: { type: Number, required: true }, championId: { type: Number, required: true },
kills: { type: Number, required: true, default: 0 }, kills: { type: Number, required: true, default: 0 },
@@ -947,9 +943,10 @@ const MatchGameResultSubSchema = new Schema<MatchGameResult>(
{ {
gameNumber: { type: Number, required: true }, gameNumber: { type: Number, required: true },
riotMatchId: { type: String, required: true }, riotMatchId: { type: String, required: true },
blueTeamIndex: { type: Number, required: true, min: 1 },
redTeamIndex: { type: Number, required: true, min: 1 },
winnerTeamIndex: { type: Number, required: true, min: 1 },
winnerSide: { type: String, enum: TEAM_SIDES, required: true }, winnerSide: { type: String, enum: TEAM_SIDES, required: true },
blueGroupIndex: { type: Number, required: true, default: 1, min: 1 },
redGroupIndex: { type: Number, required: true, default: 1, min: 1 },
gameCreation: { type: Number, required: true }, gameCreation: { type: Number, required: true },
gameDuration: { type: Number, required: true }, gameDuration: { type: Number, required: true },
participants: { participants: {
@@ -963,20 +960,18 @@ const MatchGameResultSubSchema = new Schema<MatchGameResult>(
const MatchSeriesResultSubSchema = new Schema<MatchSeriesResult>( const MatchSeriesResultSubSchema = new Schema<MatchSeriesResult>(
{ {
blueGroupIndex: { type: Number, required: true, default: 1, min: 1 }, teamAIndex: { type: Number, required: true, min: 1 },
redGroupIndex: { type: Number, required: true, default: 1, min: 1 }, teamBIndex: { type: Number, required: true, min: 1 },
blueScore: { type: Number, required: true, default: 0 }, teamAWins: { type: Number, required: true, default: 0 },
redScore: { type: Number, required: true, default: 0 }, teamBWins: { type: Number, required: true, default: 0 },
winnerSide: { type: String, enum: TEAM_SIDES, required: false }, winnerTeamIndex: { type: Number, required: false, min: 1 },
}, },
{ _id: false }, { _id: false },
); );
const MatchResultSubSchema = new Schema<MatchResult>( const MatchResultSubSchema = new Schema<MatchResult>(
{ {
winnerSide: { type: String, enum: TEAM_SIDES, required: false }, winnerTeamIndex: { type: Number, required: false, min: 1 },
blueScore: { type: Number, required: true, default: 0 },
redScore: { type: Number, required: true, default: 0 },
mvpUserId: { type: Schema.Types.ObjectId, ref: 'user' }, mvpUserId: { type: Schema.Types.ObjectId, ref: 'user' },
riotMatchIds: { type: [String], required: true, default: [] }, riotMatchIds: { type: [String], required: true, default: [] },
games: { type: [MatchGameResultSubSchema], required: true, default: [] }, games: { type: [MatchGameResultSubSchema], required: true, default: [] },
@@ -1214,8 +1209,7 @@ const AuctionTeamMemberSubSchema = new Schema<AuctionTeamMember>(
const AuctionTeamSubSchema = new Schema<AuctionTeam>( const AuctionTeamSubSchema = new Schema<AuctionTeam>(
{ {
side: { type: String, enum: TEAM_SIDES, required: true }, teamIndex: { type: Number, required: true, min: 1 },
groupIndex: { type: Number, required: true, default: 1, min: 1 },
captainUserId: { type: Schema.Types.ObjectId, ref: 'user', required: true }, captainUserId: { type: Schema.Types.ObjectId, ref: 'user', required: true },
points: { type: Number, required: true, default: 0 }, points: { type: Number, required: true, default: 0 },
members: { members: {
@@ -1229,8 +1223,7 @@ const AuctionTeamSubSchema = new Schema<AuctionTeam>(
const AuctionBidSubSchema = new Schema<AuctionBid>( const AuctionBidSubSchema = new Schema<AuctionBid>(
{ {
side: { type: String, enum: TEAM_SIDES, required: true }, teamIndex: { type: Number, required: true, min: 1 },
groupIndex: { type: Number, required: true, default: 1, min: 1 },
amount: { type: Number, required: true }, amount: { type: Number, required: true },
bidderUserId: { type: Schema.Types.ObjectId, ref: 'user', required: true }, bidderUserId: { type: Schema.Types.ObjectId, ref: 'user', required: true },
timestamp: { type: Date, required: true, default: Date.now }, timestamp: { type: Date, required: true, default: Date.now },
@@ -1261,8 +1254,7 @@ export const AuctionSchema = new Schema<Auction>(
currentIndex: { type: Number, required: true, default: 0 }, currentIndex: { type: Number, required: true, default: 0 },
bids: { type: [AuctionBidSubSchema], required: true, default: [] }, bids: { type: [AuctionBidSubSchema], required: true, default: [] },
currentBid: { type: Number, required: true, default: 0 }, currentBid: { type: Number, required: true, default: 0 },
currentBidder: { type: String, enum: TEAM_SIDES, required: false }, currentBidderTeamIndex: { type: Number, required: false, min: 1 },
currentBidderGroupIndex: { type: Number, required: false },
maxTimerSeconds: { type: Number, required: true, default: 30 }, maxTimerSeconds: { type: Number, required: true, default: 30 },
currentDeadline: { type: Date, required: false }, currentDeadline: { type: Date, required: false },
initialPoints: { type: Number, required: true, default: 1000 }, initialPoints: { type: Number, required: true, default: 1000 },
@@ -26,7 +26,6 @@ import {
buildUserByPuuidMap, buildUserByPuuidMap,
countKnownParticipants, countKnownParticipants,
resolveExternalCount, resolveExternalCount,
resolveTeam100IsBlue,
type UserByPuuidMap, type UserByPuuidMap,
} from './match-builder.util'; } from './match-builder.util';
import { import {
@@ -306,9 +305,11 @@ export class LegacyImportService {
externalCount: raw externalCount: raw
? resolveExternalCount(raw, userByPuuid) ? resolveExternalCount(raw, userByPuuid)
: Math.max(0, 10 - memberCount), : Math.max(0, 10 - memberCount),
blueScore: match.result?.blueScore ?? 0, teamAIndex: match.result?.seriesResults?.[0]?.teamAIndex ?? 1,
redScore: match.result?.redScore ?? 0, teamBIndex: match.result?.seriesResults?.[0]?.teamBIndex ?? 2,
winnerSide: match.result?.winnerSide, teamAWins: match.result?.seriesResults?.[0]?.teamAWins ?? 0,
teamBWins: match.result?.seriesResults?.[0]?.teamBWins ?? 0,
winnerTeamIndex: match.result?.winnerTeamIndex,
}; };
}), }),
nextCursor: nextCursor:
@@ -391,9 +392,8 @@ export class LegacyImportService {
continue; continue;
} }
const team100IsBlue = resolveTeam100IsBlue(raw, userByPuuid);
const participants = buildParticipantsSnapshot(raw, userByPuuid); const participants = buildParticipantsSnapshot(raw, userByPuuid);
const gameResult = buildGameResult(raw, userByPuuid, team100IsBlue, 1); const gameResult = buildGameResult(raw, userByPuuid, 1);
if (!gameResult || participants.length === 0) { if (!gameResult || participants.length === 0) {
result.skippedNoKnownParticipants += 1; result.skippedNoKnownParticipants += 1;
if (Object.keys(update).length > 0) { if (Object.keys(update).length > 0) {
@@ -402,23 +402,21 @@ export class LegacyImportService {
continue; continue;
} }
const winnerSide = gameResult.winnerSide; const winnerTeamIndex = gameResult.winnerTeamIndex;
update.mapId = raw.info.mapId ?? match.mapId; update.mapId = raw.info.mapId ?? match.mapId;
update.participants = participants; update.participants = participants;
update.teams = buildTeams(raw, userByPuuid, team100IsBlue); update.teams = buildTeams(raw, userByPuuid);
update.result = { update.result = {
winnerSide, winnerTeamIndex,
blueScore: winnerSide === 'blue' ? 1 : 0,
redScore: winnerSide === 'red' ? 1 : 0,
riotMatchIds: [riotMatchId], riotMatchIds: [riotMatchId],
games: [gameResult], games: [gameResult],
seriesResults: [ seriesResults: [
{ {
blueGroupIndex: 1, teamAIndex: 1,
redGroupIndex: 1, teamBIndex: 2,
blueScore: winnerSide === 'blue' ? 1 : 0, teamAWins: winnerTeamIndex === 1 ? 1 : 0,
redScore: winnerSide === 'red' ? 1 : 0, teamBWins: winnerTeamIndex === 2 ? 1 : 0,
winnerSide, winnerTeamIndex,
}, },
], ],
}; };
@@ -485,11 +483,10 @@ export class LegacyImportService {
const counts = countKnownParticipants(detail, userByPuuid); const counts = countKnownParticipants(detail, userByPuuid);
if (counts.total === 0) return 'skipped'; if (counts.total === 0) return 'skipped';
const team100IsBlue = resolveTeam100IsBlue(detail, userByPuuid); const gameResult = buildGameResult(detail, userByPuuid, 1);
const gameResult = buildGameResult(detail, userByPuuid, team100IsBlue, 1);
if (!gameResult || gameResult.participants.length === 0) return 'skipped'; if (!gameResult || gameResult.participants.length === 0) return 'skipped';
const winnerSide = gameResult.winnerSide; const winnerTeamIndex = gameResult.winnerTeamIndex;
const matchPayload: Partial<Match> = { const matchPayload: Partial<Match> = {
communityId: new mongoose.Types.ObjectId(job.communityId), communityId: new mongoose.Types.ObjectId(job.communityId),
title: this.formatLegacyDate(detail.info.gameCreation), title: this.formatLegacyDate(detail.info.gameCreation),
@@ -504,20 +501,18 @@ export class LegacyImportService {
teamBuiltAt: new Date(detail.info.gameCreation), teamBuiltAt: new Date(detail.info.gameCreation),
hostUserId: new mongoose.Types.ObjectId(job.triggeredBy), hostUserId: new mongoose.Types.ObjectId(job.triggeredBy),
participants: buildParticipantsSnapshot(detail, userByPuuid), participants: buildParticipantsSnapshot(detail, userByPuuid),
teams: buildTeams(detail, userByPuuid, team100IsBlue), teams: buildTeams(detail, userByPuuid),
result: { result: {
winnerSide, winnerTeamIndex,
blueScore: winnerSide === 'blue' ? 1 : 0,
redScore: winnerSide === 'red' ? 1 : 0,
riotMatchIds: [riotMatchId], riotMatchIds: [riotMatchId],
games: [gameResult], games: [gameResult],
seriesResults: [ seriesResults: [
{ {
blueGroupIndex: 1, teamAIndex: 1,
redGroupIndex: 1, teamBIndex: 2,
blueScore: winnerSide === 'blue' ? 1 : 0, teamAWins: winnerTeamIndex === 1 ? 1 : 0,
redScore: winnerSide === 'red' ? 1 : 0, teamBWins: winnerTeamIndex === 2 ? 1 : 0,
winnerSide, winnerTeamIndex,
}, },
], ],
}, },
@@ -55,9 +55,11 @@ export interface LegacyMatchListResponse {
riotMatchId: string | null; riotMatchId: string | null;
memberCount: number; memberCount: number;
externalCount: number; externalCount: number;
blueScore: number; teamAIndex: number;
redScore: number; teamBIndex: number;
winnerSide?: 'blue' | 'red'; teamAWins: number;
teamBWins: number;
winnerTeamIndex?: number;
}>; }>;
nextCursor: number | null; nextCursor: number | null;
} }
@@ -5,7 +5,6 @@ import type {
MatchTeam, MatchTeam,
Position, Position,
RiotAccount, RiotAccount,
TeamSide,
UserDocument, UserDocument,
} from '../global/database/schema'; } from '../global/database/schema';
import type { RiotMatchDto, RiotMatchParticipantDto } from '../riot/riot.types'; import type { RiotMatchDto, RiotMatchParticipantDto } from '../riot/riot.types';
@@ -91,10 +90,11 @@ export function buildParticipantsSnapshot(
export function buildTeams( export function buildTeams(
detail: RiotMatchDto, detail: RiotMatchDto,
userByPuuid: UserByPuuidMap, userByPuuid: UserByPuuidMap,
team100IsBlue: boolean,
): MatchTeam[] { ): MatchTeam[] {
return (['blue', 'red'] as TeamSide[]).map((side) => { return [
const teamId = resolveRiotTeamId(side, team100IsBlue); { teamIndex: 1, teamId: RIOT_BLUE_TEAM_ID },
{ teamIndex: 2, teamId: RIOT_RED_TEAM_ID },
].map(({ teamIndex, teamId }) => {
const members = detail.info.participants const members = detail.info.participants
.filter((participant) => participant.teamId === teamId) .filter((participant) => participant.teamId === teamId)
.map((participant) => { .map((participant) => {
@@ -107,9 +107,8 @@ export function buildTeams(
}) })
.filter((member): member is NonNullable<typeof member> => Boolean(member)); .filter((member): member is NonNullable<typeof member> => Boolean(member));
return { return {
side, teamIndex,
groupIndex: 1, name: `${teamIndex}팀`,
name: side === 'blue' ? '블루팀' : '레드팀',
members, members,
}; };
}); });
@@ -118,20 +117,21 @@ export function buildTeams(
export function buildGameResult( export function buildGameResult(
detail: RiotMatchDto, detail: RiotMatchDto,
userByPuuid: UserByPuuidMap, userByPuuid: UserByPuuidMap,
team100IsBlue: boolean,
gameNumber = 1, gameNumber = 1,
): MatchGameResult | null { ): MatchGameResult | null {
const winningTeam = detail.info.teams.find((team) => team.win); const winningTeam = detail.info.teams.find((team) => team.win);
if (!winningTeam) return null; if (!winningTeam) return null;
const winnerSide = resolveSide(winningTeam.teamId, team100IsBlue); const winnerSide = resolveSide(winningTeam.teamId);
if (!winnerSide) return null; if (!winnerSide) return null;
const winnerTeamIndex = winnerSide === 'blue' ? 1 : 2;
const participants = detail.info.participants const participants = detail.info.participants
.map((participant) => { .map((participant) => {
const user = userByPuuid.get(participant.puuid); const user = userByPuuid.get(participant.puuid);
const side = resolveSide(participant.teamId, team100IsBlue); const side = resolveSide(participant.teamId);
if (!user || !side) return null; if (!user || !side) return null;
return { return {
userId: user.userId, userId: user.userId,
teamIndex: side === 'blue' ? 1 : 2,
side, side,
championId: participant.championId, championId: participant.championId,
kills: participant.kills, kills: participant.kills,
@@ -147,9 +147,10 @@ export function buildGameResult(
return { return {
gameNumber, gameNumber,
riotMatchId: detail.metadata.matchId, riotMatchId: detail.metadata.matchId,
blueTeamIndex: 1,
redTeamIndex: 2,
winnerTeamIndex,
winnerSide, winnerSide,
blueGroupIndex: 1,
redGroupIndex: 1,
gameCreation: detail.info.gameCreation, gameCreation: detail.info.gameCreation,
gameDuration: detail.info.gameDuration, gameDuration: detail.info.gameDuration,
participants, participants,
@@ -165,16 +166,9 @@ export function resolveExternalCount(
).length; ).length;
} }
function resolveRiotTeamId(side: TeamSide, team100IsBlue: boolean): number { function resolveSide(teamId: number): 'blue' | 'red' | null {
if (side === 'blue') { if (teamId === RIOT_BLUE_TEAM_ID) return 'blue';
return team100IsBlue ? RIOT_BLUE_TEAM_ID : RIOT_RED_TEAM_ID; if (teamId === RIOT_RED_TEAM_ID) return 'red';
}
return team100IsBlue ? RIOT_RED_TEAM_ID : RIOT_BLUE_TEAM_ID;
}
function resolveSide(teamId: number, team100IsBlue: boolean): TeamSide | null {
if (teamId === RIOT_BLUE_TEAM_ID) return team100IsBlue ? 'blue' : 'red';
if (teamId === RIOT_RED_TEAM_ID) return team100IsBlue ? 'red' : 'blue';
return null; return null;
} }
+31 -10
View File
@@ -9,6 +9,7 @@ import { ConnectionService } from '../global/database/connection.service';
import { import {
Match, Match,
MatchDocument, MatchDocument,
MatchSeriesResult,
MatchStatus, MatchStatus,
PositionPreference, PositionPreference,
TierInfo, TierInfo,
@@ -99,15 +100,7 @@ export class MatchService {
(left, right) => left.gameNumber - right.gameNumber, (left, right) => left.gameNumber - right.gameNumber,
); );
if (!obj.result.seriesResults?.length) { if (!obj.result.seriesResults?.length) {
obj.result.seriesResults = [ obj.result.seriesResults = this.buildSeriesResults(obj.result.games);
{
blueGroupIndex: 1,
redGroupIndex: 1,
blueScore: obj.result.blueScore ?? 0,
redScore: obj.result.redScore ?? 0,
winnerSide: obj.result.winnerSide,
},
];
} }
} }
return { return {
@@ -120,7 +113,6 @@ export class MatchService {
})), })),
teams: (obj.teams ?? []).map((team) => ({ teams: (obj.teams ?? []).map((team) => ({
...team, ...team,
groupIndex: team.groupIndex ?? 1,
})), })),
tournamentCodes: await this.tournamentCodeService.buildSlots(match), tournamentCodes: await this.tournamentCodeService.buildSlots(match),
}; };
@@ -239,4 +231,33 @@ export class MatchService {
fetchedAt: tier.fetchedAt, fetchedAt: tier.fetchedAt,
}; };
} }
private buildSeriesResults(
games: NonNullable<Match['result']>['games'],
): MatchSeriesResult[] {
const bySeries = new Map<string, MatchSeriesResult>();
for (const game of games) {
const teamAIndex = Math.min(game.blueTeamIndex, game.redTeamIndex);
const teamBIndex = Math.max(game.blueTeamIndex, game.redTeamIndex);
const key = `${teamAIndex}:${teamBIndex}`;
const current =
bySeries.get(key) ??
({
teamAIndex,
teamBIndex,
teamAWins: 0,
teamBWins: 0,
} satisfies MatchSeriesResult);
if (game.winnerTeamIndex === teamAIndex) current.teamAWins += 1;
if (game.winnerTeamIndex === teamBIndex) current.teamBWins += 1;
current.winnerTeamIndex =
current.teamAWins > current.teamBWins
? teamAIndex
: current.teamBWins > current.teamAWins
? teamBIndex
: undefined;
bySeries.set(key, current);
}
return [...bySeries.values()];
}
} }
@@ -369,23 +369,25 @@ export class TournamentCodeService {
private resolveRequiredSlots(match: MatchDocument): number { private resolveRequiredSlots(match: MatchDocument): number {
const gameCount = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT; const gameCount = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
const teamGroups = new Set( const teamCount = (match.teams ?? []).length;
(match.teams ?? []).map((team) => team.groupIndex ?? 1),
);
const activeParticipantCount = (match.participants ?? []).filter( const activeParticipantCount = (match.participants ?? []).filter(
(participant) => !participant.excluded, (participant) => !participant.excluded,
).length; ).length;
const participantGroups = Math.floor(activeParticipantCount / 10); const participantSeriesCount = Math.floor(activeParticipantCount / 10);
const groups = Math.max(1, teamGroups.size, participantGroups); const teamSeriesCount = Math.ceil(teamCount / 2);
return groups * gameCount; const seriesCount = Math.max(1, teamSeriesCount, participantSeriesCount);
return seriesCount * gameCount;
} }
private resolveSeriesRefForGameNumber( private resolveSeriesRefForGameNumber(
match: MatchDocument, match: MatchDocument,
gameNumber: number, gameNumber: number,
): { blueGroupIndex: number; redGroupIndex: number } { ): { teamAIndex: number; teamBIndex: number } {
const perSeries = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT; const perSeries = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
const groupIndex = Math.max(1, Math.ceil(gameNumber / perSeries)); const seriesIndex = Math.max(1, Math.ceil(gameNumber / perSeries));
return { blueGroupIndex: groupIndex, redGroupIndex: groupIndex }; return {
teamAIndex: (seriesIndex - 1) * 2 + 1,
teamBIndex: (seriesIndex - 1) * 2 + 2,
};
} }
} }
@@ -24,8 +24,8 @@ export interface BulkUploadTournamentCodesResponse {
export interface TournamentCodeSlotView { export interface TournamentCodeSlotView {
gameNumber: number; gameNumber: number;
blueGroupIndex: number; teamAIndex: number;
redGroupIndex: number; teamBIndex: number;
code: string | null; code: string | null;
expiresAt: string | null; expiresAt: string | null;
state: TournamentCodeState | 'pending'; state: TournamentCodeState | 'pending';
@@ -23,16 +23,16 @@ function makeMatch(): {
const match = { const match = {
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
name: '블루팀', name: '1팀',
members: blueUserIds.map((userId) => ({ members: blueUserIds.map((userId) => ({
userId, userId,
assignedPosition: 'MID', assignedPosition: 'MID',
})), })),
}, },
{ {
side: 'red', teamIndex: 2,
name: '레드팀', name: '2팀',
members: redUserIds.map((userId) => ({ members: redUserIds.map((userId) => ({
userId, userId,
assignedPosition: 'MID', assignedPosition: 'MID',
@@ -111,9 +111,16 @@ describe('computeGameResult', () => {
gameNumber: 1, gameNumber: 1,
riotMatchId: 'KR_1', riotMatchId: 'KR_1',
winnerSide: 'blue', winnerSide: 'blue',
blueTeamIndex: 1,
redTeamIndex: 2,
winnerTeamIndex: 1,
gameDuration: 1800, gameDuration: 1800,
}); });
expect(result?.participants).toHaveLength(10); expect(result?.participants).toHaveLength(10);
expect(result?.participants[0]).toMatchObject({
teamIndex: 1,
side: 'blue',
});
}); });
it('handles reversed Riot side assignment', () => { it('handles reversed Riot side assignment', () => {
@@ -126,7 +133,12 @@ describe('computeGameResult', () => {
const result = computeGameResult({ match, lookup, detail, gameNumber: 2 }); const result = computeGameResult({ match, lookup, detail, gameNumber: 2 });
expect(result?.winnerSide).toBe('red'); expect(result).toMatchObject({
blueTeamIndex: 2,
redTeamIndex: 1,
winnerSide: 'blue',
winnerTeamIndex: 2,
});
}); });
it('rejects matches with too little overlap', () => { it('rejects matches with too little overlap', () => {
@@ -1,9 +1,5 @@
import mongoose from 'mongoose'; import mongoose from 'mongoose';
import type { import type { MatchDocument, MatchGameResult, TeamSide } from '../global/database/schema';
MatchDocument,
MatchGameResult,
TeamSide,
} from '../global/database/schema';
import type { RiotMatchDto } from '../riot/riot.types'; import type { RiotMatchDto } from '../riot/riot.types';
const RIOT_BLUE_TEAM_ID = 100; const RIOT_BLUE_TEAM_ID = 100;
@@ -37,13 +33,10 @@ export function collectMatchUserIds(match: MatchDocument): mongoose.Types.Object
export function collectTeamPuuids( export function collectTeamPuuids(
match: MatchDocument, match: MatchDocument,
side: TeamSide, teamIndex: number,
lookup: MatchPuuidLookup, lookup: MatchPuuidLookup,
groupIndex = 1,
): string[] { ): string[] {
const team = match.teams.find( const team = match.teams.find((item) => item.teamIndex === teamIndex);
(item) => item.side === side && (item.groupIndex ?? 1) === groupIndex,
);
if (!team) return []; if (!team) return [];
const userIds = [ const userIds = [
...(team.captainUserId ? [team.captainUserId] : []), ...(team.captainUserId ? [team.captainUserId] : []),
@@ -59,19 +52,19 @@ export function computeGameResult(params: {
detail: RiotMatchDto; detail: RiotMatchDto;
gameNumber: number; gameNumber: number;
lookup: MatchPuuidLookup; lookup: MatchPuuidLookup;
blueGroupIndex?: number; teamAIndex?: number;
redGroupIndex?: number; teamBIndex?: number;
}): MatchGameResult | null { }): MatchGameResult | null {
const { const {
match, match,
detail, detail,
gameNumber, gameNumber,
lookup, lookup,
blueGroupIndex = 1, teamAIndex = 1,
redGroupIndex = 1, teamBIndex = 2,
} = params; } = params;
const ourBluePuuids = collectTeamPuuids(match, 'blue', lookup, blueGroupIndex); const teamAPuuids = collectTeamPuuids(match, teamAIndex, lookup);
const ourRedPuuids = collectTeamPuuids(match, 'red', lookup, redGroupIndex); const teamBPuuids = collectTeamPuuids(match, teamBIndex, lookup);
const team100Puuids = detail.info.participants const team100Puuids = detail.info.participants
.filter((participant) => participant.teamId === RIOT_BLUE_TEAM_ID) .filter((participant) => participant.teamId === RIOT_BLUE_TEAM_ID)
.map((participant) => participant.puuid); .map((participant) => participant.puuid);
@@ -80,15 +73,21 @@ export function computeGameResult(params: {
.map((participant) => participant.puuid); .map((participant) => participant.puuid);
const normalOverlap = const normalOverlap =
countOverlap(team100Puuids, ourBluePuuids) + countOverlap(team100Puuids, teamAPuuids) +
countOverlap(team200Puuids, ourRedPuuids); countOverlap(team200Puuids, teamBPuuids);
const reversedOverlap = const reversedOverlap =
countOverlap(team100Puuids, ourRedPuuids) + countOverlap(team100Puuids, teamBPuuids) +
countOverlap(team200Puuids, ourBluePuuids); countOverlap(team200Puuids, teamAPuuids);
const teamMapping: Record<number, TeamSide> = const blueTeamIndex = normalOverlap >= reversedOverlap ? teamAIndex : teamBIndex;
normalOverlap >= reversedOverlap const redTeamIndex = normalOverlap >= reversedOverlap ? teamBIndex : teamAIndex;
? { [RIOT_BLUE_TEAM_ID]: 'blue', [RIOT_RED_TEAM_ID]: 'red' } const teamIndexByRiotTeamId: Record<number, number> = {
: { [RIOT_BLUE_TEAM_ID]: 'red', [RIOT_RED_TEAM_ID]: 'blue' }; [RIOT_BLUE_TEAM_ID]: blueTeamIndex,
[RIOT_RED_TEAM_ID]: redTeamIndex,
};
const sideByRiotTeamId: Record<number, TeamSide> = {
[RIOT_BLUE_TEAM_ID]: 'blue',
[RIOT_RED_TEAM_ID]: 'red',
};
if (Math.max(normalOverlap, reversedOverlap) < MINIMUM_TRUSTED_OVERLAP) { if (Math.max(normalOverlap, reversedOverlap) < MINIMUM_TRUSTED_OVERLAP) {
return null; return null;
@@ -96,16 +95,20 @@ export function computeGameResult(params: {
const winningTeam = detail.info.teams.find((team) => team.win); const winningTeam = detail.info.teams.find((team) => team.win);
if (!winningTeam) return null; if (!winningTeam) return null;
const winnerSide = teamMapping[winningTeam.teamId]; const winnerSide = sideByRiotTeamId[winningTeam.teamId];
if (!winnerSide) return null; if (!winnerSide) return null;
const winnerTeamIndex = teamIndexByRiotTeamId[winningTeam.teamId];
if (!winnerTeamIndex) return null;
const participants = detail.info.participants const participants = detail.info.participants
.map((participant) => { .map((participant) => {
const userId = lookup.userIdByPuuid.get(participant.puuid); const userId = lookup.userIdByPuuid.get(participant.puuid);
const side = teamMapping[participant.teamId]; const side = sideByRiotTeamId[participant.teamId];
if (!userId || !side) return null; const teamIndex = teamIndexByRiotTeamId[participant.teamId];
if (!userId || !side || !teamIndex) return null;
return { return {
userId, userId,
teamIndex,
side, side,
championId: participant.championId, championId: participant.championId,
kills: participant.kills, kills: participant.kills,
@@ -121,9 +124,10 @@ export function computeGameResult(params: {
return { return {
gameNumber, gameNumber,
riotMatchId: detail.metadata.matchId, riotMatchId: detail.metadata.matchId,
blueTeamIndex,
redTeamIndex,
winnerTeamIndex,
winnerSide, winnerSide,
blueGroupIndex,
redGroupIndex,
gameCreation: detail.info.gameCreation, gameCreation: detail.info.gameCreation,
gameDuration: detail.info.gameDuration, gameDuration: detail.info.gameDuration,
participants, participants,
@@ -243,12 +243,9 @@ export class TournamentResultService {
match.status = 'finished'; match.status = 'finished';
if (match.result) { if (match.result) {
match.result.winnerSide = match.result.winnerTeamIndex = this.resolveMatchWinnerTeamIndex(
match.result.blueScore > match.result.redScore match.result.seriesResults ?? [],
? 'blue' );
: match.result.redScore > match.result.blueScore
? 'red'
: undefined;
} }
match.resultPollState = { match.resultPollState = {
startedAt: match.resultPollState?.startedAt ?? new Date(), startedAt: match.resultPollState?.startedAt ?? new Date(),
@@ -392,15 +389,14 @@ export class TournamentResultService {
), ),
gameResult, gameResult,
].sort((left, right) => left.gameNumber - right.gameNumber); ].sort((left, right) => left.gameNumber - right.gameNumber);
const seriesResults = this.buildSeriesResults(games);
match.result = { match.result = {
winnerSide: match.result?.winnerSide, winnerTeamIndex: this.resolveMatchWinnerTeamIndex(seriesResults),
blueScore: games.filter((game) => game.winnerSide === 'blue').length,
redScore: games.filter((game) => game.winnerSide === 'red').length,
mvpUserId: match.result?.mvpUserId, mvpUserId: match.result?.mvpUserId,
riotMatchIds: [...new Set(games.map((game) => game.riotMatchId))], riotMatchIds: [...new Set(games.map((game) => game.riotMatchId))],
games, games,
seriesResults: this.buildSeriesResults(games), seriesResults,
}; };
} }
@@ -410,59 +406,83 @@ export class TournamentResultService {
const bySeries = new Map< const bySeries = new Map<
string, string,
{ {
blueGroupIndex: number; teamAIndex: number;
redGroupIndex: number; teamBIndex: number;
blueScore: number; teamAWins: number;
redScore: number; teamBWins: number;
winnerSide?: 'blue' | 'red'; winnerTeamIndex?: number;
} }
>(); >();
for (const game of games) { for (const game of games) {
const blueGroupIndex = game.blueGroupIndex ?? 1; const teamAIndex = Math.min(game.blueTeamIndex, game.redTeamIndex);
const redGroupIndex = game.redGroupIndex ?? 1; const teamBIndex = Math.max(game.blueTeamIndex, game.redTeamIndex);
const key = `${blueGroupIndex}:${redGroupIndex}`; const key = `${teamAIndex}:${teamBIndex}`;
const current = const current =
bySeries.get(key) ?? bySeries.get(key) ??
{ {
blueGroupIndex, teamAIndex,
redGroupIndex, teamBIndex,
blueScore: 0, teamAWins: 0,
redScore: 0, teamBWins: 0,
}; };
if (game.winnerSide === 'blue') current.blueScore += 1; if (game.winnerTeamIndex === teamAIndex) current.teamAWins += 1;
if (game.winnerSide === 'red') current.redScore += 1; if (game.winnerTeamIndex === teamBIndex) current.teamBWins += 1;
current.winnerSide = current.winnerTeamIndex =
current.blueScore > current.redScore current.teamAWins > current.teamBWins
? 'blue' ? teamAIndex
: current.redScore > current.blueScore : current.teamBWins > current.teamAWins
? 'red' ? teamBIndex
: undefined; : undefined;
bySeries.set(key, current); bySeries.set(key, current);
} }
return [...bySeries.values()].sort( return [...bySeries.values()].sort(
(left, right) => (left, right) =>
left.blueGroupIndex - right.blueGroupIndex || left.teamAIndex - right.teamAIndex ||
left.redGroupIndex - right.redGroupIndex, left.teamBIndex - right.teamBIndex,
); );
} }
private resolveSeriesRefForGameNumber( private resolveSeriesRefForGameNumber(
match: MatchDocument, match: MatchDocument,
gameNumber: number, gameNumber: number,
): { blueGroupIndex: number; redGroupIndex: number } { ): { teamAIndex: number; teamBIndex: number } {
const perSeries = match.gameCount || 1; const perSeries = match.gameCount || 1;
const groupIndex = Math.max(1, Math.ceil(gameNumber / perSeries)); const seriesIndex = Math.max(1, Math.ceil(gameNumber / perSeries));
return { blueGroupIndex: groupIndex, redGroupIndex: groupIndex }; return {
teamAIndex: (seriesIndex - 1) * 2 + 1,
teamBIndex: (seriesIndex - 1) * 2 + 2,
};
} }
private resolveRequiredGameSlots(match: MatchDocument): number { private resolveRequiredGameSlots(match: MatchDocument): number {
const groups = Math.max( const activeParticipantCount = match.participants.filter(
1, (participant) => !participant.excluded,
new Set(match.teams.map((team) => team.groupIndex ?? 1)).size, ).length;
const participantSeriesCount = Math.floor(activeParticipantCount / 10);
const teamSeriesCount = Math.ceil(match.teams.length / 2);
const seriesCount = Math.max(1, participantSeriesCount, teamSeriesCount);
return seriesCount * (match.gameCount || 1);
}
private resolveMatchWinnerTeamIndex(
seriesResults: NonNullable<MatchDocument['result']>['seriesResults'],
): number | undefined {
const winsByTeam = new Map<number, number>();
for (const series of seriesResults ?? []) {
if (!series.winnerTeamIndex) continue;
winsByTeam.set(
series.winnerTeamIndex,
(winsByTeam.get(series.winnerTeamIndex) ?? 0) + 1,
);
}
const sorted = [...winsByTeam.entries()].sort(
(left, right) => right[1] - left[1],
); );
return groups * (match.gameCount || 1); if (sorted.length === 0) return undefined;
if (sorted.length > 1 && sorted[0][1] === sorted[1][1]) return undefined;
return sorted[0][0];
} }
private async updatePollState( private async updatePollState(
@@ -21,6 +21,7 @@ export interface EnqueueTournamentResultPollResult {
export interface ComputedGameParticipant { export interface ComputedGameParticipant {
userId: string; userId: string;
teamIndex: number;
side: TeamSide; side: TeamSide;
championId: number; championId: number;
kills: number; kills: number;
+20 -13
View File
@@ -938,8 +938,8 @@ async function main() {
participants: auctionPlayers.map(toMatchParticipant), participants: auctionPlayers.map(toMatchParticipant),
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
name: '블루팀', name: '1팀',
captainUserId: players[0]._id, captainUserId: players[0]._id,
members: [ members: [
{ {
@@ -950,8 +950,8 @@ async function main() {
], ],
}, },
{ {
side: 'red', teamIndex: 2,
name: '레드팀', name: '2팀',
captainUserId: players[1]._id, captainUserId: players[1]._id,
members: [ members: [
{ {
@@ -982,8 +982,8 @@ async function main() {
participants: players.map(toMatchParticipant), participants: players.map(toMatchParticipant),
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
name: '블루팀', name: '1팀',
captainUserId: players[0]._id, captainUserId: players[0]._id,
members: finishedBlue.map((member) => ({ members: finishedBlue.map((member) => ({
userId: member.user._id, userId: member.user._id,
@@ -992,8 +992,8 @@ async function main() {
})), })),
}, },
{ {
side: 'red', teamIndex: 2,
name: '레드팀', name: '2팀',
captainUserId: players[1]._id, captainUserId: players[1]._id,
members: finishedRed.map((member) => ({ members: finishedRed.map((member) => ({
userId: member.user._id, userId: member.user._id,
@@ -1003,11 +1003,18 @@ async function main() {
}, },
], ],
result: { result: {
winnerSide: 'blue', winnerTeamIndex: 1,
blueScore: 2,
redScore: 1,
mvpUserId: players[0]._id, mvpUserId: players[0]._id,
riotMatchIds: ['KR_DEV_0001', 'KR_DEV_0002', 'KR_DEV_0003'], riotMatchIds: ['KR_DEV_0001', 'KR_DEV_0002', 'KR_DEV_0003'],
seriesResults: [
{
teamAIndex: 1,
teamBIndex: 2,
teamAWins: 2,
teamBWins: 1,
winnerTeamIndex: 1,
},
],
}, },
prizes: ['1등 팀: RP 10,000 지급', 'MVP: 프리리'], prizes: ['1등 팀: RP 10,000 지급', 'MVP: 프리리'],
notices: [], notices: [],
@@ -1036,13 +1043,13 @@ async function main() {
phase: 'presenting', phase: 'presenting',
teams: [ teams: [
{ {
side: 'blue', teamIndex: 1,
captainUserId: players[0]._id, captainUserId: players[0]._id,
points: 1000, points: 1000,
members: [], members: [],
}, },
{ {
side: 'red', teamIndex: 2,
captainUserId: players[1]._id, captainUserId: players[1]._id,
points: 1000, points: 1000,
members: [], members: [],
+1 -1
View File
@@ -77,7 +77,7 @@ function App() {
<Route path="/auth/callback" element={<AuthCallbackPage />} /> <Route path="/auth/callback" element={<AuthCallbackPage />} />
<Route path="/match/:id" element={<MatchDetailPage />} /> <Route path="/match/:id" element={<MatchDetailPage />} />
<Route <Route
path="/match/:id/team/:side/:groupIndex" path="/match/:id/team/:teamIndex"
element={<MatchTeamProgressPage />} element={<MatchTeamProgressPage />}
/> />
<Route path="/match/:id/auction" element={<AuctionPage />} /> <Route path="/match/:id/auction" element={<AuctionPage />} />
+28 -40
View File
@@ -11,10 +11,9 @@ import type {
MatchStatus, MatchStatus,
Position, Position,
RiotLane, RiotLane,
TeamSide,
TournamentCodeSlotView, TournamentCodeSlotView,
} from "./types"; } from "./types";
import { POSITION_ORDER, sideLabel } from "../lib/league"; import { POSITION_ORDER, teamIndexLabel } from "../lib/league";
export interface ParticipantView { export interface ParticipantView {
id: string; id: string;
@@ -34,8 +33,7 @@ export interface TeamParticipantView extends ParticipantView {
} }
export interface TeamView { export interface TeamView {
side: TeamSide; teamIndex: number;
groupIndex: number;
name: string; name: string;
participants: TeamParticipantView[]; participants: TeamParticipantView[];
} }
@@ -57,21 +55,21 @@ export interface MatchDetailView {
teams: TeamView[]; teams: TeamView[];
result?: { result?: {
winner?: string; winner?: string;
winnerSide?: TeamSide; winnerTeamIndex?: number;
blueScore: number;
redScore: number;
riotMatchIds: string[]; riotMatchIds: string[];
games: Array<{ games: Array<{
gameNumber: number; gameNumber: number;
riotMatchId: string; riotMatchId: string;
winnerSide: TeamSide; blueTeamIndex: number;
blueGroupIndex: number; redTeamIndex: number;
redGroupIndex: number; winnerTeamIndex: number;
winnerSide: "blue" | "red";
gameCreation: number; gameCreation: number;
gameDuration: number; gameDuration: number;
participants: Array<{ participants: Array<{
userId: string; userId: string;
side: TeamSide; teamIndex: number;
side: "blue" | "red";
championId: number; championId: number;
kills: number; kills: number;
deaths: number; deaths: number;
@@ -101,8 +99,8 @@ export interface AuctionPlayerView extends ParticipantView {
} }
export interface AuctionTeamView { export interface AuctionTeamView {
side: TeamSide; teamIndex: number;
groupIndex: number; name: string;
captainUserId: string; captainUserId: string;
captainName: string; captainName: string;
points: number; points: number;
@@ -121,13 +119,12 @@ export interface AuctionStateView {
totalPlayers: number; totalPlayers: number;
auctionOrder: AuctionPlayerView[]; auctionOrder: AuctionPlayerView[];
bids: { bids: {
side: TeamSide; teamIndex: number;
groupIndex: number;
amount: number; amount: number;
timestamp: string; timestamp: string;
}[]; }[];
currentBid: number; currentBid: number;
currentBidder: { side: TeamSide; groupIndex: number } | null; currentBidder: { teamIndex: number } | null;
timer: number; timer: number;
maxTimer: number; maxTimer: number;
deadline?: string; deadline?: string;
@@ -270,8 +267,8 @@ function mapAuctionTeamToView(
participantLookup: Map<string, ParticipantView>, participantLookup: Map<string, ParticipantView>,
): AuctionTeamView { ): AuctionTeamView {
return { return {
side: team.side, teamIndex: team.teamIndex,
groupIndex: team.groupIndex ?? 1, name: teamIndexLabel(team.teamIndex),
captainUserId: team.captainUserId, captainUserId: team.captainUserId,
captainName: captainName:
participantLookup.get(team.captainUserId)?.summonerName ?? participantLookup.get(team.captainUserId)?.summonerName ??
@@ -405,9 +402,8 @@ export function mapApiMatchToMatchDetail(match: ApiMatch): MatchDetailView {
); );
const teams = match.teams.map((team) => ({ const teams = match.teams.map((team) => ({
side: team.side, teamIndex: team.teamIndex,
groupIndex: team.groupIndex ?? 1, name: teamIndexLabel(team.teamIndex, team.name),
name: team.name || sideLabel(team.side),
participants: team.members.map((member) => { participants: team.members.map((member) => {
const participant = const participant =
participantLookup.get(member.userId) ?? participantLookup.get(member.userId) ??
@@ -421,8 +417,8 @@ export function mapApiMatchToMatchDetail(match: ApiMatch): MatchDetailView {
}), }),
})); }));
const winnerTeam = match.result?.winnerSide const winnerTeam = match.result?.winnerTeamIndex
? teams.find((team) => team.side === match.result?.winnerSide) ? teams.find((team) => team.teamIndex === match.result?.winnerTeamIndex)
: undefined; : undefined;
return { return {
@@ -434,20 +430,16 @@ export function mapApiMatchToMatchDetail(match: ApiMatch): MatchDetailView {
description: match.description, description: match.description,
map: mapIdToLabel(match.mapId), map: mapIdToLabel(match.mapId),
maxParticipants: match.maxParticipants, maxParticipants: match.maxParticipants,
gameCount: match.gameCount ?? 3, gameCount: match.gameCount ?? 3,
gameMode: match.gameMode ?? "pair", gameMode: match.gameMode ?? "pair",
tournamentCodes: match.tournamentCodes ?? [], tournamentCodes: match.tournamentCodes ?? [],
joined: Boolean(match.joined), joined: Boolean(match.joined),
participants, participants,
teams, teams,
result: match.result result: match.result
? { ? {
winner: match.result.winnerSide winner: match.result.winnerTeamIndex ? winnerTeam?.name : undefined,
? winnerTeam?.name ?? sideLabel(match.result.winnerSide) winnerTeamIndex: match.result.winnerTeamIndex,
: undefined,
winnerSide: match.result.winnerSide,
blueScore: match.result.blueScore,
redScore: match.result.redScore,
riotMatchIds: match.result.riotMatchIds, riotMatchIds: match.result.riotMatchIds,
games: [...(match.result.games ?? [])].sort( games: [...(match.result.games ?? [])].sort(
(left, right) => left.gameNumber - right.gameNumber, (left, right) => left.gameNumber - right.gameNumber,
@@ -476,9 +468,7 @@ export function mapApiAuctionToAuctionState(
auctionOrder.map((player) => [player.userId, player]), auctionOrder.map((player) => [player.userId, player]),
); );
const teams = [...auction.teams].sort( const teams = [...auction.teams].sort(
(left, right) => (left, right) => left.teamIndex - right.teamIndex,
(left.groupIndex ?? 1) - (right.groupIndex ?? 1) ||
(left.side === "blue" ? -1 : 1),
); );
const totalPlayers = auctionOrder.length; const totalPlayers = auctionOrder.length;
@@ -510,16 +500,14 @@ export function mapApiAuctionToAuctionState(
totalPlayers, totalPlayers,
auctionOrder, auctionOrder,
bids: auction.bids.map((bid) => ({ bids: auction.bids.map((bid) => ({
side: bid.side, teamIndex: bid.teamIndex,
groupIndex: bid.groupIndex ?? 1,
amount: bid.amount, amount: bid.amount,
timestamp: bid.timestamp, timestamp: bid.timestamp,
})), })),
currentBid: auction.currentBid, currentBid: auction.currentBid,
currentBidder: auction.currentBidder currentBidder: auction.currentBidderTeamIndex
? { ? {
side: auction.currentBidder, teamIndex: auction.currentBidderTeamIndex,
groupIndex: auction.currentBidderGroupIndex ?? 1,
} }
: null, : null,
timer, timer,
+35 -27
View File
@@ -117,8 +117,8 @@ export type TournamentCodeSlotState = TournamentCodeState | 'pending';
export interface TournamentCodeSlotView { export interface TournamentCodeSlotView {
gameNumber: number; gameNumber: number;
blueGroupIndex: number; teamAIndex: number;
redGroupIndex: number; teamBIndex: number;
code: string | null; code: string | null;
expiresAt: string | null; expiresAt: string | null;
state: TournamentCodeSlotState; state: TournamentCodeSlotState;
@@ -144,8 +144,7 @@ export interface ApiMatchTeamMember {
} }
export interface ApiMatchTeam { export interface ApiMatchTeam {
side: TeamSide; teamIndex: number;
groupIndex: number;
name: string; name: string;
captainUserId?: string; captainUserId?: string;
members: ApiMatchTeamMember[]; members: ApiMatchTeamMember[];
@@ -153,6 +152,7 @@ export interface ApiMatchTeam {
export interface ApiMatchGameResultParticipant { export interface ApiMatchGameResultParticipant {
userId: string; userId: string;
teamIndex: number;
side: TeamSide; side: TeamSide;
championId: number; championId: number;
kills: number; kills: number;
@@ -164,27 +164,26 @@ export interface ApiMatchGameResultParticipant {
export interface ApiMatchGameResult { export interface ApiMatchGameResult {
gameNumber: number; gameNumber: number;
riotMatchId: string; riotMatchId: string;
blueTeamIndex: number;
redTeamIndex: number;
winnerTeamIndex: number;
winnerSide: TeamSide; winnerSide: TeamSide;
blueGroupIndex: number;
redGroupIndex: number;
gameCreation: number; gameCreation: number;
gameDuration: number; gameDuration: number;
participants: ApiMatchGameResultParticipant[]; participants: ApiMatchGameResultParticipant[];
} }
export interface ApiMatchResult { export interface ApiMatchResult {
winnerSide?: TeamSide; winnerTeamIndex?: number;
blueScore: number;
redScore: number;
mvpUserId?: string; mvpUserId?: string;
riotMatchIds: string[]; riotMatchIds: string[];
games: ApiMatchGameResult[]; games: ApiMatchGameResult[];
seriesResults?: Array<{ seriesResults?: Array<{
blueGroupIndex: number; teamAIndex: number;
redGroupIndex: number; teamBIndex: number;
blueScore: number; teamAWins: number;
redScore: number; teamBWins: number;
winnerSide?: TeamSide; winnerTeamIndex?: number;
}>; }>;
} }
@@ -236,16 +235,14 @@ export interface ApiAuctionTeamMember {
} }
export interface ApiAuctionTeam { export interface ApiAuctionTeam {
side: TeamSide; teamIndex: number;
groupIndex: number;
captainUserId: string; captainUserId: string;
points: number; points: number;
members: ApiAuctionTeamMember[]; members: ApiAuctionTeamMember[];
} }
export interface ApiAuctionBid { export interface ApiAuctionBid {
side: TeamSide; teamIndex: number;
groupIndex?: number;
amount: number; amount: number;
bidderUserId: string; bidderUserId: string;
timestamp: string; timestamp: string;
@@ -260,8 +257,7 @@ export interface ApiAuction {
currentIndex: number; currentIndex: number;
bids: ApiAuctionBid[]; bids: ApiAuctionBid[];
currentBid: number; currentBid: number;
currentBidder?: TeamSide; currentBidderTeamIndex?: number;
currentBidderGroupIndex?: number;
maxTimerSeconds: number; maxTimerSeconds: number;
currentDeadline?: string; currentDeadline?: string;
initialPoints: number; initialPoints: number;
@@ -520,17 +516,25 @@ export interface ApiInternalMatchCard {
scheduledAt: string; scheduledAt: string;
status: 'finished' | 'in-progress'; status: 'finished' | 'in-progress';
gameCount: number; gameCount: number;
blueScore: number; winnerTeamIndex?: number;
redScore: number; seriesResults: Array<{
winnerSide?: TeamSide; teamAIndex: number;
teamBIndex: number;
teamAWins: number;
teamBWins: number;
winnerTeamIndex?: number;
}>;
games: Array<{ games: Array<{
gameNumber: number; gameNumber: number;
riotMatchId: string | null; riotMatchId: string | null;
blueTeamIndex: number;
redTeamIndex: number;
winnerTeamIndex: number | null;
winnerSide: TeamSide | null; winnerSide: TeamSide | null;
gameDuration: number; gameDuration: number;
}>; }>;
teams: Array<{ teams: Array<{
side: TeamSide; teamIndex: number;
name: string; name: string;
members: Array<{ members: Array<{
userId: string; userId: string;
@@ -605,12 +609,14 @@ export interface ApiInternalMatchDetailResponse {
gameCreation: number; gameCreation: number;
gameDuration: number; gameDuration: number;
teams: Array<{ teams: Array<{
teamIndex: number;
side: TeamSide; side: TeamSide;
win: boolean; win: boolean;
objectives: { baron: number; dragon: number; tower: number }; objectives: { baron: number; dragon: number; tower: number };
participants: Array<{ participants: Array<{
userId: string | null; userId: string | null;
summonerName: string; summonerName: string;
teamIndex: number;
side: TeamSide; side: TeamSide;
teamPosition: string; teamPosition: string;
championId: number; championId: number;
@@ -725,9 +731,11 @@ export interface LegacyMatchListItem {
riotMatchId: string | null; riotMatchId: string | null;
memberCount: number; memberCount: number;
externalCount: number; externalCount: number;
blueScore: number; teamAIndex: number;
redScore: number; teamBIndex: number;
winnerSide?: TeamSide; teamAWins: number;
teamBWins: number;
winnerTeamIndex?: number;
} }
export interface LegacyMatchListResponse { export interface LegacyMatchListResponse {
+2 -3
View File
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react';
import { io, type Socket } from 'socket.io-client'; import { io, type Socket } from 'socket.io-client';
import { API_BASE_URL, useAuthUserId } from '../config'; import { API_BASE_URL, useAuthUserId } from '../config';
import { acquireAccessToken } from '../lib/auth/token-provider'; import { acquireAccessToken } from '../lib/auth/token-provider';
import type { ApiAuction, Position, TeamSide } from './types'; import type { ApiAuction, Position } from './types';
type ConnectionStatus = type ConnectionStatus =
| 'idle' | 'idle'
@@ -12,8 +12,7 @@ type ConnectionStatus =
| 'error'; | 'error';
interface BidPayload { interface BidPayload {
side: TeamSide; teamIndex: number;
groupIndex?: number;
amount: number; amount: number;
bidderUserId?: string; bidderUserId?: string;
} }
+24 -19
View File
@@ -1,9 +1,8 @@
import { useSyncExternalStore } from 'react'; import { useSyncExternalStore } from 'react';
export type DevCaptainSide = 'spectator' | 'blue' | 'red';
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId'; const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
const DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide'; const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed'; const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed'; const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
@@ -55,23 +54,29 @@ export function setAuthUserId(userId: string | null) {
dispatchWindowEvent(AUTH_USER_CHANGED_EVENT); dispatchWindowEvent(AUTH_USER_CHANGED_EVENT);
} }
export function getDevCaptainSide(): DevCaptainSide { export function getDevCaptainTeamIndex(): number | null {
if (typeof window === 'undefined') return 'spectator'; if (typeof window === 'undefined') return null;
const value = window.localStorage.getItem( const value = window.localStorage.getItem(DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY);
DEV_CAPTAIN_SIDE_STORAGE_KEY, const parsed = Number(value);
) as DevCaptainSide | null; if (Number.isInteger(parsed) && parsed > 0) return parsed;
if (value === 'blue' || value === 'red' || value === 'spectator') { const legacy = window.localStorage.getItem(LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY);
return value; if (legacy === 'blue') return 1;
} if (legacy === 'red') return 2;
return null;
return 'spectator';
} }
export function setDevCaptainSide(side: DevCaptainSide) { export function setDevCaptainTeamIndex(teamIndex: number | null) {
if (typeof window === 'undefined') return; if (typeof window === 'undefined') return;
window.localStorage.setItem(DEV_CAPTAIN_SIDE_STORAGE_KEY, side); if (teamIndex && Number.isInteger(teamIndex) && teamIndex > 0) {
window.localStorage.setItem(
DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY,
String(teamIndex),
);
} else {
window.localStorage.removeItem(DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY);
}
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT); dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
} }
@@ -83,10 +88,10 @@ export function useAuthUserId(): string | null {
); );
} }
export function useDevCaptainSide(): DevCaptainSide { export function useDevCaptainTeamIndex(): number | null {
return useSyncExternalStore<DevCaptainSide>( return useSyncExternalStore<number | null>(
(callback) => subscribeToWindowChanges(CAPTAIN_SIDE_CHANGED_EVENT, callback), (callback) => subscribeToWindowChanges(CAPTAIN_SIDE_CHANGED_EVENT, callback),
getDevCaptainSide, getDevCaptainTeamIndex,
() => 'spectator', () => null,
); );
} }
+56 -89
View File
@@ -10,8 +10,8 @@ import {
import { useAuctionSocket } from '../api/useAuctionSocket'; import { useAuctionSocket } from '../api/useAuctionSocket';
import { import {
DEFAULT_COMMUNITY_ID, DEFAULT_COMMUNITY_ID,
setDevCaptainSide, setDevCaptainTeamIndex,
useDevCaptainSide, useDevCaptainTeamIndex,
} from '../config'; } from '../config';
import { ApiError } from '../lib/api'; import { ApiError } from '../lib/api';
import { import {
@@ -19,36 +19,31 @@ import {
championIconUrl, championIconUrl,
profileIconUrl, profileIconUrl,
} from '../lib/ddragon'; } from '../lib/ddragon';
import { positionIcon, positionLabel } from '../lib/league'; import {
positionIcon,
positionLabel,
teamIndexColorClasses,
teamIndexLabel,
} from '../lib/league';
import type { import type {
ApiAuction, ApiAuction,
ApiRiotLaneStats, ApiRiotLaneStats,
Position, Position,
TeamSide,
} from '../api/types'; } from '../api/types';
type CaptainRole = { type CaptainRole = {
side: TeamSide; teamIndex: number;
groupIndex: number;
}; };
function formatPoints(value: number) { function formatPoints(value: number) {
return value.toLocaleString(); return value.toLocaleString();
} }
function teamLabel(side: 'blue' | 'red', groupIndex = 1) {
const sideLabel = side === 'blue' ? '블루팀' : '레드팀';
return groupIndex === 1 ? sideLabel : `${groupIndex}조 ${sideLabel}`;
}
function isCurrentBidder( function isCurrentBidder(
currentBidder: AuctionStateView['currentBidder'], currentBidder: AuctionStateView['currentBidder'],
team: Pick<AuctionStateView['teams'][number], 'side' | 'groupIndex'>, team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
) { ) {
return ( return currentBidder?.teamIndex === team.teamIndex;
currentBidder?.side === team.side &&
currentBidder.groupIndex === team.groupIndex
);
} }
function getAuctionUpdatedAt(auction: ApiAuction | null | undefined) { function getAuctionUpdatedAt(auction: ApiAuction | null | undefined) {
@@ -231,26 +226,22 @@ function TeamPanel({
isLeft: boolean; isLeft: boolean;
}) { }) {
const { data: ddragon } = useDdragonManifest(); const { data: ddragon } = useDdragonManifest();
const borderColor = const tone = teamIndexColorClasses(team.teamIndex);
team.side === 'blue' ? 'border-blue-500/25' : 'border-red-500/25';
const accentBar = team.side === 'blue' ? 'bg-blue-500' : 'bg-red-500';
const sideColor = team.side === 'blue' ? 'text-blue-400' : 'text-red-400';
const headerBg = team.side === 'blue' ? 'bg-blue-500/8' : 'bg-red-500/8';
const teamSize = team.members.length + 1; const teamSize = team.members.length + 1;
const isFull = teamSize >= AUCTION_MAX_TEAM_SIZE; const isFull = teamSize >= AUCTION_MAX_TEAM_SIZE;
return ( return (
<div <div
className={`border ${borderColor} bg-base-100 relative ${isActive ? 'ring-1 ring-primary/30' : ''}`} className={`border ${tone.border} bg-base-100 relative ${isActive ? 'ring-1 ring-primary/30' : ''}`}
> >
<div <div
className={`absolute ${isLeft ? 'left-0' : 'right-0'} top-0 bottom-0 w-0.5 ${accentBar}`} className={`absolute ${isLeft ? 'left-0' : 'right-0'} top-0 bottom-0 w-0.5 ${tone.bar}`}
/> />
<div className={`${headerBg} px-3 py-2 border-b ${borderColor}`}> <div className={`${tone.bg} px-3 py-2 border-b ${tone.border}`}>
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className={`text-[11px] font-bold uppercase tracking-wide ${sideColor}`}> <span className={`text-[11px] font-bold uppercase tracking-wide ${tone.text}`}>
{teamLabel(team.side, team.groupIndex)} {teamIndexLabel(team.teamIndex, team.name)}
</span> </span>
<span className="text-[10px] text-base-content/30"> <span className="text-[10px] text-base-content/30">
팀장: {team.captainName} 팀장: {team.captainName}
@@ -306,7 +297,7 @@ function TeamPanel({
length: Math.max(0, AUCTION_MAX_TEAM_SIZE - 1 - team.members.length), length: Math.max(0, AUCTION_MAX_TEAM_SIZE - 1 - team.members.length),
}).map((_, index) => ( }).map((_, index) => (
<div <div
key={`empty-${team.side}-${team.groupIndex}-${index}`} key={`empty-${team.teamIndex}-${index}`}
className="px-3 py-1.5 h-[34px] flex items-center" className="px-3 py-1.5 h-[34px] flex items-center"
> >
<div className="w-6 h-6 border border-dashed border-base-content/8 shrink-0" /> <div className="w-6 h-6 border border-dashed border-base-content/8 shrink-0" />
@@ -426,12 +417,9 @@ function PlayerSpotlight({
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{state.currentBidder && ( {state.currentBidder && (
<span <span
className={`text-[10px] font-bold uppercase ${state.currentBidder.side === 'blue' ? 'text-blue-400' : 'text-red-400'}`} className={`text-[10px] font-bold uppercase ${teamIndexColorClasses(state.currentBidder.teamIndex).text}`}
> >
{teamLabel( {teamIndexLabel(state.currentBidder.teamIndex)}
state.currentBidder.side,
state.currentBidder.groupIndex,
)}
</span> </span>
)} )}
<span className="text-lg font-black text-amber-400 tabular-nums"> <span className="text-lg font-black text-amber-400 tabular-nums">
@@ -452,16 +440,12 @@ function BidControls({
}: { }: {
state: AuctionStateView; state: AuctionStateView;
captainRole: CaptainRole | null; captainRole: CaptainRole | null;
onBid: (side: TeamSide, groupIndex: number, amount: number) => void; onBid: (teamIndex: number, amount: number) => void;
}) { }) {
const [bidAmount, setBidAmount] = useState(100); const [bidAmount, setBidAmount] = useState(100);
const minBid = state.currentBid + 10; const minBid = state.currentBid + 10;
const activeTeam = captainRole const activeTeam = captainRole
? state.teams.find( ? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
(team) =>
team.side === captainRole.side &&
team.groupIndex === captainRole.groupIndex,
)
: null; : null;
const activeTeamSize = activeTeam ? activeTeam.members.length + 1 : 0; const activeTeamSize = activeTeam ? activeTeam.members.length + 1 : 0;
const isActiveTeamFull = activeTeamSize >= AUCTION_MAX_TEAM_SIZE; const isActiveTeamFull = activeTeamSize >= AUCTION_MAX_TEAM_SIZE;
@@ -511,21 +495,19 @@ function BidControls({
/> />
</div> </div>
<button <button
onClick={() => onBid(activeTeam.side, activeTeam.groupIndex, bidAmount)} onClick={() => onBid(activeTeam.teamIndex, bidAmount)}
disabled={ disabled={
isActiveTeamFull || isActiveTeamFull ||
bidAmount > activeTeam.points || bidAmount > activeTeam.points ||
bidAmount <= state.currentBid bidAmount <= state.currentBid
} }
className={`w-full py-2 text-xs font-bold uppercase tracking-wide border transition-colors disabled:opacity-30 disabled:cursor-not-allowed ${ className={`w-full py-2 text-xs font-bold uppercase tracking-wide border transition-colors disabled:opacity-30 disabled:cursor-not-allowed ${
activeTeam.side === 'blue' `${teamIndexColorClasses(activeTeam.teamIndex).border} ${teamIndexColorClasses(activeTeam.teamIndex).bg} ${teamIndexColorClasses(activeTeam.teamIndex).text} hover:bg-base-content/5`
? 'border-blue-500/30 bg-blue-500/10 text-blue-400 hover:bg-blue-500/20'
: 'border-red-500/30 bg-red-500/10 text-red-400 hover:bg-red-500/20'
}`} }`}
> >
{isActiveTeamFull {isActiveTeamFull
? `${teamLabel(activeTeam.side, activeTeam.groupIndex)} 정원 완료 (${activeTeamSize}/${AUCTION_MAX_TEAM_SIZE})` ? `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 정원 완료 (${activeTeamSize}/${AUCTION_MAX_TEAM_SIZE})`
: `${teamLabel(activeTeam.side, activeTeam.groupIndex)} 입찰 (${formatPoints(bidAmount)}P)`} : `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 입찰 (${formatPoints(bidAmount)}P)`}
</button> </button>
</div> </div>
); );
@@ -549,11 +531,11 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
</div> </div>
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5"> <div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
{bids.map((bid, index) => ( {bids.map((bid, index) => (
<div key={`${bid.side}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-[11px]"> <div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-[11px]">
<span <span
className={`font-bold uppercase ${bid.side === 'blue' ? 'text-blue-400' : 'text-red-400'}`} className={`font-bold uppercase ${teamIndexColorClasses(bid.teamIndex).text}`}
> >
{teamLabel(bid.side, bid.groupIndex)} {teamIndexLabel(bid.teamIndex)}
</span> </span>
<span className="text-base-content/30">→</span> <span className="text-base-content/30">→</span>
<span className="text-amber-400 tabular-nums font-semibold"> <span className="text-amber-400 tabular-nums font-semibold">
@@ -579,8 +561,7 @@ export default function AuctionPage() {
refetchInterval: 5000, refetchInterval: 5000,
}); });
const socket = useAuctionSocket(id); const socket = useAuctionSocket(id);
const captainSide = useDevCaptainSide(); const captainTeamIndex = useDevCaptainTeamIndex();
const [captainGroupIndex, setCaptainGroupIndex] = useState(1);
const [now, setNow] = useState(() => Date.now()); const [now, setNow] = useState(() => Date.now());
const [assignedPosition, setAssignedPosition] = useState<Position>('MID'); const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
@@ -594,16 +575,15 @@ export default function AuctionPage() {
liveAuction && matchQuery.data liveAuction && matchQuery.data
? mapApiAuctionToAuctionState(liveAuction, matchQuery.data, new Date(now)) ? mapApiAuctionToAuctionState(liveAuction, matchQuery.data, new Date(now))
: null; : null;
const availableGroups = useMemo(() => { const availableTeamIndexes = useMemo(() => {
const groups = new Set((auctionState?.teams ?? []).map((team) => team.groupIndex)); const indexes = new Set((auctionState?.teams ?? []).map((team) => team.teamIndex));
return [...groups].sort((left, right) => left - right); return [...indexes].sort((left, right) => left - right);
}, [auctionState?.teams]); }, [auctionState?.teams]);
const captainRole: CaptainRole | null = const captainRole: CaptainRole | null =
captainSide === 'spectator' captainTeamIndex === null
? null ? null
: { : {
side: captainSide, teamIndex: captainTeamIndex,
groupIndex: captainGroupIndex,
}; };
useEffect(() => { useEffect(() => {
@@ -613,11 +593,11 @@ export default function AuctionPage() {
}, [auctionState?.currentPlayer?.id]); }, [auctionState?.currentPlayer?.id]);
useEffect(() => { useEffect(() => {
if (availableGroups.length === 0) return; if (availableTeamIndexes.length === 0) return;
if (!availableGroups.includes(captainGroupIndex)) { if (captainTeamIndex !== null && !availableTeamIndexes.includes(captainTeamIndex)) {
setCaptainGroupIndex(availableGroups[0]); setDevCaptainTeamIndex(availableTeamIndexes[0]);
} }
}, [availableGroups, captainGroupIndex]); }, [availableTeamIndexes, captainTeamIndex]);
if (!DEFAULT_COMMUNITY_ID) { if (!DEFAULT_COMMUNITY_ID) {
return ( return (
@@ -737,31 +717,23 @@ export default function AuctionPage() {
<span>소켓: {socket.connectionStatus}</span> <span>소켓: {socket.connectionStatus}</span>
{/* 임시 운영용: 로그인/권한 확인 없이 조작자 역할을 선택할 수 있게 열어둔다. */} {/* 임시 운영용: 로그인/권한 확인 없이 조작자 역할을 선택할 수 있게 열어둔다. */}
<select <select
value={captainSide} value={captainTeamIndex ?? 'spectator'}
onChange={(event) => onChange={(event) =>
setDevCaptainSide(event.target.value as 'spectator' | 'blue' | 'red') setDevCaptainTeamIndex(
event.target.value === 'spectator'
? null
: Number(event.target.value),
)
} }
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs" className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
> >
<option value="spectator">관전자</option> <option value="spectator">관전자</option>
<option value="blue">블루팀장</option> {availableTeamIndexes.map((teamIndex) => (
<option value="red">레드팀장</option> <option key={teamIndex} value={teamIndex}>
{teamIndexLabel(teamIndex)} 팀장
</option>
))}
</select> </select>
{captainSide !== 'spectator' && availableGroups.length > 1 && (
<select
value={captainGroupIndex}
onChange={(event) =>
setCaptainGroupIndex(Number(event.target.value))
}
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
>
{availableGroups.map((groupIndex) => (
<option key={groupIndex} value={groupIndex}>
{groupIndex}조
</option>
))}
</select>
)}
</div> </div>
</div> </div>
</div> </div>
@@ -774,10 +746,10 @@ export default function AuctionPage() {
<div className="grid sm:grid-cols-2 gap-4 content-start"> <div className="grid sm:grid-cols-2 gap-4 content-start">
{auctionState.teams.map((team) => ( {auctionState.teams.map((team) => (
<TeamPanel <TeamPanel
key={`${team.side}-${team.groupIndex}`} key={team.teamIndex}
team={team} team={team}
isActive={isCurrentBidder(auctionState.currentBidder, team)} isActive={isCurrentBidder(auctionState.currentBidder, team)}
isLeft={team.side === 'blue'} isLeft={team.teamIndex % 2 === 1}
/> />
))} ))}
</div> </div>
@@ -805,15 +777,10 @@ export default function AuctionPage() {
{auctionState.phase === 'sold' && auctionState.currentBidder && ( {auctionState.phase === 'sold' && auctionState.currentBidder && (
<div <div
className={`text-center py-3 border text-sm font-bold ${ className={`text-center py-3 border text-sm font-bold ${
auctionState.currentBidder.side === 'blue' `${teamIndexColorClasses(auctionState.currentBidder.teamIndex).border} ${teamIndexColorClasses(auctionState.currentBidder.teamIndex).bg} ${teamIndexColorClasses(auctionState.currentBidder.teamIndex).text}`
? 'border-blue-500/20 bg-blue-500/8 text-blue-400'
: 'border-red-500/20 bg-red-500/8 text-red-400'
}`} }`}
> >
{teamLabel( {teamIndexLabel(auctionState.currentBidder.teamIndex)} 낙찰
auctionState.currentBidder.side,
auctionState.currentBidder.groupIndex,
)} 낙찰
{' '}— {formatPoints(auctionState.currentBid)}P {' '}— {formatPoints(auctionState.currentBid)}P
</div> </div>
)} )}
@@ -821,8 +788,8 @@ export default function AuctionPage() {
<BidControls <BidControls
state={auctionState} state={auctionState}
captainRole={captainRole} captainRole={captainRole}
onBid={(side, groupIndex, amount) => onBid={(teamIndex, amount) =>
socket.placeBid({ side, groupIndex, amount }) socket.placeBid({ teamIndex, amount })
} }
/> />
<BidLog bids={auctionState.bids} /> <BidLog bids={auctionState.bids} />
@@ -14,6 +14,7 @@ import type {
} from '../api/types'; } from '../api/types';
import { DEFAULT_COMMUNITY_ID } from '../config'; import { DEFAULT_COMMUNITY_ID } from '../config';
import { championDisplayName, championIconUrl, profileIconUrl } from '../lib/ddragon'; import { championDisplayName, championIconUrl, profileIconUrl } from '../lib/ddragon';
import { sideShortLabel, teamIndexColorClasses, teamIndexLabel } from '../lib/league';
function formatDateTime(value: string) { function formatDateTime(value: string) {
return new Intl.DateTimeFormat('ko-KR', { return new Intl.DateTimeFormat('ko-KR', {
@@ -31,7 +32,7 @@ function formatDuration(seconds: number) {
} }
function sideLabel(side: TeamSide) { function sideLabel(side: TeamSide) {
return side === 'blue' ? '블루팀' : '레드팀'; return sideShortLabel(side);
} }
function sideText(side: TeamSide) { function sideText(side: TeamSide) {
@@ -70,6 +71,13 @@ function MatchCard({
match: ApiInternalMatchCard; match: ApiInternalMatchCard;
manifest: ReturnType<typeof useDdragonManifest>['data']; manifest: ReturnType<typeof useDdragonManifest>['data'];
}) { }) {
const primarySeries = match.seriesResults[0];
const teamName = (teamIndex: number) =>
teamIndexLabel(
teamIndex,
match.teams.find((team) => team.teamIndex === teamIndex)?.name,
);
return ( return (
<Link <Link
to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats/match/${match.matchId}`} to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats/match/${match.matchId}`}
@@ -91,9 +99,9 @@ function MatchCard({
className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-[10px] text-base-content/45" className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-[10px] text-base-content/45"
> >
{game.gameNumber}경기 {game.gameNumber}경기
{game.winnerSide ? ( {game.winnerSide && game.winnerTeamIndex ? (
<span className={sideText(game.winnerSide)}> <span className={sideText(game.winnerSide)}>
{sideLabel(game.winnerSide)} 승 {teamName(game.winnerTeamIndex)} 승 ({sideLabel(game.winnerSide)})
</span> </span>
) : ( ) : (
'대기' '대기'
@@ -105,26 +113,32 @@ function MatchCard({
</div> </div>
<div className="text-center px-8"> <div className="text-center px-8">
<div className="flex items-center justify-center gap-5"> {primarySeries && (
<div className={match.winnerSide === 'blue' ? 'text-blue-400' : 'text-blue-400/30'}> <div className="flex items-center justify-center gap-5">
<div className="text-4xl font-black tabular-nums">{match.blueScore}</div> <div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
<div className="text-[10px] font-bold uppercase tracking-wider">BLUE</div> <div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
{teamName(primarySeries.teamAIndex)}
</div>
</div>
<div className="text-base-content/15 text-xs font-black">VS</div>
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
{teamName(primarySeries.teamBIndex)}
</div>
</div>
</div> </div>
<div className="text-base-content/15 text-xs font-black">VS</div> )}
<div className={match.winnerSide === 'red' ? 'text-red-400' : 'text-red-400/30'}>
<div className="text-4xl font-black tabular-nums">{match.redScore}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">RED</div>
</div>
</div>
</div> </div>
<div className="grid sm:grid-cols-2 gap-2"> <div className="grid sm:grid-cols-2 gap-2">
{match.teams.map((team) => ( {match.teams.map((team) => (
<div <div
key={team.side} key={team.teamIndex}
className={`border ${team.side === 'blue' ? 'border-blue-500/15' : 'border-red-500/15'} p-2`} className={`border ${teamIndexColorClasses(team.teamIndex).border} p-2`}
> >
<div className={`text-[10px] font-black uppercase tracking-wider ${sideText(team.side)}`}> <div className={`text-[10px] font-black uppercase tracking-wider ${teamIndexColorClasses(team.teamIndex).text}`}>
{team.name} {team.name}
</div> </div>
<div className="mt-2 space-y-1"> <div className="mt-2 space-y-1">
+28 -13
View File
@@ -3,6 +3,7 @@ import { useDdragonManifest, useInternalMatchDetail } from '../api/hooks';
import type { ApiInternalMatchDetailResponse, TeamSide } from '../api/types'; import type { ApiInternalMatchDetailResponse, TeamSide } from '../api/types';
import { DEFAULT_COMMUNITY_ID } from '../config'; import { DEFAULT_COMMUNITY_ID } from '../config';
import { championDisplayName, championIconUrl, itemIconUrl } from '../lib/ddragon'; import { championDisplayName, championIconUrl, itemIconUrl } from '../lib/ddragon';
import { sideShortLabel, teamIndexColorClasses, teamIndexLabel } from '../lib/league';
import { LANE_LABELS } from '../lib/riot-history'; import { LANE_LABELS } from '../lib/riot-history';
function formatDateTime(value: string | number) { function formatDateTime(value: string | number) {
@@ -21,7 +22,7 @@ function formatDuration(seconds: number) {
} }
function sideLabel(side: TeamSide) { function sideLabel(side: TeamSide) {
return side === 'blue' ? '블루팀' : '레드팀'; return sideShortLabel(side);
} }
function sideClass(side: TeamSide) { function sideClass(side: TeamSide) {
@@ -100,7 +101,8 @@ function GamePanel({
team.win ? 'bg-base-content/5' : 'opacity-40' team.win ? 'bg-base-content/5' : 'opacity-40'
}`} }`}
> >
{sideLabel(team.side)} {team.win ? '승' : '패'} {teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}){' '}
{team.win ? '승' : '패'}
</span> </span>
))} ))}
</div> </div>
@@ -109,7 +111,7 @@ function GamePanel({
{game.teams.map((team) => ( {game.teams.map((team) => (
<div key={team.side} className="border-b border-base-content/8 last:border-b-0"> <div key={team.side} className="border-b border-base-content/8 last:border-b-0">
<div className={`px-4 py-2 text-[11px] font-black uppercase tracking-wider ${sideClass(team.side)}`}> <div className={`px-4 py-2 text-[11px] font-black uppercase tracking-wider ${sideClass(team.side)}`}>
{sideLabel(team.side)} · 바론 {team.objectives.baron} · 드래곤{' '} {teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}) · 바론 {team.objectives.baron} · 드래곤{' '}
{team.objectives.dragon} · 타워 {team.objectives.tower} {team.objectives.dragon} · 타워 {team.objectives.tower}
</div> </div>
<div className="overflow-x-auto"> <div className="overflow-x-auto">
@@ -219,6 +221,13 @@ export default function InternalMatchDetailPage() {
); );
} }
const primarySeries = detail.match.seriesResults[0];
const teamName = (teamIndex: number) =>
teamIndexLabel(
teamIndex,
detail.match.teams.find((team) => team.teamIndex === teamIndex)?.name,
);
return ( return (
<main className="max-w-6xl mx-auto px-4 sm:px-6 py-6"> <main className="max-w-6xl mx-auto px-4 sm:px-6 py-6">
<Link <Link
@@ -238,17 +247,23 @@ export default function InternalMatchDetailPage() {
{formatDateTime(detail.match.scheduledAt)} · {detail.match.gameCount}전제 {formatDateTime(detail.match.scheduledAt)} · {detail.match.gameCount}전제
</p> </p>
</div> </div>
<div className="flex items-center gap-6"> {primarySeries && (
<div className={detail.match.winnerSide === 'blue' ? 'text-blue-400' : 'text-blue-400/30'}> <div className="flex items-center gap-6">
<div className="text-4xl font-black tabular-nums">{detail.match.blueScore}</div> <div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
<div className="text-[10px] font-bold uppercase tracking-wider">BLUE</div> <div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
{teamName(primarySeries.teamAIndex)}
</div>
</div>
<div className="text-base-content/15 text-xs font-black">VS</div>
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
{teamName(primarySeries.teamBIndex)}
</div>
</div>
</div> </div>
<div className="text-base-content/15 text-xs font-black">VS</div> )}
<div className={detail.match.winnerSide === 'red' ? 'text-red-400' : 'text-red-400/30'}>
<div className="text-4xl font-black tabular-nums">{detail.match.redScore}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">RED</div>
</div>
</div>
</div> </div>
</section> </section>
+73 -69
View File
@@ -21,7 +21,13 @@ import {
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from '../config'; import { DEFAULT_COMMUNITY_ID, useAuthUserId } from '../config';
import { apiFetch, ApiError } from '../lib/api'; import { apiFetch, ApiError } from '../lib/api';
import { profileIconUrl } from '../lib/ddragon'; import { profileIconUrl } from '../lib/ddragon';
import { positionIcon, positionLabel } from '../lib/league'; import {
positionIcon,
positionLabel,
sideShortLabel,
teamIndexColorClasses,
teamIndexLabel,
} from '../lib/league';
import type { import type {
ApiMatchParticipant, ApiMatchParticipant,
Position, Position,
@@ -30,17 +36,11 @@ import type {
} from '../api/types'; } from '../api/types';
type CaptainSelectionSlot = { type CaptainSelectionSlot = {
side: TeamSide; teamIndex: number;
groupIndex: number;
}; };
function captainSlotKey(slot: CaptainSelectionSlot) { function captainSlotKey(slot: CaptainSelectionSlot) {
return `${slot.side}:${slot.groupIndex}`; return String(slot.teamIndex);
}
function teamLabel(side: TeamSide, groupIndex = 1) {
const sideText = side === 'blue' ? '블루팀' : '레드팀';
return groupIndex === 1 ? sideText : `${groupIndex}조 ${sideText}`;
} }
function buildAuctionParticipantPool(participants: ApiMatchParticipant[]) { function buildAuctionParticipantPool(participants: ApiMatchParticipant[]) {
@@ -55,13 +55,10 @@ function buildAuctionParticipantPool(participants: ApiMatchParticipant[]) {
function buildCaptainSlots( function buildCaptainSlots(
participants: ApiMatchParticipant[], participants: ApiMatchParticipant[],
): CaptainSelectionSlot[] { ): CaptainSelectionSlot[] {
const groupCount = Math.floor(buildAuctionParticipantPool(participants).length / 10); const teamCount = Math.floor(buildAuctionParticipantPool(participants).length / 5);
return Array.from({ length: groupCount }, (_, index) => index + 1).flatMap( return Array.from({ length: teamCount }, (_, index) => ({
(groupIndex) => [ teamIndex: index + 1,
{ side: 'blue' as const, groupIndex }, }));
{ side: 'red' as const, groupIndex },
],
);
} }
function PosBadge({ pos, sub }: { pos: Position; sub?: boolean }) { function PosBadge({ pos, sub }: { pos: Position; sub?: boolean }) {
@@ -267,20 +264,16 @@ function TeamCard({
matchId: string; matchId: string;
isWinner?: boolean; isWinner?: boolean;
}) { }) {
const borderColor = const tone = teamIndexColorClasses(team.teamIndex);
team.side === 'blue' ? 'border-blue-500/25' : 'border-red-500/25';
const headerBg = team.side === 'blue' ? 'bg-blue-500/8' : 'bg-red-500/8';
const sideColor = team.side === 'blue' ? 'text-blue-400' : 'text-red-400';
const accentBar = team.side === 'blue' ? 'bg-blue-500' : 'bg-red-500';
return ( return (
<div className={`border ${borderColor} overflow-hidden bg-base-100 relative`}> <div className={`border ${tone.border} overflow-hidden bg-base-100 relative`}>
<div className={`absolute left-0 top-0 bottom-0 w-0.5 ${accentBar}`} /> <div className={`absolute left-0 top-0 bottom-0 w-0.5 ${tone.bar}`} />
<div <div
className={`${headerBg} px-4 py-2 flex items-center justify-between border-b ${borderColor}`} className={`${tone.bg} px-4 py-2 flex items-center justify-between border-b ${tone.border}`}
> >
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className={`text-xs font-bold uppercase tracking-wide ${sideColor}`}> <span className={`text-xs font-bold uppercase tracking-wide ${tone.text}`}>
{team.name} {team.name}
</span> </span>
{isWinner && ( {isWinner && (
@@ -290,7 +283,7 @@ function TeamCard({
)} )}
</div> </div>
<Link <Link
to={`/match/${matchId}/team/${team.side}/${team.groupIndex}`} to={`/match/${matchId}/team/${team.teamIndex}`}
className="text-[10px] font-bold text-base-content/35 hover:text-primary" className="text-[10px] font-bold text-base-content/35 hover:text-primary"
> >
진행 페이지 진행 페이지
@@ -414,9 +407,9 @@ function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
<div key={slot.gameNumber} className="flex items-start gap-2"> <div key={slot.gameNumber} className="flex items-start gap-2">
<span className="text-[11px] font-bold text-base-content/40 w-20 shrink-0 pt-1.5"> <span className="text-[11px] font-bold text-base-content/40 w-20 shrink-0 pt-1.5">
{slot.gameNumber}경기 {slot.gameNumber}경기
{(slot.blueGroupIndex > 1 || slot.redGroupIndex > 1) && ( {(slot.teamAIndex > 1 || slot.teamBIndex > 2) && (
<span className="block text-[10px] font-normal text-base-content/25"> <span className="block text-[10px] font-normal text-base-content/25">
{slot.blueGroupIndex}조 {teamIndexLabel(slot.teamAIndex)} vs {teamIndexLabel(slot.teamBIndex)}
</span> </span>
)} )}
</span> </span>
@@ -461,14 +454,19 @@ function formatGameDuration(seconds: number) {
return `${minutes}:${String(rest).padStart(2, '0')}`; return `${minutes}:${String(rest).padStart(2, '0')}`;
} }
function resultSideLabel(side: 'blue' | 'red', groupIndex = 1) {
return teamLabel(side, groupIndex);
}
function resultSideClass(side: 'blue' | 'red') { function resultSideClass(side: 'blue' | 'red') {
return side === 'blue' ? 'text-blue-400' : 'text-red-400'; return side === 'blue' ? 'text-blue-400' : 'text-red-400';
} }
function resultSideLabel(side: TeamSide) {
return sideShortLabel(side);
}
function resolveMatchTeamName(match: MatchDetailView, teamIndex: number) {
const team = match.teams.find((item) => item.teamIndex === teamIndex);
return teamIndexLabel(teamIndex, team?.name);
}
function MatchResultPanel({ match }: { match: MatchDetailView }) { function MatchResultPanel({ match }: { match: MatchDetailView }) {
if (!match.result) return null; if (!match.result) return null;
@@ -485,34 +483,37 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
(_, index) => index + 1, (_, index) => index + 1,
); );
const seriesResults = match.result.seriesResults ?? []; const seriesResults = match.result.seriesResults ?? [];
const primarySeries = seriesResults[0];
return ( return (
<div className="mb-6 border border-base-content/10 bg-base-content/[0.02] p-5"> <div className="mb-6 border border-base-content/10 bg-base-content/[0.02] p-5">
<div className="flex items-center justify-center gap-8"> {primarySeries && (
<div <div className="flex items-center justify-center gap-8">
className={`text-center ${match.result.winnerSide === 'blue' ? 'text-blue-400' : 'text-blue-400/30'}`} <div
> className={`text-center ${primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}`}
<div className="text-3xl font-black tabular-nums"> >
{match.result.blueScore} <div className="text-3xl font-black tabular-nums">
{primarySeries.teamAWins}
</div>
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold">
{resolveMatchTeamName(match, primarySeries.teamAIndex)}
</div>
</div> </div>
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold"> <div className="text-base-content/20 text-xs font-bold uppercase tracking-widest">
블루팀 VS
</div>
<div
className={`text-center ${primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}`}
>
<div className="text-3xl font-black tabular-nums">
{primarySeries.teamBWins}
</div>
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold">
{resolveMatchTeamName(match, primarySeries.teamBIndex)}
</div>
</div> </div>
</div> </div>
<div className="text-base-content/20 text-xs font-bold uppercase tracking-widest"> )}
VS
</div>
<div
className={`text-center ${match.result.winnerSide === 'red' ? 'text-red-400' : 'text-red-400/30'}`}
>
<div className="text-3xl font-black tabular-nums">
{match.result.redScore}
</div>
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold">
레드팀
</div>
</div>
</div>
<div className="text-center mt-3 text-[11px] font-bold text-amber-400 uppercase tracking-wide"> <div className="text-center mt-3 text-[11px] font-bold text-amber-400 uppercase tracking-wide">
{match.result.winner {match.result.winner
? `${match.result.winner} 승리` ? `${match.result.winner} 승리`
@@ -522,16 +523,21 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
<div className="mt-4 grid sm:grid-cols-2 gap-2"> <div className="mt-4 grid sm:grid-cols-2 gap-2">
{seriesResults.map((series) => ( {seriesResults.map((series) => (
<div <div
key={`${series.blueGroupIndex}-${series.redGroupIndex}`} key={`${series.teamAIndex}-${series.teamBIndex}`}
className="border border-base-content/8 bg-base-100 px-3 py-2 text-xs" className="border border-base-content/8 bg-base-100 px-3 py-2 text-xs"
> >
<div className="font-bold text-base-content/55"> <div className="font-bold text-base-content/55">
{series.blueGroupIndex}조 {resolveMatchTeamName(match, series.teamAIndex)} vs{' '}
{resolveMatchTeamName(match, series.teamBIndex)}
</div> </div>
<div className="mt-1 flex items-center justify-between"> <div className="mt-1 flex items-center justify-between">
<span className="text-blue-400">블루 {series.blueScore}</span> <span className={teamIndexColorClasses(series.teamAIndex).text}>
{series.teamAWins}
</span>
<span className="text-base-content/20">:</span> <span className="text-base-content/20">:</span>
<span className="text-red-400">레드 {series.redScore}</span> <span className={teamIndexColorClasses(series.teamBIndex).text}>
{series.teamBWins}
</span>
</div> </div>
</div> </div>
))} ))}
@@ -540,10 +546,6 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
<div className="mt-5 border border-base-content/8 divide-y divide-base-content/8"> <div className="mt-5 border border-base-content/8 divide-y divide-base-content/8">
{gameNumbers.map((gameNumber) => { {gameNumbers.map((gameNumber) => {
const game = gamesByNumber.get(gameNumber); const game = gamesByNumber.get(gameNumber);
const winnerGroupIndex =
game?.winnerSide === 'blue'
? game.blueGroupIndex
: game?.redGroupIndex;
return ( return (
<div <div
key={gameNumber} key={gameNumber}
@@ -555,7 +557,10 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
{game ? ( {game ? (
<div> <div>
<span className={`font-black ${resultSideClass(game.winnerSide)}`}> <span className={`font-black ${resultSideClass(game.winnerSide)}`}>
{resultSideLabel(game.winnerSide, winnerGroupIndex)} 승 {resolveMatchTeamName(match, game.winnerTeamIndex)} 승
</span>
<span className="ml-1 text-base-content/35">
({resultSideLabel(game.winnerSide)} 진영)
</span> </span>
<span className="ml-2 text-base-content/35 font-mono"> <span className="ml-2 text-base-content/35 font-mono">
{game.riotMatchId} {game.riotMatchId}
@@ -625,8 +630,7 @@ export default function MatchDetailPage() {
body: JSON.stringify({ body: JSON.stringify({
captains: buildCaptainSlots(matchQuery.data?.participants ?? []).map( captains: buildCaptainSlots(matchQuery.data?.participants ?? []).map(
(slot) => ({ (slot) => ({
side: slot.side, teamIndex: slot.teamIndex,
groupIndex: slot.groupIndex,
userId: captainSelections[captainSlotKey(slot)], userId: captainSelections[captainSlotKey(slot)],
}), }),
), ),
@@ -851,7 +855,7 @@ export default function MatchDetailPage() {
경매 시작 경매 시작
</h3> </h3>
<p className="mt-1 text-xs text-base-content/40"> <p className="mt-1 text-xs text-base-content/40">
참가 신청 순서 기준 10명당 1개 조가 만들어지고, 각 조에 블루/레드 팀장을 지정합니다. 참가 신청 순서 기준 5명당 1개 팀이 만들어지고, 각 팀의 팀장을 지정합니다.
</p> </p>
{waitingParticipantCount > 0 && ( {waitingParticipantCount > 0 && (
<p className="mt-1 text-[11px] text-amber-500"> <p className="mt-1 text-[11px] text-amber-500">
@@ -876,7 +880,7 @@ export default function MatchDetailPage() {
key={key} key={key}
className="text-xs text-base-content/45" className="text-xs text-base-content/45"
> >
{teamLabel(slot.side, slot.groupIndex)} 팀장 {teamIndexLabel(slot.teamIndex)} 팀장
<select <select
className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-sm" className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-sm"
value={currentValue} value={currentValue}
@@ -938,12 +942,12 @@ export default function MatchDetailPage() {
<div className="space-y-4"> <div className="space-y-4">
{match.teams.map((team) => ( {match.teams.map((team) => (
<TeamCard <TeamCard
key={`${team.side}-${team.groupIndex}`} key={team.teamIndex}
team={team} team={team}
matchId={match.id} matchId={match.id}
isWinner={ isWinner={
match.status === 'finished' match.status === 'finished'
? match.result?.winner === team.name ? match.result?.winnerTeamIndex === team.teamIndex
: undefined : undefined
} }
/> />
+15 -23
View File
@@ -1,14 +1,9 @@
import { Link, useParams } from 'react-router'; import { Link, useParams } from 'react-router';
import { useDdragonManifest, useMatch } from '../api/hooks'; import { useDdragonManifest, useMatch } from '../api/hooks';
import type { ApiMatchParticipant, Position, TeamSide } from '../api/types'; import type { ApiMatchParticipant, Position } from '../api/types';
import { DEFAULT_COMMUNITY_ID } from '../config'; import { DEFAULT_COMMUNITY_ID } from '../config';
import { profileIconUrl } from '../lib/ddragon'; import { profileIconUrl } from '../lib/ddragon';
import { positionLabel } from '../lib/league'; import { positionLabel, sideShortLabel, teamIndexLabel } from '../lib/league';
function teamLabel(side: TeamSide, groupIndex = 1) {
const sideText = side === 'blue' ? '블루팀' : '레드팀';
return groupIndex === 1 ? sideText : `${groupIndex}조 ${sideText}`;
}
function formatExpiry(value: string | null) { function formatExpiry(value: string | null) {
if (!value) return '-'; if (!value) return '-';
@@ -64,9 +59,8 @@ function ParticipantLine({
} }
export default function MatchTeamProgressPage() { export default function MatchTeamProgressPage() {
const { id, side, groupIndex } = useParams(); const { id, teamIndex } = useParams();
const parsedGroupIndex = Number(groupIndex ?? 1); const parsedTeamIndex = Number(teamIndex);
const teamSide = side === 'blue' || side === 'red' ? side : null;
const matchQuery = useMatch(id, DEFAULT_COMMUNITY_ID); const matchQuery = useMatch(id, DEFAULT_COMMUNITY_ID);
if (!DEFAULT_COMMUNITY_ID) { if (!DEFAULT_COMMUNITY_ID) {
@@ -85,7 +79,7 @@ export default function MatchTeamProgressPage() {
); );
} }
if (!teamSide || !matchQuery.data) { if (!Number.isInteger(parsedTeamIndex) || parsedTeamIndex < 1 || !matchQuery.data) {
return ( return (
<main className="mx-auto max-w-5xl px-4 py-20 text-center"> <main className="mx-auto max-w-5xl px-4 py-20 text-center">
<h1 className="text-lg font-bold">팀 정보를 찾을 수 없습니다</h1> <h1 className="text-lg font-bold">팀 정보를 찾을 수 없습니다</h1>
@@ -97,22 +91,15 @@ export default function MatchTeamProgressPage() {
} }
const match = matchQuery.data; const match = matchQuery.data;
const team = match.teams.find( const team = match.teams.find((item) => item.teamIndex === parsedTeamIndex);
(item) =>
item.side === teamSide && (item.groupIndex ?? 1) === parsedGroupIndex,
);
const participantByUserId = new Map( const participantByUserId = new Map(
match.participants.map((participant) => [participant.userId, participant]), match.participants.map((participant) => [participant.userId, participant]),
); );
const codes = (match.tournamentCodes ?? []).filter((slot) => const codes = (match.tournamentCodes ?? []).filter((slot) =>
teamSide === 'blue' slot.teamAIndex === parsedTeamIndex || slot.teamBIndex === parsedTeamIndex,
? slot.blueGroupIndex === parsedGroupIndex
: slot.redGroupIndex === parsedGroupIndex,
); );
const games = (match.result?.games ?? []).filter((game) => const games = (match.result?.games ?? []).filter((game) =>
teamSide === 'blue' game.blueTeamIndex === parsedTeamIndex || game.redTeamIndex === parsedTeamIndex,
? game.blueGroupIndex === parsedGroupIndex
: game.redGroupIndex === parsedGroupIndex,
); );
if (!team) { if (!team) {
@@ -140,7 +127,7 @@ export default function MatchTeamProgressPage() {
<div className="mb-6 border-b border-base-content/8 pb-5"> <div className="mb-6 border-b border-base-content/8 pb-5">
<h1 className="text-2xl font-black text-base-content"> <h1 className="text-2xl font-black text-base-content">
{team.name || teamLabel(team.side, team.groupIndex)} {teamIndexLabel(team.teamIndex, team.name)}
</h1> </h1>
<p className="mt-1 text-sm text-base-content/45"> <p className="mt-1 text-sm text-base-content/45">
이 팀에 연결된 토너먼트 코드와 수집된 결과만 보여줍니다. 이 팀에 연결된 토너먼트 코드와 수집된 결과만 보여줍니다.
@@ -212,7 +199,9 @@ export default function MatchTeamProgressPage() {
<div className="divide-y divide-base-content/5"> <div className="divide-y divide-base-content/5">
{games.length > 0 ? ( {games.length > 0 ? (
games.map((game) => { games.map((game) => {
const won = game.winnerSide === teamSide; const won = game.winnerTeamIndex === parsedTeamIndex;
const side =
game.blueTeamIndex === parsedTeamIndex ? 'blue' : 'red';
return ( return (
<div key={game.gameNumber} className="px-4 py-3 text-xs"> <div key={game.gameNumber} className="px-4 py-3 text-xs">
<div className="flex items-center justify-between gap-2"> <div className="flex items-center justify-between gap-2">
@@ -225,6 +214,9 @@ export default function MatchTeamProgressPage() {
{won ? '승리' : '패배'} {won ? '승리' : '패배'}
</span> </span>
</div> </div>
<div className="mt-1 text-[11px] text-base-content/35">
{sideShortLabel(side)} 진영
</div>
<div className="mt-1 truncate font-mono text-[11px] text-base-content/30"> <div className="mt-1 truncate font-mono text-[11px] text-base-content/30">
{game.riotMatchId} {game.riotMatchId}
</div> </div>
+11 -4
View File
@@ -10,6 +10,7 @@ import {
} from '../../api/hooks'; } from '../../api/hooks';
import type { LegacyMatchListItem } from '../../api/types'; import type { LegacyMatchListItem } from '../../api/types';
import { DEFAULT_COMMUNITY_ID } from '../../config'; import { DEFAULT_COMMUNITY_ID } from '../../config';
import { teamIndexLabel } from '../../lib/league';
function formatDate(value: string) { function formatDate(value: string) {
return new Intl.DateTimeFormat('ko-KR', { return new Intl.DateTimeFormat('ko-KR', {
@@ -22,10 +23,16 @@ function formatDate(value: string) {
} }
function resultLabel(match: LegacyMatchListItem) { function resultLabel(match: LegacyMatchListItem) {
if (!match.winnerSide) return '-'; if (!match.winnerTeamIndex) return '-';
return match.winnerSide === 'blue' const winnerScore =
? `블루 ${match.blueScore}:${match.redScore}` match.winnerTeamIndex === match.teamAIndex
: `레드 ${match.redScore}:${match.blueScore}`; ? match.teamAWins
: match.teamBWins;
const loserScore =
match.winnerTeamIndex === match.teamAIndex
? match.teamBWins
: match.teamAWins;
return `${teamIndexLabel(match.winnerTeamIndex)} ${winnerScore}:${loserScore}`;
} }
export default function LegacyMatchesPage() { export default function LegacyMatchesPage() {