@futdevpro/nts-dynamo 1.5.62 → 1.5.65

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

@@ -1,7 +1,7 @@
 
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
-import { Dynamo_Metadata, DynamoNTS_DataParams, DynamoNTS_DataPropertyParams, Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error } from '@futdevpro/fsm-dynamo';
 
 /**
  * 
@@ -22,7 +22,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * schemaSettings also MUST contain specific types that differs from the listed above (Array, Date)
    */
   constructor(
-    public dataParams: DynamoNTS_DataParams
+    public dataParams: Dynamo_DataParams
   ){
     this.lookForDependencyDataSettings();
   }
@@ -86,7 +86,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     const dataModel = new this.dataModel(data);
     let newData: T = await this.dataModel.findByIdAndUpdate(data._id, dataModel).then(res => {
-      if (res) {
+      return res?.toObject() as T ?? null;
+      /* if (res) {
         return res.toObject() as T;
       } else {
         throw new Dynamo_Error({ 
@@ -96,7 +97,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `update ${this.dataParams.dbName} result not found! (NTS DB)`,
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -129,10 +130,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async getDataById(id: string): Promise<T> {
     let data: T = await this.dataModel.findById(id).then(res => {
-      if (res) {
+      return res?.toObject() as T ?? null;
+      /* if (res) {
         return res.toObject() as T;
       } else {
-        /* return null; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-GI1',
@@ -140,7 +141,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `get ${this.dataParams.dbName} by ID was unsuccessful: data not found by id: ${id} (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -182,10 +183,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     }
 
     let data: T = await this.dataModel.findOne({ [this.depDataName]: dependencyId }).then(res => {
-      if (res) {
+      return res.toObject() as T ?? null;
+      /* if (res) {
         return res.toObject() as T;
       } else {
-        /* return null; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-GD2',
@@ -193,7 +194,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful: data not found by id: ${dependencyId} (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -234,12 +235,11 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     }
 
-    let dataList: T[] = await this.dataModel.find({ [this.depDataName]: dependencyId })
-    .then(res => {
-      if (res) {
+    let dataList: T[] = await this.dataModel.find({ [this.depDataName]: dependencyId }).then(res => {
+      return res as T[] ?? [];
+      /* if (res) {
         return res as T[];
       } else {
-        /* return []; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-GLD2',
@@ -247,7 +247,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful: no data found by id: ${dependencyId} (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -292,12 +292,11 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     }
 
-    let dataList: T[] = await this.dataModel.find({ [this.depDataName]: { $in: ids }})
-    .then(res => {
-      if (res) {
+    let dataList: T[] = await this.dataModel.find({ [this.depDataName]: { $in: ids }}).then(res => {
+      return res as T[] ?? [];
+      /* if (res) {
         return res as T[];
       } else {
-        /* return []; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-GLDS2',
@@ -305,7 +304,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful: no data found by ids: ${ids} (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -357,7 +356,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       filter[this.depDataName] = { $in: narrowByDependencyIds };      
     }
 
-    await this.dataParams.modelParams.forEach((modelParam: DynamoNTS_DataPropertyParams) => {
+    await this.dataParams.modelParams.forEach((modelParam: Dynamo_DataPropertyParams) => {
       if (
         (searchBy[modelParam.key] !== null && searchBy[modelParam.key] !== undefined) || 
         searchBy[modelParam.key + 'Range']
@@ -437,10 +436,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
   async getAll(): Promise<T[]> {
     let dataList: T[] = await this.dataModel.find({})
     .then(res => {
-      if (res) {
+      return res as T[] ?? [];
+      /* if (res) {
         return res as T[];
       } else {
-        /* return null; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-GA1',
@@ -448,7 +447,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `get all ${this.dataParams.dbName} was unsuccessful: no data found (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -550,10 +549,11 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async findOne(filter: any): Promise<T> {
     let data: T = await this.dataModel.findOne(filter).then(res => {
-      if (res) {
+      return res as T ?? null;
+      /* if (res) {
         return res as T;
       } else {
-        /* return null; */
+        return null;
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-FO1',
@@ -561,7 +561,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `findOne ${this.dataParams.dbName} was unsuccessful, no data found (NTS DB) fliter: ${filter}`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -614,10 +614,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
   async find(filter: any): Promise<T[]> {
     let dataList: T[] = await this.dataModel.find(filter)
     .then(res => {
-      if (res) {
+      return res as T[] ?? [];
+      /* if (res) {
         return res as T[];
       } else {
-        /* return null; */
         throw new Dynamo_Error({ 
           status: 417, 
           errorCode: 'NTS-DBS-F1',
@@ -625,7 +625,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `find ${this.dataParams.dbName} was unsuccessful, no data found (NTS DB) fliter: ${filter}`, 
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -727,7 +727,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     update.__lastModifiedBy = modifier;
 
     let newData: T = await this.dataModel.findByIdAndUpdate(id, update).then(res => {
-      if (res) {
+      return res.toObject() as T ?? null;
+      /* if (res) {
         return res.toObject() as T;
       } else {
         throw new Dynamo_Error({ 
@@ -737,7 +738,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
           message: `${this.dataParams.dbName} not found! (by id: ${id}) (NTS DB)`,
           userMessage: this.defaultErrorUserMsg
         });
-      }
+      } */
     }).catch(error => {
       if (error?.flag == 'DYNAMO ERROR OBJECT') {
         throw error;
@@ -924,14 +925,14 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * @param params DynamoBEDataPropertyParams
    * @returns mongoose schema object
    */
-  private buildMongooseSchemaByModelParams(params?: DynamoNTS_DataPropertyParams[]): any {
+  private buildMongooseSchemaByModelParams(params?: Dynamo_DataPropertyParams[]): any {
     const schemaSettingsObj = {};
 
     if (!params) {
       params = this.dataParams.modelParams;
     }
 
-    params.forEach((property: DynamoNTS_DataPropertyParams) => {
+    params.forEach((property: Dynamo_DataPropertyParams) => {
       const beType = this.getBEType(property.type);
       if (beType !== Object || !property?.subObjectParams || property?.subObjectParams?.length == 0) {
         schemaSettingsObj[property.key] = {
@@ -1001,8 +1002,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * sets depDataKey
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: DynamoNTS_DataPropertyParams = this.dataParams.modelParams.find(
-        (modelParams: DynamoNTS_DataPropertyParams) => modelParams.isDependencyHook);
+    const dependencyParam: Dynamo_DataPropertyParams = this.dataParams.modelParams.find(
+        (modelParams: Dynamo_DataPropertyParams) => modelParams.isDependencyHook);
     if (dependencyParam) {
       this.depDataName = dependencyParam.key;
     }

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

@@ -57,7 +57,7 @@ export class DynamoNTS_EmailService {
         this.constructionFinished();
       }
     } catch (error) {
-      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
+      Dynamo_Log.error(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
     }
   }
 
@@ -65,7 +65,7 @@ export class DynamoNTS_EmailService {
    * 
    */
   private constructionFinished(): void { 
-    Dynamo_Log.logSuccess(`\nEmailService construction (${this.senderName}) Finished!\n`) 
+    Dynamo_Log.success(`\nEmailService construction (${this.senderName}) Finished!\n`) 
   }
 
   /**
@@ -114,7 +114,7 @@ export class DynamoNTS_EmailService {
             this.templatePropertyKeys[set.useTemplate].forEach((key: string, index: number) => {
               props += `${key}${index != this.templatePropertyKeys[set.useTemplate].length - 1 ? ', ' : ''}`;
             });
-            Dynamo_Log.logError('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
+            Dynamo_Log.error('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
             
             throw new Dynamo_Error({ 
               errorCode: 'NTS-ES4-103',
@@ -125,7 +125,7 @@ export class DynamoNTS_EmailService {
           }
           this.templatePropertyKeys[set.useTemplate].forEach((propertyKey: string) => {
             if (!set.templateProperties[propertyKey]) {
-              Dynamo_Log.logError(`TemplateProperty missing! (${propertyKey})`);
+              Dynamo_Log.error(`TemplateProperty missing! (${propertyKey})`);
             }
             const reg = new RegExp(`{{${propertyKey}}}`, 'g')
             content = content.replace(reg, set.templateProperties[propertyKey]);
@@ -176,7 +176,7 @@ export class DynamoNTS_EmailService {
         templatePath = Path.join(rootPath, templatePath);
         FileSystem.readFile(templatePath, 'utf8' , (err, template) => {
           if (err) {
-            Dynamo_Log.logError(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
+            Dynamo_Log.error(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
             reject(err);
             return;
           } else {
@@ -192,7 +192,7 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
+      Dynamo_Log.error(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
     }
   }
 
@@ -209,7 +209,7 @@ export class DynamoNTS_EmailService {
 
       while (propertyOpenTagIndex >= 0) {
         if (propertyCloseTagIndex === -1) {
-          Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
+          Dynamo_Log.error(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
           throw new Dynamo_Error({ 
             errorCode: 'NTS-ES4-200',
             addECToUserMsg: true,
@@ -229,7 +229,7 @@ export class DynamoNTS_EmailService {
       // console.log('\n\n\nTEST propertyKeys: ', propertyKeys);
       return propertyKeys;
     } catch (error) {
-      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
+      Dynamo_Log.error(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
     }
   }
 }

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

@@ -1,6 +1,6 @@
 
 
-import { Dynamo_Metadata, DynamoNTS_DataParams, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, Dynamo_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';
@@ -35,7 +35,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
       /**
        * You need to setup your Own Auth Service extending the DynamoBEAuthService class
        */
-      authService: DynamoNTS_AuthService,
+      authService?: DynamoNTS_AuthService,
 
       /**
        * You can setup your Own Email Service extending the DynamoBEEmailServiceCollection class
@@ -45,25 +45,25 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
       /**
        * you can setup data tables by passing a DynamoBEDataParams list at this point 
        */
-      dbModels: DynamoNTS_DataParams[],
+      dbModels: Dynamo_DataParams[],
     }
   ): void {
     this.getInstance();
 
     try {
       this.instance.dbServiceCollection = new DynamoNTS_DBServiceCollection();
-      set.dbModels.forEach((dbModel: DynamoNTS_DataParams) => {
+      set.dbModels.forEach((dbModel: Dynamo_DataParams) => {
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
-          Dynamo_Log.logError(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
+          Dynamo_Log.error(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
         }
       });
 
       this.instance.authService = set.authService;
       this.instance.emailServiceCollection = set.emailServiceCollection;
     } catch (error) {
-      Dynamo_Log.logError('\nsetServices failed on DBE_Global_S.\n', error);
+      Dynamo_Log.error('\nsetServices failed on DBE_Global_S.\n', error);
     }
   }
 
@@ -102,7 +102,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * @param dataParams 
    * @returns 
    */
-  static getDBService<T extends Dynamo_Metadata>(dataParams: DynamoNTS_DataParams): DynamoNTS_DBService<T> {
+  static getDBService<T extends Dynamo_Metadata>(dataParams: Dynamo_DataParams): DynamoNTS_DBService<T> {
     return this.getDBServiceByKey<T>(dataParams.dataName);
   }
 

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

@@ -79,7 +79,7 @@ export class DynamoNTS_RoutingModule {
 
       if (this.log) console.log(`routing module setup done: ${this.route} serurity: ${this.security}\n`);
     } catch (error) {
-      Dynamo_Log.logError(`Routing module setup failed (${this.route})`, error);
+      Dynamo_Log.error(`Routing module setup failed (${this.route})`, error);
     }
   }
 

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

@@ -47,7 +47,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) {
-      Dynamo_Log.logError(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
+      Dynamo_Log.error(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
     }
   }