@futdevpro/nts-dynamo 1.6.54 → 1.6.55

package/src/_services/base/data.service.ts

@@ -698,7 +698,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     }
   }
   
-  private _getDefaultErrorSettings(fnName: string, error?: Error | Dynamo_Error) {
+  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error) {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.dataParams.dataName})`,

package/src/_services/base/db.service.ts

@@ -100,7 +100,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       }
     });
 
-    data = this.stringifyDataId(data, 'createData');
+    data = this.stringifyDataId(newData, 'createData');
 
     return data;
   }
@@ -141,14 +141,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
-      newData._id = `${newData._id}`;
-      if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.modifyData)')
-      }
-    }
-    data._id = newData._id;
-    data.__v = newData.__v;
+    data = this.stringifyDataId(newData, 'modifyData');
 
     return data;
   }
@@ -159,6 +152,15 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * @returns data
    */
   async getDataById(id: string): Promise<T> {
+    if (!id) { 
+      throw new Dynamo_Error({
+        ...this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`)),
+
+        errorCode: 'NTS-DBS-GI1',
+        message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
+      });
+    }
+
     let data: T = await this.dataModel.findById(id).then(res => {
       return res?.toObject() as T ?? null;
     }).catch(error => {
@@ -170,12 +172,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-      data._id = `${data._id}`;
-      if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataById)')
-      }
-    }
+    data = this.stringifyDataId(data, 'getDataById');
+
     return data;
   }
 
@@ -210,12 +208,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-      data._id = `${data._id}`;
-      if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataByDependencyId)')
-      }
-    }
+    data = this.stringifyDataId(data, 'getDataByDependencyId');
+
     return data;
   }
 
@@ -252,12 +246,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     if (0 < dataList.length) {
       dataList.forEach((data: T) => {
-        if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-          data._id = `${data._id}`;
-          if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataListByDependencyId)')
-          }
-        }
+        data = this.stringifyDataId(data, 'getDataListByDependencyId');
       });
     }
 
@@ -297,12 +286,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     if (0 < dataList.length) {
       dataList.forEach((data: T) => {
-        if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-          data._id = `${data._id}`;
-          if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataListByDependencyIds)')
-          }
-        }
+        data = this.stringifyDataId(data, 'getDataListByDependencyIds');
       });
     }
 
@@ -453,25 +437,21 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       }
     });
 
-    let dataList: T[] = await this.dataModel.find(filter)
-    .then(res => res ?? [])
-    .catch(error => {
-      throw new Dynamo_Error({ 
-        ...this._getDefaultErrorSettings('searchData', error),
-        
-        errorCode: 'NTS-DBS-SD1',
-        message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+    let dataList: T[] = await this.dataModel
+      .find(filter)
+      .then(res => res ?? [])
+      .catch(error => {
+        throw new Dynamo_Error({ 
+          ...this._getDefaultErrorSettings('searchData', error),
+          
+          errorCode: 'NTS-DBS-SD1',
+          message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+        });
       });
-    });
 
     if (0 < dataList.length) {
       dataList.forEach((data: T) => {
-        if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-          data._id = `${data._id}`;
-          if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.searchData)')
-          }
-        }
+        data = this.stringifyDataId(data, 'searchData');
       });
     }
 
@@ -568,12 +548,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     if (0 < dataList.length) {
       dataList.forEach((data: T) => {
-        if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-          data._id = `${data._id}`;
-          if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.find)')
-          }
-        }
+        data = this.stringifyDataId(data, 'find');
       });
     }
 
@@ -630,12 +605,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     if (0 < dataList.length) {
       dataList.forEach((data: T) => {
-        if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-          data._id = `${data._id}`;
-          if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findWithPaging)')
-          }
-        }
+        data = this.stringifyDataId(data, 'findWithPaging');
       });
     }
 
@@ -667,12 +637,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
-      newData._id = `${newData._id}`;
-      if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
-        Dynamo_Log.error('newData._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findByIdAndUpdate)')
-      }
-    }
+    newData = this.stringifyDataId(newData, 'findByIdAndUpdate');
 
     return newData;
   }
@@ -816,7 +781,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
   // PRIVATE FUNCTIONS
 
   private stringifyDataId(data: T, fnName: string): T {
-    if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
+    if (data?._id && (typeof data._id !== 'string' || typeof data._id === 'object')) {
       data._id = `${data._id}`;
 
       if (typeof data._id !== 'string' || typeof data._id === 'object') {

package/src/_services/core/email.service.ts

@@ -41,7 +41,7 @@ export class DynamoNTS_EmailService {
     }
   ) {
     try {
-      /* this.serviceName = this.constructor?.name; */
+      this.serviceName = this.constructor?.name;
       // console.log('\n\n\n\n\nNEW CONSTRUCT STARTED', set.email);
       this.senderName = set.senderName;
       this.senderNEmail = `${set.senderName} <${set.email}>`;
@@ -77,16 +77,19 @@ export class DynamoNTS_EmailService {
    * 
    * @param set 
    */
-  public async sendEmail(set: {
-    to: string,
-    subject: string,
-    content?: string,
-    useTemplate?: string,
-    templateProperties?: {
-      [propertyKey: string]: string
-    },
-    attachments?: Attachment[]
-  }): Promise<void> {
+  public async sendEmail(
+    set: {
+      to: string,
+      subject: string,
+      content?: string,
+      useTemplate?: string,
+      templateProperties?: {
+        [propertyKey: string]: string
+      },
+      attachments?: Attachment[]
+    }, 
+    issuer?: string,
+  ): Promise<void> {
     try {
       let content: string;
 
@@ -95,21 +98,25 @@ export class DynamoNTS_EmailService {
       } else {
         if (!set.useTemplate) {
           throw new Dynamo_Error({ 
+            ...this._getDefaultErrorSettings(
+              'sendEmail',
+              new Error(`No content setting passsed to emailSending!`),
+              issuer
+            ),
+
             errorCode: 'NTS-ES4-101',
-            addECToUserMsg: true,
-            message: 'No content setting passsed to emailSending!',
-            userMessage: this.defaultErrorUserMsg,
-            issuerService: this.serviceName,
           });
         }
 
         if (!this.templates[set.useTemplate]) {
           throw new Dynamo_Error({ 
+            ...this._getDefaultErrorSettings(
+              'sendEmail',
+              new Error(`No email template found with this parameter! (${set.useTemplate})`),
+              issuer
+            ),
+
             errorCode: 'NTS-ES4-102',
-            addECToUserMsg: true,
-            message: `No email template found with this parameter! (${set.useTemplate})`,
-            userMessage: this.defaultErrorUserMsg,
-            issuerService: this.serviceName,
           });
         }
 
@@ -124,11 +131,13 @@ export class DynamoNTS_EmailService {
             Dynamo_Log.error('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
             
             throw new Dynamo_Error({ 
+              ...this._getDefaultErrorSettings(
+                'sendEmail', 
+                new Error(`TemplateProperties missing! properties needed: ${props}`), 
+                issuer
+              ),
+
               errorCode: 'NTS-ES4-103',
-              addECToUserMsg: true,
-              message: `TemplateProperties missing! properties needed: ${props}`,
-              userMessage: this.defaultErrorUserMsg,
-              issuerService: this.serviceName,
             });
           }
           this.templatePropertyKeys[set.useTemplate].forEach((propertyKey: string) => {
@@ -159,14 +168,21 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      throw new Dynamo_Error({ 
-        errorCode: 'NTS-ES4-100',
-        addECToUserMsg: true,
-        message: `SendEmail failed!`,
-        userMessage: this.defaultErrorUserMsg,
-        issuerService: this.serviceName,
-        error
-      });
+      if (error.includes('all recipients were rejected')) {
+        throw new Dynamo_Error({
+          ...this._getDefaultErrorSettings('sendEmail', error, issuer),
+
+          errorCode: 'NTS-ES4-104',
+          userMessage: `Can't send mail to ${set.to}`,
+        })
+      } else {
+        throw new Dynamo_Error({ 
+          ...this._getDefaultErrorSettings('sendEmail', error, issuer),
+
+          errorCode: 'NTS-ES4-100',
+          message: `SendEmail failed!`,
+        });
+      }
     }
   }
 
@@ -240,4 +256,16 @@ export class DynamoNTS_EmailService {
       Dynamo_Log.error(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
     }
   }
+  
+  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer: string) {
+    return {
+      status: (error as Dynamo_Error)?.___status ?? 500,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
+      addECToUserMsg: true,
+      userMessage: this.defaultErrorUserMsg,
+      issuer: issuer,
+      issuerService: this.serviceName,
+      error: error,
+    }
+  }
 }