diff --git a/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts b/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts index 39df54b8..0b379dca 100644 --- a/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts +++ b/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts @@ -70,9 +70,11 @@ function makeAccount(overrides: Partial = {}): FakeAccount { function makeUser(account: FakeAccount) { const _id = new mongoose.Types.ObjectId(); + const communityId = new mongoose.Types.ObjectId(); const save = jest.fn().mockResolvedValue(undefined); return { _id, + communityId, riotAccounts: [account], save, }; @@ -86,6 +88,7 @@ function makeService(overrides?: { mastery?: Partial; recentMatches?: Partial; recentStats?: Partial; + match?: any; }) { const user = overrides?.user; const userFindById = jest.fn().mockReturnValue({ @@ -98,10 +101,15 @@ function makeService(overrides?: { Promise.resolve({ riotPlatform: 'kr', riotRegion: 'asia', - }), + }), }), }), }); + const matchUpdateManyExec = jest.fn().mockResolvedValue({ modifiedCount: 0 }); + const matchModel = { + updateMany: jest.fn().mockReturnValue({ exec: matchUpdateManyExec }), + ...overrides?.match, + }; const connectionService = { getModel: jest.fn().mockImplementation(async (modelName: string) => { if (modelName === 'user') { @@ -110,6 +118,9 @@ function makeService(overrides?: { if (modelName === 'community') { return { findById: communityFindById }; } + if (modelName === 'match') { + return matchModel; + } throw new Error(`Unexpected model: ${modelName}`); }), } as unknown as ConnectionService; @@ -160,6 +171,8 @@ function makeService(overrides?: { masteryService, recentMatchesService, recentStatsService, + matchModel, + matchUpdateManyExec, }; } @@ -437,6 +450,206 @@ describe('RiotAccountEnrichmentService', () => { expect(user.save).toHaveBeenCalledTimes(1); }); + it('appends tier history when LP changes without tier or rank changes', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 10, + wins: 20, + losses: 12, + fetchedAt: recent, + }, + ], + tierHistory: [ + { + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + leaguePoints: 10, + wins: 20, + losses: 12, + recordedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 44, + wins: 21, + losses: 12, + }, + ]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(account.tierHistory).toHaveLength(2); + expect(account.tierHistory.at(-1)).toMatchObject({ + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + leaguePoints: 44, + wins: 21, + losses: 12, + }); + }); + + it('syncs refreshed league tier into active match participant snapshots', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 1, + wins: 1, + losses: 1, + fetchedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service, matchModel } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([ + { + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + puuid: 'puuid-1', + leaguePoints: 20, + wins: 10, + losses: 8, + }, + ]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(matchModel.updateMany).toHaveBeenCalledWith( + { + status: { $in: ['recruiting', 'team-built', 'in-progress'] }, + participants: { + $elemMatch: { + userId: user._id, + puuid: 'puuid-1', + }, + }, + }, + { + $set: { + 'participants.$[participant].tier': expect.objectContaining({ + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + leaguePoints: 20, + }), + }, + }, + { + arrayFilters: [ + { + 'participant.userId': user._id, + 'participant.puuid': 'puuid-1', + }, + ], + }, + ); + }); + + it('clears active match participant tier when refreshed league entries are empty', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 1, + wins: 1, + losses: 1, + fetchedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service, matchModel } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(matchModel.updateMany).toHaveBeenCalledWith( + { + status: { $in: ['recruiting', 'team-built', 'in-progress'] }, + participants: { + $elemMatch: { + userId: user._id, + puuid: 'puuid-1', + }, + }, + }, + { $unset: { 'participants.$[participant].tier': '' } }, + { + arrayFilters: [ + { + 'participant.userId': user._id, + 'participant.puuid': 'puuid-1', + }, + ], + }, + ); + }); + it('records failed for individual failing fetches but updates the rest', async () => { const account = makeAccount(); const user = makeUser(account); diff --git a/apps/api/src/modules/riot/riot-account-enrichment.service.ts b/apps/api/src/modules/riot/riot-account-enrichment.service.ts index 65bd3840..c697551a 100644 --- a/apps/api/src/modules/riot/riot-account-enrichment.service.ts +++ b/apps/api/src/modules/riot/riot-account-enrichment.service.ts @@ -3,6 +3,7 @@ import mongoose from 'mongoose'; import { ConnectionService } from '../global/database/connection.service'; import { ChampionMasteryEntry, + MatchStatus, RiotAccount, TierInfo, } from '../global/database/schema'; @@ -33,6 +34,11 @@ const DEFAULT_SUMMONER_TTL_MS = 24 * 60 * 60 * 1000; // 24h const DEFAULT_LEAGUE_TTL_MS = 60 * 60 * 1000; // 1h const DEFAULT_MASTERY_TTL_MS = 6 * 60 * 60 * 1000; // 6h const DEFAULT_RECENT_MATCHES_TTL_MS = 6 * 60 * 60 * 1000; // 6h +const ACTIVE_MATCH_STATUSES: MatchStatus[] = [ + 'recruiting', + 'team-built', + 'in-progress', +]; export interface EnrichOptions { platform?: RiotPlatformRoute; @@ -117,6 +123,11 @@ export class RiotAccountEnrichmentService { this.applyLeagueEntries(account, outcome.dto); await user.save(); + await this.syncActiveMatchParticipantTier( + user._id, + params.puuid, + account.tiers, + ); return 'updated'; } @@ -243,6 +254,13 @@ export class RiotAccountEnrichmentService { ) { await user.save(); } + if (leagueOutcome.status === 'updated') { + await this.syncActiveMatchParticipantTier( + user._id, + params.puuid, + account.tiers, + ); + } return { summoner: summonerOutcome.status, @@ -425,7 +443,10 @@ export class RiotAccountEnrichmentService { const changed = !last || last.tier !== entry.tier || - (last.rank ?? '') !== (entry.rank ?? ''); + (last.rank ?? '') !== (entry.rank ?? '') || + last.leaguePoints !== entry.leaguePoints || + last.wins !== entry.wins || + last.losses !== entry.losses; if (!changed) continue; account.tierHistory.push({ @@ -463,6 +484,62 @@ export class RiotAccountEnrichmentService { account.matchIdsFetchedAt = fetchedAt; } + private async syncActiveMatchParticipantTier( + userId: mongoose.Types.ObjectId, + puuid: string, + tiers: TierInfo[], + ): Promise { + const MatchModel = await this.connectionService.getModel('match'); + const tier = this.selectParticipantTier(tiers); + const update = tier + ? { $set: { 'participants.$[participant].tier': tier } } + : { $unset: { 'participants.$[participant].tier': '' } }; + + await MatchModel.updateMany( + { + status: { $in: ACTIVE_MATCH_STATUSES }, + participants: { + $elemMatch: { + userId, + puuid, + }, + }, + }, + update, + { + arrayFilters: [ + { + 'participant.userId': userId, + 'participant.puuid': puuid, + }, + ], + }, + ).exec(); + } + + private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined { + const tier = + tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0]; + if (!tier) return undefined; + + return { + leagueId: tier.leagueId, + queueType: tier.queueType, + tier: tier.tier, + rank: tier.rank, + puuid: tier.puuid, + leaguePoints: tier.leaguePoints, + wins: tier.wins, + losses: tier.losses, + veteran: tier.veteran, + inactive: tier.inactive, + freshBlood: tier.freshBlood, + hotStreak: tier.hotStreak, + miniSeries: tier.miniSeries, + fetchedAt: tier.fetchedAt, + }; + } + private tiersOldestAt(tiers: TierInfo[]): number { if (tiers.length === 0) return 0; let oldest = Infinity;