@firestone-hs/bgs-global-stats 1.0.25 → 1.0.31

package/README.md

@@ -1,9 +1,3 @@
-# Test it
-
-```
-npm run build && sam local invoke -t template.yaml -e event.json BuildBgsHeroStatsFunction
-```
-
 # Deploy
 
 ```
@@ -12,6 +6,33 @@ npm run build && npm run package && npm run deploy
 rm -rf dist && tsc && rm -rf dist/node_modules && npm publish --access=public
 ```
 
+```
+$ curl https://static-api.firestoneapp.com/bgs-quests?questCardId=BG24_Quest_313\&heroCardId=BG20_HERO_101\&difficulty=6\&tribes=14,18,20,43,92\&mmrPercentile=100
+```
+
 # Reference
 
 Used this project as template: https://github.com/alukach/aws-sam-typescript-boilerplate
+
+# Random notes for Quests
+
+what do we want to get?
+
+-   average turns to complete for given hero / tribes (and current MMR bracket)
+-   how much the current hero influences the turns to complete (i.e. delta vs average of heroes)
+-   how much the current tribes influence the turns to complete (i.e. delta vs all tribes). Maybe also highlight the tribes that have the best influence, as these are probably tribes you should focus on? Maybe this is too obvious?
+
+stat: {
+globalData;
+difficulty: <difficult, globalDataForDifficulty, difficultyImpact>
+heroes: <hero, globalDataForHero>
+tribes: <tribe, globalDataForTribe, raceAverageTurnToCompleteImpact, raceCompletionRateImpact>
+}
+
+in game: - for each quest - extract quest + difficulty - get turnsToComplete + completionRate for hero - get raceImpact for turnsToComplete + completionRate for each tribe - get difficultyImpact for tTC + cR for the difficulty. - this will tell me that "on average, difficulty 4 is + 0.5 ttc vs average difficulty) - build average turn to complete for hero + tribes (using the race impacts) + difficulty (using the average delta for difficulty. That way we can use the global average for the hero, and use the difficulty delta to update this data. The assumption behind this is that the difficulty impact all heroes the same way, which a priori seems fair, since the difficulty is just a quota to get)
+
+globalData: averageTurnToComplete (when completed), completionRate
+
+```
+
+```

package/dist/bgs-global-stats.d.ts

@@ -30,6 +30,7 @@ export declare class BgsGlobalStats2 {
     readonly mmrPercentiles: readonly MmrPercentile[];
     readonly heroStats: readonly BgsGlobalHeroStat2[];
     readonly allTribes: readonly Race[];
+    readonly totalMatches: number;
 }
 export declare class BgsGlobalHeroStat2 {
     readonly date: 'all-time' | 'past-three' | 'past-seven' | 'last-patch';
@@ -56,3 +57,4 @@ export interface MmrPercentile {
     readonly mmr: number;
     readonly percentile: 100 | 50 | 25 | 10 | 1;
 }
+export * from './stats-v2/bgs-hero-stat';

package/dist/bgs-global-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"bgs-global-stats.js","sourceRoot":"/","sources":["bgs-global-stats.ts"],"names":[],"mappings":";;AAEA,MAAa,cAAc;CAG1B;AAHD,wCAGC;AAED,MAAa,iBAAiB;CAW7B;AAXD,8CAWC;AAOD,MAAa,eAAe;CAK3B;AALD,0CAKC;AAED,MAAa,kBAAkB;CAc9B;AAdD,gDAcC","sourcesContent":["import { Race } from '@firestone-hs/reference-data';\r\n\r\nexport class BgsGlobalStats {\r\n\tlastUpdateDate: string;\r\n\theroStats: readonly BgsGlobalHeroStat[];\r\n}\r\n\r\nexport class BgsGlobalHeroStat {\r\n\tid: string;\r\n\tpopularity: number;\r\n\taveragePosition: number;\r\n\ttop4: number;\r\n\ttop1: number;\r\n\ttier: BgsHeroTier;\r\n\ttotalGames: number;\r\n\ttribesStat: readonly { tribe: string; percent: number }[];\r\n\twarbandStats: readonly { turn: number; totalStats: number }[];\r\n\tcombatWinrate: readonly { turn: number; winrate: number }[];\r\n}\r\n\r\nexport type BgsHeroTier = 'S' | 'A' | 'B' | 'C' | 'D';\r\n\r\n// ===============================\r\n// New stats\r\n// =================================\r\nexport class BgsGlobalStats2 {\r\n\treadonly lastUpdateDate: string;\r\n\treadonly mmrPercentiles: readonly MmrPercentile[];\r\n\treadonly heroStats: readonly BgsGlobalHeroStat2[];\r\n\treadonly allTribes: readonly Race[];\r\n}\r\n\r\nexport class BgsGlobalHeroStat2 {\r\n\t// The filters\r\n\treadonly date: 'all-time' | 'past-three' | 'past-seven' | 'last-patch';\r\n\treadonly mmrPercentile: 100 | 50 | 25 | 10 | 1;\r\n\treadonly cardId: string;\r\n\treadonly tribes: readonly Race[];\r\n\r\n\t// The values\r\n\treadonly totalMatches: number;\r\n\treadonly placementDistribution: readonly { rank: number; totalMatches: number }[];\r\n\t// To get the actual winrate, you will have to divide the totalWinrate by the dataPoints\r\n\treadonly combatWinrate: readonly { turn: number; dataPoints: number; totalWinrate: number }[];\r\n\t// Same\r\n\treadonly warbandStats: readonly { turn: number; dataPoints: number; totalStats: number }[];\r\n}\r\n\r\nexport interface MmrPercentile {\r\n\treadonly mmr: number;\r\n\treadonly percentile: 100 | 50 | 25 | 10 | 1;\r\n}\r\n"]}
+{"version":3,"file":"bgs-global-stats.js","sourceRoot":"/","sources":["bgs-global-stats.ts"],"names":[],"mappings":";;AAEA,MAAa,cAAc;CAG1B;AAHD,wCAGC;AAED,MAAa,iBAAiB;CAW7B;AAXD,8CAWC;AAOD,MAAa,eAAe;CAM3B;AAND,0CAMC;AAED,MAAa,kBAAkB;CAc9B;AAdD,gDAcC","sourcesContent":["import { Race } from '@firestone-hs/reference-data';\r\n\r\nexport class BgsGlobalStats {\r\n\tlastUpdateDate: string;\r\n\theroStats: readonly BgsGlobalHeroStat[];\r\n}\r\n\r\nexport class BgsGlobalHeroStat {\r\n\tid: string;\r\n\tpopularity: number;\r\n\taveragePosition: number;\r\n\ttop4: number;\r\n\ttop1: number;\r\n\ttier: BgsHeroTier;\r\n\ttotalGames: number;\r\n\ttribesStat: readonly { tribe: string; percent: number }[];\r\n\twarbandStats: readonly { turn: number; totalStats: number }[];\r\n\tcombatWinrate: readonly { turn: number; winrate: number }[];\r\n}\r\n\r\nexport type BgsHeroTier = 'S' | 'A' | 'B' | 'C' | 'D';\r\n\r\n// ===============================\r\n// New stats\r\n// =================================\r\nexport class BgsGlobalStats2 {\r\n\treadonly lastUpdateDate: string;\r\n\treadonly mmrPercentiles: readonly MmrPercentile[];\r\n\treadonly heroStats: readonly BgsGlobalHeroStat2[];\r\n\treadonly allTribes: readonly Race[];\r\n\treadonly totalMatches: number;\r\n}\r\n\r\nexport class BgsGlobalHeroStat2 {\r\n\t// The filters\r\n\treadonly date: 'all-time' | 'past-three' | 'past-seven' | 'last-patch';\r\n\treadonly mmrPercentile: 100 | 50 | 25 | 10 | 1;\r\n\treadonly cardId: string;\r\n\treadonly tribes: readonly Race[];\r\n\r\n\t// The values\r\n\treadonly totalMatches: number;\r\n\treadonly placementDistribution: readonly { rank: number; totalMatches: number }[];\r\n\t// To get the actual winrate, you will have to divide the totalWinrate by the dataPoints\r\n\treadonly combatWinrate: readonly { turn: number; dataPoints: number; totalWinrate: number }[];\r\n\t// Same\r\n\treadonly warbandStats: readonly { turn: number; dataPoints: number; totalStats: number }[];\r\n}\r\n\r\nexport interface MmrPercentile {\r\n\treadonly mmr: number;\r\n\treadonly percentile: 100 | 50 | 25 | 10 | 1;\r\n}\r\n\r\nexport * from './stats-v2/bgs-hero-stat';\r\n"]}

package/dist/build-battlegrounds-hero-stats-new.d.ts

@@ -1,6 +1,9 @@
-declare const _default: (event: any) => Promise<any>;
+import { S3 } from '@firestone-hs/aws-lambda-utils';
+import { Context } from 'aws-lambda';
+export declare const s3: S3;
+declare const _default: (event: any, context: Context) => Promise<any>;
 export default _default;
-export declare const handleNewStats: () => Promise<{
+export declare const handleNewStats: (event: any, context: Context) => Promise<{
     statusCode: number;
     body: any;
 }>;

package/dist/build-battlegrounds-hero-stats-new.js

@@ -1,52 +1,235 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const aws_lambda_utils_1 = require("@firestone-hs/aws-lambda-utils");
 const reference_data_1 = require("@firestone-hs/reference-data");
+const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const zlib_1 = require("zlib");
-const rds_1 = require("./db/rds");
-const s3_1 = require("./db/s3");
+const common_1 = require("./common");
+const quests_1 = require("./quests");
+const quests_v2_1 = require("./quests-v2/quests-v2");
+const stats_v2_1 = require("./stats-v2/stats-v2");
 const util_functions_1 = require("./utils/util-functions");
-const s3 = new s3_1.S3();
+exports.s3 = new aws_lambda_utils_1.S3();
 const allCards = new reference_data_1.AllCardsService();
-exports.default = (event) => __awaiter(void 0, void 0, void 0, function* () {
-    yield exports.handleNewStats();
-});
-exports.handleNewStats = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    yield allCards.initializeCardsDb('20211104');
-    const lastPatch = yield getLastBattlegroundsPatch();
-    const mysql = yield rds_1.getConnection();
-    const rows = yield loadRows(mysql, lastPatch);
-    const mmrPercentiles = buildMmrPercentiles(rows);
+const lambda = new aws_sdk_1.default.Lambda();
+const allTimePeriods = [
+    'all-time',
+    'past-three',
+    'past-seven',
+    'last-patch',
+];
+exports.default = async (event, context) => {
+    await exports.handleNewStats(event, context);
+};
+exports.handleNewStats = async (event, context) => {
+    var _a, _b, _c, _d;
+    const cleanup = aws_lambda_utils_1.logBeforeTimeout(context);
+    aws_lambda_utils_1.logger.log('event', event);
+    await allCards.initializeCardsDb();
+    const lastPatch = await getLastBattlegroundsPatch();
+    if (event.quests) {
+        const rows = await readRowsFromS3();
+        aws_lambda_utils_1.logger.log('read rows', (_a = rows) === null || _a === void 0 ? void 0 : _a.length);
+        for (const timePeriod of allTimePeriods) {
+            await quests_1.handleQuests(timePeriod, rows, lastPatch);
+        }
+    }
+    else if (event.questsV2) {
+        const rows = await readRowsFromS3();
+        aws_lambda_utils_1.logger.log('read rows', (_b = rows) === null || _b === void 0 ? void 0 : _b.length);
+        for (const timePeriod of allTimePeriods) {
+            await quests_v2_1.handleQuestsV2(timePeriod, rows, lastPatch);
+        }
+    }
+    else if (event.statsV2) {
+        const rows = await readRowsFromS3();
+        aws_lambda_utils_1.logger.log('read rows', (_c = rows) === null || _c === void 0 ? void 0 : _c.length);
+        for (const timePeriod of allTimePeriods) {
+            await stats_v2_1.handleStatsV2(timePeriod, rows, lastPatch, allCards);
+        }
+    }
+    else if (event.permutation) {
+        const rows = await readRowsFromS3();
+        aws_lambda_utils_1.logger.log('read rows', (_d = rows) === null || _d === void 0 ? void 0 : _d.length);
+        for (const timePeriod of allTimePeriods) {
+            await handlePermutation(event.permutation, timePeriod, event.allTribes, rows, lastPatch);
+        }
+    }
+    else {
+        const mysql = await aws_lambda_utils_1.getConnection();
+        const rows = await loadRows(mysql);
+        await mysql.end();
+        await saveRowsOnS3(rows);
+        await dispatchNewLambdas(rows, context);
+        await dispatchQuestsLambda(rows, context);
+        await dispatchQuestsV2Lambda(rows, context);
+        await dispatchStatsV2Lambda(rows, context);
+    }
+    cleanup();
+    return { statusCode: 200, body: null };
+};
+const dispatchQuestsLambda = async (rows, context) => {
+    const newEvent = {
+        quests: true,
+    };
+    const params = {
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    };
+    aws_lambda_utils_1.logger.log('\tinvoking lambda', params);
+    const result = await lambda
+        .invoke({
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    })
+        .promise();
+    aws_lambda_utils_1.logger.log('\tinvocation result', result);
+};
+const dispatchQuestsV2Lambda = async (rows, context) => {
+    const newEvent = {
+        questsV2: true,
+    };
+    const params = {
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    };
+    aws_lambda_utils_1.logger.log('\tinvoking lambda', params);
+    const result = await lambda
+        .invoke({
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    })
+        .promise();
+    aws_lambda_utils_1.logger.log('\tinvocation result', result);
+};
+const dispatchStatsV2Lambda = async (rows, context) => {
+    const newEvent = {
+        statsV2: true,
+    };
+    const params = {
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    };
+    aws_lambda_utils_1.logger.log('\tinvoking lambda', params);
+    const result = await lambda
+        .invoke({
+        FunctionName: context.functionName,
+        InvocationType: 'Event',
+        LogType: 'Tail',
+        Payload: JSON.stringify(newEvent),
+    })
+        .promise();
+    aws_lambda_utils_1.logger.log('\tinvocation result', result);
+};
+const dispatchNewLambdas = async (rows, context) => {
     const allTribes = extractAllTribes(rows);
-    console.log('all tribes', allTribes);
-    const tribePermutations = [null, ...combine(allTribes, 5)];
-    console.log('tribe permutations, should be 56, because 8 tribes', tribePermutations.length);
-    console.log('tribe permutations', tribePermutations);
+    aws_lambda_utils_1.logger.log('all tribes', allTribes);
+    const tribePermutations = ['all', ...combine(allTribes, 5)];
+    aws_lambda_utils_1.logger.log('tribe permutations, should be 127 (126 + 1), because 9 tribes', tribePermutations.length);
     for (const tribes of tribePermutations) {
-        console.log('handling tribes', tribes);
-        const tribesStr = !!((_a = tribes) === null || _a === void 0 ? void 0 : _a.length) ? tribes.join(',') : null;
-        const statsForTribes = {
-            lastUpdateDate: util_functions_1.formatDate(new Date()),
-            mmrPercentiles: mmrPercentiles,
-            heroStats: buildHeroes(rows, lastPatch, mmrPercentiles, tribesStr),
+        aws_lambda_utils_1.logger.log('handling tribes', tribes, tribes !== 'all' && tribes.join('-'));
+        const newEvent = {
+            permutation: tribes,
             allTribes: allTribes,
         };
-        const stringResults = JSON.stringify(statsForTribes);
-        const gzippedResults = zlib_1.gzipSync(stringResults);
-        yield s3.writeFile(gzippedResults, 'static.zerotoheroes.com', `api/bgs/bgs-global-stats-${!!((_b = tribes) === null || _b === void 0 ? void 0 : _b.length) ? tribes.join('-') : 'all-tribes'}.gz.json`, 'application/json', 'gzip');
+        const params = {
+            FunctionName: context.functionName,
+            InvocationType: 'Event',
+            LogType: 'Tail',
+            Payload: JSON.stringify(newEvent),
+        };
+        aws_lambda_utils_1.logger.log('\tinvoking lambda', params);
+        const result = await lambda
+            .invoke({
+            FunctionName: context.functionName,
+            InvocationType: 'Event',
+            LogType: 'Tail',
+            Payload: JSON.stringify(newEvent),
+        })
+            .promise();
+        aws_lambda_utils_1.logger.log('\tinvocation result', result);
     }
-    yield mysql.end();
-    return { statusCode: 200, body: null };
-});
+};
+const handlePermutation = async (tribes, timePeriod, allTribes, rows, lastPatch) => {
+    var _a, _b, _c;
+    console.log('total rows', rows.length);
+    const rowsForTimePeriod = common_1.filterRowsForTimePeriod(rows, timePeriod, lastPatch);
+    console.log('rows for time period', rowsForTimePeriod.length);
+    const tribesStr = tribes === 'all' ? null : tribes.join(',');
+    const rowsWithTribes = !!tribesStr
+        ? rowsForTimePeriod.filter(row => !!row.tribes).filter(row => row.tribes === tribesStr)
+        : rowsForTimePeriod;
+    console.log('rowsWithTribes', rowsWithTribes.length);
+    const mmrPercentiles = common_1.buildMmrPercentiles(rowsWithTribes);
+    aws_lambda_utils_1.logger.log('handling permutation', tribes, timePeriod, (_a = rows) === null || _a === void 0 ? void 0 : _a.length, (_b = rowsWithTribes) === null || _b === void 0 ? void 0 : _b.length);
+    const stats = buildHeroes(rowsWithTribes, mmrPercentiles).map(stat => ({
+        ...stat,
+        tribes: tribes === 'all' ? allTribes : tribes,
+        date: timePeriod,
+    }));
+    const statsForTribes = {
+        lastUpdateDate: util_functions_1.formatDate(new Date()),
+        mmrPercentiles: mmrPercentiles,
+        heroStats: stats,
+        allTribes: allTribes,
+        totalMatches: stats.map(s => s.totalMatches).reduce((a, b) => a + b, 0),
+    };
+    aws_lambda_utils_1.logger.log('\tbuilt stats', statsForTribes.totalMatches, (_c = statsForTribes.heroStats) === null || _c === void 0 ? void 0 : _c.length);
+    const tribesSuffix = tribes === 'all' ? 'all-tribes' : tribes.join('-');
+    const timeSuffix = timePeriod;
+    await exports.s3.writeFile(zlib_1.gzipSync(JSON.stringify(statsForTribes)), 'static.zerotoheroes.com', `api/bgs/heroes/bgs-global-stats-${tribesSuffix}-${timeSuffix}.gz.json`, 'application/json', 'gzip');
+};
+const saveRowsOnS3 = async (rows) => {
+    aws_lambda_utils_1.logger.log('saving rows on s3', rows.length);
+    await exports.s3.writeArrayAsMultipart(rows, 'static.zerotoheroes.com', `api/bgs/working-rows.json`, 'application/json');
+    aws_lambda_utils_1.logger.log('file saved');
+};
+const readRowsFromS3 = async () => {
+    return new Promise((resolve, reject) => {
+        let parseErrors = 0;
+        let totalParsed = 0;
+        const stream = exports.s3.readStream('static.zerotoheroes.com', `api/bgs/working-rows.json`);
+        const result = [];
+        let previousString = '';
+        stream
+            .on('data', chunk => {
+            const str = Buffer.from(chunk).toString('utf-8');
+            const newStr = previousString + str;
+            const split = newStr.split('\n');
+            const rows = split.slice(0, split.length - 1).map(row => {
+                try {
+                    const result = JSON.parse(row);
+                    totalParsed++;
+                    return result;
+                }
+                catch (e) {
+                    parseErrors++;
+                }
+            });
+            previousString = split[split.length - 1];
+            result.push(...rows);
+        })
+            .on('end', () => {
+            const finalResult = result.filter(row => !!row);
+            aws_lambda_utils_1.logger.log('stream end', result.length, finalResult.length);
+            aws_lambda_utils_1.logger.log('parsing errors', parseErrors, 'and successes', totalParsed);
+            resolve(finalResult);
+        });
+    });
+};
 const combine = (input, chooseN) => {
     const finalResult = [];
     const intermediateResult = [];
@@ -73,51 +256,43 @@ const extractAllTribes = (rows) => {
             .reduce((a, b) => [...new Set(a.concat(b))], [])),
     ];
 };
-const buildHeroes = (rows, lastPatch, mmrPercentiles, tribesStr) => {
-    return mmrPercentiles
-        .map(mmrPercentile => [mmrPercentile, rows.filter(row => row.rating >= mmrPercentile.mmr)])
+const buildHeroes = (rows, mmrPercentiles) => {
+    const mappedByMmr = mmrPercentiles.map(mmrPercentile => [
+        mmrPercentile,
+        rows.filter(row => mmrPercentile.percentile === 100 || row.rating >= mmrPercentile.mmr),
+    ]);
+    return mappedByMmr
         .map(([mmr, rows]) => {
-        return buildHeroesForMmr(rows, lastPatch, tribesStr).map(stat => (Object.assign(Object.assign({}, stat), { mmrPercentile: mmr.percentile })));
-    })
-        .map(info => {
-        return info;
+        aws_lambda_utils_1.logger.log('building heroes for mmr', mmr.percentile, rows.length);
+        return buildHeroStats(rows).map(stat => ({
+            ...stat,
+            mmrPercentile: mmr.percentile,
+        }));
     })
         .reduce((a, b) => [...a, ...b], []);
 };
-const buildHeroesForMmr = (rows, lastPatch, tribesStr) => {
-    const rowsWithTribes = !!tribesStr
-        ? rows.filter(row => !!row.tribes).filter(row => row.tribes === tribesStr)
-        : rows;
-    const allTimeHeroes = buildHeroStats(rowsWithTribes, 'all-time', tribesStr);
-    const lastPatchHeroes = buildHeroStats(rowsWithTribes.filter(row => row.buildNumber >= lastPatch.number ||
-        row.creationDate > new Date(new Date(lastPatch.date).getTime() + 24 * 60 * 60 * 1000)), 'last-patch', tribesStr);
-    const threeDaysHeroes = buildHeroStats(rowsWithTribes.filter(row => row.creationDate >= new Date(new Date().getTime() - 3 * 24 * 60 * 60 * 1000)), 'past-three', tribesStr);
-    const sevenDaysHeroes = buildHeroStats(rowsWithTribes.filter(row => row.creationDate >= new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000)), 'past-seven', tribesStr);
-    return [...allTimeHeroes, ...lastPatchHeroes, ...threeDaysHeroes, ...sevenDaysHeroes];
-};
-const buildHeroStats = (rows, period, tribesStr) => {
-    const grouped = !!tribesStr
-        ? util_functions_1.groupByFunction((row) => `${row.heroCardId}-${row.tribes}-${row.darkmoonPrizes}`)(rows)
-        : util_functions_1.groupByFunction((row) => `${row.heroCardId}-${row.darkmoonPrizes}`)(rows);
-    return Object.values(grouped).map(groupedRows => {
+const buildHeroStats = (rows) => {
+    const grouped = aws_lambda_utils_1.groupByFunction((row) => util_functions_1.normalizeHeroCardId(row.heroCardId, allCards))(rows);
+    const result = Object.values(grouped).map(groupedRows => {
         const ref = groupedRows[0];
-        const placementDistribution = buildPlacementDistribution(groupedRows);
+        const placementDistribution = common_1.buildPlacementDistribution(groupedRows);
         const combatWinrate = buildCombatWinrate(groupedRows);
         const warbandStats = buildWarbandStats(groupedRows);
         return {
-            date: period,
-            cardId: ref.heroCardId,
+            cardId: util_functions_1.normalizeHeroCardId(ref.heroCardId, allCards),
             totalMatches: groupedRows.length,
             placementDistribution: placementDistribution,
             combatWinrate: combatWinrate,
             warbandStats: warbandStats,
         };
     });
+    return result;
 };
 const buildWarbandStats = (rows) => {
     var _a, _b, _c;
     const data = {};
-    for (const row of rows) {
+    const validRows = rows.filter(row => row.id > 5348374);
+    for (const row of validRows) {
         if (!((_a = row.warbandStats) === null || _a === void 0 ? void 0 : _a.length)) {
             continue;
         }
@@ -126,7 +301,10 @@ const buildWarbandStats = (rows) => {
             continue;
         }
         for (const turnInfo of parsed) {
-            if (turnInfo.turn === 0 || turnInfo.totalStats == null) {
+            if (turnInfo.turn === 0 || turnInfo.totalStats == null || isNaN(turnInfo.totalStats)) {
+                continue;
+            }
+            if (turnInfo.totalStats > 20000) {
                 continue;
             }
             const existingInfo = (_c = data['' + turnInfo.turn], (_c !== null && _c !== void 0 ? _c : { dataPoints: 0, totalStats: 0 }));
@@ -159,88 +337,49 @@ const buildCombatWinrate = (rows) => {
             }
         }
         catch (e) {
-            console.error('Could not parse combat winrate', row.id, e);
+            aws_lambda_utils_1.logger.error('Could not parse combat winrate', row.id, e);
             continue;
         }
-        if (debug) {
-        }
         for (const turnInfo of parsed) {
             if (turnInfo.turn === 0 || turnInfo.winrate == null) {
                 continue;
             }
-            if (debug) {
-            }
             const existingInfo = (_c = data['' + turnInfo.turn], (_c !== null && _c !== void 0 ? _c : { dataPoints: 0, totalWinrate: 0 }));
-            if (debug) {
-            }
             existingInfo.dataPoints = existingInfo.dataPoints + 1;
             existingInfo.totalWinrate = existingInfo.totalWinrate + Math.round(turnInfo.winrate);
-            if (debug) {
-            }
             data['' + turnInfo.turn] = existingInfo;
-            if (debug) {
-            }
         }
     }
-    if (debug) {
-    }
     const result = Object.keys(data).map(turn => ({
         turn: +turn,
         dataPoints: data[turn].dataPoints,
         totalWinrate: data[turn].totalWinrate,
     }));
-    if (debug) {
-    }
     return result;
 };
-const buildPlacementDistribution = (rows) => {
-    const placementDistribution = [];
-    const groupedByPlacement = util_functions_1.groupByFunction((res) => '' + res.rank)(rows);
-    Object.keys(groupedByPlacement).forEach(placement => placementDistribution.push({ rank: +placement, totalMatches: groupedByPlacement[placement].length }));
-    return placementDistribution;
-};
-const loadRows = (mysql, patch) => __awaiter(void 0, void 0, void 0, function* () {
-    var _c;
-    console.log('loading rows', patch);
+const loadRows = async (mysql) => {
+    var _a;
     const query = `
-		SELECT * FROM bgs_run_stats
-		WHERE creationDate > DATE_SUB(NOW(), INTERVAL 30 DAY)
+		SELECT *
+		FROM bgs_run_stats
+		WHERE creationDate > DATE_SUB(NOW(), INTERVAL 30 DAY);
 	`;
-    console.log('running query', query);
-    const rows = yield mysql.query(query);
-    console.log('rows', (_c = rows) === null || _c === void 0 ? void 0 : _c.length, rows[0]);
+    aws_lambda_utils_1.logger.log('running query', query);
+    const rows = await mysql.query(query);
+    aws_lambda_utils_1.logger.log('rows', (_a = rows) === null || _a === void 0 ? void 0 : _a.length, rows[0]);
     return rows
         .filter(row => row.heroCardId.startsWith('TB_BaconShop_') || row.heroCardId.startsWith('BG'))
-        .filter(row => row.heroCardId !== "TB_BaconShop_HERO_59t");
-});
-const getLastBattlegroundsPatch = () => __awaiter(void 0, void 0, void 0, function* () {
-    const patchInfo = yield util_functions_1.http(`https://static.zerotoheroes.com/hearthstone/data/patches.json`);
+        .filter(row => row.heroCardId !== "TB_BaconShop_HERO_59t" &&
+        row.heroCardId !== "BG22_HERO_007t")
+        .map(row => ({
+        ...row,
+        heroCardId: util_functions_1.normalizeHeroCardId(row.heroCardId, allCards),
+    }));
+};
+const getLastBattlegroundsPatch = async () => {
+    const patchInfo = await aws_lambda_utils_1.http(`https://static.zerotoheroes.com/hearthstone/data/patches.json`);
     const structuredPatch = JSON.parse(patchInfo);
     const patchNumber = structuredPatch.currentBattlegroundsMetaPatch;
     return structuredPatch.patches.find(patch => patch.number === patchNumber);
-});
-const buildMmrPercentiles = (rows) => {
-    const sortedMmrs = rows.map(row => row.rating).sort((a, b) => a - b);
-    const median = sortedMmrs[Math.floor(sortedMmrs.length / 2)];
-    const top25 = sortedMmrs[Math.floor((sortedMmrs.length / 4) * 3)];
-    const top10 = sortedMmrs[Math.floor((sortedMmrs.length / 10) * 9)];
-    return [
-        {
-            percentile: 100,
-            mmr: 0,
-        },
-        {
-            percentile: 50,
-            mmr: median,
-        },
-        {
-            percentile: 25,
-            mmr: top25,
-        },
-        {
-            percentile: 10,
-            mmr: top10,
-        },
-    ];
 };
 //# sourceMappingURL=build-battlegrounds-hero-stats-new.js.map