feat(db-proxy): add count option to read operation

labring · Oct 19, 2021 · e7545ca · e7545ca
1 parent fbcccea
commit e7545ca
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/packages/database-proxy/src/accessor/mongo.ts b/packages/database-proxy/src/accessor/mongo.ts
@@ -201,13 +201,14 @@ export class MongoAccessor implements AccessorInterface {
     protected async read(collection: string, params: Params): Promise<ReadResult> {
         const coll = this.db.collection(collection)
 
-        let { query, order, offset, limit, projection } = params
-        query = this.deserializedEjson(query || {})
+        const { order, offset, limit, projection, count } = params
+        const query: any = this.deserializedEjson(params.query || {})
 
-        let options: any = {
+        const options: any = {
             limit: 100,
             skip: 0
         }
+
         if (order) options.sort = this.processOrder(order)
         if (offset) options.skip = offset
         if (projection) options.projection = projection
@@ -220,10 +221,14 @@ export class MongoAccessor implements AccessorInterface {
         const data = await coll.find(query, options).toArray()
         this.logger.debug(`mongo end of read {${collection}}: `, { query, options, dataLength: data.length })
 
+        let total: number
+        if (count) {
+            total = await coll.countDocuments(query as Filter<any>)
+        }
 
         this.emitResult(params, { data })
         const serialized = data.map(doc => this.serializeBson(doc))
-        return { list: serialized, limit: options.limit, offset: options.skip }
+        return { list: serialized, limit: options.limit, offset: options.skip, total }
     }
 
     /**

diff --git a/packages/database-proxy/src/types.ts b/packages/database-proxy/src/types.ts
@@ -72,7 +72,7 @@ export interface Params {
 
 }
 
-const ReadAcceptParams = ['query', 'order', 'offset', 'limit', 'projection', 'multi', 'joins', 'nested']
+const ReadAcceptParams = ['query', 'order', 'offset', 'limit', 'projection', 'multi', 'count', 'joins', 'nested']
 const UpdateAcceptParams = ['query', 'data', 'multi', 'upsert', 'merge', 'joins']
 const AddAcceptParams = ['data', 'multi']
 const RemoveAcceptParams = ['query', 'multi', 'joins']

diff --git a/packages/database-proxy/tests/mongo_db/read.test.js b/packages/database-proxy/tests/mongo_db/read.test.js
@@ -127,6 +127,19 @@ describe('Database read', function () {
     assert.equal(data.list[0].title, TEST_DATA[0].title)
   })
 
+  it('read with count should be ok', async () => {
+    let params = {
+      collection: 'test_read',
+      action: ActionType.READ,
+      query: {},
+      count: true
+    }
+    const data = await entry.execute(params)
+    assert.ok(data.list instanceof Array)
+    assert.equal(data.list.length, TEST_DATA.length)
+    assert.equal(data.total, TEST_DATA.length)
+  })
+
   it('read with projection should be ok', async () => {
     let params = {
       collection: 'test_read',