FIX #75 to return right pageTokwn

webdonalds · Aug 16, 2021 · 76bb189 · 76bb189
1 parent c3621da
commit 76bb189
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/api/v1/follow.ts b/src/api/v1/follow.ts
@@ -139,10 +139,10 @@ router.get('/', async (request: express.Request, response: express.Response) =>
   }
 
   const follows = result.map(data => data.dataValues[target]);
-
+  
   response.json({
     follows: follows,
-    pageToken: follows.length > 0 ? follows[follows.length - 1].id : null
+    pageToken: follows.length > 0 ? result[result.length-1].dataValues.id : parseInt(request.query.pageToken as string)
   });
 
   return;

diff --git a/src/api/v1/logoffedPostList.ts b/src/api/v1/logoffedPostList.ts
@@ -59,7 +59,7 @@ router.get('/recent-videos', async (request: express.Request, response: express.
 
     response.json({
         videoList: recentVideoList,
-        pageToken: recentVideoList.length > 0 ? recentVideoList[recentVideoList.length - 1].id : null
+        pageToken: recentVideoList.length > 0 ? recentVideoList[recentVideoList.length - 1].id : parseInt(request.query.pageToken as string)
     });
     return;
 });
@@ -97,4 +97,4 @@ router.get('/hot-videos', async (request: express.Request, response: express.Res
 
 
 
-export default router;
+export default router;
diff --git a/src/api/v1/post.ts b/src/api/v1/post.ts
@@ -98,7 +98,7 @@ router.get('/user-videos/:userId', async (request: express.Request, response: ex
 
     response.json({
         videoList: userVideos,
-        pageToken: userVideos.length > 0 ? userVideos[userVideos.length - 1].id : null
+        pageToken: userVideos.length > 0 ? userVideos[userVideos.length - 1].id : parseInt(request.query.pageToken as string)
     });
     return;
 });
@@ -243,4 +243,4 @@ router.delete('/video', middleware.validateToken, async (request: express.Reques
 });
 
 
-export default router;
+export default router;
diff --git a/src/service/googleService.ts b/src/service/googleService.ts
@@ -116,4 +116,4 @@ class GoogleService {
 
 const googleService = new GoogleService();
 
-export default googleService;
+export default googleService;