From 97214bef1bd50b74dccc2eea17154da3e8e211f4 Mon Sep 17 00:00:00 2001 From: Michael C Date: Sat, 4 Sep 2021 17:05:23 -0400 Subject: [PATCH 01/10] add getUserStats --- src/app.ts | 4 ++ src/routes/getUserInfo.ts | 9 +--- src/routes/getUserStats.ts | 56 ++++++++++++++++++++++ test/cases/getUserStats.ts | 95 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 7 deletions(-) create mode 100644 src/routes/getUserStats.ts create mode 100644 test/cases/getUserStats.ts diff --git a/src/app.ts b/src/app.ts index eea742f..a943d69 100644 --- a/src/app.ts +++ b/src/app.ts @@ -37,6 +37,7 @@ import {getLockCategories} from "./routes/getLockCategories"; import {getLockCategoriesByHash} from "./routes/getLockCategoriesByHash"; import {endpoint as getSearchSegments } from "./routes/getSearchSegments"; import {getStatus } from "./routes/getStatus"; +import {getUserStats} from "./routes/getUserStats"; import ExpressPromiseRouter from "express-promise-router"; import { Server } from "http"; @@ -173,6 +174,9 @@ function setupRoutes(router: Router) { router.get("/api/status/:value", getStatus); router.get("/api/status", getStatus); + // get user category stats + router.get("/api/userStats", getUserStats); + if (config.postgres) { router.get("/database", (req, res) => dumpDatabase(req, res, true)); router.get("/database.json", (req, res) => dumpDatabase(req, res, false)); diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index b42d58a..dc62f84 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -43,12 +43,7 @@ async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise { async function dbGetUsername(userID: HashedUserID) { try { const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); - if (row !== undefined) { - return row.userName; - } else { - //no username yet, just send back the userID - return userID; - } + return row?.userName ?? userID; } catch (err) { return false; } @@ -172,7 +167,7 @@ async function getUserInfo(req: Request, res: Response): Promise { responseObj[property] = await dbGetValue(hashedUserID, property); } // add minutesSaved and segmentCount after to avoid getting overwritten - if (paramValues.includes("minutesSaved")) { responseObj["minutesSaved"] = segmentsSummary.minutesSaved; } + if (paramValues.includes("minutesSaved")) responseObj["minutesSaved"] = segmentsSummary.minutesSaved; if (paramValues.includes("segmentCount")) responseObj["segmentCount"] = segmentsSummary.segmentCount; return res.send(responseObj); } diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts new file mode 100644 index 0000000..5c9b563 --- /dev/null +++ b/src/routes/getUserStats.ts @@ -0,0 +1,56 @@ +import {db} from "../databases/databases"; +import {getHash} from "../utils/getHash"; +import {Request, Response} from "express"; +import { HashedUserID, UserID } from "../types/user.model"; +import { Category } from "../types/segments.model"; +import {config} from "../config"; +const maxRewardTime = config.maxRewardTimePerSegmentInSeconds; + +async function dbGetCategorySummary(userID: HashedUserID, category: Category): Promise<{ minutesSaved: number, segmentCount: number }> { + try { + const row = await db.prepare("get", + `SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved", + count(*) as "segmentCount" FROM "sponsorTimes" + WHERE "userID" = ? AND "category" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [maxRewardTime, maxRewardTime, userID, category]); + if (row.minutesSaved != null) { + return { + minutesSaved: row.minutesSaved, + segmentCount: row.segmentCount, + }; + } else { + return { + minutesSaved: 0, + segmentCount: 0, + }; + } + } catch (err) { + return null; + } +} + +async function dbGetUsername(userID: HashedUserID) { + try { + const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); + return row?.userName ?? userID; + } catch (err) { + return false; + } +} + +export async function getUserStats(req: Request, res: Response): Promise { + const userID = req.query.userID as UserID; + const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID; + + if (hashedUserID == undefined) { + //invalid request + return res.status(400).send("Invalid userID or publicUserID parameter"); + } + const responseObj = { + userID: hashedUserID, + userName: await dbGetUsername(hashedUserID), + } as Record | string >; + for (const category of config.categoryList) { + responseObj[category] = await dbGetCategorySummary(hashedUserID, category as Category); + } + return res.send(responseObj); +} diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts new file mode 100644 index 0000000..417e21b --- /dev/null +++ b/test/cases/getUserStats.ts @@ -0,0 +1,95 @@ +import fetch from "node-fetch"; +import {Done, getbaseURL} from "../utils"; +import {db} from "../../src/databases/databases"; +import {getHash} from "../../src/utils/getHash"; +import assert from "assert"; + +describe("getUserStats", () => { + before(async () => { + const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)'; + await db.prepare("run", insertUserNameQuery, [getHash("getuserstats_user_01"), "Username user 01"]); + + const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'; + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid1", getHash("getuserstats_user_01"), 1, 1, "sponsor", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid2", getHash("getuserstats_user_01"), 2, 2, "selfpromo", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid3", getHash("getuserstats_user_01"), 3, 3, "interaction", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid4", getHash("getuserstats_user_01"), 4, 4, "intro", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid5", getHash("getuserstats_user_01"), 5, 5, "outro", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid6", getHash("getuserstats_user_01"), 6, 6, "preview", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid7", getHash("getuserstats_user_01"), 7, 7, "music_offtopic", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 11, 11, 0, "getuserstatsuuid8", getHash("getuserstats_user_01"), 8, 8, "poi_highlight", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, -2, "getuserstatsuuid9", getHash("getuserstats_user_02"), 8, 2, "sponsor", 0]); + + }); + + it("Should be able to get a 400 (No userID parameter)", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats`) + .then(res => { + assert.strictEqual(res.status, 400); + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get user info", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01`) + .then(async res => { + assert.strictEqual(res.status, 200); + const expected = { + userName: "Username user 01", + userID: getHash("getuserstats_user_01"), + sponsor: { + minutesSaved: 1, segmentCount: 1, + }, selfpromo: { + minutesSaved: 2, segmentCount: 1, + }, interaction: { + minutesSaved: 3, segmentCount: 1, + }, intro: { + minutesSaved: 4, segmentCount: 1, + }, outro: { + minutesSaved: 5, segmentCount: 1, + }, preview: { + minutesSaved: 6, segmentCount: 1, + }, music_offtopic: { + minutesSaved: 7, segmentCount: 1, + }, poi_highlight: { + minutesSaved: 0, segmentCount: 1, + }, + }; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get all zeroes for invalid userid", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_invalid`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + for (const value in data) { + if (data[value]?.minutesSaved || data[value]?.segmentCount) { + done(`returned non-zero for ${value}`); + } + } + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get all zeroes for only ignored segments", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_02`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + for (const value in data) { + if (data[value]?.minutesSaved || data[value]?.segmentCount) { + done(`returned non-zero for ${value}`); + } + } + done(); + }) + .catch(err => done(err)); + }); +}); From 9b05ee96af409ce69a43f04a2cba6d47eb7e9db0 Mon Sep 17 00:00:00 2001 From: Michael C Date: Sat, 4 Sep 2021 17:05:23 -0400 Subject: [PATCH 02/10] add getUserStats --- src/app.ts | 3 ++ src/routes/getUserInfo.ts | 9 +--- src/routes/getUserStats.ts | 56 ++++++++++++++++++++++ test/cases/getUserStats.ts | 95 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+), 7 deletions(-) create mode 100644 src/routes/getUserStats.ts create mode 100644 test/cases/getUserStats.ts diff --git a/src/app.ts b/src/app.ts index c9fd95f..e4c3887 100644 --- a/src/app.ts +++ b/src/app.ts @@ -37,6 +37,7 @@ import {getLockCategories} from "./routes/getLockCategories"; import {getLockCategoriesByHash} from "./routes/getLockCategoriesByHash"; import {endpoint as getSearchSegments } from "./routes/getSearchSegments"; import {getStatus } from "./routes/getStatus"; +import {getUserStats} from "./routes/getUserStats"; import ExpressPromiseRouter from "express-promise-router"; import { Server } from "http"; import { youtubeApiProxy } from "./routes/youtubeApiProxy"; @@ -175,6 +176,8 @@ function setupRoutes(router: Router) { router.get("/api/status", getStatus); router.get("/api/youtubeApiProxy", youtubeApiProxy); + // get user category stats + router.get("/api/userStats", getUserStats); if (config.postgres) { router.get("/database", (req, res) => dumpDatabase(req, res, true)); diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index b42d58a..dc62f84 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -43,12 +43,7 @@ async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise { async function dbGetUsername(userID: HashedUserID) { try { const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); - if (row !== undefined) { - return row.userName; - } else { - //no username yet, just send back the userID - return userID; - } + return row?.userName ?? userID; } catch (err) { return false; } @@ -172,7 +167,7 @@ async function getUserInfo(req: Request, res: Response): Promise { responseObj[property] = await dbGetValue(hashedUserID, property); } // add minutesSaved and segmentCount after to avoid getting overwritten - if (paramValues.includes("minutesSaved")) { responseObj["minutesSaved"] = segmentsSummary.minutesSaved; } + if (paramValues.includes("minutesSaved")) responseObj["minutesSaved"] = segmentsSummary.minutesSaved; if (paramValues.includes("segmentCount")) responseObj["segmentCount"] = segmentsSummary.segmentCount; return res.send(responseObj); } diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts new file mode 100644 index 0000000..5c9b563 --- /dev/null +++ b/src/routes/getUserStats.ts @@ -0,0 +1,56 @@ +import {db} from "../databases/databases"; +import {getHash} from "../utils/getHash"; +import {Request, Response} from "express"; +import { HashedUserID, UserID } from "../types/user.model"; +import { Category } from "../types/segments.model"; +import {config} from "../config"; +const maxRewardTime = config.maxRewardTimePerSegmentInSeconds; + +async function dbGetCategorySummary(userID: HashedUserID, category: Category): Promise<{ minutesSaved: number, segmentCount: number }> { + try { + const row = await db.prepare("get", + `SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved", + count(*) as "segmentCount" FROM "sponsorTimes" + WHERE "userID" = ? AND "category" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [maxRewardTime, maxRewardTime, userID, category]); + if (row.minutesSaved != null) { + return { + minutesSaved: row.minutesSaved, + segmentCount: row.segmentCount, + }; + } else { + return { + minutesSaved: 0, + segmentCount: 0, + }; + } + } catch (err) { + return null; + } +} + +async function dbGetUsername(userID: HashedUserID) { + try { + const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); + return row?.userName ?? userID; + } catch (err) { + return false; + } +} + +export async function getUserStats(req: Request, res: Response): Promise { + const userID = req.query.userID as UserID; + const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID; + + if (hashedUserID == undefined) { + //invalid request + return res.status(400).send("Invalid userID or publicUserID parameter"); + } + const responseObj = { + userID: hashedUserID, + userName: await dbGetUsername(hashedUserID), + } as Record | string >; + for (const category of config.categoryList) { + responseObj[category] = await dbGetCategorySummary(hashedUserID, category as Category); + } + return res.send(responseObj); +} diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts new file mode 100644 index 0000000..417e21b --- /dev/null +++ b/test/cases/getUserStats.ts @@ -0,0 +1,95 @@ +import fetch from "node-fetch"; +import {Done, getbaseURL} from "../utils"; +import {db} from "../../src/databases/databases"; +import {getHash} from "../../src/utils/getHash"; +import assert from "assert"; + +describe("getUserStats", () => { + before(async () => { + const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)'; + await db.prepare("run", insertUserNameQuery, [getHash("getuserstats_user_01"), "Username user 01"]); + + const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'; + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid1", getHash("getuserstats_user_01"), 1, 1, "sponsor", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid2", getHash("getuserstats_user_01"), 2, 2, "selfpromo", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid3", getHash("getuserstats_user_01"), 3, 3, "interaction", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid4", getHash("getuserstats_user_01"), 4, 4, "intro", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid5", getHash("getuserstats_user_01"), 5, 5, "outro", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid6", getHash("getuserstats_user_01"), 6, 6, "preview", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, 0, "getuserstatsuuid7", getHash("getuserstats_user_01"), 7, 7, "music_offtopic", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 11, 11, 0, "getuserstatsuuid8", getHash("getuserstats_user_01"), 8, 8, "poi_highlight", 0]); + await db.prepare("run", sponsorTimesQuery, ["getuserstats1", 0, 60, -2, "getuserstatsuuid9", getHash("getuserstats_user_02"), 8, 2, "sponsor", 0]); + + }); + + it("Should be able to get a 400 (No userID parameter)", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats`) + .then(res => { + assert.strictEqual(res.status, 400); + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get user info", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01`) + .then(async res => { + assert.strictEqual(res.status, 200); + const expected = { + userName: "Username user 01", + userID: getHash("getuserstats_user_01"), + sponsor: { + minutesSaved: 1, segmentCount: 1, + }, selfpromo: { + minutesSaved: 2, segmentCount: 1, + }, interaction: { + minutesSaved: 3, segmentCount: 1, + }, intro: { + minutesSaved: 4, segmentCount: 1, + }, outro: { + minutesSaved: 5, segmentCount: 1, + }, preview: { + minutesSaved: 6, segmentCount: 1, + }, music_offtopic: { + minutesSaved: 7, segmentCount: 1, + }, poi_highlight: { + minutesSaved: 0, segmentCount: 1, + }, + }; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get all zeroes for invalid userid", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_invalid`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + for (const value in data) { + if (data[value]?.minutesSaved || data[value]?.segmentCount) { + done(`returned non-zero for ${value}`); + } + } + done(); + }) + .catch(err => done(err)); + }); + + it("Should be able to get all zeroes for only ignored segments", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_02`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + for (const value in data) { + if (data[value]?.minutesSaved || data[value]?.segmentCount) { + done(`returned non-zero for ${value}`); + } + } + done(); + }) + .catch(err => done(err)); + }); +}); From 3d30eea1cb0cb27f2b93d85cf6f7a96f48623069 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:13:52 -0400 Subject: [PATCH 03/10] add categoryStats and typeStats --- src/routes/getUserStats.ts | 82 ++++++++++++++++++++++++++++---------- test/cases/getUserStats.ts | 60 ++++++++++++++++++---------- 2 files changed, 99 insertions(+), 43 deletions(-) diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts index 5c9b563..f2d304f 100644 --- a/src/routes/getUserStats.ts +++ b/src/routes/getUserStats.ts @@ -1,29 +1,68 @@ import {db} from "../databases/databases"; import {getHash} from "../utils/getHash"; import {Request, Response} from "express"; -import { HashedUserID, UserID } from "../types/user.model"; -import { Category } from "../types/segments.model"; +import {HashedUserID, UserID} from "../types/user.model"; import {config} from "../config"; -const maxRewardTime = config.maxRewardTimePerSegmentInSeconds; +import { Logger } from "../utils/logger"; +type nestedObj = Record>; +const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400; -async function dbGetCategorySummary(userID: HashedUserID, category: Category): Promise<{ minutesSaved: number, segmentCount: number }> { +async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, typeStats: boolean) { + let additionalQuery = ""; + if (categoryStats) { + additionalQuery += ` + SUM(CASE WHEN category = 'sponsor' THEN 1 ELSE 0 END) as "categorySumSponsor", + SUM(CASE WHEN category = 'intro' THEN 1 ELSE 0 END) as "categorySumIntro", + SUM(CASE WHEN category = 'outro' THEN 1 ELSE 0 END) as "categorySumOutro", + SUM(CASE WHEN category = 'interaction' THEN 1 ELSE 0 END) as "categorySumInteraction", + SUM(CASE WHEN category = 'selfpromo' THEN 1 ELSE 0 END) as "categorySelfpromo", + SUM(CASE WHEN category = 'music_offtopic' THEN 1 ELSE 0 END) as "categoryMusicOfftopic", + SUM(CASE WHEN category = 'preview' THEN 1 ELSE 0 END) as "categorySumPreview", + SUM(CASE WHEN category = 'poi_highlight' THEN 1 ELSE 0 END) as "categorySumHighlight",`; + } + if (typeStats) { + additionalQuery += ` + SUM(CASE WHEN actionType = 'skip' THEN 1 ELSE 0 END) as 'typeSumSkip', + SUM(CASE WHEN actionType = 'mute' THEN 1 ELSE 0 END) as 'typeSumMute',`; + } try { - const row = await db.prepare("get", - `SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved", - count(*) as "segmentCount" FROM "sponsorTimes" - WHERE "userID" = ? AND "category" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [maxRewardTime, maxRewardTime, userID, category]); - if (row.minutesSaved != null) { - return { - minutesSaved: row.minutesSaved, - segmentCount: row.segmentCount, - }; - } else { - return { - minutesSaved: 0, - segmentCount: 0, + const row = await db.prepare("get", ` + SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved", + ${additionalQuery} + count(*) as "segmentCount" + FROM "sponsorTimes" + WHERE "userID" = ? AND votes > -2 AND shadowHidden !=1`, + [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]); + const source = (row.minutesSaved != null) ? row : {}; + const handler = { get: (target: Record, name: string) => target?.[name] || 0 }; + const proxy = new Proxy(source, handler); + const result = {} as nestedObj; + + result.overallStats = { + minutesSaved: proxy.minutesSaved, + segmentCount: proxy.segmentCount, + }; + if (categoryStats) { + result.categoryCount = { + sponsor: proxy.categorySumSponsor, + intro: proxy.categorySumIntro, + outro: proxy.categorySumOutro, + interaction: proxy.categorySumInteraction, + selfpromo: proxy.categorySelfpromo, + music_offtopic: proxy.categoryMusicOfftopic, + preview: proxy.categorySumPreview, + poi_highlight: proxy.categorySumHighlight, }; } + if (typeStats) { + result.actionTypeCount = { + skip: proxy.typeSumSkip, + mute: proxy.typeSumMute, + }; + } + return result; } catch (err) { + Logger.error(err as string); return null; } } @@ -40,17 +79,18 @@ async function dbGetUsername(userID: HashedUserID) { export async function getUserStats(req: Request, res: Response): Promise { const userID = req.query.userID as UserID; const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID; + const categoryStats = req.query.categoryStats == "true"; + const typeStats = req.query.typeStats == "true"; if (hashedUserID == undefined) { //invalid request return res.status(400).send("Invalid userID or publicUserID parameter"); } + const segmentSummary = await dbGetUserSummary(hashedUserID, categoryStats, typeStats); const responseObj = { userID: hashedUserID, userName: await dbGetUsername(hashedUserID), - } as Record | string >; - for (const category of config.categoryList) { - responseObj[category] = await dbGetCategorySummary(hashedUserID, category as Category); - } + ...segmentSummary, + } as Record; return res.send(responseObj); } diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts index 417e21b..d689198 100644 --- a/test/cases/getUserStats.ts +++ b/test/cases/getUserStats.ts @@ -3,6 +3,7 @@ import {Done, getbaseURL} from "../utils"; import {db} from "../../src/databases/databases"; import {getHash} from "../../src/utils/getHash"; import assert from "assert"; +const includeAllStats = "&categoryStats=true&typeStats=true"; describe("getUserStats", () => { before(async () => { @@ -31,30 +32,31 @@ describe("getUserStats", () => { .catch(err => done(err)); }); - it("Should be able to get user info", (done: Done) => { - fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01`) + it("Should be able to get all user info", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01${includeAllStats}`) .then(async res => { assert.strictEqual(res.status, 200); const expected = { userName: "Username user 01", userID: getHash("getuserstats_user_01"), - sponsor: { - minutesSaved: 1, segmentCount: 1, - }, selfpromo: { - minutesSaved: 2, segmentCount: 1, - }, interaction: { - minutesSaved: 3, segmentCount: 1, - }, intro: { - minutesSaved: 4, segmentCount: 1, - }, outro: { - minutesSaved: 5, segmentCount: 1, - }, preview: { - minutesSaved: 6, segmentCount: 1, - }, music_offtopic: { - minutesSaved: 7, segmentCount: 1, - }, poi_highlight: { - minutesSaved: 0, segmentCount: 1, + categoryCount: { + sponsor: 1, + selfpromo: 1, + interaction: 1, + intro: 1, + outro: 1, + preview: 1, + music_offtopic: 1, + poi_highlight: 1, }, + actionTypeCount: { + mute: 0, + skip: 8 + }, + overallStats: { + minutesSaved: 28, + segmentCount: 8 + } }; const data = await res.json(); assert.deepStrictEqual(data, expected); @@ -68,8 +70,8 @@ describe("getUserStats", () => { .then(async res => { assert.strictEqual(res.status, 200); const data = await res.json(); - for (const value in data) { - if (data[value]?.minutesSaved || data[value]?.segmentCount) { + for (const value in data.overallStats) { + if (data[value]) { done(`returned non-zero for ${value}`); } } @@ -83,8 +85,8 @@ describe("getUserStats", () => { .then(async res => { assert.strictEqual(res.status, 200); const data = await res.json(); - for (const value in data) { - if (data[value]?.minutesSaved || data[value]?.segmentCount) { + for (const value in data.overallStats) { + if (data[value]) { done(`returned non-zero for ${value}`); } } @@ -92,4 +94,18 @@ describe("getUserStats", () => { }) .catch(err => done(err)); }); + + it("Should not get extra stats if not requested", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + // check for categoryCount + if (data.categoryCount || data.actionTypeCount) { + done("returned extra stats"); + } + done(); + }) + .catch(err => done(err)); + }); }); From 2c2e9a290053b06cc5c196c01e75befe11dc8069 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:18:15 -0400 Subject: [PATCH 04/10] all columns in quotes --- src/routes/getUserStats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts index f2d304f..a1afc62 100644 --- a/src/routes/getUserStats.ts +++ b/src/routes/getUserStats.ts @@ -31,7 +31,7 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty ${additionalQuery} count(*) as "segmentCount" FROM "sponsorTimes" - WHERE "userID" = ? AND votes > -2 AND shadowHidden !=1`, + WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" !=1`, [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]); const source = (row.minutesSaved != null) ? row : {}; const handler = { get: (target: Record, name: string) => target?.[name] || 0 }; From 46270cfe8404d4ea1690060d829fad93bf4e1c4b Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:32:32 -0400 Subject: [PATCH 05/10] partialDeepEquals for varying orders --- test/cases/getUserStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts index d689198..209b7da 100644 --- a/test/cases/getUserStats.ts +++ b/test/cases/getUserStats.ts @@ -1,5 +1,5 @@ import fetch from "node-fetch"; -import {Done, getbaseURL} from "../utils"; +import {Done, getbaseURL, partialDeepEquals} from "../utils"; import {db} from "../../src/databases/databases"; import {getHash} from "../../src/utils/getHash"; import assert from "assert"; @@ -59,7 +59,7 @@ describe("getUserStats", () => { } }; const data = await res.json(); - assert.deepStrictEqual(data, expected); + assert.ok(partialDeepEquals(data, expected)); done(); }) .catch(err => done(err)); From 6b7fdb8d9e26b7cc181362c198b2f518b2a98567 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:38:15 -0400 Subject: [PATCH 06/10] please accept my double quotes --- src/routes/getUserStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts index a1afc62..706804a 100644 --- a/src/routes/getUserStats.ts +++ b/src/routes/getUserStats.ts @@ -22,8 +22,8 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty } if (typeStats) { additionalQuery += ` - SUM(CASE WHEN actionType = 'skip' THEN 1 ELSE 0 END) as 'typeSumSkip', - SUM(CASE WHEN actionType = 'mute' THEN 1 ELSE 0 END) as 'typeSumMute',`; + SUM(CASE WHEN actionType = 'skip' THEN 1 ELSE 0 END) as "typeSumSkip", + SUM(CASE WHEN actionType = 'mute' THEN 1 ELSE 0 END) as "typeSumMute",`; } try { const row = await db.prepare("get", ` From 76fe3f116538cd12479f27f22feb4a697f586da7 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:44:39 -0400 Subject: [PATCH 07/10] stage of grief - depression --- src/routes/getUserStats.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts index 706804a..8609c69 100644 --- a/src/routes/getUserStats.ts +++ b/src/routes/getUserStats.ts @@ -11,19 +11,19 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty let additionalQuery = ""; if (categoryStats) { additionalQuery += ` - SUM(CASE WHEN category = 'sponsor' THEN 1 ELSE 0 END) as "categorySumSponsor", - SUM(CASE WHEN category = 'intro' THEN 1 ELSE 0 END) as "categorySumIntro", - SUM(CASE WHEN category = 'outro' THEN 1 ELSE 0 END) as "categorySumOutro", - SUM(CASE WHEN category = 'interaction' THEN 1 ELSE 0 END) as "categorySumInteraction", - SUM(CASE WHEN category = 'selfpromo' THEN 1 ELSE 0 END) as "categorySelfpromo", - SUM(CASE WHEN category = 'music_offtopic' THEN 1 ELSE 0 END) as "categoryMusicOfftopic", - SUM(CASE WHEN category = 'preview' THEN 1 ELSE 0 END) as "categorySumPreview", - SUM(CASE WHEN category = 'poi_highlight' THEN 1 ELSE 0 END) as "categorySumHighlight",`; + SUM(CASE WHEN "category" = 'sponsor' THEN 1 ELSE 0 END) as "categorySumSponsor", + SUM(CASE WHEN "category" = 'intro' THEN 1 ELSE 0 END) as "categorySumIntro", + SUM(CASE WHEN "category" = 'outro' THEN 1 ELSE 0 END) as "categorySumOutro", + SUM(CASE WHEN "category" = 'interaction' THEN 1 ELSE 0 END) as "categorySumInteraction", + SUM(CASE WHEN "category" = 'selfpromo' THEN 1 ELSE 0 END) as "categorySelfpromo", + SUM(CASE WHEN "category" = 'music_offtopic' THEN 1 ELSE 0 END) as "categoryMusicOfftopic", + SUM(CASE WHEN "category" = 'preview' THEN 1 ELSE 0 END) as "categorySumPreview", + SUM(CASE WHEN "category" = 'poi_highlight' THEN 1 ELSE 0 END) as "categorySumHighlight",`; } if (typeStats) { additionalQuery += ` - SUM(CASE WHEN actionType = 'skip' THEN 1 ELSE 0 END) as "typeSumSkip", - SUM(CASE WHEN actionType = 'mute' THEN 1 ELSE 0 END) as "typeSumMute",`; + SUM(CASE WHEN "actionType" = 'skip' THEN 1 ELSE 0 END) as "typeSumSkip", + SUM(CASE WHEN "actionType" = 'mute' THEN 1 ELSE 0 END) as "typeSumMute",`; } try { const row = await db.prepare("get", ` From 18c1735087810c6bb07490e9955431a383398206 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 7 Sep 2021 00:48:01 -0400 Subject: [PATCH 08/10] acceptance --- test/cases/getUserStats.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts index 209b7da..674e85f 100644 --- a/test/cases/getUserStats.ts +++ b/test/cases/getUserStats.ts @@ -3,7 +3,6 @@ import {Done, getbaseURL, partialDeepEquals} from "../utils"; import {db} from "../../src/databases/databases"; import {getHash} from "../../src/utils/getHash"; import assert from "assert"; -const includeAllStats = "&categoryStats=true&typeStats=true"; describe("getUserStats", () => { before(async () => { @@ -33,7 +32,7 @@ describe("getUserStats", () => { }); it("Should be able to get all user info", (done: Done) => { - fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01${includeAllStats}`) + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&categoryStats=true&typeStats=true`) .then(async res => { assert.strictEqual(res.status, 200); const expected = { @@ -108,4 +107,18 @@ describe("getUserStats", () => { }) .catch(err => done(err)); }); + + it("Should get parts of extra stats if not requested", (done: Done) => { + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&typeStats=true`) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + // check for categoryCount + if (data.categoryCount && !data.actionTypeCount) { + done("returned extra stats"); + } + done(); + }) + .catch(err => done(err)); + }); }); From 93c69248d9ddd08f7b9656e752953ede6db270ad Mon Sep 17 00:00:00 2001 From: Haidang666 Date: Mon, 13 Sep 2021 14:49:17 +0700 Subject: [PATCH 09/10] Add getService helper function --- src/routes/getSearchSegments.ts | 6 ++---- src/routes/getSkipSegments.ts | 6 ++---- src/routes/getSkipSegmentsByHash.ts | 6 ++---- src/routes/postClearCache.ts | 3 ++- src/routes/postSkipSegments.ts | 6 ++---- src/utils/getService.ts | 16 ++++++++++++++++ test/cases/getService.ts | 29 +++++++++++++++++++++++++++++ 7 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 src/utils/getService.ts create mode 100644 test/cases/getService.ts diff --git a/src/routes/getSearchSegments.ts b/src/routes/getSearchSegments.ts index 5a86b55..684386b 100644 --- a/src/routes/getSearchSegments.ts +++ b/src/routes/getSearchSegments.ts @@ -1,6 +1,7 @@ import { Request, Response } from "express"; import { db } from "../databases/databases"; import { ActionType, Category, DBSegment, Service, VideoID } from "../types/segments.model"; +import { getService } from "../utils/getService"; const segmentsPerPage = 10; type searchSegmentResponse = { @@ -59,10 +60,7 @@ async function handleGetSegments(req: Request, res: Response): Promise val == service)) { - service = Service.YouTube; - } + const service = getService(req.query.service, req.body.service); let page: number = req.query.page ?? req.body.page ?? 0; page = Number(page); diff --git a/src/routes/getSkipSegments.ts b/src/routes/getSkipSegments.ts index 9968726..895ea64 100644 --- a/src/routes/getSkipSegments.ts +++ b/src/routes/getSkipSegments.ts @@ -10,6 +10,7 @@ import { getIP } from "../utils/getIP"; import { Logger } from "../utils/logger"; import { QueryCacher } from "../utils/queryCacher"; import { getReputation } from "../utils/reputation"; +import { getService } from "../utils/getService"; async function prepareCategorySegments(req: Request, videoID: VideoID, category: Category, segments: DBSegment[], cache: SegmentCache = {shadowHiddenSegmentIPs: {}}): Promise { @@ -317,10 +318,7 @@ async function handleGetSegments(req: Request, res: Response): Promise val == service)) { - service = Service.YouTube; - } + const service = getService(req.query.service, req.body.service); const segments = await getSegmentsByVideoID(req, videoID, categories, actionTypes, requiredSegments, service); diff --git a/src/routes/getSkipSegmentsByHash.ts b/src/routes/getSkipSegmentsByHash.ts index 6b8f00c..39ef9e6 100644 --- a/src/routes/getSkipSegmentsByHash.ts +++ b/src/routes/getSkipSegmentsByHash.ts @@ -2,6 +2,7 @@ import {hashPrefixTester} from "../utils/hashPrefixTester"; import {getSegmentsByHash} from "./getSkipSegments"; import {Request, Response} from "express"; import { ActionType, Category, SegmentUUID, Service, VideoIDHash } from "../types/segments.model"; +import { getService } from "../utils/getService"; export async function getSkipSegmentsByHash(req: Request, res: Response): Promise { let hashPrefix = req.params.prefix as VideoIDHash; @@ -58,10 +59,7 @@ export async function getSkipSegmentsByHash(req: Request, res: Response): Promis return res.status(400).send("Bad parameter: requiredSegments (invalid JSON)"); } - let service: Service = req.query.service ?? req.body.service ?? Service.YouTube; - if (!Object.values(Service).some((val) => val == service)) { - service = Service.YouTube; - } + const service = getService(req.query.service, req.body.service); // filter out none string elements, only flat array with strings is valid categories = categories.filter((item: any) => typeof item === "string"); diff --git a/src/routes/postClearCache.ts b/src/routes/postClearCache.ts index 5a15ee7..8835ddd 100644 --- a/src/routes/postClearCache.ts +++ b/src/routes/postClearCache.ts @@ -6,11 +6,12 @@ import { Service, VideoID } from "../types/segments.model"; import { QueryCacher } from "../utils/queryCacher"; import { isUserVIP } from "../utils/isUserVIP"; import { VideoIDHash } from "../types/segments.model"; +import { getService } from "../utils/getService"; export async function postClearCache(req: Request, res: Response): Promise { const videoID = req.query.videoID as VideoID; const userID = req.query.userID as UserID; - const service = req.query.service as Service ?? Service.YouTube; + const service = getService(req.query.service as Service); const invalidFields = []; if (typeof videoID !== "string") { diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts index f726cfa..5420271 100644 --- a/src/routes/postSkipSegments.ts +++ b/src/routes/postSkipSegments.ts @@ -19,6 +19,7 @@ import { APIVideoData, APIVideoInfo } from "../types/youtubeApi.model"; import { UserID } from "../types/user.model"; import { isUserVIP } from "../utils/isUserVIP"; import { parseUserAgent } from "../utils/userAgent"; +import { getService } from "../utils/getService"; type CheckResult = { pass: boolean, @@ -545,10 +546,7 @@ function proxySubmission(req: Request) { function preprocessInput(req: Request) { const videoID = req.query.videoID || req.body.videoID; const userID = req.query.userID || req.body.userID; - let service: Service = req.query.service ?? req.body.service ?? Service.YouTube; - if (!Object.values(Service).some((val) => val === service)) { - service = Service.YouTube; - } + const service = getService(req.query.service, req.body.service); const videoDurationParam: VideoDuration = (parseFloat(req.query.videoDuration || req.body.videoDuration) || 0) as VideoDuration; const videoDuration = videoDurationParam; diff --git a/src/utils/getService.ts b/src/utils/getService.ts new file mode 100644 index 0000000..980f240 --- /dev/null +++ b/src/utils/getService.ts @@ -0,0 +1,16 @@ +import { Service } from "../types/segments.model"; + +export function getService(...value: T[]): Service { + for (const name of value) { + if (name) { + const service = Object.values(Service).find( + (val) => val.toLowerCase() === name.trim().toLowerCase() + ); + if (service) { + return service; + } + } + } + + return Service.YouTube; +} diff --git a/test/cases/getService.ts b/test/cases/getService.ts new file mode 100644 index 0000000..a223247 --- /dev/null +++ b/test/cases/getService.ts @@ -0,0 +1,29 @@ +import { getService } from "../../src/utils/getService"; +import { Service } from "../../src/types/segments.model"; + +import assert from "assert"; + +describe("getService", () => { + it("Should return youtube if not match", () => { + assert.strictEqual(getService(), Service.YouTube); + assert.strictEqual(getService(""), Service.YouTube); + assert.strictEqual(getService("test", "not exist"), Service.YouTube); + assert.strictEqual(getService(null, null), Service.YouTube); + assert.strictEqual(getService(undefined, undefined), Service.YouTube); + assert.strictEqual(getService(undefined), Service.YouTube); + }); + + it("Should return Youtube", () => { + assert.strictEqual(getService("youtube"), Service.YouTube); + assert.strictEqual(getService(" Youtube "), Service.YouTube); + assert.strictEqual(getService(" YouTube "), Service.YouTube); + assert.strictEqual(getService(undefined, " YouTube "), Service.YouTube); + }); + + it("Should return PeerTube", () => { + assert.strictEqual(getService("PeerTube"), Service.PeerTube); + assert.strictEqual(getService(" PeerTube "), Service.PeerTube); + assert.strictEqual(getService(" peertube "), Service.PeerTube); + assert.strictEqual(getService(undefined, " PeerTube "), Service.PeerTube); + }); +}); From 4d9e5954701c5156d6d4323a051f59b39046e7ff Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 15 Sep 2021 20:44:20 -0400 Subject: [PATCH 10/10] Rename user stats parameters --- src/routes/getUserStats.ts | 16 ++++++++-------- test/cases/getUserStats.ts | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/getUserStats.ts b/src/routes/getUserStats.ts index 8609c69..c6b6420 100644 --- a/src/routes/getUserStats.ts +++ b/src/routes/getUserStats.ts @@ -7,9 +7,9 @@ import { Logger } from "../utils/logger"; type nestedObj = Record>; const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400; -async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, typeStats: boolean) { +async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolean, fetchActionTypeStats: boolean) { let additionalQuery = ""; - if (categoryStats) { + if (fetchCategoryStats) { additionalQuery += ` SUM(CASE WHEN "category" = 'sponsor' THEN 1 ELSE 0 END) as "categorySumSponsor", SUM(CASE WHEN "category" = 'intro' THEN 1 ELSE 0 END) as "categorySumIntro", @@ -20,7 +20,7 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty SUM(CASE WHEN "category" = 'preview' THEN 1 ELSE 0 END) as "categorySumPreview", SUM(CASE WHEN "category" = 'poi_highlight' THEN 1 ELSE 0 END) as "categorySumHighlight",`; } - if (typeStats) { + if (fetchActionTypeStats) { additionalQuery += ` SUM(CASE WHEN "actionType" = 'skip' THEN 1 ELSE 0 END) as "typeSumSkip", SUM(CASE WHEN "actionType" = 'mute' THEN 1 ELSE 0 END) as "typeSumMute",`; @@ -42,7 +42,7 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty minutesSaved: proxy.minutesSaved, segmentCount: proxy.segmentCount, }; - if (categoryStats) { + if (fetchCategoryStats) { result.categoryCount = { sponsor: proxy.categorySumSponsor, intro: proxy.categorySumIntro, @@ -54,7 +54,7 @@ async function dbGetUserSummary(userID: HashedUserID, categoryStats: boolean, ty poi_highlight: proxy.categorySumHighlight, }; } - if (typeStats) { + if (fetchActionTypeStats) { result.actionTypeCount = { skip: proxy.typeSumSkip, mute: proxy.typeSumMute, @@ -79,14 +79,14 @@ async function dbGetUsername(userID: HashedUserID) { export async function getUserStats(req: Request, res: Response): Promise { const userID = req.query.userID as UserID; const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID; - const categoryStats = req.query.categoryStats == "true"; - const typeStats = req.query.typeStats == "true"; + const fetchCategoryStats = req.query.fetchCategoryStats == "true"; + const fetchActionTypeStats = req.query.fetchActionTypeStats == "true"; if (hashedUserID == undefined) { //invalid request return res.status(400).send("Invalid userID or publicUserID parameter"); } - const segmentSummary = await dbGetUserSummary(hashedUserID, categoryStats, typeStats); + const segmentSummary = await dbGetUserSummary(hashedUserID, fetchCategoryStats, fetchActionTypeStats); const responseObj = { userID: hashedUserID, userName: await dbGetUsername(hashedUserID), diff --git a/test/cases/getUserStats.ts b/test/cases/getUserStats.ts index 674e85f..9b7be30 100644 --- a/test/cases/getUserStats.ts +++ b/test/cases/getUserStats.ts @@ -32,7 +32,7 @@ describe("getUserStats", () => { }); it("Should be able to get all user info", (done: Done) => { - fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&categoryStats=true&typeStats=true`) + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&fetchCategoryStats=true&fetchActionTypeStats=true`) .then(async res => { assert.strictEqual(res.status, 200); const expected = { @@ -109,7 +109,7 @@ describe("getUserStats", () => { }); it("Should get parts of extra stats if not requested", (done: Done) => { - fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&typeStats=true`) + fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&fetchActionTypeStats=true`) .then(async res => { assert.strictEqual(res.status, 200); const data = await res.json();