From 3fa8fffcec25b6ea0de17234e9ce470a7272a32b Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sat, 2 May 2026 05:34:47 -0700 Subject: [PATCH] . --- .../modules/dakao/dakao-user.service.spec.ts | 117 +++++++++++++++--- .../src/modules/dakao/dakao-user.service.ts | 56 ++++----- .../handlers/account-register.handler.spec.ts | 40 ++++-- .../handlers/account-register.handler.ts | 4 +- 4 files changed, 159 insertions(+), 58 deletions(-) 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 13248439..bcbedb98 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.spec.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.spec.ts @@ -3,7 +3,7 @@ import { ConnectionService } from '../global/database/connection.service'; import { RiotAccount, UserDocument } from '../global/database/schema'; import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service'; import { RiotAccountService } from '../riot/riot-account.service'; -import { DakaoUserError, DakaoUserService } from './dakao-user.service'; +import { DakaoUserService } from './dakao-user.service'; const objectId = (hex: string) => new mongoose.Types.ObjectId(hex); @@ -15,14 +15,24 @@ function makeQuery(value: T) { function makeService(params: { user: Partial; + community?: Record | null; riotAccountService?: Partial; enrichmentService?: Partial; }) { const findOneAndUpdate = jest .fn() .mockReturnValue(makeQuery(params.user as UserDocument)); + const findById = jest.fn().mockReturnValue({ + select: jest.fn().mockReturnValue({ + lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})), + }), + }); const connectionService = { - getModel: jest.fn().mockResolvedValue({ findOneAndUpdate }), + getModel: jest.fn().mockImplementation(async (name: string) => { + if (name === 'user') return { findOneAndUpdate }; + if (name === 'community') return { findById }; + throw new Error(`Unexpected model: ${name}`); + }), } as unknown as ConnectionService; const riotAccountService = { getByRiotId: jest.fn(), @@ -41,13 +51,14 @@ function makeService(params: { ), connectionService, findOneAndUpdate, + findById, riotAccountService, enrichmentService, }; } describe('DakaoUserService', () => { - it('rejects account registration when the user already has a Riot account', async () => { + it('registers an additional Riot account when the user already has one', async () => { const save = jest.fn().mockResolvedValue(undefined); const existingAccount = { puuid: 'puuid-1', @@ -66,25 +77,95 @@ describe('DakaoUserService', () => { riotAccounts: [existingAccount], save, } as Partial, + riotAccountService: { + getByRiotId: jest.fn().mockResolvedValue({ + puuid: 'puuid-2', + gameName: '새소환사', + tagLine: 'KR2', + }), + }, + enrichmentService: { + enrichRiotAccount: jest.fn().mockResolvedValue({ account: null }), + }, }); - await expect( - service.registerPrimaryRiotAccount({ - communityId: objectId('111111111111111111111111'), - kakaoTalkId: 'kakao-user-1', - kakaoTalkNickname: '프리리', - gameName: '새소환사', - tagLine: 'KR2', - }), - ).rejects.toMatchObject({ - code: 'riot_account_already_registered', - detail: '기존소환사#KR1', - } satisfies Partial); + const result = await service.registerRiotAccount({ + communityId: objectId('111111111111111111111111'), + kakaoTalkId: 'kakao-user-1', + kakaoTalkNickname: '프리리', + gameName: '새소환사', + tagLine: 'KR2', + }); - expect(connectionService.getModel).toHaveBeenCalledTimes(1); + expect(result.riotAccount).toMatchObject({ + puuid: 'puuid-2', + gameName: '새소환사', + tagLine: 'KR2', + isPrimary: false, + }); + expect((result.user.riotAccounts as RiotAccount[])[0]).toMatchObject({ + puuid: 'puuid-1', + isPrimary: true, + }); + expect(result.user.riotAccounts).toHaveLength(2); expect(connectionService.getModel).toHaveBeenCalledWith('user'); - expect(riotAccountService.getByRiotId).not.toHaveBeenCalled(); + expect(connectionService.getModel).toHaveBeenCalledWith('community'); + expect(riotAccountService.getByRiotId).toHaveBeenCalledWith( + '새소환사', + 'KR2', + { + region: 'asia', + }, + ); + expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledWith( + expect.objectContaining({ + userId: expect.any(mongoose.Types.ObjectId), + puuid: 'puuid-2', + options: { force: true, platform: 'kr', region: 'asia' }, + }), + ); + expect(save).toHaveBeenCalled(); + }); + + it('reuses an already attached Riot account by puuid', async () => { + const save = jest.fn().mockResolvedValue(undefined); + const existingAccount = { + puuid: 'puuid-1', + gameName: '기존소환사', + tagLine: 'KR1', + isPrimary: true, + } as RiotAccount; + const { service, enrichmentService } = makeService({ + user: { + _id: objectId('222222222222222222222222'), + riotAccounts: [existingAccount], + save, + } as Partial, + riotAccountService: { + getByRiotId: jest.fn().mockResolvedValue({ + puuid: 'puuid-1', + gameName: '바뀐소환사', + tagLine: 'KR1', + }), + }, + }); + + const result = await service.registerRiotAccount({ + communityId: objectId('111111111111111111111111'), + kakaoTalkId: 'kakao-user-1', + kakaoTalkNickname: '프리리', + gameName: '바뀐소환사', + tagLine: 'KR1', + }); + + expect(result.user.riotAccounts).toHaveLength(1); + expect(result.riotAccount).toMatchObject({ + puuid: 'puuid-1', + gameName: '바뀐소환사', + tagLine: 'KR1', + isPrimary: true, + }); expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled(); - expect(save).not.toHaveBeenCalled(); + expect(save).toHaveBeenCalled(); }); }); diff --git a/apps/api/src/modules/dakao/dakao-user.service.ts b/apps/api/src/modules/dakao/dakao-user.service.ts index d50e4a1a..90206f35 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.ts @@ -129,6 +129,8 @@ export class DakaoUserService { const routing = await this.resolveRiotRouting(context.communityId); const { requestedGameName, requestedTagLine, dto } = await this.lookupRiotIdentity(context, routing); + const nextGameName = dto.gameName ?? requestedGameName; + const nextTagLine = dto.tagLine ?? requestedTagLine; const existing = user.riotAccounts.find( (a) => @@ -142,8 +144,6 @@ export class DakaoUserService { } if (existing) { - const nextGameName = dto.gameName ?? requestedGameName; - const nextTagLine = dto.tagLine ?? requestedTagLine; if (existing.puuid !== dto.puuid) { this.logger.warn( `Riot account puuid mismatch for ${requestedGameName}#${requestedTagLine}: stored=${existing.puuid} resolved=${dto.puuid}. Updating stored account.`, @@ -172,37 +172,21 @@ export class DakaoUserService { return { user, riotAccount: existing }; } - return this.attachRiotAccount({ - user, - puuid: dto.puuid, - gameName: dto.gameName ?? requestedGameName, - tagLine: dto.tagLine ?? requestedTagLine, - platform: routing.platform, - region: routing.region, - }); - } - - public async registerPrimaryRiotAccount( - context: ResolveContext, - ): Promise { - const user = await this.upsertUser(context); - const existingPrimary = user.riotAccounts.find( - (account) => account.isPrimary, + const existingByPuuid = user.riotAccounts.find( + (account) => account.puuid === dto.puuid, ); - const existingAccount = existingPrimary ?? user.riotAccounts[0]; - if (existingAccount) { - throw new DakaoUserError( - 'riot_account_already_registered', - `${existingAccount.gameName}#${existingAccount.tagLine}`, - ); + if (existingByPuuid) { + if ( + existingByPuuid.gameName !== nextGameName || + existingByPuuid.tagLine !== nextTagLine + ) { + existingByPuuid.gameName = nextGameName; + existingByPuuid.tagLine = nextTagLine; + await user.save(); + } + return { user, riotAccount: existingByPuuid }; } - const routing = await this.resolveRiotRouting(context.communityId); - const { requestedGameName, requestedTagLine, dto } = - await this.lookupRiotIdentity(context, routing); - const nextGameName = dto.gameName ?? requestedGameName; - const nextTagLine = dto.tagLine ?? requestedTagLine; - return this.attachRiotAccount({ user, puuid: dto.puuid, @@ -213,6 +197,18 @@ export class DakaoUserService { }); } + public async registerRiotAccount( + context: ResolveContext, + ): Promise { + return this.resolveRiotAccount(context); + } + + public async registerPrimaryRiotAccount( + context: ResolveContext, + ): Promise { + return this.registerRiotAccount(context); + } + private async lookupRiotIdentity( context: ResolveContext, routing: RiotRouting, diff --git a/apps/api/src/modules/dakao/handlers/account-register.handler.spec.ts b/apps/api/src/modules/dakao/handlers/account-register.handler.spec.ts index bd9a3d87..133b49b4 100644 --- a/apps/api/src/modules/dakao/handlers/account-register.handler.spec.ts +++ b/apps/api/src/modules/dakao/handlers/account-register.handler.spec.ts @@ -6,7 +6,7 @@ const objectId = (hex: string) => new mongoose.Types.ObjectId(hex); function makeHandler(dakaoUserService?: Partial) { return new AccountRegisterHandler({ - registerPrimaryRiotAccount: jest.fn(), + registerRiotAccount: jest.fn(), ...dakaoUserService, } as unknown as DakaoUserService); } @@ -20,15 +20,39 @@ const baseParams = { }; describe('AccountRegisterHandler', () => { - it('translates already-registered Riot account errors', async () => { + it('registers a Riot account through DakaoUserService', async () => { + const registerRiotAccount = jest.fn().mockResolvedValue({ + user: { _id: objectId('222222222222222222222222') }, + riotAccount: { gameName: '프리리', tagLine: 'KR1' }, + }); const handler = makeHandler({ - registerPrimaryRiotAccount: jest + registerRiotAccount, + }); + + const segments = await handler.handle(baseParams); + + expect(registerRiotAccount).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('등록 계정: 프리리#KR1'), + }), + ]); + }); + + it('translates Riot account conflict errors', async () => { + const handler = makeHandler({ + registerRiotAccount: jest .fn() .mockRejectedValue( - new DakaoUserError( - 'riot_account_already_registered', - '기존소환사#KR1', - ), + new DakaoUserError('riot_account_conflict', '기존소환사#KR1'), ), }); @@ -38,7 +62,7 @@ describe('AccountRegisterHandler', () => { expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }), expect.objectContaining({ kind: 'text', - text: expect.stringContaining('이미 등록된 라이엇 계정'), + text: expect.stringContaining('이미 다른 사용자가 등록한 라이엇 계정'), }), ]); expect(segments[1]).toMatchObject({ diff --git a/apps/api/src/modules/dakao/handlers/account-register.handler.ts b/apps/api/src/modules/dakao/handlers/account-register.handler.ts index 26739b62..4250ba64 100644 --- a/apps/api/src/modules/dakao/handlers/account-register.handler.ts +++ b/apps/api/src/modules/dakao/handlers/account-register.handler.ts @@ -19,7 +19,7 @@ export class AccountRegisterHandler { params: AccountRegisterHandlerParams, ): Promise { try { - const resolved = await this.dakaoUserService.registerPrimaryRiotAccount({ + const resolved = await this.dakaoUserService.registerRiotAccount({ communityId: params.communityId, kakaoTalkId: params.senderUserId, kakaoTalkNickname: params.senderNickname, @@ -37,7 +37,7 @@ export class AccountRegisterHandler { kind: 'text', text: ` 계정 등록 완료` + - `\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`, + `\n등록 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`, }, ]; } catch (err) {