3.1.12

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.9",
+  "version": "3.1.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.9",
+  "version": "3.1.12",
   "private": false,
   "description": "do more with data",
   "main": "dist/index.js",

ts/smartdata.classes.collection.ts

@@ -25,7 +25,7 @@ export function Collection(dbArg: SmartdataDb | TDelayedDbCreation) {
       // tslint:disable-next-line: no-string-literal
       constructor['smartdataCollection'] = new SmartdataCollection(constructor, dbArg);
     } else {
-      constructor['smartdataDelayedDatabase'] = () => {
+      constructor['smartdataDelayedCollection'] = () => {
         return new SmartdataCollection(constructor, dbArg()); 
       };
     }
@@ -109,7 +109,6 @@ export class SmartdataCollection<T> {
     await this.checkDoc(dbDocArg);
     this.markUniqueIndexes(dbDocArg.uniqueIndexes);
     const saveableObject = await dbDocArg.createSavableObject();
-    console.log(saveableObject);
     const result = await this.mongoDbCollection.insertOne(saveableObject);
     return result;
   }
@@ -117,11 +116,19 @@ export class SmartdataCollection<T> {
   /**
    * inserts object into the DbCollection
    */
-  async update(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
+  public async update(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
+    const identifiableObject = await dbDocArg.createIdentifiableObject();
     const saveableObject = await dbDocArg.createSavableObject();
-    this.mongoDbCollection.updateOne(saveableObject.dbDocUniqueId, saveableObject);
+    this.mongoDbCollection.updateOne(identifiableObject, saveableObject);
+  }
+
+  public async delete (dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
+    await this.init();
+    await this.checkDoc(dbDocArg);
+    const identifiableObject = await dbDocArg.createIdentifiableObject();
+    this.mongoDbCollection.deleteOne(identifiableObject);
   }
 
   /**
@@ -129,7 +136,7 @@ export class SmartdataCollection<T> {
    * if this.objectValidation is not set it passes.
    */
   private checkDoc(docArg: T): Promise<void> {
-    let done = plugins.smartq.defer<void>();
+    const done = plugins.smartq.defer<void>();
     let validationResult = true;
     if (this.objectValidation) {
       validationResult = this.objectValidation(docArg);

ts/smartdata.classes.doc.ts

@@ -81,9 +81,9 @@ export class SmartDataDbDoc<T> {
       // tslint:disable-next-line: no-string-literal
       this.collection = this.constructor['smartdataCollection'];
       // tslint:disable-next-line: no-string-literal
-    } else if (typeof this.constructor['smartdataDelayedDatabase'] === 'function') {
+    } else if (typeof this.constructor['smartdataDelayedCollection'] === 'function') {
       // tslint:disable-next-line: no-string-literal
-      this.collection = this.constructor['smartdataDelayedDatabase']();
+      this.collection = this.constructor['smartdataDelayedCollection']();
     } else {
       console.error('Could not determine collection for DbDoc');
     }
@@ -91,7 +91,13 @@ export class SmartDataDbDoc<T> {
 
   static async getInstances<T>(filterArg): Promise<T[]> {
     let self: any = this; // fool typesystem
-    let referenceMongoDBCollection: SmartdataCollection<T> = self.smartdataCollection;
+    let referenceMongoDBCollection: SmartdataCollection<T>;
+    
+    if (self.smartdataCollection) {
+      referenceMongoDBCollection = self.smartdataCollection;
+    } else if (self.smartdataDelayedCollection) {
+      referenceMongoDBCollection = self.smartdataDelayedCollection();
+    };
     const foundDocs = await referenceMongoDBCollection.find(filterArg);
     const returnArray = [];
     for (let item of foundDocs) {
@@ -133,6 +139,13 @@ export class SmartDataDbDoc<T> {
     }
   }
 
+  /**
+   * deletes a document from the database
+   */
+  async delete() {
+
+  }
+
   /**
    * also store any referenced objects to DB
    * better for data consistency
@@ -151,11 +164,25 @@ export class SmartDataDbDoc<T> {
     }
   }
 
-  async createSavableObject() {
+  /**
-    let saveableObject: any = {}; // is not exposed to outside, so any is ok here
+   * creates a saveable object so the instance can be persisted as json in the database
-    for (let propertyNameString of this.saveableProperties) {
+   */
+  public async createSavableObject() {
+    const saveableObject: any = {}; // is not exposed to outside, so any is ok here
+    for (const propertyNameString of this.saveableProperties) {
       saveableObject[propertyNameString] = this[propertyNameString];
     }
     return saveableObject;
   }
+
+  /**
+   * creates an identifiable object for operations that require filtering
+   */
+  public async createIdentifiableObject() {
+    const identifiableObject: any = {}; // is not exposed to outside, so any is ok here
+    for (const propertyNameString of this.uniqueIndexes) {
+      identifiableObject[propertyNameString] = this[propertyNameString];
+    }
+    return identifiableObject;
+  }
 }