Compare commits
10
Commits
release/72
...
release/76
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12869a7e9e | ||
|
|
d10e2ab011 | ||
|
|
170e42098a | ||
|
|
fe7a482969 | ||
|
|
aa07ec0304 | ||
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 | ||
|
|
6697cd8ea1 |
No files matched your search
@@ -0,0 +1,148 @@
|
|||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||||
|
|
||||||
|
describe('DakaoUrlShortenerService', () => {
|
||||||
|
const originalEnv = process.env;
|
||||||
|
const originalFetch = global.fetch;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
process.env = { ...originalEnv };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
process.env = originalEnv;
|
||||||
|
global.fetch = originalFetch;
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
function makeService(token = 'shortener-token') {
|
||||||
|
const secretService = {
|
||||||
|
get: jest.fn().mockResolvedValue(token),
|
||||||
|
} as unknown as jest.Mocked<SecretService>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
service: new DakaoUrlShortenerService(secretService),
|
||||||
|
secretService,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('posts a production match detail URL with a deterministic slug', async () => {
|
||||||
|
process.env.NODE_ENV = 'prod';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
status: 201,
|
||||||
|
json: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtpAB12' }),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
const shortUrl = await service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'ab12',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shortUrl).toBe('https://go.dahyeon.us/lmtpAB12');
|
||||||
|
expect(global.fetch).toHaveBeenCalledWith(
|
||||||
|
'https://go.dahyeon.us/api/shorten',
|
||||||
|
expect.objectContaining({
|
||||||
|
method: 'POST',
|
||||||
|
headers: expect.objectContaining({
|
||||||
|
Accept: 'application/json',
|
||||||
|
Authorization: 'Bearer shortener-token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual({
|
||||||
|
slug: 'lmtpAB12',
|
||||||
|
url: 'https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||||
|
redirectStatus: 302,
|
||||||
|
expiresAt: null,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses staging slug prefix and configured target base URL outside production', async () => {
|
||||||
|
process.env.NODE_ENV = 'staging';
|
||||||
|
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||||
|
'https://staging.lolympus.pages.dev/';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
status: 201,
|
||||||
|
json: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtsCD34' }),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await service.shortenMatchLink({
|
||||||
|
matchId: '444444444444444444444444',
|
||||||
|
shortCode: 'cd34',
|
||||||
|
});
|
||||||
|
|
||||||
|
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
slug: 'lmtsCD34',
|
||||||
|
url: 'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds the direct match detail URL for fallback output', () => {
|
||||||
|
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||||
|
'https://staging.lolympus.pages.dev/';
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
expect(service.buildMatchDetailUrl('444444444444444444444444')).toBe(
|
||||||
|
'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips shortener calls when the bearer token is missing', async () => {
|
||||||
|
global.fetch = jest.fn();
|
||||||
|
const { service } = makeService('');
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
expect(global.fetch).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns the deterministic short URL when the slug already exists', async () => {
|
||||||
|
process.env.NODE_ENV = 'prod';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: false,
|
||||||
|
status: 409,
|
||||||
|
text: jest.fn().mockResolvedValue('Conflict'),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBe('https://go.dahyeon.us/lmtpAB12');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns undefined when the shortener rejects the request', async () => {
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: false,
|
||||||
|
status: 500,
|
||||||
|
text: jest.fn().mockResolvedValue('server error'),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
|
||||||
|
const DEFAULT_SHORTENER_API_URL = 'https://go.dahyeon.us/api/shorten';
|
||||||
|
const DEFAULT_SHORTENER_BASE_URL = 'https://go.dahyeon.us';
|
||||||
|
const DEFAULT_TARGET_BASE_URL = 'https://lolympus.dahyeon.us';
|
||||||
|
const DEFAULT_TIMEOUT_MS = 1500;
|
||||||
|
|
||||||
|
interface ShortenMatchLinkParams {
|
||||||
|
matchId: string;
|
||||||
|
shortCode: string | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ShortenerResponseBody {
|
||||||
|
shortUrl?: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class DakaoUrlShortenerService {
|
||||||
|
private readonly logger = new Logger(DakaoUrlShortenerService.name);
|
||||||
|
|
||||||
|
constructor(private readonly secretService: SecretService) {}
|
||||||
|
|
||||||
|
public async shortenMatchLink(
|
||||||
|
params: ShortenMatchLinkParams,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
const shortCode = params.shortCode?.trim().toUpperCase();
|
||||||
|
if (!shortCode) return undefined;
|
||||||
|
|
||||||
|
const token = await this.resolveToken();
|
||||||
|
if (!token) return undefined;
|
||||||
|
|
||||||
|
const slug = `${this.resolveSlugPrefix()}${shortCode}`;
|
||||||
|
const requestBody = {
|
||||||
|
slug,
|
||||||
|
url: this.buildMatchDetailUrl(params.matchId),
|
||||||
|
redirectStatus: 302,
|
||||||
|
expiresAt: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timeout = setTimeout(
|
||||||
|
() => controller.abort(),
|
||||||
|
this.resolveTimeoutMs(),
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(this.resolveApiUrl(), {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
Accept: 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(requestBody),
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status === 409) {
|
||||||
|
return this.buildShortUrl(slug);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
await this.logFailedResponse(response, slug);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = await this.parseResponseBody(response);
|
||||||
|
const shortUrl = payload?.shortUrl;
|
||||||
|
return typeof shortUrl === 'string' && shortUrl.trim()
|
||||||
|
? shortUrl.trim()
|
||||||
|
: this.buildShortUrl(slug);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener request failed for slug="${slug}": ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return undefined;
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveToken(): Promise<string | undefined> {
|
||||||
|
try {
|
||||||
|
const token = await this.secretService.get<string>(
|
||||||
|
'URL_SHORTENER_TOKEN',
|
||||||
|
'',
|
||||||
|
);
|
||||||
|
return token.trim() || undefined;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener token unavailable: ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveSlugPrefix(): 'lmtp' | 'lmts' {
|
||||||
|
const nodeEnv = process.env.NODE_ENV?.trim().toLowerCase();
|
||||||
|
return nodeEnv === 'prod' || nodeEnv === 'production' ? 'lmtp' : 'lmts';
|
||||||
|
}
|
||||||
|
|
||||||
|
public buildMatchDetailUrl(matchId: string): string {
|
||||||
|
return `${this.resolveTargetBaseUrl()}/match/${encodeURIComponent(matchId)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildShortUrl(slug: string): string {
|
||||||
|
return `${this.resolveShortenerBaseUrl()}/${encodeURIComponent(slug)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveApiUrl(): string {
|
||||||
|
return (
|
||||||
|
process.env.URL_SHORTENER_API_URL?.trim() || DEFAULT_SHORTENER_API_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveShortenerBaseUrl(): string {
|
||||||
|
return (
|
||||||
|
this.normalizeBaseUrl(process.env.URL_SHORTENER_BASE_URL) ??
|
||||||
|
this.normalizeOrigin(this.resolveApiUrl()) ??
|
||||||
|
DEFAULT_SHORTENER_BASE_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveTargetBaseUrl(): string {
|
||||||
|
return (
|
||||||
|
this.normalizeBaseUrl(process.env.URL_SHORTENER_TARGET_BASE_URL) ??
|
||||||
|
this.normalizeBaseUrl(process.env.WEB_ORIGIN) ??
|
||||||
|
DEFAULT_TARGET_BASE_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveTimeoutMs(): number {
|
||||||
|
const configured = Number(process.env.URL_SHORTENER_TIMEOUT_MS);
|
||||||
|
return Number.isFinite(configured) && configured > 0
|
||||||
|
? configured
|
||||||
|
: DEFAULT_TIMEOUT_MS;
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeBaseUrl(value: string | undefined): string | undefined {
|
||||||
|
const raw = value?.split(',')[0]?.trim();
|
||||||
|
if (!raw) return undefined;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = new URL(raw);
|
||||||
|
const pathname = url.pathname.replace(/\/+$/u, '');
|
||||||
|
return `${url.origin}${pathname}`;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeOrigin(value: string): string | undefined {
|
||||||
|
try {
|
||||||
|
return new URL(value).origin;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async parseResponseBody(
|
||||||
|
response: Response,
|
||||||
|
): Promise<ShortenerResponseBody | undefined> {
|
||||||
|
try {
|
||||||
|
return (await response.json()) as ShortenerResponseBody;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async logFailedResponse(
|
||||||
|
response: Response,
|
||||||
|
slug: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const body = await response.text().catch(() => '');
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener returned ${response.status} for slug="${slug}"${body ? `: ${body.slice(0, 200)}` : ''}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,7 +14,7 @@ function makeQuery<T>(value: T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function makeService(params: {
|
function makeService(params: {
|
||||||
user: Partial<UserDocument>;
|
user: Partial<UserDocument> | null;
|
||||||
community?: Record<string, unknown> | null;
|
community?: Record<string, unknown> | null;
|
||||||
riotAccountService?: Partial<RiotAccountService>;
|
riotAccountService?: Partial<RiotAccountService>;
|
||||||
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
||||||
@@ -22,6 +22,7 @@ function makeService(params: {
|
|||||||
const findOneAndUpdate = jest
|
const findOneAndUpdate = jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockReturnValue(makeQuery(params.user as UserDocument));
|
.mockReturnValue(makeQuery(params.user as UserDocument));
|
||||||
|
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
|
||||||
const findById = jest.fn().mockReturnValue({
|
const findById = jest.fn().mockReturnValue({
|
||||||
select: jest.fn().mockReturnValue({
|
select: jest.fn().mockReturnValue({
|
||||||
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
||||||
@@ -29,7 +30,7 @@ function makeService(params: {
|
|||||||
});
|
});
|
||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
if (name === 'user') return { findOneAndUpdate };
|
if (name === 'user') return { findOneAndUpdate, findOne };
|
||||||
if (name === 'community') return { findById };
|
if (name === 'community') return { findById };
|
||||||
throw new Error(`Unexpected model: ${name}`);
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
}),
|
}),
|
||||||
@@ -51,6 +52,7 @@ function makeService(params: {
|
|||||||
),
|
),
|
||||||
connectionService,
|
connectionService,
|
||||||
findOneAndUpdate,
|
findOneAndUpdate,
|
||||||
|
findOne,
|
||||||
findById,
|
findById,
|
||||||
riotAccountService,
|
riotAccountService,
|
||||||
enrichmentService,
|
enrichmentService,
|
||||||
@@ -168,4 +170,78 @@ describe('DakaoUserService', () => {
|
|||||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||||
expect(save).toHaveBeenCalled();
|
expect(save).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('changes the primary Riot account for the Dakao user', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const oldPrimary = {
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
} as RiotAccount;
|
||||||
|
const nextPrimary = {
|
||||||
|
puuid: 'puuid-2',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: false,
|
||||||
|
} as RiotAccount;
|
||||||
|
const { service, findOne } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
kakaoTalkNickname: '이전닉',
|
||||||
|
riotAccounts: [oldPrimary, nextPrimary],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(findOne).toHaveBeenCalledWith({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
});
|
||||||
|
expect(oldPrimary.isPrimary).toBe(false);
|
||||||
|
expect(nextPrimary.isPrimary).toBe(true);
|
||||||
|
expect(result.riotAccount).toBe(nextPrimary);
|
||||||
|
expect(result.user.kakaoTalkNickname).toBe('프리리');
|
||||||
|
expect(save).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects primary account changes for unregistered Riot accounts', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const { service } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
riotAccounts: [
|
||||||
|
{
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
}),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'riot_account_not_found',
|
||||||
|
detail: '프리리#KR1',
|
||||||
|
});
|
||||||
|
expect(save).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -230,6 +230,43 @@ export class DakaoUserService {
|
|||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async changePrimaryRiotAccount(
|
||||||
|
context: ResolveContext,
|
||||||
|
): Promise<ResolveResult> {
|
||||||
|
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||||
|
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||||
|
const detail = `${requestedGameName}#${requestedTagLine}`;
|
||||||
|
|
||||||
|
const user = await this.findUserByKakaoTalkId({
|
||||||
|
communityId: context.communityId,
|
||||||
|
kakaoTalkId: context.kakaoTalkId,
|
||||||
|
});
|
||||||
|
if (!user) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = user.riotAccounts.find(
|
||||||
|
(account) =>
|
||||||
|
normalizeRiotIdPart(account.gameName).toLowerCase() ===
|
||||||
|
requestedGameName.toLowerCase() &&
|
||||||
|
normalizeRiotIdPart(account.tagLine).toLowerCase() ===
|
||||||
|
requestedTagLine.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (!target) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (context.kakaoTalkNickname.trim()) {
|
||||||
|
user.kakaoTalkNickname = context.kakaoTalkNickname;
|
||||||
|
}
|
||||||
|
for (const account of user.riotAccounts) {
|
||||||
|
account.isPrimary = account.puuid === target.puuid;
|
||||||
|
}
|
||||||
|
await user.save();
|
||||||
|
|
||||||
|
return { user, riotAccount: target };
|
||||||
|
}
|
||||||
|
|
||||||
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
||||||
return positions.map((position, index) => ({
|
return positions.map((position, index) => ({
|
||||||
position,
|
position,
|
||||||
|
|||||||
@@ -10,11 +10,13 @@ import { DakaoOutboxSweeperService } from './dakao-outbox-sweeper.service';
|
|||||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||||
import { DakaoUserService } from './dakao-user.service';
|
import { DakaoUserService } from './dakao-user.service';
|
||||||
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
||||||
|
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [RiotModule, MatchModule],
|
imports: [RiotModule, MatchModule],
|
||||||
@@ -31,11 +33,13 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
|
|||||||
DakaoSubscriber,
|
DakaoSubscriber,
|
||||||
DakaoSendResultSubscriber,
|
DakaoSendResultSubscriber,
|
||||||
DakaoUserService,
|
DakaoUserService,
|
||||||
|
DakaoUrlShortenerService,
|
||||||
AccountRegisterHandler,
|
AccountRegisterHandler,
|
||||||
MatchListHandler,
|
MatchListHandler,
|
||||||
MatchJoinHandler,
|
MatchJoinHandler,
|
||||||
MatchCancelHandler,
|
MatchCancelHandler,
|
||||||
PreferredPositionRegisterHandler,
|
PreferredPositionRegisterHandler,
|
||||||
|
PrimaryAccountChangeHandler,
|
||||||
],
|
],
|
||||||
exports: [DakaoPublisher],
|
exports: [DakaoPublisher],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import { DakaoSubscriber } from './dakao.subscriber';
|
||||||
|
import { DakaoInboundEvent, DakaoSegment } from './dakao.types';
|
||||||
|
import { CommandParseError } from './parsers/command.parser';
|
||||||
|
|
||||||
|
function makeSubscriber(): DakaoSubscriber {
|
||||||
|
return new DakaoSubscriber(
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const event = {
|
||||||
|
projectId: '111111111111111111111111',
|
||||||
|
chatroomId: 'chatroom-1',
|
||||||
|
nickname: '프리리',
|
||||||
|
userId: '12345',
|
||||||
|
origin: {
|
||||||
|
chatId: 'chat-1',
|
||||||
|
logId: 'log-1',
|
||||||
|
chatLog: {
|
||||||
|
logId: 'log-1',
|
||||||
|
chatId: 'chat-1',
|
||||||
|
authorId: '12345',
|
||||||
|
type: 1,
|
||||||
|
sendAt: 0,
|
||||||
|
message: '!내전',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} satisfies DakaoInboundEvent;
|
||||||
|
|
||||||
|
describe('DakaoSubscriber', () => {
|
||||||
|
it('renders usage help with star emoticon command lines', () => {
|
||||||
|
const subscriber = makeSubscriber() as unknown as {
|
||||||
|
parseErrorReply: (
|
||||||
|
event: DakaoInboundEvent,
|
||||||
|
senderNickname: string,
|
||||||
|
err: CommandParseError,
|
||||||
|
) => DakaoSegment[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const segments = subscriber.parseErrorReply(
|
||||||
|
event,
|
||||||
|
'프리리',
|
||||||
|
new CommandParseError('usage'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(segments).toEqual([
|
||||||
|
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||||
|
{ kind: 'text', text: ' 사용법\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{ kind: 'text', text: ' !내전 일정\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 신청 코드 소환사이름#태그 포지션1,포지션2\n',
|
||||||
|
},
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{ kind: 'text', text: ' !내전 계정등록 소환사이름#태그\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 선호포지션등록 포지션1,포지션2\n',
|
||||||
|
},
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 대표계정변경 소환사이름#태그',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the unknown command header before star emoticon usage lines', () => {
|
||||||
|
const subscriber = makeSubscriber() as unknown as {
|
||||||
|
parseErrorReply: (
|
||||||
|
event: DakaoInboundEvent,
|
||||||
|
senderNickname: string,
|
||||||
|
err: CommandParseError,
|
||||||
|
) => DakaoSegment[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const segments = subscriber.parseErrorReply(
|
||||||
|
event,
|
||||||
|
'프리리',
|
||||||
|
new CommandParseError('unknown_command', '폭파'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(segments.slice(0, 2)).toEqual([
|
||||||
|
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||||
|
{ kind: 'text', text: ' 알 수 없는 명령어입니다.\n' },
|
||||||
|
]);
|
||||||
|
expect(segments).toContainEqual({
|
||||||
|
kind: 'emoticon',
|
||||||
|
id: '1200281_035',
|
||||||
|
altText: '스타',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -11,6 +11,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
|||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||||
import { DakaoInboxService } from './dakao-inbox.service';
|
import { DakaoInboxService } from './dakao-inbox.service';
|
||||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||||
@@ -20,6 +21,13 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
private readonly logger = new Logger(DakaoSubscriber.name);
|
private readonly logger = new Logger(DakaoSubscriber.name);
|
||||||
private readonly natsNames = resolveDakaoNatsNames();
|
private readonly natsNames = resolveDakaoNatsNames();
|
||||||
private botUserId: string | undefined;
|
private botUserId: string | undefined;
|
||||||
|
private readonly usageCommands = [
|
||||||
|
'!내전 일정',
|
||||||
|
'!내전 신청 코드 소환사이름#태그 포지션1,포지션2',
|
||||||
|
'!내전 계정등록 소환사이름#태그',
|
||||||
|
'!내전 선호포지션등록 포지션1,포지션2',
|
||||||
|
'!내전 대표계정변경 소환사이름#태그',
|
||||||
|
];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly natsService: NatsService,
|
private readonly natsService: NatsService,
|
||||||
@@ -33,6 +41,7 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
private readonly matchJoinHandler: MatchJoinHandler,
|
private readonly matchJoinHandler: MatchJoinHandler,
|
||||||
private readonly matchCancelHandler: MatchCancelHandler,
|
private readonly matchCancelHandler: MatchCancelHandler,
|
||||||
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
||||||
|
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async onModuleInit() {
|
async onModuleInit() {
|
||||||
@@ -126,6 +135,15 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
tagLine: command.tagLine,
|
tagLine: command.tagLine,
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case 'primary-account-change':
|
||||||
|
segments = await this.primaryAccountChangeHandler.handle({
|
||||||
|
communityId,
|
||||||
|
senderUserId: event.userId,
|
||||||
|
senderNickname,
|
||||||
|
gameName: command.gameName,
|
||||||
|
tagLine: command.tagLine,
|
||||||
|
});
|
||||||
|
break;
|
||||||
case 'match-join':
|
case 'match-join':
|
||||||
segments = await this.matchJoinHandler.handle({
|
segments = await this.matchJoinHandler.handle({
|
||||||
communityId,
|
communityId,
|
||||||
@@ -256,9 +274,9 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
const text = ((): string => {
|
const text = ((): string => {
|
||||||
switch (err.code) {
|
switch (err.code) {
|
||||||
case 'unknown_command':
|
case 'unknown_command':
|
||||||
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 알 수 없는 명령어입니다.\n`;
|
||||||
case 'usage':
|
case 'usage':
|
||||||
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 내전 명령어 사용법\n`;
|
||||||
case 'invalid_match_id':
|
case 'invalid_match_id':
|
||||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||||
case 'invalid_riot_id':
|
case 'invalid_riot_id':
|
||||||
@@ -269,6 +287,22 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
return ` 명령을 처리할 수 없습니다.`;
|
return ` 명령을 처리할 수 없습니다.`;
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
if (err.code === 'unknown_command' || err.code === 'usage') {
|
||||||
|
return [...head, { kind: 'text', text }, ...this.usageCommandSegments()];
|
||||||
|
}
|
||||||
return [...head, { kind: 'text', text }];
|
return [...head, { kind: 'text', text }];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private usageCommandSegments(): DakaoSegment[] {
|
||||||
|
return this.usageCommands.flatMap((command, index) => [
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' } as const,
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text:
|
||||||
|
index === this.usageCommands.length - 1
|
||||||
|
? ` ${command}`
|
||||||
|
: ` ${command} \n`,
|
||||||
|
} as const,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,28 @@
|
|||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { MatchService } from '../../match/match.service';
|
import { MatchService } from '../../match/match.service';
|
||||||
|
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||||
import { MatchListHandler } from './match-list.handler';
|
import { MatchListHandler } from './match-list.handler';
|
||||||
|
|
||||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||||
|
|
||||||
|
function makeHandler(params: {
|
||||||
|
matchService: Partial<MatchService>;
|
||||||
|
urlShortener?: Partial<DakaoUrlShortenerService>;
|
||||||
|
}): MatchListHandler {
|
||||||
|
return new MatchListHandler(
|
||||||
|
params.matchService as MatchService,
|
||||||
|
{
|
||||||
|
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||||
|
buildMatchDetailUrl: jest.fn(
|
||||||
|
(matchId: string) => `https://lolympus.dahyeon.us/match/${matchId}`,
|
||||||
|
),
|
||||||
|
...params.urlShortener,
|
||||||
|
} as unknown as DakaoUrlShortenerService,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
describe('MatchListHandler', () => {
|
describe('MatchListHandler', () => {
|
||||||
it('prints short codes and compact KST dates', async () => {
|
it('prints short codes, compact KST dates, and short links', async () => {
|
||||||
const match = {
|
const match = {
|
||||||
_id: objectId('333333333333333333333333'),
|
_id: objectId('333333333333333333333333'),
|
||||||
title: '토요 내전',
|
title: '토요 내전',
|
||||||
@@ -17,8 +34,13 @@ describe('MatchListHandler', () => {
|
|||||||
const matchService = {
|
const matchService = {
|
||||||
list: jest.fn().mockResolvedValue([match]),
|
list: jest.fn().mockResolvedValue([match]),
|
||||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||||
} as unknown as MatchService;
|
};
|
||||||
const handler = new MatchListHandler(matchService);
|
const urlShortener = {
|
||||||
|
shortenMatchLink: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue('https://go.dahyeon.us/lmtpAB12'),
|
||||||
|
};
|
||||||
|
const handler = makeHandler({ matchService, urlShortener });
|
||||||
|
|
||||||
const segments = await handler.handle({
|
const segments = await handler.handle({
|
||||||
communityId: objectId('111111111111111111111111'),
|
communityId: objectId('111111111111111111111111'),
|
||||||
@@ -27,6 +49,10 @@ describe('MatchListHandler', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
||||||
|
expect(urlShortener.shortenMatchLink).toHaveBeenCalledWith({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
});
|
||||||
expect(segments[1]).toMatchObject({
|
expect(segments[1]).toMatchObject({
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
||||||
@@ -35,6 +61,10 @@ describe('MatchListHandler', () => {
|
|||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.stringContaining('코드: AB12'),
|
text: expect.stringContaining('코드: AB12'),
|
||||||
});
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('링크: https://go.dahyeon.us/lmtpAB12'),
|
||||||
|
});
|
||||||
expect(segments[1]).toMatchObject({
|
expect(segments[1]).toMatchObject({
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.not.stringContaining('2026-05-02'),
|
text: expect.not.stringContaining('2026-05-02'),
|
||||||
@@ -43,5 +73,50 @@ describe('MatchListHandler', () => {
|
|||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.not.stringContaining('ID:'),
|
text: expect.not.stringContaining('ID:'),
|
||||||
});
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.not.stringContaining('계정등록:'),
|
||||||
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.not.stringContaining('신청:'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to a direct match detail link when short link creation is skipped', async () => {
|
||||||
|
const match = {
|
||||||
|
_id: objectId('333333333333333333333333'),
|
||||||
|
title: '토요 내전',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
participants: [],
|
||||||
|
maxParticipants: 10,
|
||||||
|
scheduledAt: new Date('2026-05-02T10:30:00.000Z'),
|
||||||
|
};
|
||||||
|
const handler = makeHandler({
|
||||||
|
matchService: {
|
||||||
|
list: jest.fn().mockResolvedValue([match]),
|
||||||
|
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||||
|
},
|
||||||
|
urlShortener: {
|
||||||
|
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
senderUserId: 'kakao-user-1',
|
||||||
|
senderNickname: '프리리',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('코드: AB12'),
|
||||||
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining(
|
||||||
|
'링크: https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||||
|
),
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,11 +1,18 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
|
import { MatchDocument } from '../../global/database/schema';
|
||||||
import { MatchService } from '../../match/match.service';
|
import { MatchService } from '../../match/match.service';
|
||||||
import { DakaoSegment } from '../dakao.types';
|
import { DakaoSegment } from '../dakao.types';
|
||||||
|
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MatchListHandler {
|
export class MatchListHandler {
|
||||||
constructor(private readonly matchService: MatchService) {}
|
private readonly logger = new Logger(MatchListHandler.name);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly matchService: MatchService,
|
||||||
|
private readonly urlShortener: DakaoUrlShortenerService,
|
||||||
|
) {}
|
||||||
|
|
||||||
public async handle(params: {
|
public async handle(params: {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
@@ -33,12 +40,16 @@ export class MatchListHandler {
|
|||||||
matches.map((match) => this.matchService.ensureShortCode(match)),
|
matches.map((match) => this.matchService.ensureShortCode(match)),
|
||||||
);
|
);
|
||||||
|
|
||||||
const lines = matchesWithCodes.map((m, i) => {
|
const lines = await Promise.all(
|
||||||
|
matchesWithCodes.map(async (m, i) => {
|
||||||
const filled = m.participants.length;
|
const filled = m.participants.length;
|
||||||
const cap = m.maxParticipants;
|
const cap = m.maxParticipants;
|
||||||
const time = formatScheduledAt(m.scheduledAt);
|
const time = formatScheduledAt(m.scheduledAt);
|
||||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}`;
|
const shortUrl = await this.createShortUrl(m);
|
||||||
});
|
const linkLine = shortUrl ? `\n 링크: ${shortUrl}` : '';
|
||||||
|
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}${linkLine}`;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
@@ -48,10 +59,29 @@ export class MatchListHandler {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async createShortUrl(
|
||||||
|
match: MatchDocument,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
try {
|
||||||
|
const shortUrl = await this.urlShortener.shortenMatchLink({
|
||||||
|
matchId: String(match._id),
|
||||||
|
shortCode: match.shortCode,
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
shortUrl ?? this.urlShortener.buildMatchDetailUrl(String(match._id))
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to create dakao match short URL for match="${String(match._id)}": ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return this.urlShortener.buildMatchDetailUrl(String(match._id));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatScheduledAt(date: Date): string {
|
function formatScheduledAt(date: Date): string {
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
import { PrimaryAccountChangeHandler } from './primary-account-change.handler';
|
||||||
|
|
||||||
|
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||||
|
|
||||||
|
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||||
|
return new PrimaryAccountChangeHandler({
|
||||||
|
changePrimaryRiotAccount: jest.fn(),
|
||||||
|
...dakaoUserService,
|
||||||
|
} as unknown as DakaoUserService);
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseParams = {
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
senderUserId: 'kakao-user-1',
|
||||||
|
senderNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('PrimaryAccountChangeHandler', () => {
|
||||||
|
it('changes the primary Riot account through DakaoUserService', async () => {
|
||||||
|
const changePrimaryRiotAccount = jest.fn().mockResolvedValue({
|
||||||
|
user: { _id: objectId('222222222222222222222222') },
|
||||||
|
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||||
|
});
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount,
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(changePrimaryRiotAccount).toHaveBeenCalledWith({
|
||||||
|
communityId: baseParams.communityId,
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정 변경 완료'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정: 프리리#KR1'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('asks users to register the Riot account first when not found', async () => {
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount: jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(
|
||||||
|
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('먼저 !내전 계정등록'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoSegment } from '../dakao.types';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
|
||||||
|
interface PrimaryAccountChangeHandlerParams {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
senderUserId: string;
|
||||||
|
senderNickname: string;
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PrimaryAccountChangeHandler {
|
||||||
|
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||||
|
|
||||||
|
public async handle(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
): Promise<DakaoSegment[]> {
|
||||||
|
try {
|
||||||
|
const resolved = await this.dakaoUserService.changePrimaryRiotAccount({
|
||||||
|
communityId: params.communityId,
|
||||||
|
kakaoTalkId: params.senderUserId,
|
||||||
|
kakaoTalkNickname: params.senderNickname,
|
||||||
|
gameName: params.gameName,
|
||||||
|
tagLine: params.tagLine,
|
||||||
|
});
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text:
|
||||||
|
` 대표 계정 변경 완료` +
|
||||||
|
`\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof DakaoUserError) {
|
||||||
|
return this.errorReply(params, this.translateUserError(err));
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private errorReply(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
message: string,
|
||||||
|
): DakaoSegment[] {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{ kind: 'text', text: ` ${message}` },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private translateUserError(err: DakaoUserError): string {
|
||||||
|
switch (err.code) {
|
||||||
|
case 'invalid_project_id':
|
||||||
|
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||||
|
case 'community_not_found':
|
||||||
|
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||||
|
case 'riot_account_not_found':
|
||||||
|
return `등록된 라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}). 먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.`;
|
||||||
|
case 'riot_account_already_registered':
|
||||||
|
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_conflict':
|
||||||
|
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_lookup_failed':
|
||||||
|
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -121,6 +121,25 @@ describe('parseCommand', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('parses primary account change command', () => {
|
||||||
|
expect(parseCommand('!내전 대표계정변경 프리리#KR1')).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('normalizes primary account change riot id', () => {
|
||||||
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
|
expect(
|
||||||
|
parseCommand(`!내전 대표계정변경 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||||
|
).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('normalizes account register riot id', () => {
|
it('normalizes account register riot id', () => {
|
||||||
const decomposedGameName = '프리리'.normalize('NFD');
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
expect(
|
expect(
|
||||||
@@ -136,6 +155,10 @@ describe('parseCommand', () => {
|
|||||||
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('throws usage for bare command prefix', () => {
|
||||||
|
expect(() => parseCommand('!내전')).toThrow(/usage/);
|
||||||
|
});
|
||||||
|
|
||||||
it('throws unknown_command for unrecognized subcommands', () => {
|
it('throws unknown_command for unrecognized subcommands', () => {
|
||||||
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ export type DakaoCommand =
|
|||||||
gameName: string;
|
gameName: string;
|
||||||
tagLine: string;
|
tagLine: string;
|
||||||
}
|
}
|
||||||
|
| {
|
||||||
|
kind: 'primary-account-change';
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
| {
|
| {
|
||||||
kind: 'match-join';
|
kind: 'match-join';
|
||||||
matchAndRiotId: string;
|
matchAndRiotId: string;
|
||||||
@@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
return parseCancelArgs(args);
|
return parseCancelArgs(args);
|
||||||
case '계정등록':
|
case '계정등록':
|
||||||
return parseAccountRegisterArgs(args);
|
return parseAccountRegisterArgs(args);
|
||||||
|
case '대표계정변경':
|
||||||
|
return parsePrimaryAccountChangeArgs(args);
|
||||||
case '선호포지션등록':
|
case '선호포지션등록':
|
||||||
case '포지션등록':
|
case '포지션등록':
|
||||||
return parsePreferredPositionRegisterArgs(args);
|
return parsePreferredPositionRegisterArgs(args);
|
||||||
@@ -79,6 +86,24 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'account-register',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parsePrimaryAccountChangeArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseRiotIdArgs(args: string): { gameName: string; tagLine: string } {
|
||||||
if (args.length === 0) {
|
if (args.length === 0) {
|
||||||
throw new CommandParseError('usage');
|
throw new CommandParseError('usage');
|
||||||
}
|
}
|
||||||
@@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand {
|
|||||||
throw new CommandParseError('invalid_riot_id', args);
|
throw new CommandParseError('invalid_riot_id', args);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return { gameName, tagLine };
|
||||||
kind: 'account-register',
|
|
||||||
gameName,
|
|
||||||
tagLine,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseCancelArgs(args: string): DakaoCommand {
|
function parseCancelArgs(args: string): DakaoCommand {
|
||||||
|
|||||||
@@ -72,16 +72,27 @@ export class MatchController {
|
|||||||
communityId: mongoose.Types.ObjectId,
|
communityId: mongoose.Types.ObjectId,
|
||||||
@Query('status') status?: MatchStatus,
|
@Query('status') status?: MatchStatus,
|
||||||
@Query('limit') limit?: string,
|
@Query('limit') limit?: string,
|
||||||
|
@Query('page') page?: string,
|
||||||
|
@Query('offset') offset?: string,
|
||||||
|
@Query('scheduledFrom') scheduledFrom?: string,
|
||||||
|
@Query('scheduledTo') scheduledTo?: string,
|
||||||
|
@Query('sort') sort?: 'asc' | 'desc',
|
||||||
) {
|
) {
|
||||||
const matches = await this.matchService.list({
|
const result = await this.matchService.listPage({
|
||||||
communityId,
|
communityId,
|
||||||
status,
|
status,
|
||||||
limit: limit ? Number(limit) : undefined,
|
limit: this.toOptionalNumber(limit),
|
||||||
|
page: this.toOptionalNumber(page),
|
||||||
|
offset: this.toOptionalNumber(offset),
|
||||||
|
scheduledFrom: this.toOptionalDate(scheduledFrom),
|
||||||
|
scheduledTo: this.toOptionalDate(scheduledTo),
|
||||||
|
sort,
|
||||||
});
|
});
|
||||||
if (!currentUser) return { matches };
|
if (!currentUser) return result;
|
||||||
const myId = currentUser._id;
|
const myId = currentUser._id;
|
||||||
return {
|
return {
|
||||||
matches: matches.map((m) => this.annotateJoined(m, myId)),
|
...result,
|
||||||
|
matches: result.matches.map((m) => this.annotateJoined(m, myId)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,4 +222,15 @@ export class MatchController {
|
|||||||
throw new BadRequestException('Different community.');
|
throw new BadRequestException('Different community.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private toOptionalNumber(value?: string): number | undefined {
|
||||||
|
const numberValue = Number(value);
|
||||||
|
return Number.isFinite(numberValue) ? numberValue : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private toOptionalDate(value?: string): Date | undefined {
|
||||||
|
if (!value) return undefined;
|
||||||
|
const date = new Date(value);
|
||||||
|
return Number.isNaN(date.getTime()) ? undefined : date;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -36,6 +36,135 @@ describe('MatchService', () => {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createServiceWithListModel() {
|
||||||
|
const exec = jest.fn().mockResolvedValue([{ title: 'second page' }]);
|
||||||
|
const limit = jest.fn().mockReturnValue({ exec });
|
||||||
|
const skip = jest.fn().mockReturnValue({ limit });
|
||||||
|
const sort = jest.fn().mockReturnValue({ skip });
|
||||||
|
const find = jest.fn().mockReturnValue({ sort });
|
||||||
|
const countExec = jest.fn().mockResolvedValue(12);
|
||||||
|
const countDocuments = jest.fn().mockReturnValue({ exec: countExec });
|
||||||
|
const MatchModel = {
|
||||||
|
find,
|
||||||
|
countDocuments,
|
||||||
|
};
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
|
if (name === 'match') return MatchModel;
|
||||||
|
return {};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
const tournamentCodeService = {
|
||||||
|
buildSlots: jest.fn().mockResolvedValue([]),
|
||||||
|
releaseFromMatch: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const communityStatsService = {
|
||||||
|
invalidateCommunity: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const matchStatsService = {
|
||||||
|
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
removeByMatch: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
service: new MatchService(
|
||||||
|
connectionService as never,
|
||||||
|
tournamentCodeService as never,
|
||||||
|
communityStatsService as never,
|
||||||
|
matchStatsService as never,
|
||||||
|
),
|
||||||
|
MatchModel,
|
||||||
|
sort,
|
||||||
|
skip,
|
||||||
|
limit,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('returns a paginated match list with total count', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const { service, MatchModel, sort, skip, limit } =
|
||||||
|
createServiceWithListModel();
|
||||||
|
|
||||||
|
const page = await service.listPage({
|
||||||
|
communityId,
|
||||||
|
page: 2,
|
||||||
|
limit: 5,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(MatchModel.find).toHaveBeenCalledWith({ communityId });
|
||||||
|
expect(MatchModel.countDocuments).toHaveBeenCalledWith({ communityId });
|
||||||
|
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||||
|
expect(skip).toHaveBeenCalledWith(5);
|
||||||
|
expect(limit).toHaveBeenCalledWith(5);
|
||||||
|
expect(page).toEqual({
|
||||||
|
matches: [{ title: 'second page' }],
|
||||||
|
total: 12,
|
||||||
|
page: 2,
|
||||||
|
limit: 5,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('applies offset before page-based pagination', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const { service, skip } = createServiceWithListModel();
|
||||||
|
|
||||||
|
const page = await service.listPage({
|
||||||
|
communityId,
|
||||||
|
offset: 4,
|
||||||
|
page: 2,
|
||||||
|
limit: 5,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(skip).toHaveBeenCalledWith(9);
|
||||||
|
expect(page.total).toBe(8);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('filters future matches and sorts oldest first for upcoming sections', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const scheduledFrom = new Date('2026-06-08T12:00:00.000Z');
|
||||||
|
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||||
|
|
||||||
|
await service.listPage({
|
||||||
|
communityId,
|
||||||
|
scheduledFrom,
|
||||||
|
sort: 'asc',
|
||||||
|
limit: 4,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
scheduledAt: { $gte: scheduledFrom },
|
||||||
|
});
|
||||||
|
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
scheduledAt: { $gte: scheduledFrom },
|
||||||
|
});
|
||||||
|
expect(sort).toHaveBeenCalledWith({ scheduledAt: 1 });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('filters past matches and keeps newest first for history sections', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const scheduledTo = new Date('2026-06-08T12:00:00.000Z');
|
||||||
|
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||||
|
|
||||||
|
await service.listPage({
|
||||||
|
communityId,
|
||||||
|
scheduledTo,
|
||||||
|
sort: 'desc',
|
||||||
|
limit: 10,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
scheduledAt: { $lt: scheduledTo },
|
||||||
|
});
|
||||||
|
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
scheduledAt: { $lt: scheduledTo },
|
||||||
|
});
|
||||||
|
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||||
|
});
|
||||||
|
|
||||||
it('clears game schedule when a built match returns to recruiting', async () => {
|
it('clears game schedule when a built match returns to recruiting', async () => {
|
||||||
const communityId = new mongoose.Types.ObjectId();
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
const match = {
|
const match = {
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
|||||||
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||||
const MATCH_SHORT_CODE_LENGTH = 4;
|
const MATCH_SHORT_CODE_LENGTH = 4;
|
||||||
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
||||||
|
const DEFAULT_MATCH_LIST_LIMIT = 50;
|
||||||
|
const MAX_MATCH_LIST_LIMIT = 200;
|
||||||
|
|
||||||
interface CreateMatchParams {
|
interface CreateMatchParams {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
@@ -40,6 +42,23 @@ interface ListMatchesQuery {
|
|||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
status?: MatchStatus;
|
status?: MatchStatus;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
|
scheduledFrom?: Date;
|
||||||
|
scheduledTo?: Date;
|
||||||
|
sort?: 'asc' | 'desc';
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ListMatchesPageQuery extends ListMatchesQuery {
|
||||||
|
page?: number;
|
||||||
|
offset?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface MatchListFilter {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
status?: MatchStatus;
|
||||||
|
scheduledAt?: {
|
||||||
|
$gte?: Date;
|
||||||
|
$lt?: Date;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
interface JoinMatchParams {
|
interface JoinMatchParams {
|
||||||
@@ -101,19 +120,42 @@ export class MatchService {
|
|||||||
|
|
||||||
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
||||||
const MatchModel = await this.connectionService.getModel('match');
|
const MatchModel = await this.connectionService.getModel('match');
|
||||||
const filter: {
|
const filter = this.buildListFilter(query);
|
||||||
communityId: mongoose.Types.ObjectId;
|
|
||||||
status?: MatchStatus;
|
|
||||||
} = {
|
|
||||||
communityId: query.communityId,
|
|
||||||
};
|
|
||||||
if (query.status) filter.status = query.status;
|
|
||||||
return MatchModel.find(filter)
|
return MatchModel.find(filter)
|
||||||
.sort({ scheduledAt: -1 })
|
.sort(this.buildListSort(query.sort))
|
||||||
.limit(Math.min(query.limit ?? 50, 200))
|
.limit(this.normalizeListLimit(query.limit))
|
||||||
.exec();
|
.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async listPage(query: ListMatchesPageQuery): Promise<{
|
||||||
|
matches: MatchDocument[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
limit: number;
|
||||||
|
}> {
|
||||||
|
const MatchModel = await this.connectionService.getModel('match');
|
||||||
|
const filter = this.buildListFilter(query);
|
||||||
|
const page = this.normalizeListPage(query.page);
|
||||||
|
const limit = this.normalizeListLimit(query.limit);
|
||||||
|
const offset = this.normalizeListOffset(query.offset);
|
||||||
|
const skip = offset + (page - 1) * limit;
|
||||||
|
const [matches, rawTotal] = await Promise.all([
|
||||||
|
MatchModel.find(filter)
|
||||||
|
.sort(this.buildListSort(query.sort))
|
||||||
|
.skip(skip)
|
||||||
|
.limit(limit)
|
||||||
|
.exec(),
|
||||||
|
MatchModel.countDocuments(filter).exec(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
matches,
|
||||||
|
total: Math.max(rawTotal - offset, 0),
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
||||||
if (match.shortCode) return match;
|
if (match.shortCode) return match;
|
||||||
|
|
||||||
@@ -394,6 +436,44 @@ export class MatchService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private buildListFilter(query: ListMatchesQuery): MatchListFilter {
|
||||||
|
const filter: MatchListFilter = {
|
||||||
|
communityId: query.communityId,
|
||||||
|
};
|
||||||
|
if (query.status) filter.status = query.status;
|
||||||
|
if (query.scheduledFrom || query.scheduledTo) {
|
||||||
|
filter.scheduledAt = {};
|
||||||
|
if (query.scheduledFrom) filter.scheduledAt.$gte = query.scheduledFrom;
|
||||||
|
if (query.scheduledTo) filter.scheduledAt.$lt = query.scheduledTo;
|
||||||
|
}
|
||||||
|
return filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildListSort(sort?: 'asc' | 'desc'): { scheduledAt: 1 | -1 } {
|
||||||
|
return { scheduledAt: sort === 'asc' ? 1 : -1 };
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeListLimit(limit?: number): number {
|
||||||
|
if (!Number.isFinite(limit) || !limit || limit < 1) {
|
||||||
|
return DEFAULT_MATCH_LIST_LIMIT;
|
||||||
|
}
|
||||||
|
return Math.min(Math.floor(limit), MAX_MATCH_LIST_LIMIT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeListPage(page?: number): number {
|
||||||
|
if (!Number.isFinite(page) || !page || page < 1) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return Math.floor(page);
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeListOffset(offset?: number): number {
|
||||||
|
if (!Number.isFinite(offset) || !offset || offset < 1) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return Math.floor(offset);
|
||||||
|
}
|
||||||
|
|
||||||
private async generateUniqueShortCode(
|
private async generateUniqueShortCode(
|
||||||
MatchModel: mongoose.Model<Match>,
|
MatchModel: mongoose.Model<Match>,
|
||||||
communityId: mongoose.Types.ObjectId,
|
communityId: mongoose.Types.ObjectId,
|
||||||
|
|||||||
+87
-1
@@ -1,4 +1,5 @@
|
|||||||
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
||||||
|
import type { ReactNode } from "react";
|
||||||
import { useMsal } from "@azure/msal-react";
|
import { useMsal } from "@azure/msal-react";
|
||||||
import { Moon, Sun } from "lucide-react";
|
import { Moon, Sun } from "lucide-react";
|
||||||
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||||
@@ -65,13 +66,60 @@ function ThemeToggle() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function AppFooter() {
|
||||||
|
return (
|
||||||
|
<footer className="border-t border-base-content/10 bg-base-100">
|
||||||
|
<div className="max-w-5xl mx-auto px-4 sm:px-6 py-8 text-xs text-base-content/35">
|
||||||
|
<nav className="flex items-center gap-4 mb-4 font-semibold text-base-content/45">
|
||||||
|
<Link to="/terms" className="hover:text-base-content">
|
||||||
|
서비스 이용약관
|
||||||
|
</Link>
|
||||||
|
<Link to="/privacy" className="hover:text-base-content">
|
||||||
|
개인정보처리방침
|
||||||
|
</Link>
|
||||||
|
</nav>
|
||||||
|
<p className="leading-relaxed max-w-4xl">
|
||||||
|
© 2026 LOLYMPUS. LOLYMPUS is not endorsed by Riot Games and
|
||||||
|
does not reflect the views or opinions of Riot Games or anyone
|
||||||
|
officially involved in producing or managing League of Legends.
|
||||||
|
League of Legends and Riot Games are trademarks or registered
|
||||||
|
trademarks of Riot Games, Inc. League of Legends © Riot Games, Inc.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function LegalPage({
|
||||||
|
title,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
title: string;
|
||||||
|
children: ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<main className="max-w-3xl mx-auto px-4 sm:px-6 py-12">
|
||||||
|
<Link
|
||||||
|
to="/"
|
||||||
|
className="inline-flex text-xs text-base-content/40 hover:text-base-content mb-5"
|
||||||
|
>
|
||||||
|
← 홈으로
|
||||||
|
</Link>
|
||||||
|
<h1 className="text-2xl font-black text-base-content">{title}</h1>
|
||||||
|
<div className="mt-6 space-y-4 text-sm leading-7 text-base-content/60">
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
||||||
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<div className="min-h-screen bg-base-100">
|
<div className="min-h-screen bg-base-100 flex flex-col">
|
||||||
<nav className="bg-base-100 border-b border-base-content/10 sticky top-0 z-50">
|
<nav className="bg-base-100 border-b border-base-content/10 sticky top-0 z-50">
|
||||||
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-11">
|
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-11">
|
||||||
<Link
|
<Link
|
||||||
@@ -96,6 +144,7 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
|
<div className="flex-1">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<HomePage />} />
|
<Route path="/" element={<HomePage />} />
|
||||||
<Route path="/login" element={<LoginPage />} />
|
<Route path="/login" element={<LoginPage />} />
|
||||||
@@ -131,7 +180,44 @@ function App() {
|
|||||||
path="/admin/communities/:cid/legacy-matches"
|
path="/admin/communities/:cid/legacy-matches"
|
||||||
element={<LegacyMatchesPage />}
|
element={<LegacyMatchesPage />}
|
||||||
/>
|
/>
|
||||||
|
<Route
|
||||||
|
path="/terms"
|
||||||
|
element={
|
||||||
|
<LegalPage title="서비스 이용약관">
|
||||||
|
<p>
|
||||||
|
This service is provided for community tournament support,
|
||||||
|
including match scheduling, participation management, team
|
||||||
|
organization, and related statistics.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
By using this service, users agree not to interfere with
|
||||||
|
service operation, misuse community data, or submit content
|
||||||
|
that violates applicable laws or community rules.
|
||||||
|
</p>
|
||||||
|
</LegalPage>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="/privacy"
|
||||||
|
element={
|
||||||
|
<LegalPage title="개인정보처리방침">
|
||||||
|
<p>
|
||||||
|
This service processes account, profile, match
|
||||||
|
participation, team, and authentication data only as needed
|
||||||
|
to operate community tournament features.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Users may request access, correction, or deletion of their
|
||||||
|
personal data through the service administrator, subject to
|
||||||
|
records that must be retained for service integrity or legal
|
||||||
|
obligations.
|
||||||
|
</p>
|
||||||
|
</LegalPage>
|
||||||
|
}
|
||||||
|
/>
|
||||||
</Routes>
|
</Routes>
|
||||||
|
</div>
|
||||||
|
<AppFooter />
|
||||||
<DevAuthSwitcher />
|
<DevAuthSwitcher />
|
||||||
</div>
|
</div>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ const DDRAGON_MANIFEST_STALE_MS = 24 * 60 * 60 * 1000;
|
|||||||
interface MatchesQueryOptions {
|
interface MatchesQueryOptions {
|
||||||
status?: MatchStatus;
|
status?: MatchStatus;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
|
page?: number;
|
||||||
|
offset?: number;
|
||||||
|
scheduledFrom?: string;
|
||||||
|
scheduledTo?: string;
|
||||||
|
sort?: 'asc' | 'desc';
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserHistoryFilters {
|
export interface UserHistoryFilters {
|
||||||
@@ -74,6 +79,11 @@ function createMatchesPath(
|
|||||||
const searchParams = new URLSearchParams();
|
const searchParams = new URLSearchParams();
|
||||||
if (options.status) searchParams.set('status', options.status);
|
if (options.status) searchParams.set('status', options.status);
|
||||||
if (options.limit) searchParams.set('limit', String(options.limit));
|
if (options.limit) searchParams.set('limit', String(options.limit));
|
||||||
|
if (options.page) searchParams.set('page', String(options.page));
|
||||||
|
if (options.offset) searchParams.set('offset', String(options.offset));
|
||||||
|
if (options.scheduledFrom) searchParams.set('scheduledFrom', options.scheduledFrom);
|
||||||
|
if (options.scheduledTo) searchParams.set('scheduledTo', options.scheduledTo);
|
||||||
|
if (options.sort) searchParams.set('sort', options.sort);
|
||||||
|
|
||||||
const queryString = searchParams.toString();
|
const queryString = searchParams.toString();
|
||||||
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
|
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
|
||||||
@@ -93,7 +103,17 @@ export function useMatches(
|
|||||||
communityId = DEFAULT_COMMUNITY_ID,
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
) {
|
) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['matches', communityId, options.status ?? null, options.limit ?? null],
|
queryKey: [
|
||||||
|
'matches',
|
||||||
|
communityId,
|
||||||
|
options.status ?? null,
|
||||||
|
options.limit ?? null,
|
||||||
|
options.page ?? null,
|
||||||
|
options.offset ?? null,
|
||||||
|
options.scheduledFrom ?? null,
|
||||||
|
options.scheduledTo ?? null,
|
||||||
|
options.sort ?? null,
|
||||||
|
],
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
const response = await apiFetch<MatchesResponse>(
|
const response = await apiFetch<MatchesResponse>(
|
||||||
createMatchesPath(communityId, options),
|
createMatchesPath(communityId, options),
|
||||||
@@ -105,6 +125,31 @@ export function useMatches(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function useMatchesPage(
|
||||||
|
options: MatchesQueryOptions,
|
||||||
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
|
) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: [
|
||||||
|
'matches-page',
|
||||||
|
communityId,
|
||||||
|
options.status ?? null,
|
||||||
|
options.limit ?? null,
|
||||||
|
options.page ?? null,
|
||||||
|
options.offset ?? null,
|
||||||
|
options.scheduledFrom ?? null,
|
||||||
|
options.scheduledTo ?? null,
|
||||||
|
options.sort ?? null,
|
||||||
|
],
|
||||||
|
queryFn: () =>
|
||||||
|
apiFetch<MatchesResponse>(createMatchesPath(communityId, options), {
|
||||||
|
auth: 'none',
|
||||||
|
}),
|
||||||
|
enabled: Boolean(communityId),
|
||||||
|
placeholderData: (previousData) => previousData,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['match', communityId, matchId ?? null],
|
queryKey: ['match', communityId, matchId ?? null],
|
||||||
|
|||||||
@@ -340,6 +340,9 @@ export interface MeResponse {
|
|||||||
|
|
||||||
export interface MatchesResponse {
|
export interface MatchesResponse {
|
||||||
matches: ApiMatch[];
|
matches: ApiMatch[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
limit: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MatchMutationRequest {
|
export interface MatchMutationRequest {
|
||||||
|
|||||||
+462
-42
@@ -1,10 +1,243 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { ChevronLeft, ChevronRight } from 'lucide-react';
|
||||||
import { Link } from 'react-router';
|
import { Link } from 'react-router';
|
||||||
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
||||||
import { useMatches, useMe } from '../api/hooks';
|
import { useMatches, useMatchesPage, useMe } from '../api/hooks';
|
||||||
import { DEFAULT_COMMUNITY_ID } from '../config';
|
import { DEFAULT_COMMUNITY_ID } from '../config';
|
||||||
|
|
||||||
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
||||||
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
||||||
|
const HISTORY_MATCH_PAGE_SIZE = 10;
|
||||||
|
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
|
||||||
|
const HISTORY_TABLE_ROW_CLASS =
|
||||||
|
'h-10 border-b border-base-content/5 last:border-b-0';
|
||||||
|
|
||||||
|
function SkeletonBlock({ className }: { className: string }) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
className={`animate-pulse bg-base-content/10 ${className}`}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function SkeletonText({
|
||||||
|
children,
|
||||||
|
className = '',
|
||||||
|
skeletonClassName,
|
||||||
|
}: {
|
||||||
|
children: string;
|
||||||
|
className?: string;
|
||||||
|
skeletonClassName: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className={`relative block ${className}`}>
|
||||||
|
<span className="invisible">{children}</span>
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className={`absolute left-0 top-1/2 -translate-y-1/2 animate-pulse bg-base-content/10 ${skeletonClassName}`}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function SkeletonBadge({
|
||||||
|
children,
|
||||||
|
className,
|
||||||
|
}: {
|
||||||
|
children: string;
|
||||||
|
className: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className={`relative ${className}`}>
|
||||||
|
<span className="invisible">{children}</span>
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className="absolute inset-0 animate-pulse bg-base-content/10"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryTableColGroup() {
|
||||||
|
return (
|
||||||
|
<colgroup>
|
||||||
|
<col className="w-[156px]" />
|
||||||
|
<col />
|
||||||
|
<col className="w-[88px]" />
|
||||||
|
<col className="w-[132px]" />
|
||||||
|
<col className="w-[72px]" />
|
||||||
|
<col className="w-[116px]" />
|
||||||
|
</colgroup>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryTableHeader() {
|
||||||
|
return (
|
||||||
|
<thead>
|
||||||
|
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
||||||
|
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">내전</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">상태</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">맵</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">참가</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">결과</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryRecordsSkeleton({ rows = 5 }: { rows?: number }) {
|
||||||
|
const historySkeletons = Array.from({ length: rows });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
|
<table className="w-full table-fixed text-left">
|
||||||
|
<HistoryTableColGroup />
|
||||||
|
<HistoryTableHeader />
|
||||||
|
<tbody>
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<tr
|
||||||
|
key={index}
|
||||||
|
className={HISTORY_TABLE_ROW_CLASS}
|
||||||
|
>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
skeletonClassName="h-[1em] w-20"
|
||||||
|
>
|
||||||
|
2026년 6월 8일 월
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonText
|
||||||
|
className="truncate text-sm font-medium"
|
||||||
|
skeletonClassName="h-[1em] w-36 max-w-full"
|
||||||
|
>
|
||||||
|
정기 내전
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBadge className="inline-flex items-center whitespace-nowrap text-[11px] font-semibold px-1.5 py-0.5 border border-transparent">
|
||||||
|
팀빌딩
|
||||||
|
</SkeletonBadge>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBadge className="inline-flex items-center whitespace-nowrap text-[11px] px-1.5 py-0.5 border border-transparent">
|
||||||
|
소환사의 협곡
|
||||||
|
</SkeletonBadge>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
skeletonClassName="h-[1em] w-8"
|
||||||
|
>
|
||||||
|
10명
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
className="truncate"
|
||||||
|
skeletonClassName="h-[1em] w-14"
|
||||||
|
>
|
||||||
|
1팀 승리
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div className="md:hidden border border-base-content/10">
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className="border-b border-base-content/5 last:border-b-0 p-3"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1 space-y-2">
|
||||||
|
<SkeletonBlock className="h-3 w-28" />
|
||||||
|
<SkeletonBlock className="h-4 w-32" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="mt-2 h-3 w-40" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HomePageSkeleton() {
|
||||||
|
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main
|
||||||
|
className="max-w-5xl mx-auto px-4 sm:px-6"
|
||||||
|
aria-busy="true"
|
||||||
|
aria-live="polite"
|
||||||
|
>
|
||||||
|
<span className="sr-only">매치 목록을 불러오는 중...</span>
|
||||||
|
|
||||||
|
<section className="pt-8 pb-6">
|
||||||
|
<div className="flex items-center justify-between gap-3 mb-3">
|
||||||
|
<SkeletonBlock className="h-3 w-20" />
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<SkeletonBlock className="h-3 w-16" />
|
||||||
|
<SkeletonBlock className="h-3 w-20" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border border-base-content/10 bg-base-200/50">
|
||||||
|
<div className="p-5 sm:p-6">
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
||||||
|
<div className="space-y-3 flex-1">
|
||||||
|
<div className="flex items-center gap-2.5 flex-wrap">
|
||||||
|
<SkeletonBlock className="h-7 w-52 sm:w-64" />
|
||||||
|
<SkeletonBlock className="h-5 w-12" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<SkeletonBlock className="h-4 w-full max-w-xl" />
|
||||||
|
<SkeletonBlock className="h-4 w-4/5 max-w-lg" />
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3 flex-wrap pt-1">
|
||||||
|
<SkeletonBlock className="h-3 w-24" />
|
||||||
|
<SkeletonBlock className="h-3 w-12" />
|
||||||
|
<SkeletonBlock className="h-5 w-16" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-8 w-24 sm:shrink-0" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="pb-6">
|
||||||
|
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
|
||||||
|
{upcomingSkeletons.map((_, index) => (
|
||||||
|
<div key={index} className="bg-base-100 h-full p-4 min-h-[122px]">
|
||||||
|
<div className="flex items-center justify-between mb-3 gap-3">
|
||||||
|
<SkeletonBlock className="h-4 w-28" />
|
||||||
|
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<SkeletonBlock className="h-3 w-24" />
|
||||||
|
<SkeletonBlock className="h-3 w-12" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-5 w-16 mt-3" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="pb-12">
|
||||||
|
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||||
|
<HistoryRecordsSkeleton />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function StatusBadge({ status }: { status: string }) {
|
function StatusBadge({ status }: { status: string }) {
|
||||||
const styles: Record<string, string> = {
|
const styles: Record<string, string> = {
|
||||||
@@ -16,7 +249,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className={`inline-flex items-center text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
className={`inline-flex items-center whitespace-nowrap text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
||||||
>
|
>
|
||||||
{status}
|
{status}
|
||||||
</span>
|
</span>
|
||||||
@@ -25,7 +258,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
function MapBadge({ map }: { map: string }) {
|
function MapBadge({ map }: { map: string }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
<span className="inline-flex items-center whitespace-nowrap text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
||||||
{map}
|
{map}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -46,13 +279,110 @@ function getStatusLabel(status: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatCompactDateTime(dateLike: string) {
|
||||||
|
const date = new Date(dateLike);
|
||||||
|
if (Number.isNaN(date.getTime())) return '';
|
||||||
|
|
||||||
|
const weekday = new Intl.DateTimeFormat('ko-KR', {
|
||||||
|
weekday: 'short',
|
||||||
|
}).format(date);
|
||||||
|
const hours = String(date.getHours()).padStart(2, '0');
|
||||||
|
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||||
|
|
||||||
|
return `${date.getMonth() + 1}/${date.getDate()} (${weekday}) ${hours}:${minutes}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryMetaText({
|
||||||
|
map,
|
||||||
|
participants,
|
||||||
|
result,
|
||||||
|
}: {
|
||||||
|
map: string;
|
||||||
|
participants: number;
|
||||||
|
result?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-[11px] text-base-content/45">
|
||||||
|
<span>{map}</span>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{participants}명</span>
|
||||||
|
{result && (
|
||||||
|
<>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{result}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface HistoryPaginationProps {
|
||||||
|
page: number;
|
||||||
|
pageCount: number;
|
||||||
|
total: number;
|
||||||
|
isFetching: boolean;
|
||||||
|
onPrevious: () => void;
|
||||||
|
onNext: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryPagination({
|
||||||
|
page,
|
||||||
|
pageCount,
|
||||||
|
total,
|
||||||
|
isFetching,
|
||||||
|
onPrevious,
|
||||||
|
onNext,
|
||||||
|
}: HistoryPaginationProps) {
|
||||||
|
const hasPrevious = page > 1;
|
||||||
|
const hasNext = page < pageCount;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-wrap items-center gap-2 text-xs text-base-content/40">
|
||||||
|
<span className="font-medium whitespace-nowrap">
|
||||||
|
총 {total}개 · {page}/{pageCount}페이지
|
||||||
|
</span>
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs px-2"
|
||||||
|
disabled={!hasPrevious || isFetching}
|
||||||
|
onClick={onPrevious}
|
||||||
|
>
|
||||||
|
<ChevronLeft className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
이전
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs px-2"
|
||||||
|
disabled={!hasNext || isFetching}
|
||||||
|
onClick={onNext}
|
||||||
|
>
|
||||||
|
다음
|
||||||
|
<ChevronRight className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function HomePage() {
|
export default function HomePage() {
|
||||||
|
const [timelineNow] = useState(() => new Date().toISOString());
|
||||||
|
const [historyPage, setHistoryPage] = useState(1);
|
||||||
const upcomingMatchesQuery = useMatches(
|
const upcomingMatchesQuery = useMatches(
|
||||||
{ limit: UPCOMING_MATCH_LIST_LIMIT },
|
{
|
||||||
|
limit: UPCOMING_MATCH_LIST_LIMIT,
|
||||||
|
scheduledFrom: timelineNow,
|
||||||
|
sort: 'asc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const finishedMatchesQuery = useMatches(
|
const historyMatchesQuery = useMatchesPage(
|
||||||
{ status: 'finished', limit: 10 },
|
{
|
||||||
|
limit: HISTORY_MATCH_PAGE_SIZE,
|
||||||
|
page: historyPage,
|
||||||
|
scheduledTo: timelineNow,
|
||||||
|
sort: 'desc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const meQuery = useMe();
|
const meQuery = useMe();
|
||||||
@@ -67,15 +397,11 @@ export default function HomePage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
|
if (upcomingMatchesQuery.isLoading) {
|
||||||
return (
|
return <HomePageSkeleton />;
|
||||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
|
||||||
<span className="text-sm text-base-content/40">매치 목록을 불러오는 중...</span>
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.error || finishedMatchesQuery.error) {
|
if (upcomingMatchesQuery.error) {
|
||||||
return (
|
return (
|
||||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
||||||
<span className="text-sm text-red-500">
|
<span className="text-sm text-red-500">
|
||||||
@@ -87,8 +413,26 @@ export default function HomePage() {
|
|||||||
|
|
||||||
const upcomingMatches =
|
const upcomingMatches =
|
||||||
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
||||||
const finishedMatches =
|
const historyMatches =
|
||||||
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
historyMatchesQuery.data?.matches.map((match) => ({
|
||||||
|
...mapApiMatchToMatchDetail(match),
|
||||||
|
compactDateTime: formatCompactDateTime(match.scheduledAt),
|
||||||
|
})) ?? [];
|
||||||
|
const historyTotal = historyMatchesQuery.data?.total ?? 0;
|
||||||
|
const historyLimit =
|
||||||
|
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
|
||||||
|
const historyPageCount = Math.max(
|
||||||
|
1,
|
||||||
|
Math.ceil(historyTotal / historyLimit),
|
||||||
|
);
|
||||||
|
const isHistoryPageLoading =
|
||||||
|
historyMatchesQuery.isLoading ||
|
||||||
|
(historyMatchesQuery.isFetching && historyMatchesQuery.isPlaceholderData);
|
||||||
|
const hasHistoryError =
|
||||||
|
Boolean(historyMatchesQuery.error) && !historyMatchesQuery.data;
|
||||||
|
const goToPreviousHistoryPage = () =>
|
||||||
|
setHistoryPage((page) => Math.max(1, page - 1));
|
||||||
|
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||||
const nextMatch = upcomingMatches[0];
|
const nextMatch = upcomingMatches[0];
|
||||||
const upcomingCards = (nextMatch
|
const upcomingCards = (nextMatch
|
||||||
? upcomingMatches.slice(1)
|
? upcomingMatches.slice(1)
|
||||||
@@ -128,7 +472,7 @@ export default function HomePage() {
|
|||||||
{nextMatch ? (
|
{nextMatch ? (
|
||||||
<Link to={`/match/${nextMatch.id}`} className="block group">
|
<Link to={`/match/${nextMatch.id}`} className="block group">
|
||||||
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
|
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
|
||||||
<div className="p-5 sm:p-6">
|
<div className="p-5 sm:p-6 min-h-[150px]">
|
||||||
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
||||||
<div className="space-y-2.5">
|
<div className="space-y-2.5">
|
||||||
<div className="flex items-center gap-2.5 flex-wrap">
|
<div className="flex items-center gap-2.5 flex-wrap">
|
||||||
@@ -160,8 +504,10 @@ export default function HomePage() {
|
|||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<div className="border border-base-content/10 bg-base-100 px-5 py-10 text-center text-sm text-base-content/40">
|
<div className="border border-base-content/10 bg-base-200/50">
|
||||||
아직 등록된 내전이 없습니다.
|
<div className="p-5 sm:p-6 min-h-[150px] flex items-center justify-center text-center text-sm text-base-content/40">
|
||||||
|
{EMPTY_SCHEDULE_TEXT}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
@@ -174,7 +520,7 @@ export default function HomePage() {
|
|||||||
{upcomingCards.length > 0 ? (
|
{upcomingCards.length > 0 ? (
|
||||||
upcomingCards.map((match) => (
|
upcomingCards.map((match) => (
|
||||||
<Link key={match.id} to={`/match/${match.id}`}>
|
<Link key={match.id} to={`/match/${match.id}`}>
|
||||||
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4">
|
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4 min-h-[122px]">
|
||||||
<div className="flex items-center justify-between mb-2.5">
|
<div className="flex items-center justify-between mb-2.5">
|
||||||
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
||||||
{match.title}
|
{match.title}
|
||||||
@@ -194,34 +540,40 @@ export default function HomePage() {
|
|||||||
</Link>
|
</Link>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<div className="bg-base-100 px-4 py-6 text-sm text-base-content/35 col-span-full">
|
<div className="bg-base-100 h-full p-4 min-h-[122px] flex items-center justify-center text-center text-sm text-base-content/35">
|
||||||
예정된 추가 매치가 없습니다.
|
{EMPTY_SCHEDULE_TEXT}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="pb-12">
|
<section
|
||||||
|
className="pb-12"
|
||||||
|
aria-busy={isHistoryPageLoading}
|
||||||
|
aria-live="polite"
|
||||||
|
>
|
||||||
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
||||||
지난 내전 기록
|
지난 내전 기록
|
||||||
</h2>
|
</h2>
|
||||||
<div className="border border-base-content/10 overflow-x-auto">
|
{isHistoryPageLoading ? (
|
||||||
<table className="w-full text-left">
|
<HistoryRecordsSkeleton rows={HISTORY_MATCH_PAGE_SIZE} />
|
||||||
<thead>
|
) : hasHistoryError ? (
|
||||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
<div className="border border-base-content/10 px-4 py-8 text-center text-sm text-red-500">
|
||||||
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
지난 내전 기록을 불러오지 못했습니다.
|
||||||
<th className="py-2.5 px-4 font-semibold">내전</th>
|
</div>
|
||||||
<th className="py-2.5 px-4 font-semibold">맵</th>
|
) : (
|
||||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
<>
|
||||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
{/* 데스크톱: 테이블 */}
|
||||||
</tr>
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
</thead>
|
<table className="w-full table-fixed text-left">
|
||||||
|
<HistoryTableColGroup />
|
||||||
|
<HistoryTableHeader />
|
||||||
<tbody>
|
<tbody>
|
||||||
{finishedMatches.length > 0 ? (
|
{historyMatches.length > 0 ? (
|
||||||
finishedMatches.map((match) => (
|
historyMatches.map((match) => (
|
||||||
<tr
|
<tr
|
||||||
key={match.id}
|
key={match.id}
|
||||||
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
className={`${HISTORY_TABLE_ROW_CLASS} hover:bg-base-content/[0.02] transition-colors`}
|
||||||
>
|
>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||||
{match.date}
|
{match.date}
|
||||||
@@ -229,35 +581,103 @@ export default function HomePage() {
|
|||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<Link
|
<Link
|
||||||
to={`/match/${match.id}`}
|
to={`/match/${match.id}`}
|
||||||
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
|
className="block truncate text-sm font-medium text-base-content hover:text-primary transition-colors"
|
||||||
>
|
>
|
||||||
{match.title}
|
{match.title}
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<StatusBadge status={getStatusLabel(match.status)} />
|
||||||
|
</td>
|
||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<MapBadge map={match.map} />
|
<MapBadge map={match.map} />
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.participants.length}명
|
{match.participants.length}명
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
<span className="block truncate">
|
||||||
|
{match.result?.winner
|
||||||
|
? `${match.result.winner} 승리`
|
||||||
|
: '-'}
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<tr>
|
<tr>
|
||||||
<td
|
<td
|
||||||
colSpan={5}
|
colSpan={6}
|
||||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||||
>
|
>
|
||||||
아직 종료된 내전 기록이 없습니다.
|
아직 내전 기록이 없습니다.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* 모바일: 카드 리스트 */}
|
||||||
|
<div className="md:hidden border border-base-content/10">
|
||||||
|
{historyMatches.length > 0 ? (
|
||||||
|
historyMatches.map((match) => {
|
||||||
|
const resultLabel = match.result?.winner
|
||||||
|
? `${match.result.winner} 승리`
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Link
|
||||||
|
key={match.id}
|
||||||
|
to={`/match/${match.id}`}
|
||||||
|
className="block border-b border-base-content/5 last:border-b-0 p-3 hover:bg-base-content/[0.02] transition-colors"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<div className="text-[11px] font-medium text-base-content/40">
|
||||||
|
{match.compactDateTime ||
|
||||||
|
`${match.date} ${match.time}`}
|
||||||
|
</div>
|
||||||
|
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words">
|
||||||
|
{match.title}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="shrink-0">
|
||||||
|
<StatusBadge
|
||||||
|
status={getStatusLabel(match.status)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2">
|
||||||
|
<HistoryMetaText
|
||||||
|
map={match.map}
|
||||||
|
participants={match.participants.length}
|
||||||
|
result={resultLabel}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
|
||||||
|
아직 내전 기록이 없습니다.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{!hasHistoryError && historyTotal > 0 && (
|
||||||
|
<div className="mt-3 flex justify-end">
|
||||||
|
<HistoryPagination
|
||||||
|
page={historyPage}
|
||||||
|
pageCount={historyPageCount}
|
||||||
|
total={historyTotal}
|
||||||
|
isFetching={historyMatchesQuery.isFetching}
|
||||||
|
onPrevious={goToPreviousHistoryPage}
|
||||||
|
onNext={goToNextHistoryPage}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -88,6 +88,9 @@ const PARTICIPANT_TIER_LABELS: Record<string, string> = {
|
|||||||
UNRANKED: "언랭크",
|
UNRANKED: "언랭크",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const PARTICIPANT_TABLE_ROW_CLASS =
|
||||||
|
"h-12 border-b border-base-content/5 last:border-b-0";
|
||||||
|
|
||||||
function captainSlotKey(slot: CaptainSelectionSlot) {
|
function captainSlotKey(slot: CaptainSelectionSlot) {
|
||||||
return String(slot.teamIndex);
|
return String(slot.teamIndex);
|
||||||
}
|
}
|
||||||
@@ -184,13 +187,29 @@ function QueueRankCell({
|
|||||||
tier?: ApiTierInfo;
|
tier?: ApiTierInfo;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex w-[54px] items-center gap-1">
|
<span className="grid grid-cols-[24px_auto] items-center gap-1">
|
||||||
<span>{label}</span>
|
<span>{label}</span>
|
||||||
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function PreferredPositionText({
|
||||||
|
mainPosition,
|
||||||
|
subPosition,
|
||||||
|
}: {
|
||||||
|
mainPosition: Position;
|
||||||
|
subPosition: Position;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className="inline-flex flex-col gap-0.5 text-[11px] font-medium leading-tight text-base-content/55 whitespace-nowrap sm:flex-row sm:items-center sm:gap-1 sm:leading-normal">
|
||||||
|
<span>주 {positionLabel[mainPosition]}</span>
|
||||||
|
<span className="hidden sm:inline">/</span>
|
||||||
|
<span>부 {positionLabel[subPosition]}</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
||||||
@@ -214,7 +233,7 @@ function TierCell({ participant }: { participant: ParticipantView }) {
|
|||||||
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2 text-[10px] font-black text-base-content/35 whitespace-nowrap">
|
<div className="flex flex-col items-start gap-1 text-[10px] font-black text-base-content/35 whitespace-nowrap sm:flex-row sm:items-center sm:gap-3">
|
||||||
<QueueRankCell label="SOLO" tier={soloTier} />
|
<QueueRankCell label="SOLO" tier={soloTier} />
|
||||||
<QueueRankCell label="FLEX" tier={flexTier} />
|
<QueueRankCell label="FLEX" tier={flexTier} />
|
||||||
</div>
|
</div>
|
||||||
@@ -286,7 +305,7 @@ function PositionSelect({
|
|||||||
value={value}
|
value={value}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onChange={(event) => onChange(event.target.value as Position)}
|
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 ${
|
className={`h-7 w-16 border bg-base-100 pl-1.5 pr-1 text-[11px] font-medium focus:border-primary/30 focus:outline-none disabled:opacity-50 ${
|
||||||
sub
|
sub
|
||||||
? "border-base-content/10 text-base-content/45"
|
? "border-base-content/10 text-base-content/45"
|
||||||
: "border-primary/20 text-primary"
|
: "border-primary/20 text-primary"
|
||||||
@@ -334,17 +353,18 @@ function ParticipantRow({
|
|||||||
: participant.mainPosition;
|
: participant.mainPosition;
|
||||||
admin.onChangePositions(participant.userId, main, next);
|
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
|
||||||
<td className="py-2 px-3 text-center text-[11px] text-base-content/30 w-8">
|
className={`${PARTICIPANT_TABLE_ROW_CLASS} hover:bg-base-content/[0.02] transition-colors`}
|
||||||
|
>
|
||||||
|
<td className="hidden py-2 px-3 text-center text-[11px] text-base-content/30 w-8 sm:table-cell">
|
||||||
{index + 1}
|
{index + 1}
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<Link
|
<Link
|
||||||
to={`/users/${participant.userId}/history`}
|
to={`/users/${participant.userId}/history`}
|
||||||
state={{ backTo: historyBackTo }}
|
state={{ backTo: historyBackTo }}
|
||||||
className="flex items-center gap-2 group"
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
>
|
>
|
||||||
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
||||||
<img
|
<img
|
||||||
@@ -355,7 +375,7 @@ function ParticipantRow({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<span className="font-medium text-[13px] text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
|
<span className="font-medium text-[13px] text-base-content block leading-tight break-words group-hover:text-primary transition-colors sm:truncate">
|
||||||
{participant.summonerName}
|
{participant.summonerName}
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
||||||
@@ -374,7 +394,10 @@ function ParticipantRow({
|
|||||||
</td>
|
</td>
|
||||||
{assignedPos ? (
|
{assignedPos ? (
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<PosBadge pos={assignedPos} />
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
</td>
|
</td>
|
||||||
) : admin ? (
|
) : admin ? (
|
||||||
<>
|
<>
|
||||||
@@ -452,6 +475,53 @@ function ParticipantRow({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function TeamParticipantMobileRow({
|
||||||
|
participant,
|
||||||
|
}: {
|
||||||
|
participant: ParticipantView;
|
||||||
|
}) {
|
||||||
|
const { data: ddragon } = useDdragonManifest();
|
||||||
|
const location = useLocation();
|
||||||
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] items-center gap-x-2 border-b border-base-content/5 px-3 py-2 last:border-b-0">
|
||||||
|
<Link
|
||||||
|
to={`/users/${participant.userId}/history`}
|
||||||
|
state={{ backTo: historyBackTo }}
|
||||||
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
|
>
|
||||||
|
<div className="h-7 w-7 shrink-0 overflow-hidden bg-base-content/10">
|
||||||
|
<img
|
||||||
|
src={profileIconUrl(ddragon, participant.profileIconId)}
|
||||||
|
alt=""
|
||||||
|
className="h-full w-full object-cover"
|
||||||
|
loading="lazy"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<span className="block break-words text-[13px] font-medium leading-tight text-base-content transition-colors group-hover:text-primary">
|
||||||
|
{participant.summonerName}
|
||||||
|
</span>
|
||||||
|
<span className="inline-flex items-center gap-1 text-[10px] leading-tight text-base-content/25">
|
||||||
|
#{participant.tag}
|
||||||
|
{participant.excluded && (
|
||||||
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-[9px] font-bold text-amber-500">
|
||||||
|
제외
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<TierCell participant={participant} />
|
||||||
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ParticipantTable({
|
function ParticipantTable({
|
||||||
participants,
|
participants,
|
||||||
maxParticipants,
|
maxParticipants,
|
||||||
@@ -546,18 +616,18 @@ function ParticipantTable({
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="border-b border-base-content/10 bg-base-100 px-4 py-2.5">
|
<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="flex flex-wrap items-center gap-x-2 gap-y-2">
|
||||||
<div className="inline-flex items-center gap-1">
|
<div className="inline-flex items-center gap-1">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setPositionFilter(ALL_PARTICIPANT_FILTER)}
|
onClick={() => setPositionFilter(ALL_PARTICIPANT_FILTER)}
|
||||||
className={`inline-flex h-8 items-center px-2.5 text-[11px] font-semibold border transition-colors ${
|
className={`inline-flex h-8 w-[3.75rem] items-center justify-center px-1 text-[10px] font-semibold border transition-colors ${
|
||||||
positionFilter === ALL_PARTICIPANT_FILTER
|
positionFilter === ALL_PARTICIPANT_FILTER
|
||||||
? "border-primary/30 bg-primary/5 text-primary"
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
전체 ({participants.length})
|
전체<span className="tabular-nums">({participants.length})</span>
|
||||||
</button>
|
</button>
|
||||||
{POSITION_ORDER.map((position) => {
|
{POSITION_ORDER.map((position) => {
|
||||||
const active = positionFilter === position;
|
const active = positionFilter === position;
|
||||||
@@ -574,27 +644,20 @@ function ParticipantTable({
|
|||||||
active ? ALL_PARTICIPANT_FILTER : position,
|
active ? ALL_PARTICIPANT_FILTER : position,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
className={`inline-flex h-8 items-center gap-1 px-2 text-[11px] font-semibold border transition-colors ${
|
className={`inline-flex h-8 w-[3.75rem] items-center justify-center px-1 text-[10px] font-semibold border transition-colors ${
|
||||||
active
|
active
|
||||||
? "border-primary/30 bg-primary/5 text-primary"
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
: "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]}
|
{positionLabel[position]}
|
||||||
</span>
|
|
||||||
<span className="tabular-nums">({count})</span>
|
<span className="tabular-nums">({count})</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<select
|
<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"
|
className="h-8 w-32 shrink-0 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
|
||||||
value={tierFilter}
|
value={tierFilter}
|
||||||
onChange={(event) => setTierFilter(event.target.value)}
|
onChange={(event) => setTierFilter(event.target.value)}
|
||||||
>
|
>
|
||||||
@@ -606,14 +669,11 @@ function ParticipantTable({
|
|||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
<div className="ml-auto flex items-center gap-2 text-[11px] text-base-content/35">
|
<div className="ml-auto flex min-w-[6.5rem] shrink-0 items-center justify-end gap-1 whitespace-nowrap text-[11px] text-base-content/35">
|
||||||
<span>
|
|
||||||
{filteredParticipants.length}/{participants.length}명
|
|
||||||
</span>
|
|
||||||
{isFiltered && (
|
{isFiltered && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="btn btn-ghost btn-xs h-8 min-h-8 px-2 text-[11px] text-base-content/40"
|
className="btn btn-ghost btn-xs h-8 min-h-8 shrink-0 px-1 text-[11px] text-base-content/40"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setPositionFilter(ALL_PARTICIPANT_FILTER);
|
setPositionFilter(ALL_PARTICIPANT_FILTER);
|
||||||
setTierFilter(ALL_PARTICIPANT_FILTER);
|
setTierFilter(ALL_PARTICIPANT_FILTER);
|
||||||
@@ -622,20 +682,41 @@ function ParticipantTable({
|
|||||||
초기화
|
초기화
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
<span className="w-10 shrink-0 text-right tabular-nums">
|
||||||
|
{filteredParticipants.length}/{participants.length}명
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full text-left">
|
<table className="w-full min-w-[40rem] table-fixed text-left">
|
||||||
|
<colgroup>
|
||||||
|
<col className="w-0 sm:w-[5%]" />
|
||||||
|
<col className={canManage ? "w-[25%]" : "w-[37%]"} />
|
||||||
|
<col className={canManage ? "w-[30%]" : "w-[30%]"} />
|
||||||
|
<col className={canManage ? "w-[14%]" : "w-[14%]"} />
|
||||||
|
<col className={canManage ? "w-[14%]" : "w-[14%]"} />
|
||||||
|
{canManage && <col className="w-[12%]" />}
|
||||||
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-0 sm:table-cell sm:w-[5%]">
|
||||||
<th className="py-2 px-3">소환사</th>
|
#
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
</th>
|
||||||
<th className="py-2 px-3">주 포지션</th>
|
<th className={canManage ? "py-2 px-3 w-[25%]" : "py-2 px-3 w-[37%]"}>
|
||||||
<th className="py-2 px-3">부 포지션</th>
|
소환사
|
||||||
|
</th>
|
||||||
|
<th className={canManage ? "py-2 px-3 w-[30%]" : "py-2 px-3 w-[30%]"}>
|
||||||
|
현재 티어
|
||||||
|
</th>
|
||||||
|
<th className={canManage ? "py-2 px-3 w-[14%]" : "py-2 px-3 w-[14%]"}>
|
||||||
|
주 포지션
|
||||||
|
</th>
|
||||||
|
<th className={canManage ? "py-2 px-3 w-[14%]" : "py-2 px-3 w-[14%]"}>
|
||||||
|
부 포지션
|
||||||
|
</th>
|
||||||
{canManage && (
|
{canManage && (
|
||||||
<th className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
|
<th className="py-2 px-3 w-[12%] min-w-[5rem] whitespace-nowrap text-right">
|
||||||
관리
|
관리
|
||||||
</th>
|
</th>
|
||||||
)}
|
)}
|
||||||
@@ -722,7 +803,20 @@ function TeamCard({
|
|||||||
진행 페이지
|
진행 페이지
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<table className="w-full table-fixed text-left">
|
<div className="sm:hidden">
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] gap-x-2 border-b border-base-content/8 bg-base-200/30 px-3 py-2 text-[11px] font-semibold uppercase tracking-wider text-base-content/35">
|
||||||
|
<span>소환사</span>
|
||||||
|
<span>현재 티어</span>
|
||||||
|
<span>포지션</span>
|
||||||
|
</div>
|
||||||
|
{team.participants.map((participant) => (
|
||||||
|
<TeamParticipantMobileRow
|
||||||
|
key={participant.id}
|
||||||
|
participant={participant}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<table className="hidden w-full table-fixed text-left sm:table">
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col className="w-11" />
|
<col className="w-11" />
|
||||||
<col />
|
<col />
|
||||||
@@ -731,7 +825,7 @@ function TeamCard({
|
|||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-8 sm:table-cell">#</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>
|
<th className="py-2 px-3">포지션</th>
|
||||||
|
|||||||
Reference in new issue
Block a user