From 3b16cdb920d639c26206ee5d464a7269a73b19df Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 15 Jun 2021 17:08:17 -0400 Subject: [PATCH] add last lastSegmentID --- src/routes/getUserInfo.ts | 13 ++++++++++++- test/cases/getUserInfo.ts | 34 +++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index 4ade24e..8dc8ac9 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -5,6 +5,7 @@ import {Request, Response} from 'express'; import {Logger} from '../utils/logger'; import { HashedUserID, UserID } from '../types/user.model'; import { getReputation } from '../utils/reputation'; +import { SegmentUUID } from "../types/segments.model"; async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> { try { @@ -27,7 +28,7 @@ async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ min } } -async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise<{ ignoredSegmentCount: number }> { +async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise { try { let row = await db.prepare("get", `SELECT COUNT(*) as "ignoredSegmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]); return row?.ignoredSegmentCount ?? 0 @@ -78,6 +79,15 @@ async function dbGetWarningsForUser(userID: HashedUserID): Promise { } } +async function dbGetLastSegmentForUser(userID: HashedUserID): Promise { + try { + let row = await db.prepare('get', `SELECT "timeSubmitted", "UUID" FROM "sponsorTimes" WHERE "userID" = ? ORDER BY "timeSubmitted" DESC LIMIT 1`, [userID]); + return row?.UUID ?? null; + } catch (err) { + return null; + } +} + export async function getUserInfo(req: Request, res: Response) { const userID = req.query.userID as UserID; const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID; @@ -101,6 +111,7 @@ export async function getUserInfo(req: Request, res: Response) { warnings: await dbGetWarningsForUser(hashedUserID), reputation: await getReputation(hashedUserID), vip: await isUserVIP(hashedUserID), + lastSegmentID: await dbGetLastSegmentForUser(hashedUserID), }); } else { res.status(400).send(); diff --git a/test/cases/getUserInfo.ts b/test/cases/getUserInfo.ts index f810d7a..3e63474 100644 --- a/test/cases/getUserInfo.ts +++ b/test/cases/getUserInfo.ts @@ -8,14 +8,14 @@ describe('getUserInfo', () => { let startOfUserNamesQuery = `INSERT INTO "userNames" ("userID", "userName") VALUES`; await db.prepare("run", startOfUserNamesQuery + "('" + getHash("getuserinfo_user_01") + "', 'Username user 01')"); let startOfSponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES'; - await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000001', '" + getHash("getuserinfo_user_01") + "', 0, 10, 'sponsor', 0)"); - await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000002', '" + getHash("getuserinfo_user_01") + "', 0, 10, 'sponsor', 0)"); - await db.prepare("run", startOfSponsorTimesQuery + "('yyyxxxzzz', 1, 11, -1, 'uuid000003', '" + getHash("getuserinfo_user_01") + "', 0, 10, 'sponsor', 0)"); - await db.prepare("run", startOfSponsorTimesQuery + "('yyyxxxzzz', 1, 11, -2, 'uuid000004', '" + getHash("getuserinfo_user_01") + "', 0, 10, 'sponsor', 1)"); - await db.prepare("run", startOfSponsorTimesQuery + "('xzzzxxyyy', 1, 11, -5, 'uuid000005', '" + getHash("getuserinfo_user_01") + "', 0, 10, 'sponsor', 1)"); - await db.prepare("run", startOfSponsorTimesQuery + "('zzzxxxyyy', 1, 11, 2, 'uuid000006', '" + getHash("getuserinfo_user_02") + "', 0, 10, 'sponsor', 0)"); - await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000007', '" + getHash("getuserinfo_user_02") + "', 0, 10, 'sponsor', 1)"); - await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000008', '" + getHash("getuserinfo_user_02") + "', 0, 10, 'sponsor', 1)"); + await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000001', '" + getHash("getuserinfo_user_01") + "', 1, 10, 'sponsor', 0)"); + await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000002', '" + getHash("getuserinfo_user_01") + "', 2, 10, 'sponsor', 0)"); + await db.prepare("run", startOfSponsorTimesQuery + "('yyyxxxzzz', 1, 11, -1, 'uuid000003', '" + getHash("getuserinfo_user_01") + "', 3, 10, 'sponsor', 0)"); + await db.prepare("run", startOfSponsorTimesQuery + "('yyyxxxzzz', 1, 11, -2, 'uuid000004', '" + getHash("getuserinfo_user_01") + "', 4, 10, 'sponsor', 1)"); + await db.prepare("run", startOfSponsorTimesQuery + "('xzzzxxyyy', 1, 11, -5, 'uuid000005', '" + getHash("getuserinfo_user_01") + "', 5, 10, 'sponsor', 1)"); + await db.prepare("run", startOfSponsorTimesQuery + "('zzzxxxyyy', 1, 11, 2, 'uuid000006', '" + getHash("getuserinfo_user_02") + "', 6, 10, 'sponsor', 0)"); + await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000007', '" + getHash("getuserinfo_user_02") + "', 7, 10, 'sponsor', 1)"); + await db.prepare("run", startOfSponsorTimesQuery + "('xxxyyyzzz', 1, 11, 2, 'uuid000008', '" + getHash("getuserinfo_user_02") + "', 8, 10, 'sponsor', 1)"); await db.prepare("run", `INSERT INTO warnings ("userID", "issueTime", "issuerUserID", enabled) VALUES ('` + getHash('getuserinfo_warning_0') + "', 10, 'getuserinfo_vip', 1)"); @@ -62,6 +62,8 @@ describe('getUserInfo', () => { done('Returned incorrect ignoredSegmentCount "' + data.ignoredSegmentCount + '"'); } else if (Math.abs(data.reputation - -0.928) > 0.001) { done('Returned incorrect reputation "' + data.reputation + '"'); + } else if (data.lastSegmentID !== "uuid000005") { + done('Returned incorrect last segment "' + data.lastSegmentID + '"'); } else { done(); // pass } @@ -113,7 +115,7 @@ describe('getUserInfo', () => { .catch(err => ("couldn't call endpoint")); }); - it('Should not get warnings if noe', (done: Done) => { + it('Should not get warnings if none', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_warning_2') .then(async res => { if (res.status !== 200) { @@ -142,4 +144,18 @@ describe('getUserInfo', () => { }) .catch(err => ('couldn\'t call endpoint')); }); + + it('Should return null segment if none', (done: Done) => { + fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_null') + .then(async res => { + if (res.status !== 200) { + done('non 200 (' + res.status + ')'); + } else { + const data = await res.json(); + if (data.lastSegmentID !== null) done('returned segment ' + data.warnings + ', not ' + null); + else done(); // pass + } + }) + .catch(err => ("couldn't call endpoint")); + }); });