Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12869a7e9e | ||
|
|
d10e2ab011 | ||
|
|
170e42098a | ||
|
|
fe7a482969 | ||
|
|
aa07ec0304 |
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)}` : ''}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ 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';
|
||||||
@@ -32,6 +33,7 @@ import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.h
|
|||||||
DakaoSubscriber,
|
DakaoSubscriber,
|
||||||
DakaoSendResultSubscriber,
|
DakaoSendResultSubscriber,
|
||||||
DakaoUserService,
|
DakaoUserService,
|
||||||
|
DakaoUrlShortenerService,
|
||||||
AccountRegisterHandler,
|
AccountRegisterHandler,
|
||||||
MatchListHandler,
|
MatchListHandler,
|
||||||
MatchJoinHandler,
|
MatchJoinHandler,
|
||||||
|
|||||||
@@ -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: '스타',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -21,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,
|
||||||
@@ -267,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':
|
||||||
@@ -280,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(
|
||||||
const filled = m.participants.length;
|
matchesWithCodes.map(async (m, i) => {
|
||||||
const cap = m.maxParticipants;
|
const filled = m.participants.length;
|
||||||
const time = formatScheduledAt(m.scheduledAt);
|
const cap = m.maxParticipants;
|
||||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}`;
|
const time = formatScheduledAt(m.scheduledAt);
|
||||||
});
|
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선호포지션등록: !내전 선호포지션등록 미드,정글\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 {
|
||||||
|
|||||||
@@ -155,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/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ export function useMatchesPage(
|
|||||||
auth: 'none',
|
auth: 'none',
|
||||||
}),
|
}),
|
||||||
enabled: Boolean(communityId),
|
enabled: Boolean(communityId),
|
||||||
|
placeholderData: (previousData) => previousData,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+273
-164
@@ -9,6 +9,8 @@ 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 HISTORY_MATCH_PAGE_SIZE = 10;
|
||||||
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
|
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 }) {
|
function SkeletonBlock({ className }: { className: string }) {
|
||||||
return (
|
return (
|
||||||
@@ -19,9 +21,155 @@ function SkeletonBlock({ className }: { className: string }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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() {
|
function HomePageSkeleton() {
|
||||||
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||||
const historySkeletons = Array.from({ length: 5 });
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main
|
<main
|
||||||
@@ -85,63 +233,7 @@ function HomePageSkeleton() {
|
|||||||
|
|
||||||
<section className="pb-12">
|
<section className="pb-12">
|
||||||
<SkeletonBlock className="h-3 w-24 mb-3" />
|
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
<HistoryRecordsSkeleton />
|
||||||
<table className="w-full text-left">
|
|
||||||
<thead>
|
|
||||||
<tr className="bg-base-200/60 border-b border-base-content/10">
|
|
||||||
{['날짜', '내전', '상태', '맵', '참가', '결과'].map((label) => (
|
|
||||||
<th key={label} className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-3 w-10" />
|
|
||||||
</th>
|
|
||||||
))}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{historySkeletons.map((_, index) => (
|
|
||||||
<tr
|
|
||||||
key={index}
|
|
||||||
className="border-b border-base-content/5 last:border-b-0"
|
|
||||||
>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-3 w-16" />
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-4 w-36" />
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-5 w-12" />
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-5 w-16" />
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-3 w-10" />
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<SkeletonBlock className="h-3 w-14" />
|
|
||||||
</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>
|
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
@@ -305,11 +397,11 @@ export default function HomePage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.isLoading || historyMatchesQuery.isLoading) {
|
if (upcomingMatchesQuery.isLoading) {
|
||||||
return <HomePageSkeleton />;
|
return <HomePageSkeleton />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.error || historyMatchesQuery.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">
|
||||||
@@ -329,11 +421,15 @@ export default function HomePage() {
|
|||||||
const historyTotal = historyMatchesQuery.data?.total ?? 0;
|
const historyTotal = historyMatchesQuery.data?.total ?? 0;
|
||||||
const historyLimit =
|
const historyLimit =
|
||||||
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
|
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
|
||||||
const historyPageFromApi = historyMatchesQuery.data?.page ?? historyPage;
|
|
||||||
const historyPageCount = Math.max(
|
const historyPageCount = Math.max(
|
||||||
1,
|
1,
|
||||||
Math.ceil(historyTotal / historyLimit),
|
Math.ceil(historyTotal / historyLimit),
|
||||||
);
|
);
|
||||||
|
const isHistoryPageLoading =
|
||||||
|
historyMatchesQuery.isLoading ||
|
||||||
|
(historyMatchesQuery.isFetching && historyMatchesQuery.isPlaceholderData);
|
||||||
|
const hasHistoryError =
|
||||||
|
Boolean(historyMatchesQuery.error) && !historyMatchesQuery.data;
|
||||||
const goToPreviousHistoryPage = () =>
|
const goToPreviousHistoryPage = () =>
|
||||||
setHistoryPage((page) => Math.max(1, page - 1));
|
setHistoryPage((page) => Math.max(1, page - 1));
|
||||||
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||||
@@ -451,116 +547,129 @@ export default function HomePage() {
|
|||||||
</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>
|
||||||
{/* 데스크톱: 테이블 */}
|
{isHistoryPageLoading ? (
|
||||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
<HistoryRecordsSkeleton rows={HISTORY_MATCH_PAGE_SIZE} />
|
||||||
<table className="w-full text-left">
|
) : hasHistoryError ? (
|
||||||
<thead>
|
<div className="border border-base-content/10 px-4 py-8 text-center text-sm text-red-500">
|
||||||
<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>
|
</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>
|
{/* 데스크톱: 테이블 */}
|
||||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
<table className="w-full table-fixed text-left">
|
||||||
</tr>
|
<HistoryTableColGroup />
|
||||||
</thead>
|
<HistoryTableHeader />
|
||||||
<tbody>
|
<tbody>
|
||||||
{historyMatches.length > 0 ? (
|
{historyMatches.length > 0 ? (
|
||||||
historyMatches.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">
|
|
||||||
{match.date}
|
|
||||||
</td>
|
|
||||||
<td className="py-2.5 px-4">
|
|
||||||
<Link
|
|
||||||
to={`/match/${match.id}`}
|
|
||||||
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
|
|
||||||
>
|
>
|
||||||
{match.title}
|
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||||
</Link>
|
{match.date}
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<StatusBadge status={getStatusLabel(match.status)} />
|
<Link
|
||||||
</td>
|
to={`/match/${match.id}`}
|
||||||
<td className="py-2.5 px-4">
|
className="block truncate text-sm font-medium text-base-content hover:text-primary transition-colors"
|
||||||
<MapBadge map={match.map} />
|
>
|
||||||
</td>
|
{match.title}
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
</Link>
|
||||||
{match.participants.length}명
|
</td>
|
||||||
</td>
|
<td className="py-2.5 px-4">
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
<StatusBadge status={getStatusLabel(match.status)} />
|
||||||
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
</td>
|
||||||
</td>
|
<td className="py-2.5 px-4">
|
||||||
</tr>
|
<MapBadge map={match.map} />
|
||||||
))
|
</td>
|
||||||
) : (
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
<tr>
|
{match.participants.length}명
|
||||||
<td
|
</td>
|
||||||
colSpan={6}
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
<span className="block truncate">
|
||||||
>
|
{match.result?.winner
|
||||||
아직 내전 기록이 없습니다.
|
? `${match.result.winner} 승리`
|
||||||
</td>
|
: '-'}
|
||||||
</tr>
|
</span>
|
||||||
)}
|
</td>
|
||||||
</tbody>
|
</tr>
|
||||||
</table>
|
))
|
||||||
</div>
|
) : (
|
||||||
|
<tr>
|
||||||
{/* 모바일: 카드 리스트 */}
|
<td
|
||||||
<div className="md:hidden border border-base-content/10">
|
colSpan={6}
|
||||||
{historyMatches.length > 0 ? (
|
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||||
historyMatches.map((match) => {
|
>
|
||||||
const resultLabel = match.result?.winner
|
아직 내전 기록이 없습니다.
|
||||||
? `${match.result.winner} 승리`
|
</td>
|
||||||
: undefined;
|
</tr>
|
||||||
|
)}
|
||||||
return (
|
</tbody>
|
||||||
<Link
|
</table>
|
||||||
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>
|
||||||
)}
|
|
||||||
</div>
|
{/* 모바일: 카드 리스트 */}
|
||||||
{historyTotal > 0 && (
|
<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">
|
<div className="mt-3 flex justify-end">
|
||||||
<HistoryPagination
|
<HistoryPagination
|
||||||
page={historyPageFromApi}
|
page={historyPage}
|
||||||
pageCount={historyPageCount}
|
pageCount={historyPageCount}
|
||||||
total={historyTotal}
|
total={historyTotal}
|
||||||
isFetching={historyMatchesQuery.isFetching}
|
isFetching={historyMatchesQuery.isFetching}
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
@@ -302,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"
|
||||||
@@ -351,7 +354,9 @@ function ParticipantRow({
|
|||||||
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
|
||||||
|
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">
|
<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>
|
||||||
@@ -611,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;
|
||||||
@@ -639,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
|
{positionLabel[position]}
|
||||||
src={positionIcon[position]}
|
|
||||||
alt=""
|
|
||||||
className="h-3.5 w-3.5 object-contain"
|
|
||||||
/>
|
|
||||||
<span className="hidden sm:inline">
|
|
||||||
{positionLabel[position]}
|
|
||||||
</span>
|
|
||||||
<span className="tabular-nums">({count})</span>
|
<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)}
|
||||||
>
|
>
|
||||||
@@ -671,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);
|
||||||
@@ -687,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="hidden py-2 px-3 w-8 sm:table-cell">#</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>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in new issue
Block a user