@futdevpro/nts-dynamo 1.5.54 → 1.5.58

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

@@ -50,14 +50,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 422, 
-        errorCode: 'NTS-DBS-CD0',
-        addECToUserMsg: true,
-        message: `Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 422, 
+          errorCode: 'NTS-DBS-CD0',
+          addECToUserMsg: true,
+          message: `Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (typeof newData._id === 'object') {
@@ -92,14 +96,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-FU0',
-        addECToUserMsg: true,
-        message: `modify ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-FU0',
+          addECToUserMsg: true,
+          message: `modify ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (typeof newData._id === 'object') {
@@ -132,14 +140,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-GI0',
-        addECToUserMsg: true,
-        message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-GI0',
+          addECToUserMsg: true,
+          message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (data && typeof data._id === 'object') {
@@ -181,14 +193,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-GD1',
-        addECToUserMsg: true,
-        message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-GD1',
+          addECToUserMsg: true,
+          message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (data && typeof data._id === 'object') {
@@ -231,14 +247,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-GLD1',
-        addECToUserMsg: true,
-        message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-GLD1',
+          addECToUserMsg: true,
+          message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (0 < dataList.length) {
@@ -285,14 +305,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-GLDS1',
-        addECToUserMsg: true,
-        message: `get ${this.dataParams.dbName}s by ${this.depDataName}s was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-GLDS1',
+          addECToUserMsg: true,
+          message: `get ${this.dataParams.dbName}s by ${this.depDataName}s was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (0 < dataList.length) {
@@ -424,14 +448,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-GA0',
-        addECToUserMsg: true,
-        message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-GA0',
+          addECToUserMsg: true,
+          message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (0 < dataList.length && typeof dataList[0]._id === 'object') {
@@ -475,8 +503,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     }
 
-    await this.dataModel.deleteMany({ [this.depDataName]: dependencyId })
-    .catch(error => {
+    await this.dataModel.deleteMany({ [this.depDataName]: dependencyId }).catch(error => {
       throw new Dynamo_Error({ 
         status: 417, 
         errorCode: 'NTS-DBS-DDD1',
@@ -534,14 +561,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-FO0',
-        addECToUserMsg: true,
-        message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB) fliter: ${filter}`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-FO0',
+          addECToUserMsg: true,
+          message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB) fliter: ${filter}`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (data && typeof data._id === 'object') {
@@ -594,14 +625,18 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-F0',
-        addECToUserMsg: true,
-        message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error 
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-F0',
+          addECToUserMsg: true,
+          message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error 
+        });
+      }
     });
 
     if (0 < dataList.length) {
@@ -697,19 +732,23 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           status: 204, 
           errorCode: 'NTS-DBS-FIU1',
           addECToUserMsg: true,
-          message: `${this.dataParams.dbName} not found! (NTS DB)`,
+          message: `${this.dataParams.dbName} not found! (by id: ${id}) (NTS DB)`,
           userMessage: this.defaultErrorUserMsg
         });
       }
     }).catch(error => {
-      throw new Dynamo_Error({ 
-        status: 417, 
-        errorCode: 'NTS-DBS-FIU0',
-        addECToUserMsg: true,
-        message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
-        userMessage: this.defaultErrorUserMsg, 
-        error
-      });
+      if (error?.flag == 'DYNAMO ERROR OBJECT') {
+        throw error;
+      } else {
+        throw new Dynamo_Error({ 
+          status: 417, 
+          errorCode: 'NTS-DBS-FIU0',
+          addECToUserMsg: true,
+          message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          userMessage: this.defaultErrorUserMsg, 
+          error
+        });
+      }
     });
 
     if (typeof newData._id === 'object') {

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

@@ -3,9 +3,7 @@ import * as FileSystem from 'fs';
 import * as Path from 'path';
 import * as NodeMailer from 'nodemailer';
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
-
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 /**
  * 
@@ -57,7 +55,7 @@ export class DynamoNTS_EmailService {
         this.constructionFinished();
       }
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
     }
   }
 
@@ -65,7 +63,7 @@ export class DynamoNTS_EmailService {
    * 
    */
   private constructionFinished(): void { 
-    DynamoNTS_Shared.logSuccess(`\nEmailService construction (${this.senderName}) Finished!\n`) 
+    Dynamo_Log.logSuccess(`\nEmailService construction (${this.senderName}) Finished!\n`) 
   }
 
   /**
@@ -87,15 +85,25 @@ export class DynamoNTS_EmailService {
 
       if (set.content) {
         content = set.content
-      } else if (set.useTemplate) {
-        if (!this.templates[set.useTemplate]) {
+      } else {
+        if (!set.useTemplate) {
           throw new Dynamo_Error({ 
             errorCode: 'NTS-ES4-101',
             addECToUserMsg: true,
+            message: 'No content setting passsed to emailSending!',
+            userMessage: this.defaultErrorUserMsg,
+          });
+        }
+
+        if (!this.templates[set.useTemplate]) {
+          throw new Dynamo_Error({ 
+            errorCode: 'NTS-ES4-102',
+            addECToUserMsg: true,
             message: `No email template found with this parameter! (${set.useTemplate})`,
             userMessage: this.defaultErrorUserMsg
           });
         }
+
         content = this.templates[set.useTemplate];
 
         if (0 < this.templatePropertyKeys[set.useTemplate].length) {
@@ -104,9 +112,10 @@ export class DynamoNTS_EmailService {
             this.templatePropertyKeys[set.useTemplate].forEach((key: string, index: number) => {
               props += `${key}${index != this.templatePropertyKeys[set.useTemplate].length - 1 ? ', ' : ''}`;
             });
-            DynamoNTS_Shared.logError('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
+            Dynamo_Log.logError('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
+            
             throw new Dynamo_Error({ 
-              errorCode: 'NTS-ES4-102',
+              errorCode: 'NTS-ES4-103',
               addECToUserMsg: true,
               message: `TemplateProperties missing! properties needed: ${props}`,
               userMessage: this.defaultErrorUserMsg
@@ -114,19 +123,12 @@ export class DynamoNTS_EmailService {
           }
           this.templatePropertyKeys[set.useTemplate].forEach((propertyKey: string) => {
             if (!set.templateProperties[propertyKey]) {
-              DynamoNTS_Shared.logError(`TemplateProperty missing! (${propertyKey})`);
+              Dynamo_Log.logError(`TemplateProperty missing! (${propertyKey})`);
             }
             const reg = new RegExp(`{{${propertyKey}}}`, 'g')
             content = content.replace(reg, set.templateProperties[propertyKey]);
           });
         }
-      } else {
-        throw new Dynamo_Error({ 
-          errorCode: 'NTS-ES4-100',
-          addECToUserMsg: true,
-          message: 'No content setting passsed to emailSending!',
-          userMessage: this.defaultErrorUserMsg,
-        });
       }
 
       let mailOptions: MailOptions = {
@@ -148,8 +150,13 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      DynamoNTS_Shared.logError('\nDynamoBEEmailService ERROR: email sending error', error);
-      throw error;
+      throw new Dynamo_Error({ 
+        errorCode: 'NTS-ES4-100',
+        addECToUserMsg: true,
+        message: `SendEmail failed!`,
+        userMessage: this.defaultErrorUserMsg,
+        error
+      });
     }
   }
 
@@ -167,7 +174,7 @@ export class DynamoNTS_EmailService {
         templatePath = Path.join(rootPath, templatePath);
         FileSystem.readFile(templatePath, 'utf8' , (err, template) => {
           if (err) {
-            DynamoNTS_Shared.logError(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
+            Dynamo_Log.logError(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
             reject(err);
             return;
           } else {
@@ -183,7 +190,7 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
     }
   }
 
@@ -197,9 +204,10 @@ export class DynamoNTS_EmailService {
       const propertyKeys: string[] = [];
       let propertyOpenTagIndex = template.indexOf('{{');
       let propertyCloseTagIndex = template.indexOf('}}', propertyOpenTagIndex + 2);
+
       while (propertyOpenTagIndex >= 0) {
         if (propertyCloseTagIndex === -1) {
-          DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
+          Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
           throw new Dynamo_Error({ 
             errorCode: 'NTS-ES4-200',
             addECToUserMsg: true,
@@ -207,17 +215,19 @@ export class DynamoNTS_EmailService {
             userMessage: this.defaultErrorUserMsg
           });
         }
+
         const newKey: string = template.substring(propertyOpenTagIndex + 2, propertyCloseTagIndex);
         if (!propertyKeys.includes(newKey)) {
           propertyKeys.push(newKey);
         }
+
         propertyOpenTagIndex = template.indexOf('{{', propertyOpenTagIndex + 2);
         propertyCloseTagIndex = template.indexOf('}}', propertyOpenTagIndex + 2);
       }
       // console.log('\n\n\nTEST propertyKeys: ', propertyKeys);
       return propertyKeys;
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
     }
   }
 }

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

@@ -1,12 +1,11 @@
 
 
-import { Dynamo_Metadata, DynamoNTS_DataParams } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, DynamoNTS_DataParams, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_AuthService } from './dynamo-nts-auth.service';
 import { DynamoNTS_DBServiceCollection } from './dynamo-nts-db-service-collection.service';
 import { DynamoNTS_DBService } from './dynamo-nts-db.service';
 import { DynamoNTS_EmailServiceCollection } from './dynamo-nts-email-service-collection.service';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketServiceCollection } from './dynamo-nts-socket-service-collection.service';
 import { DynamoNTS_SocketService } from './dynamo-nts-socket.service';
@@ -57,14 +56,14 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
-          DynamoNTS_Shared.logError(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
+          Dynamo_Log.logError(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
         }
       });
 
       this.instance.authService = set.authService;
       this.instance.emailServiceCollection = set.emailServiceCollection;
     } catch (error) {
-      DynamoNTS_Shared.logError('\nsetServices failed on DBE_Global_S.\n', error);
+      Dynamo_Log.logError('\nsetServices failed on DBE_Global_S.\n', error);
     }
   }
 

package/src/_services/dynamo-nts-routing-module.service.ts

@@ -1,13 +1,12 @@
 
 import { Router } from 'express';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
 import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
 import { DynamoNTS_Controller } from './dynamo-nts-controller.service';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_RoutingModuleSettings } from '../_models/dynamo-nts-routing-module-settings';
 
 /**
@@ -78,7 +77,7 @@ export class DynamoNTS_RoutingModule {
 
       if (this.log) console.log(`routing module setup done: ${this.route} serurity: ${this.security}\n`);
     } catch (error) {
-      DynamoNTS_Shared.logError(`Routing module setup failed (${this.route})`, error);
+      Dynamo_Log.logError(`Routing module setup failed (${this.route})`, error);
     }
   }
 

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

@@ -2,12 +2,11 @@
 import * as SocketIO from 'socket.io';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketEventParams } from '../_models/dynamo-nts-socket-event-params';
 import { DynamoNTS_SocketEvent } from '../_enums/http/socket-event.enum';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_SocketServiceParams } from '../_models/dynamo-nts-socket-service-params';
 import { DynamoNTS_SocketDictionary } from '../_models/dynamo-nts-socket-dictionary';
 import { DynamoNTS_SocketSecurity } from '../_enums/dynamo-nts-socket-security.enum';
@@ -46,7 +45,7 @@ export abstract class DynamoNTS_SocketService<T extends DynamoNTS_SocketDictiona
 
       if (this.log) console.log(`Socket Controller setup done: ${this.params.name} (${this.params.port}) serurity: ${this.params.security}\n`);
     } catch (error) {
-      DynamoNTS_Shared.logError(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
+      Dynamo_Log.logError(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
     }
   }
 

package/src/version.json

@@ -1,2 +0,0 @@
-
-"v01.04.03"