fix(fs): fix pagination error @ get files;

labring · Nov 15, 2021 · 5d4563d · 5d4563d
1 parent b1cb02a
commit 5d4563d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/storage-service/src/api/file.ts b/packages/storage-service/src/api/file.ts
@@ -29,12 +29,12 @@ export async function getFileByName(bucket: string, filename: string) {
 export async function getFilesInDirectory(bucket: string, parent: string, offset?: number, limit?: number) {
   assert.ok(bucket, 'empty bucket got')
   assert.ok(parent, 'empty parent got')
+
   const options = {
-    skip: offset ?? 0
-  }
-  if (limit) {
-    options['limit'] = limit
+    skip: offset ?? 0,
+    limit: limit ?? Infinity
   }
+
   const coll = DatabaseAgent.db.collection<FileItemType>(bucket + ".files")
   const files = await coll.find({ "metadata.parent": parent }, options).toArray()
   return files

diff --git a/packages/storage-service/src/router/file/get.ts b/packages/storage-service/src/router/file/get.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<wangfugen@126.com>
  * @Date: 2021-08-19 16:10:27
- * @LastEditTime: 2021-11-15 18:10:10
+ * @LastEditTime: 2021-11-16 00:10:38
  * @Description:
  */
 
@@ -52,8 +52,9 @@ export async function handleGetFile(req: express.Request, res: express.Response)
       return res.status(code).send(message)
     }
 
-    const offset = (req.query?.offset ?? 0) as any
-    const limit = req.query?.limit as any
+    const offset = Number(req.query?.offset ?? 0) as any
+    const limit = Number(req.query?.limit) as any
+
     const files = await getFilesInDirectory(bucket_name, filename, offset, limit)
     const total = await countFilesInDirectory(bucket_name, filename)
     res.type('json')