@futdevpro/nts-dynamo 1.5.51 → 1.5.52

package/src/_services/dynamo-nts-data.service.ts

@@ -31,6 +31,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
   depKey?: string;
   depDBServiceKey?: string;
+  private depDataDBService: DynamoNTS_DBService<any>;
 
   // dataModelParams?: DynamoBEDataPropertyParams[] = [];
   dataParams: DynamoNTS_DataParams;
@@ -56,15 +57,13 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    */
   async getAll(): Promise<void> {
     try {
-      await this.dataDBService.getAll().then((dataList: T[]) => {
-        this.dataList = dataList;
-      });
+      this.dataList = await this.dataDBService.getAll();
     } catch (error) {
       throw new Dynamo_Error({ 
         status: 417, 
         errorCode: 'NTS-DS0-GA0',
         addECToUserMsg: true,
-        message: 'getAll was unsuccessful', 
+        message: `getAll was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg, 
         error: error 
       });
@@ -72,25 +71,34 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   }
 
   /**
+   * @description
    * returns data from database by id
+   * also if dontSetToService is false or not setted, 
+   * the data will be saved to the service
+   * 
+   * @remarks 
+   * If you need to get-save a data, if possible, 
+   * use db-service update instead.
+   * 
+   * @param {string} id
+   * @param dontSetToService
+   * 
+   * @return {T} data: T
    */
   async getDataById(id?: string, dontSetToService?: boolean): Promise<T> {
     try {
       if (id || this.data._id) {
-        let dataExists: T;
-        await this.dataDBService.getDataById(id ? id : this.data._id).then((data: T) => {
-          if (!dontSetToService) {
-            this.data = data;
-          }
-          dataExists = data;
-        });
+        let dataExists: T = await this.dataDBService.getDataById(id ? id : this.data._id);
+        if (!dontSetToService && dataExists) {
+          this.data = dataExists;
+        }
         return dataExists;
       } else {
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DS0-GI1',
           addECToUserMsg: true,
-          message: `ID is missing! (maybe you wanted to use getDataByDependencyId instead...)`,
+          message: `ID is missing! (maybe you wanted to use getDataByDependencyId() instead...) (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -99,7 +107,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         status: 417, 
         errorCode: 'NTS-DS0-GI0',
         addECToUserMsg: true,
-        message: 'getDataById was unsuccessful', 
+        message: `getDataById was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg, 
         error: error 
       });
@@ -114,20 +122,17 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       if (this.depKey) {
         if (dependencyId || this.data[this.depKey]) {
-          let dataExists: T;
-          await this.dataDBService.getDataByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]).then((data: T) => {
-            if (!dontSetToService) {
-              this.data = data;
-            }
-            dataExists = data;
-          });
+          let dataExists: T = await this.dataDBService.getDataByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]);
+          if (!dontSetToService && dataExists) {
+            this.data = dataExists;
+          }
           return dataExists;
         } else {
           throw new Dynamo_Error({ 
             status: 417, 
             errorCode: 'NTS-DS0-GD3',
             addECToUserMsg: true,
-            message: `${this.depKey} is missing!`,
+            message: `${this.depKey} is missing! (${this.dataParams.dataName})`,
             userMessage: this.defaultErrorUserMsg
           });
         }
@@ -136,7 +141,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GD2',
           addECToUserMsg: true,
-          message: 'dependencyDataIdKey is missing from service!',
+          message: `'dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -145,7 +150,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         status: 417, 
         errorCode: 'NTS-DS0-GD0',
         addECToUserMsg: true,
-        message: 'getDataByDependencyId was unsuccessful', 
+        message: `getDataByDependencyId was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg, 
         error: error 
       });
@@ -160,15 +165,13 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       if (this.depKey) {
         if (dependencyId || this.data[this.depKey]) {
-          await this.dataDBService.getDataListByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]).then((data: T[]) => {
-            this.dataList = data;
-          });
+          this.dataList = await this.dataDBService.getDataListByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]);
         } else {
           throw new Dynamo_Error({ 
             status: 417, 
             errorCode: 'NTS-DS0-GLD3',
             addECToUserMsg: true,
-            message: `${this.depKey} is missing!`,
+            message: `${this.depKey} is missing (${this.dataParams.dataName})`,
             userMessage: this.defaultErrorUserMsg
           });
         }
@@ -177,7 +180,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GLD2',
           addECToUserMsg: true,
-          message: 'dependencyDataIdKey is missing from service!',
+          message: `dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -186,7 +189,26 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         status: 417, 
         errorCode: 'NTS-DS0-GLD0',
         addECToUserMsg: true,
-        message: 'getDataListByDependencyId was unsuccessful', 
+        message: `getDataListByDependencyId was unsuccessful (${this.dataParams.dataName})`, 
+        userMessage: this.defaultErrorUserMsg, 
+        error: error 
+      });
+    }
+  }
+
+
+  async updateData(set: { updateBy?: any, update: any }): Promise<void> {
+    try {
+      if (set.updateBy) {
+        this.data = await this.dataDBService.updateOne(set.updateBy, set.update, this.issuer);
+      }
+
+    } catch (error) {
+      throw new Dynamo_Error({ 
+        status: 417, 
+        errorCode: 'NTS-DS0-UD0',
+        addECToUserMsg: true,
+        message: `updateData was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg, 
         error: error 
       });
@@ -196,24 +218,23 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   /**
    * modifies data if the data have ID and already exists in the DB, 
    * creates new if the ID is not present or cant find in DB, 
-   * and if dependency data setted up, will check before creation
+   * and if dependency data setted up, will check before creation,
+   * @warning
+   * but the proper way to update data, if you use update method instead,
+   * this way, you can avoid data override errors 
+   * (when you simultaneously trying to change the same data's 
+   * different values from different flows)
    */
   async saveData(): Promise<void> {
     try {
       if (this.data._id) {
         // check if already exists
-        let dataExists: T;
-        await this.getDataById(null, true).then((data: T) => {
-          dataExists = data;
-        }).catch(() => {});
+        let dataExists: T = await this.getDataById(null, true).catch(() => null);
         if (!dataExists) {
           // if data not exists check that dependency already exists for this
           if (this.depKey) {
             if (this.data[this.depKey]) {
-              let dependencyExists = false;
-              await this.getDependencyDataDBService().getDataById(this.data[this.depKey]).then((dep) => {
-                dependencyExists = !!dep;
-              });
+              let dependencyExists = await this.getDependencyDataDBService().getDataById(this.data[this.depKey]);
               if (!dependencyExists) {
                 throw new Dynamo_Error({ 
                   status: 417, 
@@ -234,20 +255,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
             }
           }
           // if data not exists create new data
-          await this.dataDBService.createData(this.data, this.issuer).then((data: T) => {
-            this.data = data;
-          });
+          this.data = await this.dataDBService.createData(this.data, this.issuer);
         } else {
           // if data exists do modify
-          await this.dataDBService.modifyData(this.data, this.issuer).then((data: T) => {
-            this.data = data;
-          });
+          this.data = await this.dataDBService.modifyData(this.data, this.issuer);
         }
       } else {
         // if ID is not present, data not exists, create new data
-        await this.dataDBService.createData(this.data, this.issuer).then((data: T) => {
-          this.data = data;
-        });
+        this.data = await this.dataDBService.createData(this.data, this.issuer);
       }
     } catch (error) {
       throw new Dynamo_Error({ 
@@ -273,7 +288,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-DD1',
           addECToUserMsg: true,
-          message: 'ID is missing!' ,
+          message: `ID is missing! (${this.dataParams.dataName})` ,
           userMessage: this.defaultErrorUserMsg, 
         });
       }
@@ -282,7 +297,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         status: 417, 
         errorCode: 'NTS-DS0-DD0',
         addECToUserMsg: true,
-        message: 'deleteData was unsuccessful', 
+        message: `deleteData was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg, 
         error: error 
       });
@@ -308,7 +323,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         }
         // specific Date validation
         if (this.dataParams.modelParams[i].type === 'Date' && !(new Date(this.data[this.dataParams.modelParams[i].key]) instanceof Date)) {
-          throw new Dynamo_Error({ 
+          throw new Dynamo_Error({
             status: 422, 
             errorCode: 'NTS-DS0-VD2',
             addECToUserMsg: true,
@@ -328,7 +343,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         status: 422, 
         errorCode: 'NTS-DS0-VD0',
         addECToUserMsg: true,
-        message: 'validateForSave was unsuccessful', 
+        message: `validateForSave was unsuccessful (${this.dataParams.dataName})`, 
         userMessage: this.defaultErrorUserMsg,
         error: error 
       });
@@ -342,8 +357,8 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     const dependencyParam: DynamoNTS_DataPropertyParams = this.dataParams.modelParams.find((modelParams: DynamoNTS_DataPropertyParams) => modelParams.isDependencyHook);
     if (dependencyParam) {
       this.depKey = dependencyParam.key;
-      if (dependencyParam.dependencyName) {
-        this.depDBServiceKey = dependencyParam.dependencyName;
+      if (dependencyParam.dependencyDataName) {
+        this.depDBServiceKey = dependencyParam.dependencyDataName;
       }
     }
   }
@@ -354,7 +369,12 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    */
   getDependencyDataDBService(): DynamoNTS_DBService<any> {
     if (this.depDBServiceKey) {
-      return DynamoNTS_GlobalService.getDBService(this.dataParams);
+      if (this.depDataDBService) {
+        return this.depDataDBService;
+      } else {
+        this.depDataDBService = DynamoNTS_GlobalService.getDBServiceByKey(this.depDBServiceKey);
+        return this.depDataDBService;
+      }
     } else {
       throw new Dynamo_Error({ 
         status: 501,