Compare commits
1
Commits
release/74
...
release/75
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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(
|
||||||
|
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선호포지션등록: !내전 선호포지션등록 미드,정글\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/);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user