diff --git a/apps/api/src/modules/dakao/dakao-user.service.spec.ts b/apps/api/src/modules/dakao/dakao-user.service.spec.ts index bcbedb98..a8b98cd0 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.spec.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.spec.ts @@ -14,7 +14,7 @@ function makeQuery(value: T) { } function makeService(params: { - user: Partial; + user: Partial | null; community?: Record | null; riotAccountService?: Partial; enrichmentService?: Partial; @@ -22,6 +22,7 @@ function makeService(params: { const findOneAndUpdate = jest .fn() .mockReturnValue(makeQuery(params.user as UserDocument)); + const findOne = jest.fn().mockReturnValue(makeQuery(params.user)); const findById = jest.fn().mockReturnValue({ select: jest.fn().mockReturnValue({ lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})), @@ -29,7 +30,7 @@ function makeService(params: { }); const connectionService = { getModel: jest.fn().mockImplementation(async (name: string) => { - if (name === 'user') return { findOneAndUpdate }; + if (name === 'user') return { findOneAndUpdate, findOne }; if (name === 'community') return { findById }; throw new Error(`Unexpected model: ${name}`); }), @@ -51,6 +52,7 @@ function makeService(params: { ), connectionService, findOneAndUpdate, + findOne, findById, riotAccountService, enrichmentService, @@ -168,4 +170,78 @@ describe('DakaoUserService', () => { expect(enrichmentService.enrichRiotAccount).not.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, + }); + + 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, + }); + + 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(); + }); }); diff --git a/apps/api/src/modules/dakao/dakao-user.service.ts b/apps/api/src/modules/dakao/dakao-user.service.ts index 2ffb22c4..15b31553 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.ts @@ -230,6 +230,43 @@ export class DakaoUserService { return user; } + public async changePrimaryRiotAccount( + context: ResolveContext, + ): Promise { + 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[] { return positions.map((position, index) => ({ position, diff --git a/apps/api/src/modules/dakao/dakao.module.ts b/apps/api/src/modules/dakao/dakao.module.ts index c9520727..b6b42846 100644 --- a/apps/api/src/modules/dakao/dakao.module.ts +++ b/apps/api/src/modules/dakao/dakao.module.ts @@ -15,6 +15,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler'; import { MatchJoinHandler } from './handlers/match-join.handler'; import { MatchListHandler } from './handlers/match-list.handler'; import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler'; +import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler'; @Module({ imports: [RiotModule, MatchModule], @@ -36,6 +37,7 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position- MatchJoinHandler, MatchCancelHandler, PreferredPositionRegisterHandler, + PrimaryAccountChangeHandler, ], exports: [DakaoPublisher], }) diff --git a/apps/api/src/modules/dakao/dakao.subscriber.ts b/apps/api/src/modules/dakao/dakao.subscriber.ts index 2a73644b..95cc3816 100644 --- a/apps/api/src/modules/dakao/dakao.subscriber.ts +++ b/apps/api/src/modules/dakao/dakao.subscriber.ts @@ -11,6 +11,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler'; import { MatchJoinHandler } from './handlers/match-join.handler'; import { MatchListHandler } from './handlers/match-list.handler'; import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler'; +import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler'; import { resolveDakaoNatsNames } from './dakao.nats-names'; import { DakaoInboxService } from './dakao-inbox.service'; import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service'; @@ -33,6 +34,7 @@ export class DakaoSubscriber implements OnModuleInit { private readonly matchJoinHandler: MatchJoinHandler, private readonly matchCancelHandler: MatchCancelHandler, private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler, + private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler, ) {} async onModuleInit() { @@ -126,6 +128,15 @@ export class DakaoSubscriber implements OnModuleInit { tagLine: command.tagLine, }); 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': segments = await this.matchJoinHandler.handle({ communityId, @@ -256,9 +267,9 @@ export class DakaoSubscriber implements OnModuleInit { const text = ((): string => { switch (err.code) { case 'unknown_command': - return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; + return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; case 'usage': - return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; + return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; case 'invalid_match_id': return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`; case 'invalid_riot_id': diff --git a/apps/api/src/modules/dakao/handlers/match-list.handler.ts b/apps/api/src/modules/dakao/handlers/match-list.handler.ts index 0d019957..afe6441e 100644 --- a/apps/api/src/modules/dakao/handlers/match-list.handler.ts +++ b/apps/api/src/modules/dakao/handlers/match-list.handler.ts @@ -48,7 +48,7 @@ export class MatchListHandler { }, { kind: 'text', - text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`, + text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n대표계정변경: !내전 대표계정변경 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`, }, ]; } diff --git a/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts new file mode 100644 index 00000000..23225bdc --- /dev/null +++ b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts @@ -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) { + 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('먼저 !내전 계정등록'), + }), + ]); + }); +}); diff --git a/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts new file mode 100644 index 00000000..8a265a4e --- /dev/null +++ b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts @@ -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 { + 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 '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.'; + } + } +} diff --git a/apps/api/src/modules/dakao/parsers/command.parser.spec.ts b/apps/api/src/modules/dakao/parsers/command.parser.spec.ts index edfd8d73..d0e00e34 100644 --- a/apps/api/src/modules/dakao/parsers/command.parser.spec.ts +++ b/apps/api/src/modules/dakao/parsers/command.parser.spec.ts @@ -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', () => { const decomposedGameName = '프리리'.normalize('NFD'); expect( diff --git a/apps/api/src/modules/dakao/parsers/command.parser.ts b/apps/api/src/modules/dakao/parsers/command.parser.ts index f7d699c9..92d7ced0 100644 --- a/apps/api/src/modules/dakao/parsers/command.parser.ts +++ b/apps/api/src/modules/dakao/parsers/command.parser.ts @@ -12,6 +12,11 @@ export type DakaoCommand = gameName: string; tagLine: string; } + | { + kind: 'primary-account-change'; + gameName: string; + tagLine: string; + } | { kind: 'match-join'; matchAndRiotId: string; @@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand { return parseCancelArgs(args); case '계정등록': return parseAccountRegisterArgs(args); + case '대표계정변경': + return parsePrimaryAccountChangeArgs(args); case '선호포지션등록': case '포지션등록': return parsePreferredPositionRegisterArgs(args); @@ -79,6 +86,24 @@ export function parseCommand(rawMessage: 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) { throw new CommandParseError('usage'); } @@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand { throw new CommandParseError('invalid_riot_id', args); } - return { - kind: 'account-register', - gameName, - tagLine, - }; + return { gameName, tagLine }; } function parseCancelArgs(args: string): DakaoCommand {