@futdevpro/nts-dynamo 1.5.17 → 1.5.20

package/src/_services/dynamobe-data.service.ts

@@ -13,7 +13,8 @@ export class DynamoBEDataService<T extends Metadata> {
   depKey?: string;
   depDBServiceKey?: string;
 
-  dataModelParams?: DynamoBEDataPropertyParams[] = [];
+  // dataModelParams?: DynamoBEDataPropertyParams[] = [];
+  dataParams: DynamoBEDataParams;
 
   constructor(
     data: T,
@@ -22,7 +23,8 @@ export class DynamoBEDataService<T extends Metadata> {
   ) {
     this.dataDBService = DBE_Global_S.getDBService<T>(dataParams);
     this.data = data;
-    this.dataModelParams = dataParams.modelParams;
+    this.dataParams = dataParams;
+    // this.dataModelParams = dataParams.modelParams;
     this.lookForDependencyDataSettings();
     this.issuer = issuer;
   }
@@ -36,18 +38,22 @@ export class DynamoBEDataService<T extends Metadata> {
         this.dataList = dataList;
       });
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'getAll was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 417, message: 'getAll was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-130`, 
+        error: error 
+      });
     }
   }
 
   /**
    * returns data from database by id
    */
-  async getDataById(dontSetToService?: boolean): Promise<T> {
+  async getDataById(id?: string, dontSetToService?: boolean): Promise<T> {
     try {
-      if (this.data._id) {
+      if (id || this.data._id) {
         let dataExists: T;
-        await this.dataDBService.getDataById(this.data._id).then((data: T) => {
+        await this.dataDBService.getDataById(id ? id : this.data._id).then((data: T) => {
           if (!dontSetToService) {
             this.data = data;
           }
@@ -55,10 +61,17 @@ export class DynamoBEDataService<T extends Metadata> {
         });
         return dataExists;
       } else {
-        throw new DynamoBEError({ status: 417, message: 'ID is missing!' });
+        throw new DynamoBEError({ 
+          status: 417, message: 'ID is missing!',
+          userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-131B`, 
+        });
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'getDataById was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 417, message: 'getDataById was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-131A`, 
+        error: error 
+      });
     }
   }
   
@@ -66,21 +79,36 @@ export class DynamoBEDataService<T extends Metadata> {
    * returns data from database by dependencyId to the service
    * @param dependencyId 
    */
-  async getDataByDependencyId(dependencyId?: string): Promise<void> {
+  async getDataByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T> {
     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) => {
-            this.data = data;
+            if (!dontSetToService) {
+              this.data = data;
+            }
+            dataExists = data;
           });
+          return dataExists;
         } else {
-          throw new DynamoBEError({ status: 417, message: `${this.depKey} is missing!` });
+          throw new DynamoBEError({ 
+            status: 417, message: `${this.depKey} is missing!`,
+            userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-132C`, 
+          });
         }
       } else {
-        throw new DynamoBEError({ status: 417, message: 'dependencyDataIdKey is missing from service!' });
+        throw new DynamoBEError({ 
+          status: 417, message: 'dependencyDataIdKey is missing from service!',
+          userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-132B`, 
+        });
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'getDataByDependencyId was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 417, message: 'getDataByDependencyId was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-132A`, 
+        error: error 
+      });
     }
   }
   
@@ -96,13 +124,23 @@ export class DynamoBEDataService<T extends Metadata> {
             this.dataList = data;
           });
         } else {
-          throw new DynamoBEError({ status: 417, message: `${this.depKey} is missing!` });
+          throw new DynamoBEError({ 
+            status: 417, message: `${this.depKey} is missing!`,
+            userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-133C`, 
+          });
         }
       } else {
-        throw new DynamoBEError({ status: 417, message: 'dependencyDataIdKey is missing from service!' });
+        throw new DynamoBEError({ 
+          status: 417, message: 'dependencyDataIdKey is missing from service!',
+          userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-133B`, 
+        });
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'getDataListByDependencyId was unsuccessful', error: error });
+      throw new DynamoBEError({ status: 417, 
+        message: 'getDataListByDependencyId was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-133A`, 
+        error: error 
+      });
     }
   }
 
@@ -116,7 +154,7 @@ export class DynamoBEDataService<T extends Metadata> {
       if (this.data._id) {
         // check if already exists
         let dataExists: T;
-        await this.getDataById(true).then((data: T) => {
+        await this.getDataById(null, true).then((data: T) => {
           dataExists = data;
         }).catch(() => {});
         if (!dataExists) {
@@ -142,7 +180,11 @@ export class DynamoBEDataService<T extends Metadata> {
         });
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'modifyData was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 417, message: `modifyData was unsuccessful (${this.dataParams.dataName})`, 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-222`, 
+        error: error 
+      });
     }
   }
 
@@ -157,7 +199,11 @@ export class DynamoBEDataService<T extends Metadata> {
         throw new DynamoBEError({ status: 417, message: 'ID is missing!' });
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 417, message: 'deleteData was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 417, message: 'deleteData was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-223`, 
+        error: error 
+      });
     }
   }
 
@@ -166,25 +212,29 @@ export class DynamoBEDataService<T extends Metadata> {
    */
   async validateForSave(): Promise<void> {
     try {
-      for (let i = 0; i < this.dataModelParams.length; i++) {
+      for (let i = 0; i < this.dataParams.modelParams.length; i++) {
         // basic required validations
-        if ((this.dataModelParams[i].required && (this.data[this.dataModelParams[i].key] === null || this.data[this.dataModelParams[i].key] === undefined)) ||
-            (this.dataModelParams[i].index && (this.data[this.dataModelParams[i].key] === null || this.data[this.dataModelParams[i].key] === undefined))) {
-          throw new DynamoBEError({ status: 422, message: `${this.dataModelParams[i].key} is missing! (${this.dataModelParams[i].required ? 'required' : 'index'})` });
+        if ((this.dataParams.modelParams[i].required && (this.data[this.dataParams.modelParams[i].key] === null || this.data[this.dataParams.modelParams[i].key] === undefined)) ||
+            (this.dataParams.modelParams[i].index && (this.data[this.dataParams.modelParams[i].key] === null || this.data[this.dataParams.modelParams[i].key] === undefined))) {
+          throw new DynamoBEError({ status: 422, message: `${this.dataParams.modelParams[i].key} is missing! (${this.dataParams.modelParams[i].required ? 'required' : 'index'})` });
         }
         // specific Date validation
-        if (this.dataModelParams[i].type === 'Date' && !(new Date(this.data[this.dataModelParams[i].key]) instanceof Date)) {
-          throw new DynamoBEError({ status: 422, message: `${this.dataModelParams[i].key} is not a date!` });
+        if (this.dataParams.modelParams[i].type === 'Date' && !(new Date(this.data[this.dataParams.modelParams[i].key]) instanceof Date)) {
+          throw new DynamoBEError({ status: 422, message: `${this.dataParams.modelParams[i].key} is not a date!` });
         }
         // call additional validators
-        if (this.dataModelParams[i].additionalValidators) {
-          for (let j = 0; j < this.dataModelParams[i].additionalValidators.length; j++) {
-            this.dataModelParams[i].additionalValidators[j](this.data[this.dataModelParams[i].key]);
+        if (this.dataParams.modelParams[i].additionalValidators) {
+          for (let j = 0; j < this.dataParams.modelParams[i].additionalValidators.length; j++) {
+            this.dataParams.modelParams[i].additionalValidators[j](this.data[this.dataParams.modelParams[i].key]);
           }
         }
       }
     } catch (error) {
-      throw new DynamoBEError({ status: 422, message: 'validateForSave was unsuccessful', error: error });
+      throw new DynamoBEError({ 
+        status: 422, message: 'validateForSave was unsuccessful', 
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-220`, 
+        error: error 
+      });
     }
   }
 
@@ -192,7 +242,7 @@ export class DynamoBEDataService<T extends Metadata> {
    * setting up dependency dataHook by DynamoBEDataModelParams
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: DynamoBEDataPropertyParams = this.dataModelParams.find((modelParams: DynamoBEDataPropertyParams) => modelParams.isDependencyHook);
+    const dependencyParam: DynamoBEDataPropertyParams = this.dataParams.modelParams.find((modelParams: DynamoBEDataPropertyParams) => modelParams.isDependencyHook);
     if (dependencyParam) {
       this.depKey = dependencyParam.key;
       if (dependencyParam.dependencyName) {
@@ -201,11 +251,18 @@ export class DynamoBEDataService<T extends Metadata> {
     }
   }
 
+  /**
+   * 
+   * @returns 
+   */
   getDependencyDataDBService(): DynamoBEDBService<any> {
     if (this.depDBServiceKey) {
-      return DBE_Global_S.getDBServiceCollection()[this.depDBServiceKey];
+      return DBE_Global_S.getDBService(this.dataParams);
     } else {
-      throw new DynamoBEError({ status: 501, message: 'getDependencyDataDBService was unsuccessful, service key not setted up!' });
+      throw new DynamoBEError({ 
+        status: 501, message: 'getDependencyDataDBService was unsuccessful, service key not setted up!',
+        userMessage: `We encountered a DB Error, please contact the responsible development team. errorcode: 744-234-200`, 
+      });
     }
   }
 }

package/src/_services/dynamobe-db-service-collection.service.ts

@@ -2,6 +2,9 @@
 import { DynamoBEDBService } from './dynamobe-db.service';
 import { DynamoBESingletonService } from './dynamobe-singleton.service';
 
+/**
+ * 
+ */
 export class DynamoBEDBServiceCollection extends DynamoBESingletonService {
 
   [service: string]: DynamoBEDBService<any>;