Compare commits

...
10 Commits
23 changed files with 1555 additions and 116 deletions

No files matched your search

@@ -16,6 +16,7 @@ import { IdentityService } from '../auth/identity.service';
import { JwtService } from '../auth/jwt.service'; import { JwtService } from '../auth/jwt.service';
import { ConnectionService } from '../global/database/connection.service'; import { ConnectionService } from '../global/database/connection.service';
import type { import type {
AuctionChatMessage,
AuctionDocument, AuctionDocument,
IdentityDocument, IdentityDocument,
Position, Position,
@@ -37,6 +38,11 @@ interface SoldPayload {
assignedPosition?: Position; assignedPosition?: Position;
} }
interface ChatMessagePayload {
message?: string;
displayName?: string;
}
@WebSocketGateway({ @WebSocketGateway({
namespace: '/auction', namespace: '/auction',
cors: { cors: {
@@ -100,6 +106,7 @@ export class AuctionGateway
const auction = await this.auctionService.getByMatchId( const auction = await this.auctionService.getByMatchId(
new mongoose.Types.ObjectId(payload.matchId), new mongoose.Types.ObjectId(payload.matchId),
); );
this.emitChatHistory(socket, auction);
this.broadcastState(payload.matchId, auction); this.broadcastState(payload.matchId, auction);
} catch (error) { } catch (error) {
this.emitKnownError(socket, error); this.emitKnownError(socket, error);
@@ -182,6 +189,34 @@ export class AuctionGateway
} }
} }
@SubscribeMessage('chat-message')
public async handleChatMessage(
@ConnectedSocket() socket: Socket,
@MessageBody() payload: ChatMessagePayload,
) {
const matchId = this.requireJoinedMatchId(socket);
if (!matchId) return;
if (typeof payload?.message !== 'string') {
this.emitError(socket, 'Chat message is required.');
return;
}
try {
const { message } = await this.auctionService.appendChatMessage({
matchId: new mongoose.Types.ObjectId(matchId),
userId: this.resolveSocketUserId(socket),
displayName: this.resolveChatDisplayName(socket, payload.displayName),
message: payload.message,
});
this.server
.to(matchId)
.emit('chat-message', this.serializeChatMessage(message));
} catch (error) {
this.emitKnownError(socket, error);
}
}
private requireJoinedMatchId(socket: Socket): string | null { private requireJoinedMatchId(socket: Socket): string | null {
const matchId = this.getSocketMatchId(socket); const matchId = this.getSocketMatchId(socket);
if (!matchId) { if (!matchId) {
@@ -219,6 +254,36 @@ export class AuctionGateway
return Array.isArray(header) ? header[0] : header; return Array.isArray(header) ? header[0] : header;
} }
private resolveSocketUserId(
socket: Socket,
): mongoose.Types.ObjectId | undefined {
return (socket.data.user as UserDocument | undefined)?._id;
}
private resolveChatDisplayName(
socket: Socket,
fallbackDisplayName?: string,
): string {
const user = socket.data.user as UserDocument | undefined;
const primaryRiotAccount =
user?.riotAccounts.find((entry) => entry.isPrimary) ??
user?.riotAccounts[0];
if (primaryRiotAccount?.gameName) {
return primaryRiotAccount.tagLine
? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}`
: primaryRiotAccount.gameName;
}
if (user?.kakaoTalkNickname) return user.kakaoTalkNickname;
if (user?.discordNickname) return user.discordNickname;
const identity = socket.data.identity as IdentityDocument | undefined;
if (identity?.displayName) return identity.displayName;
if (identity?.email) return identity.email;
return fallbackDisplayName ?? '관전자';
}
private async authenticateSocket(socket: Socket): Promise<void> { private async authenticateSocket(socket: Socket): Promise<void> {
const fallback = await this.authService.resolveDevUserById( const fallback = await this.authService.resolveDevUserById(
this.readHandshakeUserId(socket), this.readHandshakeUserId(socket),
@@ -299,6 +364,14 @@ export class AuctionGateway
this.syncRoomTimer(matchId, auction); this.syncRoomTimer(matchId, auction);
} }
private emitChatHistory(socket: Socket, auction: AuctionDocument) {
socket.emit('chat-history', {
messages: (auction.chatMessages ?? []).map((message) =>
this.serializeChatMessage(message),
),
});
}
private syncRoomTimer(matchId: string, auction: AuctionDocument) { private syncRoomTimer(matchId: string, auction: AuctionDocument) {
this.clearRoomTimer(matchId); this.clearRoomTimer(matchId);
if (!auction.currentDeadline) return; if (!auction.currentDeadline) return;
@@ -382,4 +455,8 @@ export class AuctionGateway
private serializeAuction(auction: AuctionDocument) { private serializeAuction(auction: AuctionDocument) {
return JSON.parse(JSON.stringify(auction)); return JSON.parse(JSON.stringify(auction));
} }
private serializeChatMessage(message: AuctionChatMessage) {
return JSON.parse(JSON.stringify(message));
}
} }
@@ -159,6 +159,76 @@ describe('AuctionService', () => {
expect(tournamentResultService.scheduleInitialPoll).not.toHaveBeenCalled(); expect(tournamentResultService.scheduleInitialPoll).not.toHaveBeenCalled();
}); });
it('appends a chat message and keeps only the latest 200 messages', async () => {
const matchId = new mongoose.Types.ObjectId();
const userId = new mongoose.Types.ObjectId();
const oldMessages = Array.from({ length: 200 }, (_, index) => ({
id: `old-${index}`,
displayName: 'Old',
message: `old message ${index}`,
sentAt: new Date(index),
}));
const auction = {
matchId,
chatMessages: oldMessages,
save: jest.fn().mockResolvedValue(undefined),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
const appended = await service.appendChatMessage({
matchId,
userId,
displayName: ' Captain One ',
message: ' 좋은 픽입니다 ',
});
expect(appended.message).toMatchObject({
userId,
displayName: 'Captain One',
message: '좋은 픽입니다',
});
expect(appended.message.id).toHaveLength(36);
expect(appended.message.sentAt).toBeInstanceOf(Date);
expect(auction.chatMessages).toHaveLength(200);
expect(auction.chatMessages[0].id).toBe('old-1');
expect(auction.chatMessages.at(-1)).toBe(appended.message);
expect(auction.save).toHaveBeenCalledTimes(1);
});
it('rejects blank and overly long chat messages', async () => {
const matchId = new mongoose.Types.ObjectId();
const auction = {
matchId,
chatMessages: [],
save: jest.fn().mockResolvedValue(undefined),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
await expect(
service.appendChatMessage({
matchId,
displayName: 'Spectator',
message: ' ',
}),
).rejects.toThrow('Chat message is required.');
await expect(
service.appendChatMessage({
matchId,
displayName: 'Spectator',
message: 'a'.repeat(301),
}),
).rejects.toThrow('Chat message must be 300 characters or less.');
expect(auction.save).not.toHaveBeenCalled();
});
it('randomizes the non-captain player order when starting an auction', async () => { it('randomizes the non-captain player order when starting an auction', async () => {
const randomSpy = jest.spyOn(Math, 'random').mockReturnValue(0); const randomSpy = jest.spyOn(Math, 'random').mockReturnValue(0);
const matchId = new mongoose.Types.ObjectId(); const matchId = new mongoose.Types.ObjectId();
@@ -348,7 +418,7 @@ describe('AuctionService', () => {
expect(auction.save).not.toHaveBeenCalled(); expect(auction.save).not.toHaveBeenCalled();
}); });
it('marks a zero-bid player as passed and queues them for round two', async () => { it('marks a zero-bid player as passed and queues them for another round', async () => {
const matchId = new mongoose.Types.ObjectId(); const matchId = new mongoose.Types.ObjectId();
const playerId = new mongoose.Types.ObjectId(); const playerId = new mongoose.Types.ObjectId();
const auction = { const auction = {
@@ -383,25 +453,63 @@ describe('AuctionService', () => {
expect(auction.save).toHaveBeenCalledTimes(1); expect(auction.save).toHaveBeenCalledTimes(1);
}); });
it('force-assigns second-pass players to the open team with most points', async () => { it('queues zero-bid passes after the first auction round', async () => {
const matchId = new mongoose.Types.ObjectId();
const playerId = new mongoose.Types.ObjectId();
const auction = {
_id: new mongoose.Types.ObjectId(),
matchId,
phase: 'bidding',
currentBid: 0,
currentIndex: 0,
auctionRound: 2,
order: [
{
userId: playerId,
preferredPositions: [{ position: 'MID', priority: 1 }],
passCount: 1,
},
],
passedQueue: [],
save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
await service.markPassed(matchId);
expect(auction.phase).toBe('passed');
expect(auction.order[0].passCount).toBe(2);
expect(auction.passedQueue).toHaveLength(1);
expect(auction.passedQueue[0]).toMatchObject({
userId: playerId.toString(),
preferredPositions: [{ position: 'MID', priority: 1 }],
passCount: 2,
});
});
it('requeues second-pass players instead of force-assigning them', async () => {
const matchId = new mongoose.Types.ObjectId(); const matchId = new mongoose.Types.ObjectId();
const captainOneId = new mongoose.Types.ObjectId(); const captainOneId = new mongoose.Types.ObjectId();
const captainTwoId = new mongoose.Types.ObjectId(); const captainTwoId = new mongoose.Types.ObjectId();
const passedPlayerId = new mongoose.Types.ObjectId(); const passedPlayerId = new mongoose.Types.ObjectId();
const passedPlayer = {
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
passCount: 2,
};
const auction = { const auction = {
_id: new mongoose.Types.ObjectId(), _id: new mongoose.Types.ObjectId(),
matchId, matchId,
phase: 'passed', phase: 'passed',
currentIndex: 0, currentIndex: 0,
auctionRound: 2, auctionRound: 2,
order: [ order: [passedPlayer],
{ passedQueue: [passedPlayer],
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
passCount: 2,
},
],
passedQueue: [],
teams: [ teams: [
{ {
teamIndex: 1, teamIndex: 1,
@@ -419,46 +527,28 @@ describe('AuctionService', () => {
save: jest.fn().mockResolvedValue(undefined), save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }), toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
}; };
const match = {
participants: [
{
userId: captainOneId,
preferredPositions: [{ position: 'TOP', priority: 1 }],
},
{
userId: captainTwoId,
preferredPositions: [{ position: 'JGL', priority: 1 }],
},
{
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
},
],
status: 'team-built',
teams: [],
teamBuiltAt: undefined,
save: jest.fn().mockResolvedValue(undefined),
};
const { service } = createService({ const { service } = createService({
auction: { auction: {
findOne: jest.fn().mockResolvedValue(auction), findOne: jest.fn().mockResolvedValue(auction),
}, },
match: {
findById: jest.fn().mockResolvedValue(match),
},
}); });
await service.next(matchId); await service.next(matchId);
expect(auction.phase).toBe('complete'); expect(auction.phase).toBe('presenting');
expect(auction.teams[1].members).toEqual([ expect(auction.auctionRound).toBe(3);
{ expect(auction.currentIndex).toBe(1);
userId: passedPlayerId, expect(auction.order).toHaveLength(2);
assignedPosition: 'SUP', expect(auction.order[1]).toMatchObject({
cost: 1, userId: passedPlayerId.toString(),
}, preferredPositions: [{ position: 'SUP', priority: 1 }],
]); passCount: 2,
expect(auction.teams[1].points).toBe(49); });
expect(auction.passedQueue).toEqual([]);
expect(auction.teams[0].members).toEqual([]);
expect(auction.teams[1].members).toEqual([]);
expect(auction.teams[0].points).toBe(10);
expect(auction.teams[1].points).toBe(50);
}); });
it('syncs completed auction teams into the match document', async () => { it('syncs completed auction teams into the match document', async () => {
+63 -47
View File
@@ -5,10 +5,12 @@ import {
Logger, Logger,
NotFoundException, NotFoundException,
} from '@nestjs/common'; } from '@nestjs/common';
import { randomUUID } from 'crypto';
import mongoose from 'mongoose'; import mongoose from 'mongoose';
import { ConnectionService } from '../global/database/connection.service'; import { ConnectionService } from '../global/database/connection.service';
import { import {
AuctionActionType, AuctionActionType,
AuctionChatMessage,
AuctionDocument, AuctionDocument,
AuctionPlayerSnapshot, AuctionPlayerSnapshot,
AuctionTeam, AuctionTeam,
@@ -26,6 +28,9 @@ import { TournamentResultService } from '../tournament-result/tournament-result.
const AUCTION_MAX_TEAM_SIZE = 5; const AUCTION_MAX_TEAM_SIZE = 5;
const AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY = 1; const AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY = 1;
const AUCTION_ENRICHMENT_COOLDOWN_MS = 3 * 60 * 60 * 1000; const AUCTION_ENRICHMENT_COOLDOWN_MS = 3 * 60 * 60 * 1000;
const AUCTION_CHAT_MAX_MESSAGES = 200;
const AUCTION_CHAT_MAX_MESSAGE_LENGTH = 300;
const AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH = 24;
interface StartAuctionParams { interface StartAuctionParams {
matchId: mongoose.Types.ObjectId; matchId: mongoose.Types.ObjectId;
@@ -54,6 +59,13 @@ interface MarkSoldParams {
assignedPosition?: Position; assignedPosition?: Position;
} }
interface AppendChatMessageParams {
matchId: mongoose.Types.ObjectId;
userId?: mongoose.Types.ObjectId;
displayName?: string;
message: string;
}
export interface AuctionHistoryView { export interface AuctionHistoryView {
sequence: number; sequence: number;
action: AuctionActionType; action: AuctionActionType;
@@ -221,6 +233,31 @@ export class AuctionService {
return auction; return auction;
} }
public async appendChatMessage(params: AppendChatMessageParams): Promise<{
auction: AuctionDocument;
message: AuctionChatMessage;
}> {
const auction = await this.getByMatchId(params.matchId);
const messageText = this.normalizeChatMessage(params.message);
const message: AuctionChatMessage = {
id: randomUUID(),
userId: params.userId,
displayName: this.normalizeChatDisplayName(params.displayName),
message: messageText,
sentAt: new Date(),
};
auction.chatMessages ??= [];
auction.chatMessages.push(message);
const overflow = auction.chatMessages.length - AUCTION_CHAT_MAX_MESSAGES;
if (overflow > 0) {
auction.chatMessages.splice(0, overflow);
}
await auction.save();
return { auction, message };
}
public async listHistory(params: { public async listHistory(params: {
matchId: mongoose.Types.ObjectId; matchId: mongoose.Types.ObjectId;
communityId: mongoose.Types.ObjectId; communityId: mongoose.Types.ObjectId;
@@ -345,9 +382,8 @@ export class AuctionService {
await this.recordSnapshot(auction, 'passed'); await this.recordSnapshot(auction, 'passed');
current.passCount = (current.passCount ?? 0) + 1; current.passCount = (current.passCount ?? 0) + 1;
if ((auction.auctionRound ?? 1) === 1) { auction.passedQueue ??= [];
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current)); auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
}
auction.phase = 'passed'; auction.phase = 'passed';
auction.currentDeadline = undefined; auction.currentDeadline = undefined;
await auction.save(); await auction.save();
@@ -368,29 +404,22 @@ export class AuctionService {
const nextIndex = auction.currentIndex + 1; const nextIndex = auction.currentIndex + 1;
const completesAuction = const completesAuction =
nextIndex >= auction.order.length && nextIndex >= auction.order.length &&
!( (auction.passedQueue?.length ?? 0) === 0;
(auction.auctionRound ?? 1) === 1 &&
(auction.passedQueue?.length ?? 0) > 0
);
await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next'); await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next');
if (nextIndex >= auction.order.length) { if (nextIndex >= auction.order.length) {
if ( if ((auction.passedQueue?.length ?? 0) > 0) {
(auction.auctionRound ?? 1) === 1 &&
(auction.passedQueue?.length ?? 0) > 0
) {
auction.order.push( auction.order.push(
...auction.passedQueue.map((player) => ...auction.passedQueue.map((player) =>
this.cloneAuctionPlayerSnapshot(player), this.cloneAuctionPlayerSnapshot(player),
), ),
); );
auction.passedQueue = []; auction.passedQueue = [];
auction.auctionRound = 2; auction.auctionRound = (auction.auctionRound ?? 1) + 1;
auction.currentIndex = nextIndex; auction.currentIndex = nextIndex;
auction.phase = 'presenting'; auction.phase = 'presenting';
auction.currentBid = 0; auction.currentBid = 0;
auction.currentBidderTeamIndex = undefined; auction.currentBidderTeamIndex = undefined;
} else { } else {
this.forceAssignRemainingPasses(auction);
auction.phase = 'complete'; auction.phase = 'complete';
auction.completedAt = new Date(); auction.completedAt = new Date();
} }
@@ -603,47 +632,34 @@ export class AuctionService {
return shuffled; return shuffled;
} }
private forceAssignRemainingPasses(auction: AuctionDocument): void {
const forcedPlayers = auction.order.filter(
(player) =>
(player.passCount ?? 0) >= 2 &&
!this.isAuctionPlayerAssigned(auction, player.userId),
);
for (const player of forcedPlayers) {
const targetTeam = [...auction.teams]
.filter(
(team) => this.countTeamMembersIncludingCaptain(team) < AUCTION_MAX_TEAM_SIZE,
)
.sort((left, right) => right.points - left.points)[0];
if (!targetTeam) return;
const preferredPrimary = player.preferredPositions[0]?.position;
targetTeam.members.push({
userId: player.userId,
assignedPosition: preferredPrimary ?? 'MID',
cost: 1,
});
targetTeam.points = Math.max(0, targetTeam.points - 1);
}
}
private isAuctionPlayerAssigned(
auction: AuctionDocument,
userId: mongoose.Types.ObjectId,
): boolean {
const userIdText = userId.toString();
return auction.teams.some((team) =>
team.members.some((member) => member.userId.toString() === userIdText),
);
}
private cloneAuctionPlayerSnapshot( private cloneAuctionPlayerSnapshot(
player: AuctionPlayerSnapshot, player: AuctionPlayerSnapshot,
): AuctionPlayerSnapshot { ): AuctionPlayerSnapshot {
return JSON.parse(JSON.stringify(player)) as AuctionPlayerSnapshot; return JSON.parse(JSON.stringify(player)) as AuctionPlayerSnapshot;
} }
private normalizeChatMessage(message: string): string {
const normalized = message.trim();
if (!normalized) {
throw new BadRequestException('Chat message is required.');
}
if (Array.from(normalized).length > AUCTION_CHAT_MAX_MESSAGE_LENGTH) {
throw new BadRequestException(
`Chat message must be ${AUCTION_CHAT_MAX_MESSAGE_LENGTH} characters or less.`,
);
}
return normalized;
}
private normalizeChatDisplayName(displayName: string | undefined): string {
const normalized = displayName?.trim() || '관전자';
const chars = Array.from(normalized);
if (chars.length <= AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH) {
return normalized;
}
return chars.slice(0, AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH).join('');
}
private async recordSnapshot( private async recordSnapshot(
auction: AuctionDocument, auction: AuctionDocument,
action: AuctionActionType, action: AuctionActionType,
@@ -0,0 +1,116 @@
import { ConnectionService } from '../global/database/connection.service';
import { NatsService } from '../global/nats/nats.service';
import { DakaoOutboxService } from './dakao-outbox.service';
import { DakaoResultSubjects } from './dakao.types';
function execResult<T>(value: T) {
return { exec: jest.fn().mockResolvedValue(value) };
}
function makeService(outboxModel: Record<string, unknown>) {
const connectionService = {
getModel: jest.fn().mockResolvedValue(outboxModel),
} as unknown as ConnectionService;
const natsService = {
publishJetStream: jest.fn().mockResolvedValue(undefined),
} as unknown as NatsService;
return {
service: new DakaoOutboxService(connectionService, natsService),
connectionService,
natsService,
};
}
describe('DakaoOutboxService', () => {
it('persists result subjects when enqueuing send-message commands', async () => {
const outboxModel = {
findOneAndUpdate: jest.fn().mockReturnValue(execResult({})),
updateOne: jest.fn().mockReturnValue(execResult({})),
};
const { service, natsService } = makeService(outboxModel);
const resultSubjects: DakaoResultSubjects = {
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
};
await service.enqueueAndPublish({
subject: 'staging.dakao.chat.send-message.v1',
eventId: 'lolympus:chat.send-message:chat-log-1',
envelope: {
schema: 'dakao.command.v1',
eventId: 'lolympus:chat.send-message:chat-log-1',
type: 'chat.send-message',
eventSource: 'lolympus',
correlationId: 'chat-log-1',
resultSubjects,
payload: {
chatroomId: '18474390111480678',
segments: [{ kind: 'text', text: 'done' }],
},
},
});
expect(outboxModel.findOneAndUpdate).toHaveBeenCalledWith(
{ eventId: 'lolympus:chat.send-message:chat-log-1' },
expect.objectContaining({
$setOnInsert: expect.objectContaining({ resultSubjects }),
}),
expect.any(Object),
);
expect(natsService.publishJetStream).toHaveBeenCalledWith(
'staging.dakao.chat.send-message.v1',
expect.objectContaining({ resultSubjects }),
{ messageId: 'lolympus:chat.send-message:chat-log-1' },
);
});
it('restores send-message result subjects when sweeping legacy stale rows', async () => {
const previousNodeEnv = process.env.NODE_ENV;
process.env.NODE_ENV = 'staging';
try {
const exec = jest.fn().mockResolvedValue([
{
eventId: 'lolympus:chat.send-message:chat-log-1',
type: 'chat.send-message',
eventSource: 'lolympus',
subject: 'staging.dakao.chat.send-message.v1',
correlationId: 'chat-log-1',
payload: {
chatroomId: '18474390111480678',
segments: [{ kind: 'text', text: 'done' }],
},
},
]);
const lean = jest.fn().mockReturnValue({ exec });
const limit = jest.fn().mockReturnValue({ lean });
const sort = jest.fn().mockReturnValue({ limit });
const outboxModel = {
find: jest.fn().mockReturnValue({ sort }),
};
const { service } = makeService(outboxModel);
const enqueue = jest
.spyOn(service, 'enqueueAndPublish')
.mockResolvedValue(undefined);
await expect(service.sweepStale({ staleMs: 1, limit: 1 })).resolves.toBe(
1,
);
expect(enqueue).toHaveBeenCalledWith(
expect.objectContaining({
envelope: expect.objectContaining({
resultSubjects: {
succeeded:
'staging.lolympus.dakao.chat.send-message.succeeded.v1',
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
},
}),
}),
);
} finally {
process.env.NODE_ENV = previousNodeEnv;
}
});
});
@@ -1,13 +1,23 @@
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { ConnectionService } from '../global/database/connection.service'; import { ConnectionService } from '../global/database/connection.service';
import { NatsService } from '../global/nats/nats.service'; import { NatsService } from '../global/nats/nats.service';
import { DakaoCommandEnvelope, DakaoResultEnvelope } from './dakao.types'; import { resolveDakaoNatsNames } from './dakao.nats-names';
import {
DakaoCommandEnvelope,
DakaoResultEnvelope,
DakaoResultSubjects,
} from './dakao.types';
const CHAT_SEND_MESSAGE_TYPE = 'chat.send-message';
const TERMINAL_STATES = ['sent', 'failed'] as const; const TERMINAL_STATES = ['sent', 'failed'] as const;
@Injectable() @Injectable()
export class DakaoOutboxService { export class DakaoOutboxService {
private readonly logger = new Logger(DakaoOutboxService.name); private readonly logger = new Logger(DakaoOutboxService.name);
private readonly chatSendMessageResultSubjects = {
succeeded: resolveDakaoNatsNames().subjects.chatSendMessageSucceeded,
failed: resolveDakaoNatsNames().subjects.chatSendMessageFailed,
};
constructor( constructor(
private readonly connectionService: ConnectionService, private readonly connectionService: ConnectionService,
@@ -30,6 +40,7 @@ export class DakaoOutboxService {
type: params.envelope.type, type: params.envelope.type,
subject: params.subject, subject: params.subject,
correlationId: params.envelope.correlationId, correlationId: params.envelope.correlationId,
resultSubjects: params.envelope.resultSubjects,
payload: params.envelope.payload as Record<string, unknown>, payload: params.envelope.payload as Record<string, unknown>,
state: 'pending', state: 'pending',
publishAttempts: 0, publishAttempts: 0,
@@ -161,6 +172,8 @@ export class DakaoOutboxService {
type: row.type, type: row.type,
eventSource: row.eventSource, eventSource: row.eventSource,
correlationId: row.correlationId, correlationId: row.correlationId,
resultSubjects:
row.resultSubjects ?? this.resolveDefaultResultSubjects(row.type),
payload: row.payload, payload: row.payload,
}, },
}); });
@@ -168,4 +181,11 @@ export class DakaoOutboxService {
return rows.length; return rows.length;
} }
private resolveDefaultResultSubjects(
type: string,
): DakaoResultSubjects | undefined {
if (type !== CHAT_SEND_MESSAGE_TYPE) return undefined;
return this.chatSendMessageResultSubjects;
}
} }
@@ -97,6 +97,10 @@ describe('DakaoPublisher', () => {
eventSource: 'lolympus', eventSource: 'lolympus',
type: 'chat.send-message', type: 'chat.send-message',
correlationId: 'chat-log-1', correlationId: 'chat-log-1',
resultSubjects: {
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
},
}); });
expect(getPublishedEnvelope(outboxService)).not.toHaveProperty( expect(getPublishedEnvelope(outboxService)).not.toHaveProperty(
'replySubject', 'replySubject',
+12 -1
View File
@@ -3,6 +3,7 @@ import { randomUUID } from 'crypto';
import { SecretService } from '../global/secret/secret.service'; import { SecretService } from '../global/secret/secret.service';
import { import {
DakaoCommandEnvelope, DakaoCommandEnvelope,
DakaoResultSubjects,
DakaoSegment, DakaoSegment,
DakaoSendMessagePayload, DakaoSendMessagePayload,
} from './dakao.types'; } from './dakao.types';
@@ -16,7 +17,12 @@ const EVENT_SOURCE_DEFAULT = 'lolympus';
@Injectable() @Injectable()
export class DakaoPublisher implements OnModuleInit { export class DakaoPublisher implements OnModuleInit {
private readonly logger = new Logger(DakaoPublisher.name); private readonly logger = new Logger(DakaoPublisher.name);
private sendMessageSubject = resolveDakaoNatsNames().subjects.chatSendMessage; private readonly names = resolveDakaoNatsNames();
private sendMessageSubject = this.names.subjects.chatSendMessage;
private resultSubjects: DakaoResultSubjects = {
succeeded: this.names.subjects.chatSendMessageSucceeded,
failed: this.names.subjects.chatSendMessageFailed,
};
private eventSource = EVENT_SOURCE_DEFAULT; private eventSource = EVENT_SOURCE_DEFAULT;
constructor( constructor(
@@ -35,6 +41,10 @@ export class DakaoPublisher implements OnModuleInit {
this.sendMessageSubject = this.sendMessageSubject =
sendOverride || resolveDakaoNatsNames().subjects.chatSendMessage; sendOverride || resolveDakaoNatsNames().subjects.chatSendMessage;
this.resultSubjects = {
succeeded: this.names.subjects.chatSendMessageSucceeded,
failed: this.names.subjects.chatSendMessageFailed,
};
this.eventSource = sourceOverride || EVENT_SOURCE_DEFAULT; this.eventSource = sourceOverride || EVENT_SOURCE_DEFAULT;
this.logger.log( this.logger.log(
@@ -63,6 +73,7 @@ export class DakaoPublisher implements OnModuleInit {
type: 'chat.send-message', type: 'chat.send-message',
eventSource: this.eventSource, eventSource: this.eventSource,
correlationId: params.correlationId, correlationId: params.correlationId,
resultSubjects: this.resultSubjects,
payload, payload,
}; };
await this.outboxService.enqueueAndPublish({ await this.outboxService.enqueueAndPublish({
@@ -75,12 +75,18 @@ export interface DakaoSendMessagePayload {
silence?: boolean; silence?: boolean;
} }
export interface DakaoResultSubjects {
succeeded: string;
failed: string;
}
export interface DakaoCommandEnvelope<TPayload> { export interface DakaoCommandEnvelope<TPayload> {
schema: 'dakao.command.v1'; schema: 'dakao.command.v1';
eventId: string; eventId: string;
type: string; type: string;
eventSource: string; eventSource: string;
correlationId?: string; correlationId?: string;
resultSubjects?: DakaoResultSubjects;
payload: TPayload; payload: TPayload;
} }
@@ -350,6 +350,10 @@ export interface DakaoOutboxMessage extends MongooseTimestamps {
type: string; type: string;
subject: string; subject: string;
correlationId?: string; correlationId?: string;
resultSubjects?: {
succeeded: string;
failed: string;
};
payload: Record<string, unknown>; payload: Record<string, unknown>;
state: DakaoOutboxMessageState; state: DakaoOutboxMessageState;
publishAttempts: number; publishAttempts: number;
@@ -614,6 +618,14 @@ export interface AuctionBid {
timestamp: Date; timestamp: Date;
} }
export interface AuctionChatMessage {
id: string;
userId?: mongoose.Types.ObjectId;
displayName: string;
message: string;
sentAt: Date;
}
export interface Auction extends MongooseTimestamps { export interface Auction extends MongooseTimestamps {
matchId: mongoose.Types.ObjectId; matchId: mongoose.Types.ObjectId;
phase: AuctionPhase; phase: AuctionPhase;
@@ -631,6 +643,7 @@ export interface Auction extends MongooseTimestamps {
initialPoints: number; initialPoints: number;
topTierThreshold: AuctionTopTierThreshold; topTierThreshold: AuctionTopTierThreshold;
manualTopTierUserIds: mongoose.Types.ObjectId[]; manualTopTierUserIds: mongoose.Types.ObjectId[];
chatMessages: AuctionChatMessage[];
startedAt?: Date; startedAt?: Date;
completedAt?: Date; completedAt?: Date;
} }
@@ -960,6 +973,10 @@ export const DakaoOutboxMessageSchema = new Schema<DakaoOutboxMessage>(
type: { type: String, required: true }, type: { type: String, required: true },
subject: { type: String, required: true }, subject: { type: String, required: true },
correlationId: { type: String }, correlationId: { type: String },
resultSubjects: {
succeeded: { type: String },
failed: { type: String },
},
payload: { type: Schema.Types.Mixed, required: true }, payload: { type: Schema.Types.Mixed, required: true },
state: { state: {
type: String, type: String,
@@ -1558,6 +1575,17 @@ const AuctionBidSubSchema = new Schema<AuctionBid>(
{ _id: false }, { _id: false },
); );
const AuctionChatMessageSubSchema = new Schema<AuctionChatMessage>(
{
id: { type: String, required: true },
userId: { type: Schema.Types.ObjectId, ref: 'user', required: false },
displayName: { type: String, required: true },
message: { type: String, required: true },
sentAt: { type: Date, required: true, default: Date.now },
},
{ _id: false },
);
export const AuctionSchema = new Schema<Auction>( export const AuctionSchema = new Schema<Auction>(
{ {
matchId: { matchId: {
@@ -1604,6 +1632,11 @@ export const AuctionSchema = new Schema<Auction>(
required: true, required: true,
default: [], default: [],
}, },
chatMessages: {
type: [AuctionChatMessageSubSchema],
required: true,
default: [],
},
startedAt: { type: Date, required: false }, startedAt: { type: Date, required: false },
completedAt: { type: Date, required: false }, completedAt: { type: Date, required: false },
}, },
@@ -173,6 +173,14 @@ export class UpdateMatchDto {
schedule?: MatchScheduleItemDto[]; schedule?: MatchScheduleItemDto[];
} }
export class UpdateParticipantDto {
@IsEnum(POSITIONS)
mainPosition!: Position;
@IsEnum(POSITIONS)
subPosition!: Position;
}
export class JoinMatchDto { export class JoinMatchDto {
@IsArray() @IsArray()
@ArrayMinSize(1) @ArrayMinSize(1)
@@ -27,6 +27,7 @@ import {
CreateMatchDto, CreateMatchDto,
JoinMatchDto, JoinMatchDto,
UpdateMatchDto, UpdateMatchDto,
UpdateParticipantDto,
} from './dto/create-match.dto'; } from './dto/create-match.dto';
import { MatchService } from './match.service'; import { MatchService } from './match.service';
@@ -137,6 +138,49 @@ export class MatchController {
}); });
} }
// 관리자 전용 — 참가자 주/부 포지션 변경.
@Patch(':matchId/participants/:userId')
@Roles('admin', 'owner')
@UseGuards(RolesGuard)
public async updateParticipant(
@CurrentUser() currentUser: UserDocument,
@Param('communityId', ParseObjectIdPipe)
communityId: mongoose.Types.ObjectId,
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
@Body() body: UpdateParticipantDto,
) {
this.assertSameCommunity(currentUser, communityId);
const match = await this.matchService.updateParticipantPositions({
matchId,
communityId,
targetUserId: userId,
mainPosition: body.mainPosition,
subPosition: body.subPosition,
});
return this.matchService.serialize(match);
}
// 관리자 전용 — 참가자 강제 제외.
@Delete(':matchId/participants/:userId')
@Roles('admin', 'owner')
@UseGuards(RolesGuard)
@HttpCode(HttpStatus.NO_CONTENT)
public async removeParticipant(
@CurrentUser() currentUser: UserDocument,
@Param('communityId', ParseObjectIdPipe)
communityId: mongoose.Types.ObjectId,
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
) {
this.assertSameCommunity(currentUser, communityId);
await this.matchService.removeParticipant({
matchId,
communityId,
targetUserId: userId,
});
}
private resolveJoinerUserId( private resolveJoinerUserId(
currentUser: UserDocument | undefined, currentUser: UserDocument | undefined,
bodyUserId?: string, bodyUserId?: string,
@@ -13,6 +13,7 @@ import {
MatchDocument, MatchDocument,
MatchSeriesResult, MatchSeriesResult,
MatchStatus, MatchStatus,
Position,
PositionPreference, PositionPreference,
TierInfo, TierInfo,
} from '../global/database/schema'; } from '../global/database/schema';
@@ -54,6 +55,20 @@ interface CancelMatchJoinParams {
userId: mongoose.Types.ObjectId; userId: mongoose.Types.ObjectId;
} }
interface RemoveParticipantParams {
matchId: mongoose.Types.ObjectId;
communityId: mongoose.Types.ObjectId;
targetUserId: mongoose.Types.ObjectId;
}
interface UpdateParticipantPositionsParams {
matchId: mongoose.Types.ObjectId;
communityId: mongoose.Types.ObjectId;
targetUserId: mongoose.Types.ObjectId;
mainPosition: Position;
subPosition: Position;
}
@Injectable() @Injectable()
export class MatchService { export class MatchService {
constructor( constructor(
@@ -276,6 +291,86 @@ export class MatchService {
return match; return match;
} }
// 관리자 전용 — 특정 참가자를 강제로 제외한다.
public async removeParticipant(
params: RemoveParticipantParams,
): Promise<MatchDocument> {
const match = await this.loadRecruitingMatch(
params.matchId,
params.communityId,
);
const participantIndex = match.participants.findIndex((participant) =>
participant.userId.equals(params.targetUserId),
);
if (participantIndex === -1) {
throw new NotFoundException('Participant not found.');
}
match.participants.splice(participantIndex, 1);
await match.save();
return match;
}
// 관리자 전용 — 참가자의 주/부 포지션(선호 우선순위 1·2)을 교체한다.
public async updateParticipantPositions(
params: UpdateParticipantPositionsParams,
): Promise<MatchDocument> {
const match = await this.loadRecruitingMatch(
params.matchId,
params.communityId,
);
const participant = match.participants.find((entry) =>
entry.userId.equals(params.targetUserId),
);
if (!participant) {
throw new NotFoundException('Participant not found.');
}
participant.preferredPositions = this.reorderPreferredPositions(
params.mainPosition,
params.subPosition,
participant.preferredPositions,
);
match.markModified('participants');
await match.save();
return match;
}
private async loadRecruitingMatch(
matchId: mongoose.Types.ObjectId,
communityId: mongoose.Types.ObjectId,
): Promise<MatchDocument> {
const MatchModel = await this.connectionService.getModel('match');
const match = await MatchModel.findById(matchId);
if (!match) throw new NotFoundException('Match not found.');
if (!match.communityId.equals(communityId)) {
throw new BadRequestException('Different community.');
}
if (match.status !== 'recruiting') {
throw new BadRequestException('Match is not recruiting.');
}
return match;
}
// 주/부 포지션을 priority 1·2로 올리고 기존 나머지 선호는 뒤로 보존한다.
private reorderPreferredPositions(
mainPosition: Position,
subPosition: Position,
current: PositionPreference[],
): PositionPreference[] {
const ordered: Position[] = [mainPosition];
if (subPosition !== mainPosition) ordered.push(subPosition);
for (const preference of [...current].sort(
(left, right) => left.priority - right.priority,
)) {
if (!ordered.includes(preference.position)) {
ordered.push(preference.position);
}
}
return ordered.map((position, index) => ({
position,
priority: index + 1,
}));
}
private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined { private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined {
const tier = const tier =
tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0]; tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0];
@@ -0,0 +1,116 @@
import mongoose from 'mongoose';
import { ConnectionService } from '../global/database/connection.service';
import { GarnetService } from '../global/garnet/garnet.service';
import { LegacyImportService } from '../legacy-import/legacy-import.service';
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service';
import { TournamentResultService } from '../tournament-result/tournament-result.service';
import { RIOT_JOB_GROUP, RiotRefreshSubJob } from './riot-job-queue.types';
import { RiotJobQueueService } from './riot-job-queue.service';
import { RiotJobWorkerService } from './riot-job-worker.service';
import { RiotRefreshGateway } from './riot-refresh.gateway';
function execResult<T>(value: T) {
return { exec: jest.fn().mockResolvedValue(value) };
}
function makeWorker() {
const garnetService = {
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
} as unknown as jest.Mocked<GarnetService>;
const jobQueueService = {
markProcessing: jest.fn().mockResolvedValue(undefined),
markCompleted: jest.fn().mockResolvedValue({
parentJobId: 'parent-1',
jobId: 'job-1',
queueGroup: 'summoners-rift',
puuid: 'puuid-1',
state: 'completed',
}),
markFailed: jest.fn(),
} as unknown as jest.Mocked<RiotJobQueueService>;
const recentMatchesService = {
ensureFreshForQueue: jest.fn().mockResolvedValue(undefined),
} as unknown as jest.Mocked<RiotRecentMatchesService>;
const userModel = {
updateOne: jest.fn().mockReturnValue(execResult({ modifiedCount: 1 })),
};
const connectionService = {
getModel: jest.fn().mockResolvedValue(userModel),
} as unknown as jest.Mocked<ConnectionService>;
const refreshGateway = {
broadcastRefreshEvent: jest.fn(),
} as unknown as jest.Mocked<RiotRefreshGateway>;
const tournamentResultService = {
processPollJob: jest.fn(),
} as unknown as jest.Mocked<TournamentResultService>;
const legacyImportService = {
processMemberJob: jest.fn(),
} as unknown as jest.Mocked<LegacyImportService>;
const enrichmentService = {
refreshLeagueEntries: jest.fn().mockResolvedValue('updated'),
} as unknown as jest.Mocked<RiotAccountEnrichmentService>;
const worker = new RiotJobWorkerService(
garnetService,
jobQueueService,
recentMatchesService,
connectionService,
refreshGateway,
tournamentResultService,
legacyImportService,
enrichmentService,
);
return {
worker,
garnetService,
jobQueueService,
recentMatchesService,
connectionService,
refreshGateway,
enrichmentService,
};
}
describe('RiotJobWorkerService', () => {
it('refreshes league entries while processing user history refresh jobs', async () => {
const { worker, enrichmentService, recentMatchesService, garnetService } =
makeWorker();
const userId = new mongoose.Types.ObjectId().toString();
const job: RiotRefreshSubJob = {
jobId: 'job-1',
parentJobId: 'parent-1',
userId,
puuid: 'puuid-1',
region: 'asia',
platform: 'kr',
queueGroup: 'summoners-rift',
queueIds: [420, 430],
requestedAt: Date.now(),
priority: 'high',
};
await (worker as unknown as {
processEntry: (
stream: string,
entry: { id: string; message: Record<string, string> },
) => Promise<void>;
}).processEntry('riot:queue:high', {
id: '1-0',
message: { job: JSON.stringify(job) },
});
expect(recentMatchesService.ensureFreshForQueue).toHaveBeenCalledTimes(2);
expect(enrichmentService.refreshLeagueEntries).toHaveBeenCalledWith({
userId: expect.any(mongoose.Types.ObjectId),
puuid: 'puuid-1',
platform: 'kr',
});
expect(garnetService.acknowledgeStream).toHaveBeenCalledWith(
'riot:queue:high',
RIOT_JOB_GROUP,
'1-0',
);
});
});
@@ -9,7 +9,10 @@ import { ConnectionService } from '../global/database/connection.service';
import { GarnetService, StreamEntry } from '../global/garnet/garnet.service'; import { GarnetService, StreamEntry } from '../global/garnet/garnet.service';
import { LegacyImportService } from '../legacy-import/legacy-import.service'; import { LegacyImportService } from '../legacy-import/legacy-import.service';
import type { LegacyImportMemberJob } from '../legacy-import/legacy-import.types'; import type { LegacyImportMemberJob } from '../legacy-import/legacy-import.types';
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service'; import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service';
import { TournamentResultService } from '../tournament-result/tournament-result.service';
import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types';
import { import {
RIOT_JOB_GROUP, RIOT_JOB_GROUP,
RIOT_JOB_HIGH_STREAM, RIOT_JOB_HIGH_STREAM,
@@ -19,8 +22,6 @@ import {
} from './riot-job-queue.types'; } from './riot-job-queue.types';
import { RiotJobQueueService } from './riot-job-queue.service'; import { RiotJobQueueService } from './riot-job-queue.service';
import { RiotRefreshGateway } from './riot-refresh.gateway'; import { RiotRefreshGateway } from './riot-refresh.gateway';
import { TournamentResultService } from '../tournament-result/tournament-result.service';
import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types';
const LEADER_KEY = 'riot:worker:leader'; const LEADER_KEY = 'riot:worker:leader';
const LEADER_TTL_SECONDS = 60; const LEADER_TTL_SECONDS = 60;
@@ -39,6 +40,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
private readonly refreshGateway: RiotRefreshGateway, private readonly refreshGateway: RiotRefreshGateway,
private readonly tournamentResultService: TournamentResultService, private readonly tournamentResultService: TournamentResultService,
private readonly legacyImportService: LegacyImportService, private readonly legacyImportService: LegacyImportService,
private readonly enrichmentService: RiotAccountEnrichmentService,
) {} ) {}
public async onModuleInit() { public async onModuleInit() {
@@ -102,6 +104,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
queueId, queueId,
}); });
} }
await this.refreshLeagueEntries(job);
await this.markUserFetchedAt(job); await this.markUserFetchedAt(job);
const event = await this.jobQueueService.markCompleted(job); const event = await this.jobQueueService.markCompleted(job);
this.refreshGateway.broadcastRefreshEvent(event); this.refreshGateway.broadcastRefreshEvent(event);
@@ -135,6 +138,26 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
} }
} }
private async refreshLeagueEntries(job: RiotRefreshSubJob): Promise<void> {
try {
const result = await this.enrichmentService.refreshLeagueEntries({
userId: new mongoose.Types.ObjectId(job.userId),
puuid: job.puuid,
platform: job.platform,
});
if (result !== 'failed') return;
this.logger.warn(
`Riot league refresh failed ${job.jobId}: puuid=${job.puuid}`,
);
} catch (error) {
this.logger.warn(
`Riot league refresh failed ${job.jobId}: ${
error instanceof Error ? error.message : error
}`,
);
}
}
private async markUserFetchedAt(job: RiotRefreshSubJob): Promise<void> { private async markUserFetchedAt(job: RiotRefreshSubJob): Promise<void> {
const UserModel = await this.connectionService.getModel('user'); const UserModel = await this.connectionService.getModel('user');
const now = new Date(); const now = new Date();
@@ -370,6 +370,73 @@ describe('RiotAccountEnrichmentService', () => {
expect(user.save).not.toHaveBeenCalled(); expect(user.save).not.toHaveBeenCalled();
}); });
it('refreshes league entries without refreshing recent matches', async () => {
const recent = new Date(Date.now() - 60_000);
const account = makeAccount({
revisionDate: Date.now() - 60_000,
tiers: [
{
leagueId: 'L1',
queueType: 'RANKED_SOLO_5x5',
tier: 'GOLD',
rank: 'II',
puuid: 'puuid-1',
leaguePoints: 1,
wins: 1,
losses: 1,
fetchedAt: recent,
},
],
recentStatsFetchedAt: recent,
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
});
const user = makeUser(account);
const { service, leagueService, recentMatchesService } = makeService({
user,
league: {
getEntriesByPuuid: jest.fn().mockResolvedValue([
{
leagueId: 'L2',
queueType: 'RANKED_SOLO_5x5',
tier: 'PLATINUM',
rank: 'IV',
puuid: 'puuid-1',
leaguePoints: 20,
wins: 10,
losses: 8,
},
]),
} as Partial<RiotLeagueService>,
});
const result = await service.refreshLeagueEntries({
userId: user._id,
puuid: 'puuid-1',
platform: 'kr',
});
expect(result).toBe('updated');
expect(leagueService.getEntriesByPuuid).toHaveBeenCalledWith('puuid-1', {
platform: 'kr',
});
expect(recentMatchesService.syncRecentMatches).not.toHaveBeenCalled();
expect(account.tiers).toHaveLength(1);
expect(account.tiers[0]).toMatchObject({
leagueId: 'L2',
queueType: 'RANKED_SOLO_5x5',
tier: 'PLATINUM',
rank: 'IV',
leaguePoints: 20,
});
expect(account.tierHistory.at(-1)).toMatchObject({
queueType: 'RANKED_SOLO_5x5',
tier: 'PLATINUM',
rank: 'IV',
leaguePoints: 20,
});
expect(user.save).toHaveBeenCalledTimes(1);
});
it('records failed for individual failing fetches but updates the rest', async () => { it('records failed for individual failing fetches but updates the rest', async () => {
const account = makeAccount(); const account = makeAccount();
const user = makeUser(account); const user = makeUser(account);
@@ -52,6 +52,8 @@ export interface EnrichResult {
account: RiotAccount | null; account: RiotAccount | null;
} }
export type RefreshLeagueEntriesResult = 'updated' | 'failed';
@Injectable() @Injectable()
export class RiotAccountEnrichmentService { export class RiotAccountEnrichmentService {
private readonly logger = new Logger(RiotAccountEnrichmentService.name); private readonly logger = new Logger(RiotAccountEnrichmentService.name);
@@ -95,6 +97,29 @@ export class RiotAccountEnrichmentService {
return promise; return promise;
} }
public async refreshLeagueEntries(params: {
userId: mongoose.Types.ObjectId;
puuid: string;
platform?: RiotPlatformRoute;
}): Promise<RefreshLeagueEntriesResult> {
const UserModel = await this.connectionService.getModel('user');
const user = await UserModel.findById(params.userId).exec();
if (!user) return 'failed';
const account = user.riotAccounts.find((a) => a.puuid === params.puuid);
if (!account) return 'failed';
const outcome = await this.fetchLeagueSafe(
params.puuid,
params.platform ?? DEFAULT_PLATFORM,
);
if (outcome.status !== 'updated' || !outcome.dto) return 'failed';
this.applyLeagueEntries(account, outcome.dto);
await user.save();
return 'updated';
}
private async doEnrichRiotAccount(params: { private async doEnrichRiotAccount(params: {
userId: mongoose.Types.ObjectId; userId: mongoose.Types.ObjectId;
puuid: string; puuid: string;
+2
View File
@@ -5,6 +5,8 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"start:dev": "vite --mode development",
"start:staging": "vite --mode staging",
"build": "tsc -b && vite build", "build": "tsc -b && vite build",
"build:staging": "tsc -b && vite build --mode staging", "build:staging": "tsc -b && vite build --mode staging",
"build:prod": "tsc -b && vite build --mode production", "build:prod": "tsc -b && vite build --mode production",
+9
View File
@@ -272,6 +272,14 @@ export interface ApiAuctionBid {
timestamp: string; timestamp: string;
} }
export interface ApiAuctionChatMessage {
id: string;
userId?: string;
displayName: string;
message: string;
sentAt: string;
}
export interface ApiAuction { export interface ApiAuction {
_id: string; _id: string;
matchId: string; matchId: string;
@@ -290,6 +298,7 @@ export interface ApiAuction {
initialPoints: number; initialPoints: number;
topTierThreshold: AuctionTopTierThreshold; topTierThreshold: AuctionTopTierThreshold;
manualTopTierUserIds: string[]; manualTopTierUserIds: string[];
chatMessages?: ApiAuctionChatMessage[];
startedAt?: string; startedAt?: string;
completedAt?: string; completedAt?: string;
createdAt: string; createdAt: string;
+49 -5
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 } from './types'; import type { ApiAuction, ApiAuctionChatMessage, Position } from './types';
type ConnectionStatus = type ConnectionStatus =
| 'idle' | 'idle'
@@ -17,18 +17,42 @@ interface BidPayload {
bidderUserId?: string; bidderUserId?: string;
} }
interface ChatMessagePayload {
displayName?: string;
message: string;
}
interface ChatHistoryPayload {
messages?: ApiAuctionChatMessage[];
}
const MAX_CHAT_MESSAGES = 200;
function mergeChatMessages(
current: ApiAuctionChatMessage[],
incoming: ApiAuctionChatMessage[],
) {
const byId = new Map(current.map((message) => [message.id, message]));
for (const message of incoming) {
byId.set(message.id, message);
}
return [...byId.values()]
.sort((left, right) => Date.parse(left.sentAt) - Date.parse(right.sentAt))
.slice(-MAX_CHAT_MESSAGES);
}
export function useAuctionSocket(matchId: string | undefined) { export function useAuctionSocket(matchId: string | undefined) {
const authUserId = useAuthUserId(); const authUserId = useAuthUserId();
const socketRef = useRef<Socket | null>(null); const socketRef = useRef<Socket | null>(null);
const [auction, setAuction] = useState<ApiAuction | null>(null); const [auction, setAuction] = useState<ApiAuction | null>(null);
const [chatMessages, setChatMessages] = useState<ApiAuctionChatMessage[]>([]);
const [connectionStatus, setConnectionStatus] = const [connectionStatus, setConnectionStatus] =
useState<ConnectionStatus>('idle'); useState<ConnectionStatus>('idle');
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
useEffect(() => { useEffect(() => {
if (!matchId) { if (!matchId) {
setAuction(null);
setConnectionStatus('idle');
return; return;
} }
@@ -65,9 +89,20 @@ export function useAuctionSocket(matchId: string | undefined) {
socket.on('state', (nextAuction: ApiAuction) => { socket.on('state', (nextAuction: ApiAuction) => {
setAuction(nextAuction); setAuction(nextAuction);
if (nextAuction.chatMessages) {
setChatMessages(mergeChatMessages([], nextAuction.chatMessages));
}
setError(null); setError(null);
}); });
socket.on('chat-history', (payload: ChatHistoryPayload) => {
setChatMessages(mergeChatMessages([], payload.messages ?? []));
});
socket.on('chat-message', (message: ApiAuctionChatMessage) => {
setChatMessages((current) => mergeChatMessages(current, [message]));
});
socket.on('error', (payload: { message?: string }) => { socket.on('error', (payload: { message?: string }) => {
setConnectionStatus('error'); setConnectionStatus('error');
setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.'); setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.');
@@ -101,9 +136,15 @@ export function useAuctionSocket(matchId: string | undefined) {
socket.emit(eventName, payload); socket.emit(eventName, payload);
} }
const visibleAuction = auction?.matchId === matchId ? auction : null;
const visibleConnectionStatus: ConnectionStatus = matchId
? connectionStatus
: 'idle';
return { return {
auction, auction: visibleAuction,
connectionStatus, chatMessages: visibleAuction ? chatMessages : [],
connectionStatus: visibleConnectionStatus,
error, error,
placeBid(payload: BidPayload) { placeBid(payload: BidPayload) {
emit('bid', payload); emit('bid', payload);
@@ -117,5 +158,8 @@ export function useAuctionSocket(matchId: string | undefined) {
next() { next() {
emit('next', {}); emit('next', {});
}, },
sendChatMessage(payload: ChatMessagePayload) {
emit('chat-message', payload);
},
}; };
} }
+159 -14
View File
@@ -1,5 +1,13 @@
import { useEffect, useMemo, useRef, useState } from 'react'; import {
useEffect,
useMemo,
useRef,
useState,
type FormEvent,
type KeyboardEvent,
} from 'react';
import { useQueryClient } from '@tanstack/react-query'; import { useQueryClient } from '@tanstack/react-query';
import { SendHorizontal } from 'lucide-react';
import { Link, useLocation, useParams } from 'react-router'; import { Link, useLocation, useParams } from 'react-router';
import { import {
useAuction, useAuction,
@@ -34,8 +42,10 @@ import {
} from '../lib/league'; } from '../lib/league';
import type { import type {
ApiAuction, ApiAuction,
ApiAuctionChatMessage,
ApiRiotLaneStats, ApiRiotLaneStats,
ApiTierInfo, ApiTierInfo,
ApiUser,
Position, Position,
} from '../api/types'; } from '../api/types';
@@ -73,6 +83,31 @@ function relativeTime(dateLike: string) {
return `${Math.floor(hours / 24)}일 전`; return `${Math.floor(hours / 24)}일 전`;
} }
function formatChatTime(dateLike: string) {
return new Intl.DateTimeFormat('ko-KR', {
hour: '2-digit',
minute: '2-digit',
}).format(new Date(dateLike));
}
function resolveChatSenderLabel(
currentUser: ApiUser | null,
captainRole: CaptainRole | null,
) {
const primaryRiotAccount =
currentUser?.riotAccounts.find((entry) => entry.isPrimary) ??
currentUser?.riotAccounts[0];
if (primaryRiotAccount?.gameName) {
return primaryRiotAccount.tagLine
? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}`
: primaryRiotAccount.gameName;
}
if (currentUser?.kakaoTalkNickname) return currentUser.kakaoTalkNickname;
if (currentUser?.discordNickname) return currentUser.discordNickname;
if (captainRole) return `${teamIndexLabel(captainRole.teamIndex)} 팀장`;
return '관전자';
}
function normalizeRank(rank: string | undefined) { function normalizeRank(rank: string | undefined) {
switch (rank) { switch (rank) {
case 'I': case 'I':
@@ -738,6 +773,7 @@ export default function AuctionPage() {
: { : {
teamIndex: captainTeamIndex, teamIndex: captainTeamIndex,
}; };
const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole);
useEffect(() => { useEffect(() => {
if (auctionState?.currentPlayer) { if (auctionState?.currentPlayer) {
@@ -1073,9 +1109,35 @@ export default function AuctionPage() {
</div> </div>
<aside className="hidden xl:block"> <aside className="hidden xl:block">
<ChatPanel /> <ChatPanel
messages={socket.chatMessages}
connectionStatus={socket.connectionStatus}
senderLabel={chatSenderLabel}
onSend={(message) =>
socket.sendChatMessage({
displayName: chatSenderLabel,
message,
})
}
className="sticky top-4 h-[520px] max-h-[calc(100vh-2rem)]"
/>
</aside> </aside>
</div> </div>
<div className="mt-4 xl:hidden">
<ChatPanel
messages={socket.chatMessages}
connectionStatus={socket.connectionStatus}
senderLabel={chatSenderLabel}
onSend={(message) =>
socket.sendChatMessage({
displayName: chatSenderLabel,
message,
})
}
className="h-[420px]"
/>
</div>
</main> </main>
); );
} }
@@ -1231,37 +1293,120 @@ function PoolListItem({
); );
} }
function ChatPanel() { function ChatPanel({
messages,
connectionStatus,
senderLabel,
onSend,
className = '',
}: {
messages: ApiAuctionChatMessage[];
connectionStatus: ReturnType<typeof useAuctionSocket>['connectionStatus'];
senderLabel: string;
onSend: (message: string) => void;
className?: string;
}) {
const [draft, setDraft] = useState('');
const messagesEndRef = useRef<HTMLDivElement | null>(null);
const trimmedDraft = draft.trim();
const isConnected = connectionStatus === 'connected';
const canSend = isConnected && trimmedDraft.length > 0;
useEffect(() => {
messagesEndRef.current?.scrollIntoView({ block: 'end' });
}, [messages.length]);
function handleSubmit(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
if (!canSend) return;
onSend(trimmedDraft);
setDraft('');
}
function handleKeyDown(event: KeyboardEvent<HTMLTextAreaElement>) {
if (event.key !== 'Enter' || event.shiftKey) return;
event.preventDefault();
if (!canSend) return;
onSend(trimmedDraft);
setDraft('');
}
const statusLabel =
connectionStatus === 'connected'
? '실시간'
: connectionStatus === 'connecting'
? '연결 중'
: '오프라인';
return ( return (
<div className="border border-base-content/10 bg-base-100 sticky top-4 h-[calc(100vh-2rem)] flex flex-col"> <div
className={`border border-base-content/10 bg-base-100 flex min-h-0 flex-col ${className}`}
>
<div className="border-b border-base-content/10 px-3 py-2.5 flex items-center justify-between"> <div className="border-b border-base-content/10 px-3 py-2.5 flex items-center justify-between">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35"> <div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
채팅 채팅
</div> </div>
<span className="text-[10px] text-base-content/30"> <span
곧 활성화됩니다 className={`text-[10px] ${
isConnected ? 'text-green-500' : 'text-base-content/30'
}`}
>
{statusLabel}
</span> </span>
</div> </div>
<div className="flex-1 overflow-y-auto px-3 py-8 text-center text-[11px] text-base-content/25"> <div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
{messages.length === 0 ? (
<div className="flex h-full items-center justify-center text-center text-[11px] text-base-content/25">
아직 메시지가 없습니다 아직 메시지가 없습니다
</div> </div>
) : (
<ol className="space-y-3">
{messages.map((message) => (
<li key={message.id} className="space-y-1">
<div className="flex items-center justify-between gap-2">
<span className="min-w-0 truncate text-[11px] font-bold text-base-content/70">
{message.displayName}
</span>
<time className="shrink-0 text-[10px] tabular-nums text-base-content/25">
{formatChatTime(message.sentAt)}
</time>
</div>
<p className="whitespace-pre-wrap break-words border border-base-content/8 bg-base-content/[0.03] px-2.5 py-2 text-[12px] leading-relaxed text-base-content/75">
{message.message}
</p>
</li>
))}
</ol>
)}
<div ref={messagesEndRef} />
</div>
<div className="border-t border-base-content/10 p-2 space-y-2"> <form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">
<div className="flex items-center justify-between gap-2 px-0.5 text-[10px] text-base-content/30">
<span className="truncate">{senderLabel}</span>
<span className="tabular-nums">{draft.length}/300</span>
</div>
<textarea <textarea
disabled value={draft}
onChange={(event) => setDraft(event.target.value)}
onKeyDown={handleKeyDown}
disabled={!isConnected}
maxLength={300}
placeholder="메시지를 입력하세요" placeholder="메시지를 입력하세요"
className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-[12px] text-base-content/40 placeholder:text-base-content/25 focus:outline-none" className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-[12px] text-base-content/80 placeholder:text-base-content/25 focus:border-primary/40 focus:outline-none disabled:cursor-not-allowed disabled:text-base-content/30"
rows={2} rows={2}
aria-label="경매 채팅 메시지"
/> />
<button <button
type="button" type="submit"
disabled disabled={!canSend}
className="btn btn-primary btn-sm w-full text-[11px] opacity-50" className="btn btn-primary btn-sm w-full text-[11px]"
> >
<SendHorizontal className="h-3.5 w-3.5" aria-hidden="true" />
전송 전송
</button> </button>
</div> </form>
</div> </div>
); );
} }
+11 -2
View File
@@ -3,6 +3,9 @@ import { mapApiMatchToMatchDetail } from '../api/mappers';
import { useMatches, useMe } from '../api/hooks'; import { useMatches, useMe } from '../api/hooks';
import { DEFAULT_COMMUNITY_ID } from '../config'; import { DEFAULT_COMMUNITY_ID } from '../config';
const UPCOMING_GRID_MATCH_LIMIT = 3;
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
function StatusBadge({ status }: { status: string }) { function StatusBadge({ status }: { status: string }) {
const styles: Record<string, string> = { const styles: Record<string, string> = {
모집중: 'bg-green-500/15 text-green-500 border-green-500/20', 모집중: 'bg-green-500/15 text-green-500 border-green-500/20',
@@ -44,7 +47,10 @@ function getStatusLabel(status: string) {
} }
export default function HomePage() { export default function HomePage() {
const upcomingMatchesQuery = useMatches({ limit: 20 }, DEFAULT_COMMUNITY_ID); const upcomingMatchesQuery = useMatches(
{ limit: UPCOMING_MATCH_LIST_LIMIT },
DEFAULT_COMMUNITY_ID,
);
const finishedMatchesQuery = useMatches( const finishedMatchesQuery = useMatches(
{ status: 'finished', limit: 10 }, { status: 'finished', limit: 10 },
DEFAULT_COMMUNITY_ID, DEFAULT_COMMUNITY_ID,
@@ -84,7 +90,10 @@ export default function HomePage() {
const finishedMatches = const finishedMatches =
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? []; finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
const nextMatch = upcomingMatches[0]; const nextMatch = upcomingMatches[0];
const upcomingCards = nextMatch ? upcomingMatches.slice(1) : upcomingMatches; const upcomingCards = (nextMatch
? upcomingMatches.slice(1)
: upcomingMatches
).slice(0, UPCOMING_GRID_MATCH_LIMIT);
const currentUser = const currentUser =
meQuery.data?.memberships.find( meQuery.data?.memberships.find(
(membership) => membership.community?._id === DEFAULT_COMMUNITY_ID, (membership) => membership.community?._id === DEFAULT_COMMUNITY_ID,
+479 -2
View File
@@ -24,6 +24,7 @@ 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 { import {
POSITION_ORDER,
positionIcon, positionIcon,
positionLabel, positionLabel,
sideShortLabel, sideShortLabel,
@@ -32,7 +33,9 @@ import {
} from "../lib/league"; } from "../lib/league";
import type { import type {
AuctionTopTierThreshold, AuctionTopTierThreshold,
ApiMatch,
ApiMatchParticipant, ApiMatchParticipant,
ApiPositionPreference,
ApiTierInfo, ApiTierInfo,
ManualTournamentResultCollectResponse, ManualTournamentResultCollectResponse,
Position, Position,
@@ -52,11 +55,62 @@ type CaptainSelection = {
const DEFAULT_AUCTION_MAX_TIMER_SECONDS = 30; const DEFAULT_AUCTION_MAX_TIMER_SECONDS = 30;
const DEFAULT_AUCTION_BID_EXTENSION_SECONDS = 5; const DEFAULT_AUCTION_BID_EXTENSION_SECONDS = 5;
const MAX_AUCTION_TIMER_SECONDS = 3600; const MAX_AUCTION_TIMER_SECONDS = 3600;
const ALL_PARTICIPANT_FILTER = "all";
type ParticipantPositionFilter = Position | typeof ALL_PARTICIPANT_FILTER;
type ParticipantTierFilter = string | typeof ALL_PARTICIPANT_FILTER;
const PARTICIPANT_TIER_FILTERS = [
"CHALLENGER",
"GRANDMASTER",
"MASTER",
"DIAMOND",
"EMERALD",
"PLATINUM",
"GOLD",
"SILVER",
"BRONZE",
"IRON",
"UNRANKED",
] as const;
const PARTICIPANT_TIER_LABELS: Record<string, string> = {
CHALLENGER: "챌린저",
GRANDMASTER: "그랜드마스터",
MASTER: "마스터",
DIAMOND: "다이아몬드",
EMERALD: "에메랄드",
PLATINUM: "플래티넘",
GOLD: "골드",
SILVER: "실버",
BRONZE: "브론즈",
IRON: "아이언",
UNRANKED: "언랭크",
};
function captainSlotKey(slot: CaptainSelectionSlot) { function captainSlotKey(slot: CaptainSelectionSlot) {
return String(slot.teamIndex); return String(slot.teamIndex);
} }
// 백엔드 reorderPreferredPositions와 동일 규칙. 낙관적 업데이트에서
// 캐시된 preferredPositions를 즉시 갱신하는 데 사용한다.
function reorderPreferredPositions(
mainPosition: Position,
subPosition: Position,
current: ApiPositionPreference[],
): ApiPositionPreference[] {
const ordered: Position[] = [mainPosition];
if (subPosition !== mainPosition) ordered.push(subPosition);
for (const preference of [...current].sort(
(left, right) => left.priority - right.priority,
)) {
if (!ordered.includes(preference.position)) {
ordered.push(preference.position);
}
}
return ordered.map((position, index) => ({ position, priority: index + 1 }));
}
function parseInitialPointsInput(value: string) { function parseInitialPointsInput(value: string) {
if (!value.trim()) return null; if (!value.trim()) return null;
const points = Number(value); const points = Number(value);
@@ -270,18 +324,94 @@ function statusBadge(status: MatchDetailView["status"]) {
} }
} }
function participantTierFilterValue(participant: ParticipantView) {
return participant.tier?.tier ?? "UNRANKED";
}
// PARTICIPANT_TIER_FILTERS는 높은 티어 → 낮은 티어 순서이므로
// 인덱스가 작을수록 상위 티어. (없는 값은 최하위로 취급)
function tierRank(tier: string) {
const index = PARTICIPANT_TIER_FILTERS.indexOf(
tier as (typeof PARTICIPANT_TIER_FILTERS)[number],
);
return index === -1 ? PARTICIPANT_TIER_FILTERS.length : index;
}
type ParticipantRowAdmin = {
onRemove: (userId: string) => void;
onChangePositions: (
userId: string,
mainPosition: Position,
subPosition: Position,
) => void;
isRemoving: boolean;
isUpdating: boolean;
};
function PositionSelect({
value,
sub,
disabled,
onChange,
}: {
value: Position;
sub?: boolean;
disabled?: boolean;
onChange: (next: Position) => void;
}) {
return (
<select
value={value}
disabled={disabled}
onChange={(event) => onChange(event.target.value as Position)}
className={`h-7 border bg-base-100 pl-1.5 pr-1 text-[11px] font-medium focus:border-primary/30 focus:outline-none disabled:opacity-50 ${
sub
? "border-base-content/10 text-base-content/45"
: "border-primary/20 text-primary"
}`}
>
{POSITION_ORDER.map((position) => (
<option key={position} value={position}>
{positionLabel[position]}
</option>
))}
</select>
);
}
function ParticipantRow({ function ParticipantRow({
participant, participant,
index, index,
assignedPos, assignedPos,
admin,
}: { }: {
participant: ParticipantView; participant: ParticipantView;
index: number; index: number;
assignedPos?: Position; assignedPos?: Position;
admin?: ParticipantRowAdmin;
}) { }) {
const { data: ddragon } = useDdragonManifest(); const { data: ddragon } = useDdragonManifest();
const location = useLocation(); const location = useLocation();
const historyBackTo = `${location.pathname}${location.search}${location.hash}`; const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
const [confirmingRemove, setConfirmingRemove] = useState(false);
// 주/부 포지션이 겹치면 두 값을 맞바꿔 항상 서로 다르게 유지한다.
const handleMainChange = (next: Position) => {
if (!admin) return;
const sub =
next === participant.subPosition
? participant.mainPosition
: participant.subPosition;
admin.onChangePositions(participant.userId, next, sub);
};
const handleSubChange = (next: Position) => {
if (!admin) return;
const main =
next === participant.mainPosition
? participant.subPosition
: participant.mainPosition;
admin.onChangePositions(participant.userId, main, next);
};
return ( return (
<tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"> <tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors">
@@ -324,6 +454,68 @@ function ParticipantRow({
<td className="py-2 px-3"> <td className="py-2 px-3">
<PosBadge pos={assignedPos} /> <PosBadge pos={assignedPos} />
</td> </td>
) : admin ? (
<>
<td className="py-2 px-3">
<PositionSelect
value={participant.mainPosition}
disabled={admin.isUpdating}
onChange={handleMainChange}
/>
</td>
<td className="py-2 px-3">
<PositionSelect
value={participant.subPosition}
sub
disabled={admin.isUpdating}
onChange={handleSubChange}
/>
</td>
<td className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
{confirmingRemove ? (
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
<button
type="button"
disabled={admin.isRemoving}
onClick={() => admin.onRemove(participant.userId)}
className="text-[10px] font-bold text-red-400 hover:text-red-300 disabled:opacity-50"
>
{admin.isRemoving ? "제외 중..." : "확인"}
</button>
<button
type="button"
onClick={() => setConfirmingRemove(false)}
className="text-[10px] text-base-content/35 hover:text-base-content/60"
>
취소
</button>
</span>
) : (
<button
type="button"
title="참가자 제외"
aria-label="참가자 제외"
onClick={() => setConfirmingRemove(true)}
className="text-base-content/25 hover:text-red-400 transition-colors"
>
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-3.5 w-3.5"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M6 18L18 6M6 6l12 12"
/>
</svg>
</button>
)}
</td>
</>
) : ( ) : (
<> <>
<td className="py-2 px-3"> <td className="py-2 px-3">
@@ -345,6 +537,11 @@ function ParticipantTable({
canJoin, canJoin,
onJoin, onJoin,
isJoining, isJoining,
canManage,
onRemoveParticipant,
onUpdatePositions,
removingUserId,
updatingUserId,
}: { }: {
participants: ParticipantView[]; participants: ParticipantView[];
maxParticipants: number; maxParticipants: number;
@@ -352,7 +549,65 @@ function ParticipantTable({
canJoin: boolean; canJoin: boolean;
onJoin: () => void; onJoin: () => void;
isJoining: boolean; isJoining: boolean;
canManage: boolean;
onRemoveParticipant: (userId: string) => void;
onUpdatePositions: (
userId: string,
mainPosition: Position,
subPosition: Position,
) => void;
removingUserId: string | null;
updatingUserId: string | null;
}) { }) {
const [positionFilter, setPositionFilter] =
useState<ParticipantPositionFilter>(ALL_PARTICIPANT_FILTER);
const [tierFilter, setTierFilter] = useState<ParticipantTierFilter>(
ALL_PARTICIPANT_FILTER,
);
const filteredParticipants = participants.filter((participant) => {
const matchesPosition =
positionFilter === ALL_PARTICIPANT_FILTER ||
participant.mainPosition === positionFilter;
const matchesTier =
tierFilter === ALL_PARTICIPANT_FILTER ||
tierRank(participantTierFilterValue(participant)) <= tierRank(tierFilter);
return matchesPosition && matchesTier;
});
const isFiltered =
positionFilter !== ALL_PARTICIPANT_FILTER ||
tierFilter !== ALL_PARTICIPANT_FILTER;
const positionFilteredParticipants = participants.filter(
(participant) =>
positionFilter === ALL_PARTICIPANT_FILTER ||
participant.mainPosition === positionFilter,
);
// "이상" 임계값으로 쓸 수 있는 티어 = 참가자 중 실제 존재하는 티어.
// 언랭크는 "이상" 기준으로 전체와 동일하므로 임계값 후보에서 제외한다.
const presentTiers = new Set(
positionFilteredParticipants.map(participantTierFilterValue),
);
const availableTiers = PARTICIPANT_TIER_FILTERS.filter(
(tier) => tier !== "UNRANKED" && presentTiers.has(tier),
);
const tierAtOrAboveCounts = new Map<string, number>(
availableTiers.map((tier) => [
tier,
positionFilteredParticipants.filter(
(participant) =>
tierRank(participantTierFilterValue(participant)) <= tierRank(tier),
).length,
]),
);
const positionCounts = new Map<Position, number>(
POSITION_ORDER.map((position) => [
position,
participants.filter(
(participant) => participant.mainPosition === position,
).length,
]),
);
return ( return (
<div className="border border-base-content/10 bg-base-100 overflow-hidden"> <div className="border border-base-content/10 bg-base-100 overflow-hidden">
<div className="px-4 py-2.5 border-b border-base-content/10 bg-base-200/40 flex items-center justify-between gap-3"> <div className="px-4 py-2.5 border-b border-base-content/10 bg-base-200/40 flex items-center justify-between gap-3">
@@ -368,6 +623,86 @@ function ParticipantTable({
{joined ? "참가 완료" : isJoining ? "신청 중..." : "참가 신청"} {joined ? "참가 완료" : isJoining ? "신청 중..." : "참가 신청"}
</button> </button>
</div> </div>
<div className="border-b border-base-content/10 bg-base-100 px-4 py-2.5">
<div className="flex flex-wrap items-center gap-x-3 gap-y-2">
<div className="inline-flex items-center gap-1">
<button
type="button"
onClick={() => setPositionFilter(ALL_PARTICIPANT_FILTER)}
className={`inline-flex h-8 items-center px-2.5 text-[11px] font-semibold border transition-colors ${
positionFilter === ALL_PARTICIPANT_FILTER
? "border-primary/30 bg-primary/5 text-primary"
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
}`}
>
전체 ({participants.length})
</button>
{POSITION_ORDER.map((position) => {
const active = positionFilter === position;
const count = positionCounts.get(position) ?? 0;
return (
<button
key={position}
type="button"
title={`${positionLabel[position]} (${count}명)`}
aria-label={`${positionLabel[position]} (${count}명)`}
aria-pressed={active}
onClick={() =>
setPositionFilter(
active ? ALL_PARTICIPANT_FILTER : position,
)
}
className={`inline-flex h-8 items-center gap-1 px-2 text-[11px] font-semibold border transition-colors ${
active
? "border-primary/30 bg-primary/5 text-primary"
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
}`}
>
<img
src={positionIcon[position]}
alt=""
className="h-3.5 w-3.5 object-contain"
/>
<span className="hidden sm:inline">
{positionLabel[position]}
</span>
<span className="tabular-nums">({count})</span>
</button>
);
})}
</div>
<select
className="h-8 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
value={tierFilter}
onChange={(event) => setTierFilter(event.target.value)}
>
<option value={ALL_PARTICIPANT_FILTER}>티어 전체</option>
{availableTiers.map((tier) => (
<option key={tier} value={tier}>
{PARTICIPANT_TIER_LABELS[tier]} 이상 (
{tierAtOrAboveCounts.get(tier)})
</option>
))}
</select>
<div className="ml-auto flex items-center gap-2 text-[11px] text-base-content/35">
<span>
{filteredParticipants.length}/{participants.length}명
</span>
{isFiltered && (
<button
type="button"
className="btn btn-ghost btn-xs h-8 min-h-8 px-2 text-[11px] text-base-content/40"
onClick={() => {
setPositionFilter(ALL_PARTICIPANT_FILTER);
setTierFilter(ALL_PARTICIPANT_FILTER);
}}
>
초기화
</button>
)}
</div>
</div>
</div>
<div className="overflow-x-auto"> <div className="overflow-x-auto">
<table className="w-full text-left"> <table className="w-full text-left">
<thead> <thead>
@@ -377,16 +712,42 @@ function ParticipantTable({
<th className="py-2 px-3">현재 티어</th> <th className="py-2 px-3">현재 티어</th>
<th className="py-2 px-3">주 포지션</th> <th className="py-2 px-3">주 포지션</th>
<th className="py-2 px-3">부 포지션</th> <th className="py-2 px-3">부 포지션</th>
{canManage && (
<th className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
관리
</th>
)}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{participants.map((participant, index) => ( {filteredParticipants.length > 0 ? (
filteredParticipants.map((participant, index) => (
<ParticipantRow <ParticipantRow
key={participant.id} key={participant.id}
participant={participant} participant={participant}
index={index} index={index}
admin={
canManage
? {
onRemove: onRemoveParticipant,
onChangePositions: onUpdatePositions,
isRemoving: removingUserId === participant.userId,
isUpdating: updatingUserId === participant.userId,
}
: undefined
}
/> />
))} ))
) : (
<tr>
<td
colSpan={canManage ? 6 : 5}
className="px-3 py-8 text-center text-sm text-base-content/35"
>
조건에 맞는 참가자가 없습니다.
</td>
</tr>
)}
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -1065,6 +1426,89 @@ export default function MatchDetailPage() {
}, },
}); });
const matchQueryKey = ["match", DEFAULT_COMMUNITY_ID, id ?? null];
const removeParticipantMutation = useMutation({
mutationFn: (userId: string) =>
apiFetch(
`/communities/${DEFAULT_COMMUNITY_ID}/matches/${id}/participants/${userId}`,
{ method: "DELETE" },
),
onMutate: async (userId: string) => {
await queryClient.cancelQueries({ queryKey: matchQueryKey });
const previous = queryClient.getQueryData<ApiMatch>(matchQueryKey);
if (previous) {
queryClient.setQueryData<ApiMatch>(matchQueryKey, {
...previous,
participants: previous.participants.filter(
(participant) => participant.userId !== userId,
),
});
}
return { previous };
},
onError: (_error, _userId, context) => {
if (context?.previous) {
queryClient.setQueryData(matchQueryKey, context.previous);
}
},
onSettled: () => {
void queryClient.invalidateQueries({ queryKey: matchQueryKey });
void queryClient.invalidateQueries({
queryKey: ["matches", DEFAULT_COMMUNITY_ID],
});
},
});
const updateParticipantMutation = useMutation({
mutationFn: ({
userId,
mainPosition,
subPosition,
}: {
userId: string;
mainPosition: Position;
subPosition: Position;
}) =>
apiFetch(
`/communities/${DEFAULT_COMMUNITY_ID}/matches/${id}/participants/${userId}`,
{
method: "PATCH",
body: JSON.stringify({ mainPosition, subPosition }),
},
),
onMutate: async ({ userId, mainPosition, subPosition }) => {
await queryClient.cancelQueries({ queryKey: matchQueryKey });
const previous = queryClient.getQueryData<ApiMatch>(matchQueryKey);
if (previous) {
queryClient.setQueryData<ApiMatch>(matchQueryKey, {
...previous,
participants: previous.participants.map((participant) =>
participant.userId === userId
? {
...participant,
preferredPositions: reorderPreferredPositions(
mainPosition,
subPosition,
participant.preferredPositions,
),
}
: participant,
),
});
}
return { previous };
},
onError: (_error, _variables, context) => {
if (context?.previous) {
queryClient.setQueryData(matchQueryKey, context.previous);
}
},
onSettled: () => {
void queryClient.invalidateQueries({ queryKey: matchQueryKey });
},
});
const startAuctionMutation = useMutation({ const startAuctionMutation = useMutation({
mutationFn: () => mutationFn: () =>
apiFetch(`/communities/${DEFAULT_COMMUNITY_ID}/matches/${id}/auction`, { apiFetch(`/communities/${DEFAULT_COMMUNITY_ID}/matches/${id}/auction`, {
@@ -1335,6 +1779,18 @@ export default function MatchDetailPage() {
</div> </div>
)} )}
{removeParticipantMutation.error instanceof Error && (
<div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500">
{removeParticipantMutation.error.message}
</div>
)}
{updateParticipantMutation.error instanceof Error && (
<div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500">
{updateParticipantMutation.error.message}
</div>
)}
{pollTournamentResultMutation.error instanceof Error && ( {pollTournamentResultMutation.error instanceof Error && (
<div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500"> <div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500">
{pollTournamentResultMutation.error.message} {pollTournamentResultMutation.error.message}
@@ -1366,6 +1822,27 @@ export default function MatchDetailPage() {
canJoin={canUseMemberActions} canJoin={canUseMemberActions}
onJoin={() => joinMatchMutation.mutate()} onJoin={() => joinMatchMutation.mutate()}
isJoining={joinMatchMutation.isPending} isJoining={joinMatchMutation.isPending}
canManage={canManageAuction}
onRemoveParticipant={(userId) =>
removeParticipantMutation.mutate(userId)
}
onUpdatePositions={(userId, mainPosition, subPosition) =>
updateParticipantMutation.mutate({
userId,
mainPosition,
subPosition,
})
}
removingUserId={
removeParticipantMutation.isPending
? (removeParticipantMutation.variables ?? null)
: null
}
updatingUserId={
updateParticipantMutation.isPending
? (updateParticipantMutation.variables?.userId ?? null)
: null
}
/> />
{isCheckingPermissions ? ( {isCheckingPermissions ? (
+2
View File
@@ -8,6 +8,8 @@
"start:api:staging": "pnpm --filter api start:staging", "start:api:staging": "pnpm --filter api start:staging",
"start:api:prod": "pnpm --filter api start:prod", "start:api:prod": "pnpm --filter api start:prod",
"start:api": "pnpm --filter api start:prod", "start:api": "pnpm --filter api start:prod",
"start:web:dev": "pnpm --filter web start:dev",
"start:web:staging": "pnpm --filter web start:staging",
"build:api": "pnpm --filter api build", "build:api": "pnpm --filter api build",
"dev:web": "pnpm --filter web dev", "dev:web": "pnpm --filter web dev",
"build:web:staging": "pnpm --filter web build:staging", "build:web:staging": "pnpm --filter web build:staging",