@futdevpro/nts-dynamo 1.5.62 → 1.5.65

package/src/_models/dynamo-nts-socket-service-params.ts

@@ -31,7 +31,7 @@ export class DynamoNTS_SocketServiceParams {
     if (set.getIdFromSubscrioption) {
       this.getIdFromSubscrioption = set.getIdFromSubscrioption;
       if (set.groupActiveSocketsBy) {
-        Dynamo_Log.logError(
+        Dynamo_Log.error(
           `setting groupActiveSocketsBy on DynamoNTS_SocketService (${this.name}) won't take effect, ` +
           `since getIdFromSubscrioption is also setted, so it will be used instead`)
       }

package/src/_modules/custom-data/custom-data.controller.ts

@@ -0,0 +1,62 @@
+
+            
+import { customDataModuleSettings } from '@futdevpro/fsm-dynamo';
+import { Request, Response } from 'express';
+import { HttpCallType } from '../../_enums/http/http-call-type.enum';
+import { DynamoNTS_EndpointParams } from '../../_models/dynamo-nts-endpoint-params';
+import { DynamoNTS_Controller } from '../../_services/dynamo-nts-controller.service';
+import { Dynamo_CustomDataService } from '../custom-data/custom-data.service';
+
+export class CustomDataController extends DynamoNTS_Controller {
+
+    static getInstance(): CustomDataController {
+      return CustomDataController.getSingletonInstance();
+    }
+
+    setupEndpoints(): void {
+        this.endpoints = [
+            // CUSTOM DATA
+            new DynamoNTS_EndpointParams({
+              name: 'getCustomData',
+              type: HttpCallType.get,
+              endpoint: customDataModuleSettings.endPoints.getCustomData,
+              tasks: [ 
+                  async (req: Request, res: Response) => {
+                      const customDataService = new Dynamo_CustomDataService({ _id: req.params.customId });
+          
+                      await customDataService.getDataById();
+          
+                      res.send({
+                          url: req.url,
+                          result: 'get custom call was successful!',
+                          response: customDataService.data,
+                          request: `.../custom/get/${req.params.customId}`
+                      });
+                  }
+              ]
+          }),
+          
+          new DynamoNTS_EndpointParams({
+              name: 'modifyCustomData',
+              type: HttpCallType.post,
+              endpoint: customDataModuleSettings.endPoints.modifyCustomData,
+              tasks: [ 
+                  async (req: Request, res: Response, issuer: string) => {
+                      const customDataService = new Dynamo_CustomDataService(req.body, issuer);
+          
+                      await customDataService.saveData();
+          
+                      res.send({
+                          url: req.url,
+                          result: 'post custom call was successful!',
+                          response: customDataService.data,
+                          warning: 'keep in mind that this is a playground DB, and it will be cleared out from time to time',
+                          request: req.body
+                      });
+                  }
+              ]
+          }),
+        ];
+    }
+}
+

package/src/_modules/{test → custom-data}/custom-data.service.ts

@@ -1,7 +1,7 @@
 
 
 
-import { Dynamo_CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo/test-module';
+import { customDataModelParams, Dynamo_CustomData } from '@futdevpro/fsm-dynamo/custom-data-module';
 import { DynamoNTS_DataService } from '../../_services/dynamo-nts-data.service';
 
 export class Dynamo_CustomDataService extends DynamoNTS_DataService<Dynamo_CustomData> {

package/src/_modules/custom-data/get-custom-data-routing-module.ts

@@ -0,0 +1,17 @@
+
+import { customDataModuleSettings } from '@futdevpro/fsm-dynamo';
+import { DynamoNTS_RouteSecurity } from '../../_enums/dynamo-nts-route-security.enum';
+import { DynamoNTS_RoutingModuleSettings } from '../../_models/dynamo-nts-routing-module-settings';
+import { DynamoNTS_RoutingModule } from '../../_services/dynamo-nts-routing-module.service';
+import { CustomDataController } from './custom-data.controller';
+
+export function getCustomDataRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {
+  const set: DynamoNTS_RoutingModuleSettings = {
+    route: customDataModuleSettings.mainRoute,
+    controllers: [ CustomDataController.getInstance() ]
+  }
+  if (securityOverride) {
+    set.securityOverride = securityOverride;
+  }
+  return new DynamoNTS_RoutingModule(set);
+}

package/src/_modules/custom-data/index.ts

@@ -0,0 +1,6 @@
+
+// CUSTOM-DATA MODULE
+export * from './custom-data.service';
+export * from './get-custom-data-routing-module';
+export * from './custom-data.controller';
+export * from '@futdevpro/fsm-dynamo/custom-data-module';

package/src/_modules/test/get-test-routing-module.ts

@@ -3,7 +3,7 @@ import { testModuleSettings } from '@futdevpro/fsm-dynamo/test-module';
 import { DynamoNTS_RouteSecurity } from '../../_enums/dynamo-nts-route-security.enum';
 import { DynamoNTS_RoutingModuleSettings } from '../../_models/dynamo-nts-routing-module-settings';
 import { DynamoNTS_RoutingModule } from '../../_services/dynamo-nts-routing-module.service';
-import { TestController } from './test-controller';
+import { TestController } from './test.controller';
 
 export function getTestRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {
   const set: DynamoNTS_RoutingModuleSettings = {

package/src/_modules/test/index.ts

@@ -1,6 +1,5 @@
 
 // TEST MODULE
-export * from './test-controller';
-export * from './custom-data.service';
+export * from './test.controller';
 export * from './get-test-routing-module';
 export * from '@futdevpro/fsm-dynamo/test-module';

package/src/_modules/test/{test-controller.ts → test.controller.ts}

@@ -4,7 +4,6 @@ import { testModuleSettings } from '@futdevpro/fsm-dynamo/test-module';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_EndpointParams } from '../../_models/dynamo-nts-endpoint-params';
 import { DynamoNTS_Controller } from '../../_services/dynamo-nts-controller.service';
-import { Dynamo_CustomDataService } from './custom-data.service';
 
 export class TestController extends DynamoNTS_Controller {
 
@@ -90,43 +89,15 @@ export class TestController extends DynamoNTS_Controller {
                 ]
             }),
             
-            // CUSTOM DATA
             new DynamoNTS_EndpointParams({
-                name: 'getCustomData',
+                name: 'getServerStatus',
                 type: HttpCallType.get,
-                endpoint: testModuleSettings.endPoints.getCustomData,
+                endpoint: testModuleSettings.endPoints.getServerStatus,
                 tasks: [ 
                     async (req: Request, res: Response) => {
-                        const customDataService = new Dynamo_CustomDataService({ _id: req.params.customId });
-            
-                        await customDataService.getDataById();
-            
-                        res.send({
-                            url: req.url,
-                            result: 'get custom call was successful!',
-                            response: customDataService.data,
-                            request: `.../custom/get/${req.params.customId}`
-                        });
-                    }
-                ]
-            }),
-            
-            new DynamoNTS_EndpointParams({
-                name: 'modifyCustomData',
-                type: HttpCallType.post,
-                endpoint: testModuleSettings.endPoints.modifyCustomData,
-                tasks: [ 
-                    async (req: Request, res: Response, issuer: string) => {
-                        const customDataService = new Dynamo_CustomDataService(req.body, issuer);
-            
-                        await customDataService.saveData();
-            
+                        
                         res.send({
-                            url: req.url,
-                            result: 'post custom call was successful!',
-                            response: customDataService.data,
-                            warning: 'keep in mind that this is a playground DB, and it will be cleared out from time to time',
-                            request: req.body
+                            status: 'ready'
                         });
                     }
                 ]

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

@@ -53,7 +53,7 @@ export class DynamoNTS_ApiService {
                 if (callParams.httpOptions.headers[headerKey]) {
                     privateAxiosInstance.defaults.headers.common[headerKey] = callParams.httpOptions.headers[headerKey];
                 } else {
-                    Dynamo_Log.logError('DYNAMOBE ERROR: \n missing header:', headerKey, '\n\n', new Error());
+                    Dynamo_Log.error('DYNAMOBE ERROR: \n missing header:', headerKey, '\n\n', new Error());
                 }
             }
         }
@@ -70,11 +70,11 @@ export class DynamoNTS_ApiService {
                         url = url.replace(`:${pathParamKey}`, inputParams.pathParams[pathParamKey]);
                         break;
                     default:
-                        Dynamo_Log.logError(`DYNAMOBE ERROR: \n wrong path param type: (${pathParamKey}): ${paramType} \n${inputParams.pathParams[pathParamKey]}\nMUST BE string or number\n\n`, new Error());
+                        Dynamo_Log.error(`DYNAMOBE ERROR: \n wrong path param type: (${pathParamKey}): ${paramType} \n${inputParams.pathParams[pathParamKey]}\nMUST BE string or number\n\n`, new Error());
                         break;
                     }
                 } else {
-                    Dynamo_Log.logError('DYNAMOBE ERROR: \n missing pathParam:', pathParamKey, '\n\n', new Error());
+                    Dynamo_Log.error('DYNAMOBE ERROR: \n missing pathParam:', pathParamKey, '\n\n', new Error());
                 }
             }
         }
@@ -143,7 +143,7 @@ export class DynamoNTS_ApiService {
                 });
             break;
             default:
-                Dynamo_Log.logError('DYNAMOBE ERROR: \n wrong api call type', '\n\n', new Error());
+                Dynamo_Log.error('DYNAMOBE ERROR: \n wrong api call type', '\n\n', new Error());
             break;
         }
 
@@ -153,7 +153,7 @@ export class DynamoNTS_ApiService {
             return a as T;
         }
     } catch (error) {
-        Dynamo_Log.logError(`\nAPI ERROR: ${callParams?.name} failed...` +
+        Dynamo_Log.error(`\nAPI ERROR: ${callParams?.name} failed...` +
         `\n${callParams?.baseUrl}${callParams?.endPoint}`);
 
         if (callParams?.httpOptions?.responseType === HttpResponseType.text) {
@@ -161,7 +161,7 @@ export class DynamoNTS_ApiService {
         }
         
         if (error?.response?.data?.flag === 'DYNAMO ERROR OBJECT') {
-            Dynamo_Log.logError(`\n${callParams.name} was UNSUCCESSFUL\n\n`, new Error());
+            Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL\n\n`, new Error());
 
             throw new Dynamo_Error({
                 errorCode: 'NTS-API-002',
@@ -171,7 +171,7 @@ export class DynamoNTS_ApiService {
                 error: error.response.data
             });
         } else if (error.code === 'ENOTFOUND') {
-            Dynamo_Log.logError(`\n${callParams.name} was UNSUCCESSFUL\n\n`, new Error());
+            Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL\n\n`, new Error());
 
             throw new Dynamo_Error({ 
                 status: 404, 
@@ -191,7 +191,7 @@ export class DynamoNTS_ApiService {
                 error 
             });
         } else {
-            Dynamo_Log.logError(`\n${callParams.name} was UNSUCCESSFUL`, error, '\n\n', new Error());
+            Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`, error, '\n\n', new Error());
 
             throw error;
         }

package/src/_services/dynamo-nts-app-extended.ts

@@ -134,13 +134,13 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
         if (this.debugLog) console.log(`\nAll sockets setted up.... sockets using security: ${this.socketSecurity}`);
       } else {
-        Dynamo_Log.logWarning(
+        Dynamo_Log.warn(
           '\nNo socketServices setted up while using Extended Application.',
           '\nYou should use DynamoNTS_App if you don`t need socket services.\n' 
         );
       }
     } catch (error) {
-      Dynamo_Log.logError('\nExtended Application start failed.\n', error, '\n');
+      Dynamo_Log.error('\nExtended Application start failed.\n', error, '\n');
     }
   }
 
@@ -188,7 +188,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               errorMsg += `\n  ${service.name} (port: ${service.port})`;
             }
           });
-          Dynamo_Log.logError(errorMsg);
+          Dynamo_Log.error(errorMsg);
   
           let error = new Error('Secure routes cannot be established!');
           let errorStack: string[] = error.stack.split('\n');

package/src/_services/dynamo-nts-app.ts

@@ -204,7 +204,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         if (this.debugLog) console.log(`\nRoutes mounted.... server using security: ${this.security}`);
       }
     } catch (error) {
-      Dynamo_Log.logError('\nApplication start failed.\n', error);
+      Dynamo_Log.error('\nApplication start failed.\n', error);
     }
   }
 
@@ -214,10 +214,10 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private startDB(): void {
     this.mongoose.connection
       .on('error', (error) => {
-        Dynamo_Log.logError('\nUnable to connect to MongoDB server, ERROR: ', error);
+        Dynamo_Log.error('\nUnable to connect to MongoDB server, ERROR: ', error);
       })
       .once('open', () => {
-        Dynamo_Log.logSuccess('\nConnected to MongoDB\n');
+        Dynamo_Log.success('\nConnected to MongoDB\n');
       });
 
     this.mongoose.connect(
@@ -251,7 +251,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             });
           }
         });
-        Dynamo_Log.logError(errorMsg);
+        Dynamo_Log.error(errorMsg);
 
         let error = new Error('Open routes cannot be established!');
         let errorStack: string[] = error.stack.split('\n');
@@ -288,7 +288,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             });
           }
         });
-        Dynamo_Log.logError(errorMsg);
+        Dynamo_Log.error(errorMsg);
 
         let error = new Error('Secure routes cannot be established!');
         let errorStack: string[] = error.stack.split('\n');
@@ -334,30 +334,30 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       if (this.security !== DynamoNTS_RouteSecurity.open) {
         this.httpsServer
           .listen(this.httpsPort, 'localhost', 0, () => {
-            Dynamo_Log.logSuccess(`\nHTTPS (secure) server is listening on port ${this.httpsPort}\n`);
+            Dynamo_Log.success(`\nHTTPS (secure) server is listening on port ${this.httpsPort}\n`);
           })
           .on('error', (error) => {
-            Dynamo_Log.logError(`\nHTTPS (secure) server ERROR`, error);
+            Dynamo_Log.error(`\nHTTPS (secure) server ERROR`, error);
           })
           .on('uncaughtException', (ex) => {
-            Dynamo_Log.logWarning(`\nHTTPS (secure) server uncaughtException`, ex);
+            Dynamo_Log.warn(`\nHTTPS (secure) server uncaughtException`, ex);
           });
       }
 
       if (this.security !== DynamoNTS_RouteSecurity.secure) {
         this.openExpress
           .listen(this.httpPort, () => {
-            Dynamo_Log.logSuccess(`\nHTTP  (-open-) server is listening on port ${this.httpPort}\n`);
+            Dynamo_Log.success(`\nHTTP  (-open-) server is listening on port ${this.httpPort}\n`);
           })
           .on('error', (error) => {
-            Dynamo_Log.logError(`\nHTTP  (-open-) server ERROR`, error);
+            Dynamo_Log.error(`\nHTTP  (-open-) server ERROR`, error);
           })
           .on('uncaughtException', (ex) => {
-            Dynamo_Log.logWarning(`\nHTTP  (-open-) server uncaughtException`, ex);
+            Dynamo_Log.warn(`\nHTTP  (-open-) server uncaughtException`, ex);
           });
       }
     } catch (error) {
-      Dynamo_Log.logError(`startExpresses failed...`, error);
+      Dynamo_Log.error(`startExpresses failed...`, error);
     }
   }
 

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

@@ -67,7 +67,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *     let token = AuthService.getTokenFromRequest(req);
    *     token = await AuthService.verifyToken(token);
    * 
-   *     Dynamo_Log.logSuccess('token authenticated');
+   *     Dynamo_Log.success('token authenticated');
    *     res.setHeader('authorization', `Bearer ${token}`);
    *     next();
    *   } catch (error) {
@@ -78,7 +78,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *       userMessage: `Authorization failed.`, 
    *       error 
    *     });
-   *     Dynamo_Log.logError(error?.message, error);
+   *     Dynamo_Log.error(error?.message, error);
    * 
    *     res.status(error.status);
    *     res.send(error);
@@ -101,7 +101,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *   try {
    *     let token = AuthService.getTokenFromRequest(req);
    *     token = await AuthService.verifyTokenSelf(token, req?.params?.userId);
-   *     Dynamo_Log.logSuccess('selftoken authenticated');
+   *     Dynamo_Log.success('selftoken authenticated');
    * 
    *     res.setHeader('authorization', `Bearer ${token}`);
    *     next();
@@ -113,7 +113,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *       userMessage: `Authorization failed.`, 
    *       error 
    *     });
-   *     Dynamo_Log.logError(error?.message, error);
+   *     Dynamo_Log.error(error?.message, error);
    * 
    *     res.status(error.status);
    *     res.send(error);

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

@@ -81,7 +81,7 @@ export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
     try {
       this.setupEndpoints();
     } catch (error) {
-      Dynamo_Log.logError(`DynamoBEController ERROR setup failed:`, error);
+      Dynamo_Log.error(`DynamoBEController ERROR setup failed:`, error);
     }
   }
 

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_Metadata, DynamoNTS_DataParams, DynamoNTS_DataPropertyParams, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_DBService } from './dynamo-nts-db.service';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
@@ -33,7 +33,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   depDBServiceKey?: string;
   private depDataDBService: DynamoNTS_DBService<any>;
 
-  dataParams: DynamoNTS_DataParams;
+  dataParams: Dynamo_DataParams;
 
   defaultErrorUserMsg = 
     `We encountered an unhandled Data Error, ` +
@@ -50,7 +50,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     /**
      * DB data prams will be used to connect to usable dbService on GlobalService
      */
-    dataParams: DynamoNTS_DataParams,
+    dataParams: Dynamo_DataParams,
     /**
      * Initial set for issuer to be able to follow the issuer's activity
      */
@@ -70,7 +70,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.getAll().catch(error => {
         if (error?.errorCode === 'NTS-DBS-GA1') {
-          Dynamo_Log.logWarning(`getAll ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.warn(`getAll ${this.dataParams.dataName} didn't found any.`);
           return [];
         } else {
           throw error;
@@ -122,7 +122,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataExists: T = await this.dataDBService.getDataById(id ?? this.data._id).catch(error => {
         if (error?.errorCode == 'NTS-DBS-GI1') {
-          Dynamo_Log.logWarning(`getDataById ${this.dataParams.dataName} (${id ?? this.data._id}) didn't found any.`);
+          Dynamo_Log.warn(`getDataById ${this.dataParams.dataName} (${id ?? this.data._id}) didn't found any.`);
           return null;
         } else {
           throw error;
@@ -177,7 +177,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataExists: T = await this.dataDBService.getDataByDependencyId(dependencyId ?? this.data[this.depKey]).catch(error => {
         if (error?.errorCode === 'NTS-DBS-GD2') {
-          Dynamo_Log.logWarning(`getDataByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
+          Dynamo_Log.warn(`getDataByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
           return null;
         } else {
           throw error;
@@ -232,7 +232,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataListExists: T[] = await this.dataDBService.getDataListByDependencyId(dependencyId ?? this.data[this.depKey]).catch(error => {
         if (error?.errorCode === 'NTS-DBS-GLD2') {
-          Dynamo_Log.logWarning(`getDataListByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
+          Dynamo_Log.warn(`getDataListByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
           return [];
         } else {
           throw error;
@@ -293,7 +293,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataExists: T = await this.dataDBService.findOne(findBy).catch(error => {
         if (error?.errorCode === 'NTS-DBS-FO1') {
-          Dynamo_Log.logWarning(`findData ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
           return null;
         } else {
           throw error;
@@ -350,7 +350,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.find(findBy).catch(error => {
         if (error?.errorCode === 'NTS-DBS-F1') {
-          Dynamo_Log.logWarning(`findDatas ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.warn(`findDatas ${this.dataParams.dataName} didn't found any.`);
           return [];
         } else {
           throw error;
@@ -641,7 +641,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * setting up dependency dataHook by DynamoBEDataModelParams
    */
   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.depKey = dependencyParam.key;
       if (dependencyParam.dependencyDataName) {