1.1.26 - add specific fields fetch

sudzy-group · Jun 25, 2019 · ea01290 · ea01290
1 parent 167b67c
commit ea01290
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pouchable",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "description": "PouchDB wrapped for TypeScript lovers",
   "main": "./dist/src/index.js",
   "scripts": {

diff --git a/src/Collection.ts b/src/Collection.ts
@@ -48,9 +48,9 @@ export abstract class Collection<T extends Entity> {
      * Get entity by its id
      * @param id 
      */
-    public get(id) : Promise<T> { 
+    public get(id, options?) : Promise<T> { 
         return new Promise<T>((resolved, rejected)=> {
-            this._collectionBase.getById(id).then((eb) => {
+            this._collectionBase.getById(id, options).then((eb) => {
                 return resolved(new this._ctor(eb));
             }).catch((m) => {
                 return rejected(m)

diff --git a/src/EntityCollectionBase.ts b/src/EntityCollectionBase.ts
@@ -3,7 +3,7 @@
  * constructing, destructing and querying
  */
 import * as PouchDB from 'pouchdb';
-import { concat, compact, map, startsWith, findIndex, values, keys, uniq, uniqBy, defaults, forIn, isUndefined, reduce } from 'lodash';
+import { concat, compact, map, startsWith, values, keys, uniq, uniqBy, defaults, forIn, isUndefined, reduce } from 'lodash';
 
 import { IdGenerator } from './IdGenerator';
 import { DateIdGenerator } from './DateIdGenerator';
@@ -93,15 +93,24 @@ export class EntityCollectionBase {
     /**
      * Get entity by id
      */
-    getById(id) : Promise<EntityBase> {
+    getById(id, buckets?) : Promise<EntityBase> {
         return new Promise<EntityBase>((resolved, rejected) => {
             // generate id
             let prefix = this.prefix + id + "/";
-            this._db.allDocs({
-                include_docs: true,
-                startkey: prefix,
-                endkey: prefix + "\uffff"
-            }).then((docs) => {
+            let allDocs;
+            if (buckets) {
+                allDocs = this._db.allDocs({
+                    include_docs: true,
+                    keys: map(buckets, b => (prefix + b))
+                })
+            } else {
+                allDocs = this._db.allDocs({
+                    include_docs: true,
+                    startkey: prefix,
+                    endkey: prefix + "\uffff"
+                })
+            }
+            allDocs.then((docs) => {
                 let e = this._createEntityFromDocs(docs, prefix, id);
                 return resolved(e);
             }).catch((m) => {

diff --git a/tests/CollectionTest.ts b/tests/CollectionTest.ts
@@ -176,6 +176,32 @@ import { Promise } from 'ts-promise';
         }).catch(_.noop);
     }
 
+    @test ("get by id after inserted doc should return entity with fields")
+    testGetEntityByIdAndFields(done: Function) {
+        let users = new Users(CollectionTest.db, User);
+        users.insert({ name: "New One", mobile : "6465490560", street : "Orchard St."}).then((p) => {
+            return users.get(p.id, ['']);
+        }).then((p) => {
+            if (!p || !p.name || p.street) { // no street
+                throw new Error("street should not be fetched");
+            }
+            done();
+        }).catch(_.noop);
+    }    
+
+    @test ("get by id after inserted doc should return entity with multiple fields")
+    testGetEntityByIdAndMultipleFields(done: Function) {
+        let users = new Users(CollectionTest.db, User);
+        users.insert({ name: "New One", mobile : "6465490560", street : "Orchard St."}).then((p) => {
+            return users.get(p.id, ['', 'address']);
+        }).then((p) => {
+            if (!p || !p.name || !p.street) { 
+                throw new Error("street should be fetched");
+            }
+            done();
+        }).catch(_.noop);
+    }        
+
     @test ("find by key value")
     testFindByKeyVal(done: Function) {
         let users = new Users(CollectionTest.db, User);