From 9732d0e6ef3d21f209edf7ec26c3708919d4dc35 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 15 Oct 2023 17:59:19 -0700
Subject: [PATCH] Add back pageSize.

---
 src/pages/api/reports/index.ts             | 3 ++-
 src/pages/api/teams/[id]/users/index.ts    | 5 ++++-
 src/pages/api/teams/[id]/websites/index.ts | 8 +++++++-
 src/pages/api/teams/index.ts               | 3 ++-
 src/pages/api/users/[id]/teams.ts          | 2 +-
 src/pages/api/users/[id]/websites.ts       | 2 +-
 src/pages/api/users/index.ts               | 4 ++--
 src/pages/api/websites/[id]/reports.ts     | 7 +++++--
 8 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 2d59c9d6..82902aef 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -50,10 +50,11 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    const { page, query } = req.query;
+    const { page, query, pageSize } = req.query;
 
     const data = await getReportsByUserId(userId, {
       page,
+      pageSize: +pageSize || undefined,
       query,
       includeTeams: true,
     });
diff --git a/src/pages/api/teams/[id]/users/index.ts b/src/pages/api/teams/[id]/users/index.ts
index c3181e6a..4915ad7f 100644
--- a/src/pages/api/teams/[id]/users/index.ts
+++ b/src/pages/api/teams/[id]/users/index.ts
@@ -5,6 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getUsersByTeamId } from 'queries';
+import { pageInfo } from 'lib/schema';
 
 export interface TeamUserRequestQuery extends SearchFilter {
   id: string;
@@ -13,6 +14,7 @@ export interface TeamUserRequestQuery extends SearchFilter {
 const schema = {
   GET: yup.object().shape({
     id: yup.string().uuid().required(),
+    ...pageInfo,
   }),
 };
 
@@ -30,11 +32,12 @@ export default async (
       return unauthorized(res);
     }
 
-    const { query, page } = req.query;
+    const { query, page, pageSize } = req.query;
 
     const users = await getUsersByTeamId(teamId, {
       query,
       page,
+      pageSize: +pageSize || undefined,
     });
 
     return ok(res, users);
diff --git a/src/pages/api/teams/[id]/websites/index.ts b/src/pages/api/teams/[id]/websites/index.ts
index 5ff8c665..4e754d20 100644
--- a/src/pages/api/teams/[id]/websites/index.ts
+++ b/src/pages/api/teams/[id]/websites/index.ts
@@ -41,7 +41,13 @@ export default async (
       return unauthorized(res);
     }
 
-    const websites = await getWebsitesByTeamId(teamId, { ...req.query });
+    const { page, query, pageSize } = req.query;
+
+    const websites = await getWebsitesByTeamId(teamId, {
+      page,
+      query,
+      pageSize: +pageSize || undefined,
+    });
 
     return ok(res, websites);
   }
diff --git a/src/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
index 4a9f4bb4..e89b4ee8 100644
--- a/src/pages/api/teams/index.ts
+++ b/src/pages/api/teams/index.ts
@@ -35,11 +35,12 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    const { page, query } = req.query;
+    const { page, query, pageSize } = req.query;
 
     const results = await getTeamsByUserId(userId, {
       page,
       query,
+      pageSize: +pageSize || undefined,
     });
 
     return ok(res, results);
diff --git a/src/pages/api/users/[id]/teams.ts b/src/pages/api/users/[id]/teams.ts
index bfa0d31a..cb5d4448 100644
--- a/src/pages/api/users/[id]/teams.ts
+++ b/src/pages/api/users/[id]/teams.ts
@@ -44,7 +44,7 @@ export default async (
     const teams = await getTeamsByUserId(userId, {
       query,
       page,
-      pageSize,
+      pageSize: +pageSize || undefined,
     });
 
     return ok(res, teams);
diff --git a/src/pages/api/users/[id]/websites.ts b/src/pages/api/users/[id]/websites.ts
index 4eb659c8..ab8fedfb 100644
--- a/src/pages/api/users/[id]/websites.ts
+++ b/src/pages/api/users/[id]/websites.ts
@@ -47,7 +47,7 @@ export default async (
 
     const websites = await getWebsitesByUserId(userId, {
       page,
-      pageSize,
+      pageSize: +pageSize || undefined,
       query,
       orderBy,
       includeTeams,
diff --git a/src/pages/api/users/index.ts b/src/pages/api/users/index.ts
index b6d81271..de49a37b 100644
--- a/src/pages/api/users/index.ts
+++ b/src/pages/api/users/index.ts
@@ -44,9 +44,9 @@ export default async (
       return unauthorized(res);
     }
 
-    const { page, query } = req.query;
+    const { page, query, pageSize } = req.query;
 
-    const users = await getUsers({ page, query });
+    const users = await getUsers({ page, query, pageSize: +pageSize || undefined });
 
     return ok(res, users);
   }
diff --git a/src/pages/api/websites/[id]/reports.ts b/src/pages/api/websites/[id]/reports.ts
index 971797f1..18e944fe 100644
--- a/src/pages/api/websites/[id]/reports.ts
+++ b/src/pages/api/websites/[id]/reports.ts
@@ -5,6 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getReportsByWebsiteId } from 'queries';
+import { pageInfo } from 'lib/schema';
 
 export interface ReportsRequestQuery extends SearchFilter {
   id: string;
@@ -13,6 +14,7 @@ export interface ReportsRequestQuery extends SearchFilter {
 const schema = {
   GET: yup.object().shape({
     id: yup.string().uuid().required(),
+    ...pageInfo,
   }),
 };
 
@@ -27,14 +29,15 @@ export default async (
   const { id: websiteId } = req.query;
 
   if (req.method === 'GET') {
-    if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const { page, query } = req.query;
+    const { page, query, pageSize } = req.query;
 
     const data = await getReportsByWebsiteId(websiteId, {
       page,
+      pageSize: +pageSize || undefined,
       query,
     });