Add pagination response fields to API requests that handle pagination.

vircadia · Nov 3, 2020 · db36bcc · db36bcc
1 parent 1c51ba8
commit db36bcc
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 3 deletions.
diff --git a/src/routes/api/v1/account/accountId/tokens.ts b/src/routes/api/v1/account/accountId/tokens.ts
@@ -43,6 +43,8 @@ const procGetAccountTokens: RequestHandler = async (req: Request, resp: Response
     req.vRestResp.Data = {
       'tokens': toks
     };
+
+    pager.addResponseFields(req);
   };
   next();
   next();

diff --git a/src/routes/api/v1/domains.ts b/src/routes/api/v1/domains.ts
@@ -35,19 +35,21 @@ import { Logger } from '@Tools/Logging';
 const procGetDomains: RequestHandler = async (req: Request, resp: Response, next: NextFunction) => {
   if (req.vAuthAccount) {
 
-    const pagination = new PaginationInfo();
+    const pager = new PaginationInfo();
     const scoper = new AccountScopeFilter(req.vAuthAccount, "sponsorAccountId");
 
-    pagination.parametersFromRequest(req);
+    pager.parametersFromRequest(req);
     scoper.parametersFromRequest(req);
 
     const domainArray: any[] = [];
-    for await (const aDomain of Domains.enumerateAsync(scoper, pagination)) {
+    for await (const aDomain of Domains.enumerateAsync(scoper, pager)) {
       domainArray.push( await buildDomainInfoV1(aDomain) );
     };
     req.vRestResp.Data = {
       'domains': domainArray
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure("Unauthorized");

diff --git a/src/routes/api/v1/places.ts b/src/routes/api/v1/places.ts
@@ -46,6 +46,8 @@ const procGetPlaces: RequestHandler = async (req: Request, resp: Response, next:
     req.vRestResp.Data = {
       'places': places
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('No account specified');

diff --git a/src/routes/api/v1/places/placeId.ts b/src/routes/api/v1/places/placeId.ts
@@ -47,6 +47,8 @@ const procGetPlaces: RequestHandler = async (req: Request, resp: Response, next:
     req.vRestResp.Data = {
       'places': allPlaces
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('unauthorized');

diff --git a/src/routes/api/v1/requests.ts b/src/routes/api/v1/requests.ts
@@ -57,6 +57,8 @@ const procGetRequests: RequestHandler = async (req: Request, resp: Response, nex
     req.vRestResp.Data = {
       requests: reqs
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('No account specified');

diff --git a/src/routes/api/v1/tokens.ts b/src/routes/api/v1/tokens.ts
@@ -50,6 +50,8 @@ const procGetTokens: RequestHandler = async (req: Request, resp: Response, next:
     req.vRestResp.Data = {
       tokens: toks
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('No account specified');

diff --git a/src/routes/api/v1/user/connections.ts b/src/routes/api/v1/user/connections.ts
@@ -39,6 +39,8 @@ const procGetUserConnections: RequestHandler = async (req: Request, resp: Respon
     req.vRestResp.Data = {
       'connections': connections
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('unauthorized');

diff --git a/src/routes/api/v1/user/friends.ts b/src/routes/api/v1/user/friends.ts
@@ -39,6 +39,8 @@ const procGetUserFriends: RequestHandler = async (req: Request, resp: Response,
     req.vRestResp.Data = {
       'friends': friends
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('unauthorized');

diff --git a/src/routes/api/v1/user/places.ts b/src/routes/api/v1/user/places.ts
@@ -44,6 +44,8 @@ const procGetPlaces: RequestHandler = async (req: Request, resp: Response, next:
     req.vRestResp.Data = {
       'places': allPlaces
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('unauthorized');

diff --git a/src/routes/api/v1/users.ts b/src/routes/api/v1/users.ts
@@ -59,6 +59,8 @@ const procGetUsers: RequestHandler = async (req: Request, resp: Response, next:
     req.vRestResp.Data = {
       users: accts
     };
+
+    pager.addResponseFields(req);
   }
   else {
     req.vRestResp.respondFailure('No account specified');