@futdevpro/nts-dynamo 1.7.28 → 1.8.5

package/src/_modules/usage/usage.controller.ts

@@ -2,7 +2,7 @@
 import { Request, Response } from 'express';
 
 import { 
-  usageModuleSettings, Dynamo_UsageSession, Dynamo_RelativeDate 
+  Dynamo_usageModule_settings, Dynamo_UsageSession, Dynamo_RelativeDate 
 } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
@@ -10,14 +10,14 @@ import { DynamoNTS_AuthService } from '../../_services/core/auth.service';
 import { DynamoNTS_Controller } from '../../_services/route/controller.service';
 import { DynamoNTS_GlobalService } from '../../_services/core/global.service';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
-import { UsageService } from './usage.data-service';
+import { DynamoNTS_Usage_DataService } from './usage.data-service';
 
-export class UsageController extends DynamoNTS_Controller {
+export class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
 
-  static getInstance(): UsageController {
-    return UsageController.getSingletonInstance();
+  static getInstance(): DynamoNTS_Usage_Controller {
+    return DynamoNTS_Usage_Controller.getSingletonInstance();
   }
 
   // SERVICES
@@ -27,15 +27,15 @@ export class UsageController extends DynamoNTS_Controller {
     this.authService = DynamoNTS_GlobalService.getAuthService();
 
     this.endpoints = [
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'newSession',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: usageModuleSettings.endPoints.newSession,
+        endpoint: Dynamo_usageModule_settings.endPoints.newSession,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
             const authService = DynamoNTS_GlobalService.getAuthService();
             const username = authService.getUsernameFromRequest(req);
-            const usageService = new UsageService({
+            const usageService = new DynamoNTS_Usage_DataService({
               usageSession: new Dynamo_UsageSession({
                 sessionStart: new Date(),
                 issuer: username,
@@ -53,14 +53,14 @@ export class UsageController extends DynamoNTS_Controller {
         ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'updateUsage',
         type: DynamoNTS_HttpCallType.post,
-        endpoint: usageModuleSettings.endPoints.updateUsage,
+        endpoint: Dynamo_usageModule_settings.endPoints.updateUsage,
         logRequestsContent: false,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const usageService = new UsageService({
+            const usageService = new DynamoNTS_Usage_DataService({
               usageSession: { _id: req.params.sessionId },
               usageData: req.body,
               issuer,
@@ -75,13 +75,13 @@ export class UsageController extends DynamoNTS_Controller {
         ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'closeSession',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: usageModuleSettings.endPoints.closeSession,
+        endpoint: Dynamo_usageModule_settings.endPoints.closeSession,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const usageService = new UsageService({
+            const usageService = new DynamoNTS_Usage_DataService({
               usageSession: { _id: req.params.sessionId },
               issuer,
             });
@@ -95,16 +95,16 @@ export class UsageController extends DynamoNTS_Controller {
         ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'getUsageData',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: usageModuleSettings.endPoints.getUsageData,
+        endpoint: Dynamo_usageModule_settings.endPoints.getUsageData,
         preProcessess: [this.authService.authTokenPermAccUsageData],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             const range: Dynamo_RelativeDate = req.params.range as Dynamo_RelativeDate;
 
-            const usageService = new UsageService();
+            const usageService = new DynamoNTS_Usage_DataService();
 
             await usageService.getUsage(range);
 
@@ -114,7 +114,6 @@ export class UsageController extends DynamoNTS_Controller {
           },
         ],
       }),
-
     ];
   }
 }

package/src/_modules/usage/usage.data-service.ts

@@ -1,13 +1,13 @@
 
 import { Request } from 'express';
 import { Dynamo_Error, Dynamo_Time, Dynamo_RelativeDate } from '@futdevpro/fsm-dynamo';
-import { Dynamo_UsageSession, usageSessionModelParams, Dynamo_UsageData, 
+import { Dynamo_UsageSession, Dynamo_usageSessionModel_params, Dynamo_UsageData, 
   Dynamo_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoNTS_DataService } from '../../_services/base/data.service';
 import { DynamoNTS_Shared } from '../../_services/shared.static-service';
 
-export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
+export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_UsageSession> {
   usageData: Dynamo_UsageData[] = [];
   simplifiedDailyUsage: Dynamo_DailyUsageData[] = [];
 
@@ -20,7 +20,7 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
   ) {
     super(
       new Dynamo_UsageSession(set?.usageSession),
-      usageSessionModelParams,
+      Dynamo_usageSessionModel_params,
       set?.issuer
     );
     this.usageData = set?.usageData ? set?.usageData : [];

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

@@ -1,6 +1,6 @@
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error,
+  Dynamo_Metadata, Dynamo_DataModel_Params, Dynamo_DataProperty_Params, Dynamo_Error,
   Dynamo_Log, Dynamo_AnyError, Dynamo_Error_Settings 
 } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
@@ -43,7 +43,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   depKeyIsRequired?: boolean;
   private depDataDBService: DynamoNTS_DBService<any>;
 
-  dataParams: Dynamo_DataParams;
+  dataParams: Dynamo_DataModel_Params;
 
   defaultErrorUserMsg: string = 
     `We encountered an unhandled Data Service Error, ` +
@@ -60,7 +60,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     /**
      * DB data prams will be used to connect to usable dbService on GlobalService
      */
-    dataParams: Dynamo_DataParams,
+    dataParams: Dynamo_DataModel_Params,
     /**
      * Initial set for issuer to be able to follow the issuer's activity
      */
@@ -383,6 +383,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
           
           errorCode: 'NTS-DS0-GLD0',
+          
         });
       }
     }
@@ -765,17 +766,17 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    */
   async validateForSave(): Promise<void> {
     try {
-      for (let i = 0; i < this.dataParams.modelParams.length; i++) {
+      for (let i = 0; i < this.dataParams.properties.length; i++) {
         // basic required validations
         if (
-          (this.dataParams.modelParams[i].required && 
-            (this.data[this.dataParams.modelParams[i].key] === null || 
-              this.data[this.dataParams.modelParams[i].key] === undefined
+          (this.dataParams.properties[i].required && 
+            (this.data[this.dataParams.properties[i].key] === null || 
+              this.data[this.dataParams.properties[i].key] === undefined
             )
           ) ||
-          (this.dataParams.modelParams[i].index && 
-            (this.data[this.dataParams.modelParams[i].key] === null || 
-              this.data[this.dataParams.modelParams[i].key] === undefined
+          (this.dataParams.properties[i].index && 
+            (this.data[this.dataParams.properties[i].key] === null || 
+              this.data[this.dataParams.properties[i].key] === undefined
             )
           )
         ) {
@@ -783,7 +784,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
-                `validateForSave failed, ${this.dataParams.modelParams[i].key} is missing! ` +
+                `validateForSave failed, ${this.dataParams.properties[i].key} is missing! ` +
                 `(${this.dataParams.dataName})`
               )
             ),
@@ -795,14 +796,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         }
 
         // specific Date validation
-        if (this.dataParams.modelParams[i].type === 'Date' && 
-          !(new Date(this.data[this.dataParams.modelParams[i].key]) instanceof Date)
+        if (this.dataParams.properties[i].type === 'Date' && 
+          !(new Date(this.data[this.dataParams.properties[i].key]) instanceof Date)
         ) {
           throw new Dynamo_Error({
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
-                `validateForSave failed, ${this.dataParams.modelParams[i].key} is not a date! ` +
+                `validateForSave failed, ${this.dataParams.properties[i].key} is not a date! ` +
                 `(${this.dataParams.dataName})`
               )
             ),
@@ -814,10 +815,10 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         }
 
         // call additional validators
-        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]
+        if (this.dataParams.properties[i].additionalValidators) {
+          for (let j = 0; j < this.dataParams.properties[i].additionalValidators.length; j++) {
+            this.dataParams.properties[i].additionalValidators[j](
+              this.data[this.dataParams.properties[i].key]
             );
           }
         }
@@ -840,8 +841,8 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * setting up dependency dataHook by DynamoBEDataModelParams
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: Dynamo_DataPropertyParams = this.dataParams.modelParams.find(
-      (modelParams: Dynamo_DataPropertyParams): boolean => modelParams.isDependencyHook
+    const dependencyParam: Dynamo_DataProperty_Params = this.dataParams.properties.find(
+      (modelParams: Dynamo_DataProperty_Params): boolean => modelParams.isDependencyHook
     );
 
     if (dependencyParam) {

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

@@ -3,7 +3,7 @@ import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, 
+  Dynamo_Metadata, Dynamo_DataModel_Params, Dynamo_DataProperty_Params, Dynamo_Error, 
   Dynamo_Log, Dynamo_AnyError, Dynamo_Error_Settings 
 } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
@@ -31,7 +31,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: Dynamo_DataParams
+    public dataParams: Dynamo_DataModel_Params
   ){
     try {
       this.serviceName = this.constructor?.name;
@@ -50,8 +50,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     } catch (error) {
       Dynamo_Log.error(
         `\nDynamoNTS_DBService ERROR, ` +
-        `The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
-        error,
+        `The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}` +
+        `\nERROR: `, error,
         new Error()
       );
     }
@@ -246,13 +246,16 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         ...this._getDefaultErrorSettings(
           'getDataListByDependencyId',
           new Error(
-            `dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
+            `isDependencyHook not setted up for this dataModel (${this.dataParams.dbName}) ` +
             `(NTS DB)`
           )
         ),
 
         status: 501, 
         errorCode: 'NTS-DBS-GLD0',
+        additionalContent: {
+          dataModel: this.dataModel,
+        },
       });
     }
 
@@ -468,7 +471,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       filter[this.depDataName] = { $in: narrowByDependencyIds };      
     }
 
-    await this.dataParams.modelParams.forEach((modelParam: Dynamo_DataPropertyParams): void => {
+    await this.dataParams.properties.forEach((modelParam: Dynamo_DataProperty_Params): void => {
       if (
         (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) || 
         filterBy[modelParam.key + 'Range']
@@ -944,14 +947,14 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * @param params DynamoBEDataPropertyParams
    * @returns mongoose schema object
    */
-  private buildMongooseSchemaByModelParams(params?: Dynamo_DataPropertyParams[]): any {
+  private buildMongooseSchemaByModelParams(params?: Dynamo_DataProperty_Params[]): any {
     const schemaSettingsObj = {};
 
     if (!params) {
-      params = this.dataParams.modelParams;
+      params = this.dataParams.properties;
     }
 
-    params.forEach((property: Dynamo_DataPropertyParams): void => {
+    params.forEach((property: Dynamo_DataProperty_Params): void => {
       const beType = this.getBEType(property.type);
 
       if (
@@ -960,7 +963,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         property?.subObjectParams?.length == 0
       ) {
         schemaSettingsObj[property.key] = {
-          type: beType
+          type: beType,
         };
 
         if (property.index) {
@@ -1041,8 +1044,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * sets depDataKey
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: Dynamo_DataPropertyParams = this.dataParams.modelParams.find(
-      (modelParams: Dynamo_DataPropertyParams): boolean => modelParams.isDependencyHook
+    const dependencyParam: Dynamo_DataProperty_Params = this.dataParams.properties.find(
+      (modelParams: Dynamo_DataProperty_Params): boolean => modelParams.isDependencyHook
     );
     
     if (dependencyParam) {

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

@@ -7,11 +7,11 @@ import {
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
 import {
-  DynamoNTS_ApiCallParams
+  DynamoNTS_ApiCall_Params
 } from '../../_models/control-models/api-call-params.control-model';
-import { dynamoNTS_globalSettings } from '../../_constants';
+import { DynamoNTS_globalSettings } from '../../_constants';
 
-export interface DynamoNTS_ApiCallInputParams<T_Body = any> {
+export interface DynamoNTS_ApiCallInput_Params<T_Body = any> {
   pathParams?: {
     /**
      * path params setted in endpoint
@@ -47,11 +47,11 @@ export class DynamoNTS_ApiService {
      * you must setup the basic api call params with this.
      * follow the instructions in the constructor: new DynamoNTS_ApiCallParams({ ... })
      */
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     /**
      * you can pass data and other inputs in this section
      */
-    inputParams?: DynamoNTS_ApiCallInputParams<T_Body>
+    inputParams?: DynamoNTS_ApiCallInput_Params<T_Body>
   ): Promise<T_Response /* | Axios.AxiosResponse */> {
     try {
       let a: T_Response;
@@ -70,7 +70,7 @@ export class DynamoNTS_ApiService {
         this.setupQueryParams<T_Body>(inputParams, callParams);
       } */
 
-      if (dynamoNTS_globalSettings.logApiEvents) {
+      if (DynamoNTS_globalSettings.logApiEvents) {
         this.logEvent(url, inputParams, callParams);
       }
 
@@ -146,7 +146,7 @@ export class DynamoNTS_ApiService {
   } */
 
   private static handleError<T_Body>(
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     error: any,
     inputParams: {
       pathParams?: { [param: string]: string; };
@@ -243,17 +243,17 @@ export class DynamoNTS_ApiService {
 
   private static async postPutPatch<T_Response, T_Body>(
     axios: Axios.AxiosInstance,
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     url: string,
-    inputParams: DynamoNTS_ApiCallInputParams<T_Body>
+    inputParams: DynamoNTS_ApiCallInput_Params<T_Body>
   ): Promise<T_Response> {
     return await axios[callParams.type]<T_Response>(
       url,
       inputParams.body,
       callParams.httpOptions
     ).then((res: Axios.AxiosResponse): T_Response => {
-      if (dynamoNTS_globalSettings.logApiEvents) {
-        if (dynamoNTS_globalSettings.logApiResponseContents) {
+      if (DynamoNTS_globalSettings.logApiEvents) {
+        if (DynamoNTS_globalSettings.logApiResponseContents) {
           Dynamo_Log.success(`>      ${callParams.name} api call was successful`, res.data);
 
         } else {
@@ -272,12 +272,12 @@ export class DynamoNTS_ApiService {
   private static async delete<T_Response>(
     axios: Axios.AxiosInstance,
     url: string,
-    callParams: DynamoNTS_ApiCallParams
+    callParams: DynamoNTS_ApiCall_Params
   ): Promise<T_Response> {
     return await axios.delete<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (dynamoNTS_globalSettings.logApiEvents) {
-          if (dynamoNTS_globalSettings.logApiResponseContents) {
+        if (DynamoNTS_globalSettings.logApiEvents) {
+          if (DynamoNTS_globalSettings.logApiResponseContents) {
             Dynamo_Log.success(`${callParams.name} was successful`, res.data);
           } else {
             Dynamo_Log.success(`${callParams.name} was successful`);
@@ -294,12 +294,12 @@ export class DynamoNTS_ApiService {
   private static async get<T_Response>(
     axios: Axios.AxiosInstance,
     url: string,
-    callParams: DynamoNTS_ApiCallParams
+    callParams: DynamoNTS_ApiCall_Params
   ): Promise<T_Response> {
     return await axios.get<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (dynamoNTS_globalSettings.logApiEvents) {
-          if (dynamoNTS_globalSettings.logApiResponseContents) {
+        if (DynamoNTS_globalSettings.logApiEvents) {
+          if (DynamoNTS_globalSettings.logApiResponseContents) {
             Dynamo_Log.success(`${callParams.name} was successful`, res.data);
           } else {
             Dynamo_Log.success(`${callParams.name} was successful`);
@@ -317,17 +317,17 @@ export class DynamoNTS_ApiService {
 
   private static logEvent<T_Body>(
     url: string,
-    inputParams: DynamoNTS_ApiCallInputParams<T_Body>,
-    callParams: DynamoNTS_ApiCallParams
+    inputParams: DynamoNTS_ApiCallInput_Params<T_Body>,
+    callParams: DynamoNTS_ApiCall_Params
   ): void {
-    if (dynamoNTS_globalSettings.logApiRequestContents) {
+    if (DynamoNTS_globalSettings.logApiRequestContents) {
       Dynamo_Log.log(`<      outgoing API call: ${url} \nbody:`, inputParams?.body);
 
     } else {
       Dynamo_Log.log(`<      outgoing API call: ${url}`);
     }
 
-    if (dynamoNTS_globalSettings.logApiRequestSettings) {
+    if (DynamoNTS_globalSettings.logApiRequestSettings) {
       Dynamo_Log.log(`callParams:`, callParams);
       Dynamo_Log.log('inputParams:', {
         pathParams: inputParams.pathParams ?? {},
@@ -337,7 +337,7 @@ export class DynamoNTS_ApiService {
   }
 
   private static setupHeaders(
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     axios: Axios.AxiosInstance
   ): void {
     for (const headerKey in callParams.httpOptions.headers) {

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

@@ -7,7 +7,7 @@ import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
 
 import { Dynamo_AnyError, Dynamo_Array, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
-export interface DynamoNTS_EmailServiceSettings {
+export interface DynamoNTS_EmailService_Settings {
   host: string,
   port: number,
   email: string,
@@ -41,7 +41,7 @@ export class DynamoNTS_EmailTemplateComponent {
   }
 }
 
-export interface DynamoNTS_SendEmailSettings<T = { [propertyKey: string]: string; }> {
+export interface DynamoNTS_SendEmail_Settings<T = { [propertyKey: string]: string; }> {
   to: string;
   subject: string;
   /** direct email content, if provided, this will be used */
@@ -78,7 +78,7 @@ export class DynamoNTS_EmailService {
     `\nplease contact the responsible development team.`;
   
   constructor (
-    set: DynamoNTS_EmailServiceSettings
+    set: DynamoNTS_EmailService_Settings
   ) {
     this.serviceName = this.constructor?.name;
     this.senderName = set.senderName;
@@ -126,7 +126,7 @@ export class DynamoNTS_EmailService {
    * @param set 
    */
   public async sendEmail<T>(
-    set: DynamoNTS_SendEmailSettings<T>, 
+    set: DynamoNTS_SendEmail_Settings<T>, 
     issuer: string
   ): Promise<void> {
     try {

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

@@ -3,19 +3,19 @@
 import { Request, Response } from 'express';
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_Log, Dynamo_Error, Dynamo_Array 
+  Dynamo_Metadata, Dynamo_DataModel_Params, Dynamo_Log, Dynamo_Error, Dynamo_Array 
 } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
+import { DynamoNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
 import { 
-  DynamoNTS_GlobalServiceSettings 
+  DynamoNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
 
 import { DynamoNTS_AuthService } from './auth.service';
 /* import { DynamoNTS_DBServiceCollection } from './db-service-collection.service'; */
 import { DynamoNTS_DBService } from '../base/db.service';
 import { DynamoNTS_EmailService } from './email.service';
-import { DynamoNTS_ServiceCollection } from './service-collection.service';
+import { DynamoNTS_Service_Collection } from './service-collection.service';
 /* import { DynamoNTS_EmailServiceCollection } from './email-service-collection.service'; */
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
@@ -30,8 +30,8 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
     return DynamoNTS_GlobalService.getSingletonInstance();
   }
 
-  private static _params: DynamoNTS_AppParams;
-  static get params(): DynamoNTS_AppParams { 
+  private static _params: DynamoNTS_App_Params;
+  static get params(): DynamoNTS_App_Params { 
     return this._params; 
   }
 
@@ -44,8 +44,8 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   }
 
   authService: DynamoNTS_AuthService;
-  dbServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>>;
-  emailServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_EmailService>; 
+  dbServiceCollection: DynamoNTS_Service_Collection<DynamoNTS_DBService<any>>;
+  emailServiceCollection: DynamoNTS_Service_Collection<DynamoNTS_EmailService>; 
 
   static globalErrorHandler?: (
     err: any, 
@@ -57,21 +57,35 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   /**
    * You need to setup global Services through this function
    */
-  static async setServices(set: DynamoNTS_GlobalServiceSettings): Promise<void> {
+  static async setServices(set: DynamoNTS_GlobalService_Settings): Promise<void> {
     this.getInstance();
 
     try {
       this.instance.dbServiceCollection = {};
-      set.dbModels?.forEach((dbModel: Dynamo_DataParams): void => {
+      set.dbModels?.forEach((dbModel: Dynamo_DataModel_Params): void => {
+        if (!dbModel.constructed) {
+          throw new Dynamo_Error({
+            message: `DynamoNTS_GlobalService.setServices failed, ` +
+              `ERROR: dbModel is not constructed!`,
+            errorCode: 'NTS-GS0-SS1',
+            additionalContent: {
+              dbModel: dbModel,
+            },
+          });  
+        }
+
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
           Dynamo_Log.error(`Failed to create DynamoNTS_DBService (${dbModel.dataName}).`, error);
           
           throw new Dynamo_Error({
-            message: `Failed to create DynamoNTS_DBService (${dbModel.dataName}).\n` + dbModel, 
+            message: `Failed to create DynamoNTS_DBService (${dbModel.dataName}).`, 
             issuerService: 'DynamoNTS_GlobalService',
             error: error,
+            additionalContent: {
+              dbModel: dbModel,
+            },
           });
         }
       });
@@ -102,7 +116,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
     }
   }
 
-  static setParams(params: DynamoNTS_AppParams): void {
+  static setParams(params: DynamoNTS_App_Params): void {
     this._params = params;
   }
 
@@ -126,7 +140,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * 
    * @returns 
    */
-  static getDBServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>> {
+  static getDBServiceCollection(): DynamoNTS_Service_Collection<DynamoNTS_DBService<any>> {
     if (!this.instance?.dbServiceCollection) {
       throw new Error(
         `\n  Unique DataBase Service Collection missing!` + 
@@ -145,7 +159,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * @returns 
    */
   static getDBService<T extends Dynamo_Metadata>(
-    dataParams: Dynamo_DataParams
+    dataParams: Dynamo_DataModel_Params
   ): DynamoNTS_DBService<T> {
     return this.getDBServiceByKey<T>(dataParams.dataName);
   }
@@ -178,7 +192,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * 
    * @returns 
    */
-  static getEmailServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_EmailService> {
+  static getEmailServiceCollection(): DynamoNTS_Service_Collection<DynamoNTS_EmailService> {
     if (!this.instance?.emailServiceCollection) {
       throw new Error(
         `\n  Unique Email Service Collection missing!` + 

package/src/_services/core/service-collection.service.ts

@@ -1,5 +1,5 @@
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
-export class DynamoNTS_ServiceCollection<T> extends DynamoNTS_SingletonService {
+export class DynamoNTS_Service_Collection<T> extends DynamoNTS_SingletonService {
   [service: string]: T;
 }

package/src/_services/route/controller.service.ts

@@ -2,7 +2,7 @@
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
@@ -76,7 +76,7 @@ export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
    *   }),
    * ];
    */
-  endpoints: DynamoNTS_EndpointParams[];
+  endpoints: DynamoNTS_Endpoint_Params[];
 
   protected constructor(){
     super();