@futdevpro/nts-dynamo 1.8.5 → 1.9.1

package/src/_models/control-models/endpoint-params.control-model.ts

@@ -2,7 +2,7 @@
 
 import { Request, Response } from 'express';
 
-import { Dynamo_Array, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_Array, DynamoFM_Error, DynamoFM_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
@@ -91,7 +91,7 @@ export class DynamoNTS_Endpoint_Params {
       this.endpoint = set.endpoint;
 
       if (!this.endpoint) {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           status: 406, 
           errorCode: 'NTS-EP0-C00',
           addECToUserMsg: true,
@@ -118,7 +118,7 @@ export class DynamoNTS_Endpoint_Params {
       this.logResponseContent = 
         set.logResponseContent ?? DynamoNTS_globalSettings.logResponseContent;
     } catch (error) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `\nEndpoint params setup failed: name: '${set.name}' ` +
           `(security: ${set.security}) endpoint: ${set.endpoint}` +
         `\nERROR:` +
@@ -145,9 +145,9 @@ export class DynamoNTS_Endpoint_Params {
         }
 
         if (this.logRequestsContent && req.body && 0 < Object.keys(req.body).length) {
-          Dynamo_Log.info(msg + `\nbody:`, req.body);
+          DynamoFM_Log.info(msg + `\nbody:`, req.body);
         } else {
-          Dynamo_Log.info(msg);
+          DynamoFM_Log.info(msg);
         }
       }
 
@@ -171,13 +171,13 @@ export class DynamoNTS_Endpoint_Params {
           await this.preLog(req, res, issuer);
         }
 
-        await Dynamo_Array.asyncForEach(this.preProcessess, 
+        await DynamoFM_Array.asyncForEach(this.preProcessess, 
           async (preProcess: (req: Request, res: Response) => Promise<void>): Promise<void> => {
             await preProcess(req, res);
           }
         );
   
-        await Dynamo_Array.asyncForEach(this.tasks,
+        await DynamoFM_Array.asyncForEach(this.tasks,
           async (
             task: (req: Request, res: Response, issuer?: string) => Promise<void>
           ): Promise<void> => {
@@ -187,10 +187,10 @@ export class DynamoNTS_Endpoint_Params {
   
         if (this.logRequest) {
           if (this.logResponseContent) {
-            Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
-            Dynamo_Log.warn('sorry, the logResponseContent is not implemented yet.');
+            DynamoFM_Log.success(`  <<<=====   ${this.name} result sent.`);
+            DynamoFM_Log.warn('sorry, the logResponseContent is not implemented yet.');
           } else {
-            Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
+            DynamoFM_Log.success(`  <<<=====   ${this.name} result sent.`);
           }
         }
       } catch (error) {
@@ -207,7 +207,7 @@ export class DynamoNTS_Endpoint_Params {
   private async error(
     req: Request, 
     res: Response, 
-    error: Error | Dynamo_Error, 
+    error: Error | DynamoFM_Error, 
     issuer: string
   ): Promise<void> {
     try {
@@ -215,20 +215,20 @@ export class DynamoNTS_Endpoint_Params {
 
       msg += this.getPathParamsLogContent(req);
 
-      Dynamo_Log.error(msg);
-      Dynamo_Log.error(
+      DynamoFM_Log.error(msg);
+      DynamoFM_Log.error(
         'ERROR:',
-        (error as Dynamo_Error)?.flag?.includes('DYNAMO') ? 
-          (error as Dynamo_Error).getErrorSimplified() : 
+        (error as DynamoFM_Error)?.flag?.includes('DYNAMO') ? 
+          (error as DynamoFM_Error).getErrorSimplified() : 
           error, 
         '\n'
       );
 
-      if ((error as Dynamo_Error)?.flag?.includes('DYNAMO')) {
-        if (!(error as Dynamo_Error).additionalContent) {
-          (error as Dynamo_Error).additionalContent = {};
+      if ((error as DynamoFM_Error)?.flag?.includes('DYNAMO')) {
+        if (!(error as DynamoFM_Error).additionalContent) {
+          (error as DynamoFM_Error).additionalContent = {};
         }
-        (error as Dynamo_Error).additionalContent.endpointInfo = msg;
+        (error as DynamoFM_Error).additionalContent.endpointInfo = msg;
       }
 
       await DynamoNTS_GlobalService.globalErrorHandler?.(
@@ -237,29 +237,29 @@ export class DynamoNTS_Endpoint_Params {
         res, 
         issuer
       ).catch((err): void => {
-        Dynamo_Log.warn('DynamoNTS_GlobalService.globalErrorHandler failed to handle error: ', err);
-        Dynamo_Log.warn('It will proceed as normal.');
+        DynamoFM_Log.warn('DynamoNTS_GlobalService.globalErrorHandler failed to handle error: ', err);
+        DynamoFM_Log.warn('It will proceed as normal.');
       });
 
-      res.status((error as Dynamo_Error)?.___status ?? 501);
+      res.status((error as DynamoFM_Error)?.___status ?? 501);
       res.send(error);
 
       if (this.logRequest) {
         if (this.logResponseContent) {
-          Dynamo_Log.error(
-            `  <<<=====   ${this.name} error sent: ${(error as Dynamo_Error)?._message ?? ''}`
+          DynamoFM_Log.error(
+            `  <<<=====   ${this.name} error sent: ${(error as DynamoFM_Error)?._message ?? ''}`
           );
-          Dynamo_Log.error(
+          DynamoFM_Log.error(
             'sorry, the logResponseContent is not implemented yet.'
           );
         } else {
-          Dynamo_Log.error(
-            `  <<<=====   ${this.name} error sent: ${(error as Dynamo_Error)?._message ?? ''}`
+          DynamoFM_Log.error(
+            `  <<<=====   ${this.name} error sent: ${(error as DynamoFM_Error)?._message ?? ''}`
           );
         }
       }
     } catch (error) {
-      Dynamo_Log.H_error(
+      DynamoFM_Log.H_error(
         `\n\nDYNAMO MULTILEVEL ERROR:DynamoNTS_EndpointParams: error: ` +
           `(${this.name}, ${this.endpoint})` +
         `\n(DYNAMO MULTILEVEL ERROR means, that the ERRORHANDLING is ALSO FAILED, ` +

package/src/_models/control-models/socket-event.control-model.ts

@@ -1,5 +1,5 @@
 
-import { Dynamo_Array, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_Array, DynamoFM_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DynamoNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 
@@ -86,7 +86,7 @@ export class DynamoNTS_SocketEvent<T>{
       this.logEventContent = set.logEventContent !== undefined ? 
         set.logEventContent : DynamoNTS_globalSettings.logSocketEventContent;
     } catch (error) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `\nSocket Event params setup failed (${this.serviceName}): ${set.eventKey}`, 
         error
       );
@@ -102,15 +102,15 @@ export class DynamoNTS_SocketEvent<T>{
   private async getPreLog(content: T, issuer?: string): Promise<void> {
     try {
       if (this.logEventContent && this.eventKey !== DynamoNTS_SocketEventKey.connection) {
-        Dynamo_Log.log(
+        DynamoFM_Log.log(
           `--->   incoming socket(${this.serviceName}) event: ${this.eventKey};
           \ncontent:`, content
         );
       } else {
-        Dynamo_Log.log(`--->   incoming socket(${this.serviceName}) event: ${this.eventKey}...`);
+        DynamoFM_Log.log(`--->   incoming socket(${this.serviceName}) event: ${this.eventKey}...`);
       }
     } catch (error) {
-      Dynamo_Log.error(`PreLog failed... (socket:  ${this.serviceName})`, error);
+      DynamoFM_Log.error(`PreLog failed... (socket:  ${this.serviceName})`, error);
     }
   }
 
@@ -124,18 +124,18 @@ export class DynamoNTS_SocketEvent<T>{
         await this.getPreLog(content, issuer);
       }
 
-      await Dynamo_Array.asyncForEach(
+      await DynamoFM_Array.asyncForEach(
         this.preProcessess, 
         async (preProcess: DynamoNTS_SocketEventPreprocessTask<any, any>) => {
           content = await preProcess(content);
         }
       );
 
-      await Dynamo_Array.asyncForEach(this.tasks, async (task: DynamoNTS_SocketEventTask<T>) => {
+      await DynamoFM_Array.asyncForEach(this.tasks, async (task: DynamoNTS_SocketEventTask<T>) => {
         await task(content, issuer);
       });
     } catch (error) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `Socket Event tasks failed to execute on ${this.serviceName}.... (${this.eventKey})`, 
         error, 
         'content:', 

package/src/_models/control-models/socket-presence.control-model.ts

@@ -1,6 +1,6 @@
 
 import { 
-  Dynamo_AnyError, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log 
+  DynamoFM_AnyError, DynamoFM_Error, DynamoFM_Error_Settings, DynamoFM_Log 
 } from '@futdevpro/fsm-dynamo';
 import * as SocketIO from 'socket.io';
 
@@ -43,7 +43,7 @@ export class DynamoNTS_SocketPresence {
     }
   ) {
     if (!set?.issuerId) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'constructor',
           new Error(
@@ -72,7 +72,7 @@ export class DynamoNTS_SocketPresence {
     }
 
     if (!set?.sockets?.length) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'constructor',
           new Error(
@@ -101,13 +101,13 @@ export class DynamoNTS_SocketPresence {
 
     this.sockets.forEach((socket: SocketIO.Socket, index: number) => {
       if (!socket.connected) {
-        Dynamo_Log.warn(
+        DynamoFM_Log.warn(
           `Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!` +
           `\nERROR: socket[${socket.id}] is not connected! (it will be removed...)`
         );
 
         /* errors.push(
-          new Dynamo_Error({
+          new DynamoFM_Error({
             status: 500,
             errorCode: 'NTS-SPC-EE1',
             addECToUserMsg: true,
@@ -137,7 +137,7 @@ export class DynamoNTS_SocketPresence {
 
     this.sockets.forEach((socket: SocketIO.Socket, index: number): void => {
       const success: boolean = socket.emit(event, content, (error): void => {
-        Dynamo_Log.error(
+        DynamoFM_Log.error(
           `Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(0)` +
           `\nerror:`, error
         );
@@ -145,14 +145,14 @@ export class DynamoNTS_SocketPresence {
       });
 
       if (!success) {
-        Dynamo_Log.error(
+        DynamoFM_Log.error(
           `Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(1)`
         );
       }
     });
 
     if (0 < errors.length) {
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           'emitEvent',
           new Error(
@@ -171,7 +171,7 @@ export class DynamoNTS_SocketPresence {
       });
 
     } else if (this.sockets.length === 0) {
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           'emitEvent',
           new Error(
@@ -189,15 +189,15 @@ export class DynamoNTS_SocketPresence {
   
   private _getDefaultErrorSettings(
     fnName: string, 
-    error: Dynamo_AnyError, 
+    error: DynamoFM_AnyError, 
     issuer: string
-  ): Dynamo_Error_Settings {
+  ): DynamoFM_Error_Settings {
     return {
-      status: (error as Dynamo_Error)?.___status ?? 406,
+      status: (error as DynamoFM_Error)?.___status ?? 406,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
-      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
+      userMessage: (error as DynamoFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_SocketPresence)`,
-      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      addECToUserMsg: !(error as DynamoFM_Error)?.__userMessage,
       issuer: issuer,
       error: error,
     };

package/src/_models/interfaces/global-service-settings.interface.ts

@@ -4,7 +4,7 @@
 
 import { Request, Response } from 'express';
 
-import { Dynamo_DataModel_Params } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_DataModel_Params } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_Service_Collection } from '../../_services/core/service-collection.service';
 import { DynamoNTS_EmailService } from '../../_services/core/email.service';
@@ -23,9 +23,9 @@ export interface DynamoNTS_GlobalService_Settings {
   emailServiceCollection?: DynamoNTS_Service_Collection<DynamoNTS_EmailService>,
 
   /**
-   * you can setup data tables by passing a Dynamo_DataModel_Params list at this point 
+   * you can setup data tables by passing a DynamoFM_DataModel_Params list at this point 
    */
-  dbModels?: Dynamo_DataModel_Params[],
+  dbModels?: DynamoFM_DataModel_Params[],
 
   /**
    * you can setup other services by passing a DynamoNTS_SingletonService list at this point

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

@@ -1,11 +1,11 @@
 
 import { Request, Response } from 'express';
 
-import { Dynamo_customDataModule_settings } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_customDataModule_settings } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_Controller } from '../../_services/route/controller.service';
-import { Dynamo_CustomData_DataService } from './custom-data.data-service';
+import { DynamoFM_CustomData_DataService } from './custom-data.data-service';
 import { 
   DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
@@ -22,10 +22,10 @@ export class DynamoNTS_CustomData_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'getCustomData',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_customDataModule_settings.endPoints.getCustomData,
+        endpoint: DynamoFM_customDataModule_settings.endPoints.getCustomData,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
-            const customDataService = new Dynamo_CustomData_DataService({ 
+            const customDataService = new DynamoFM_CustomData_DataService({ 
               _id: req.params.customId,
             });
 
@@ -44,10 +44,10 @@ export class DynamoNTS_CustomData_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'modifyCustomData',
         type: DynamoNTS_HttpCallType.post,
-        endpoint: Dynamo_customDataModule_settings.endPoints.modifyCustomData,
+        endpoint: DynamoFM_customDataModule_settings.endPoints.modifyCustomData,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const customDataService = new Dynamo_CustomData_DataService(req.body, issuer);
+            const customDataService = new DynamoFM_CustomData_DataService(req.body, issuer);
 
             await customDataService.saveData();
 

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

@@ -2,19 +2,19 @@
 
 
 import { 
-  Dynamo_customDataModel_params, Dynamo_CustomData 
+  DynamoFM_customDataModel_params, DynamoFM_CustomData 
 } from '@futdevpro/fsm-dynamo/custom-data-module';
 import { DynamoNTS_DataService } from '../../_services/base/data.service';
 
-export class Dynamo_CustomData_DataService extends DynamoNTS_DataService<Dynamo_CustomData> {
+export class DynamoFM_CustomData_DataService extends DynamoNTS_DataService<DynamoFM_CustomData> {
 
   constructor(
-    customData?: Dynamo_CustomData,
+    customData?: DynamoFM_CustomData,
     issuer?: string
   ) {
     super(
-      new Dynamo_CustomData(customData),
-      Dynamo_customDataModel_params,
+      new DynamoFM_CustomData(customData),
+      DynamoFM_customDataModel_params,
       issuer
     );
   }

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_customDataModule_settings } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_customDataModule_settings } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { 
   DynamoNTS_RoutingModule_Settings 
@@ -11,7 +11,7 @@ export function DynamoNTS_getCustomDataRoutingModule(
   securityOverride?: DynamoNTS_RouteSecurity
 ): DynamoNTS_RoutingModule {
   const set: DynamoNTS_RoutingModule_Settings = {
-    route: Dynamo_customDataModule_settings.mainRoute,
+    route: DynamoFM_customDataModule_settings.mainRoute,
     controllers: [ DynamoNTS_CustomData_Controller.getInstance() ],
   };
   

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_testModule_settings } from '@futdevpro/fsm-dynamo/test-module';
+import { DynamoFM_testModule_settings } from '@futdevpro/fsm-dynamo/test-module';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { 
   DynamoNTS_RoutingModule_Settings 
@@ -11,7 +11,7 @@ export function DynamoNTS_getTestRoutingModule(
   securityOverride?: DynamoNTS_RouteSecurity
 ): DynamoNTS_RoutingModule {
   const set: DynamoNTS_RoutingModule_Settings = {
-    route: Dynamo_testModule_settings.mainRoute,
+    route: DynamoFM_testModule_settings.mainRoute,
     controllers: [ DynamoNTS_Test_Controller.getInstance() ],
   };
 

package/src/_modules/test/test.controller.ts

@@ -1,7 +1,7 @@
 
 import { Request, Response } from 'express';
 
-import { Dynamo_testModule_settings } from '@futdevpro/fsm-dynamo/test-module';
+import { DynamoFM_testModule_settings } from '@futdevpro/fsm-dynamo/test-module';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_Controller } from '../../_services/route/controller.service';
@@ -22,7 +22,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'testGet',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_testModule_settings.endPoints.testGet,
+        endpoint: DynamoFM_testModule_settings.endPoints.testGet,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -37,7 +37,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'testPost',
         type: DynamoNTS_HttpCallType.post,
-        endpoint: Dynamo_testModule_settings.endPoints.testPost,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPost,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -52,7 +52,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'testPut',
         type: DynamoNTS_HttpCallType.put,
-        endpoint: Dynamo_testModule_settings.endPoints.testPut,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPut,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -67,7 +67,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'testPatch',
         type: DynamoNTS_HttpCallType.patch,
-        endpoint: Dynamo_testModule_settings.endPoints.testPatch,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPatch,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -82,7 +82,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'testDelete',
         type: DynamoNTS_HttpCallType.delete,
-        endpoint: Dynamo_testModule_settings.endPoints.testDelete,
+        endpoint: DynamoFM_testModule_settings.endPoints.testDelete,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -97,7 +97,7 @@ export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'getServerStatus',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_testModule_settings.endPoints.getServerStatus,
+        endpoint: DynamoFM_testModule_settings.endPoints.getServerStatus,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
 

package/src/_modules/usage/get-usage-routing-module.util.ts

@@ -1,5 +1,5 @@
 
-import { Dynamo_usageModule_settings } from '@futdevpro/fsm-dynamo/usage-module';
+import { DynamoFM_usageModule_settings } from '@futdevpro/fsm-dynamo/usage-module';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { 
   DynamoNTS_RoutingModule_Settings 
@@ -11,7 +11,7 @@ export function DynamoNTS_getUsageRoutingModule(
   securityOverride?: DynamoNTS_RouteSecurity
 ): DynamoNTS_RoutingModule {
   const set: DynamoNTS_RoutingModule_Settings = {
-    route: Dynamo_usageModule_settings.mainRoute,
+    route: DynamoFM_usageModule_settings.mainRoute,
     controllers: [ DynamoNTS_Usage_Controller.getInstance() ],
   };
 

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

@@ -2,7 +2,7 @@
 import { Request, Response } from 'express';
 
 import { 
-  Dynamo_usageModule_settings, Dynamo_UsageSession, Dynamo_RelativeDate 
+  DynamoFM_usageModule_settings, DynamoFM_UsageSession, DynamoFM_RelativeDate 
 } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
@@ -30,13 +30,13 @@ export class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'newSession',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_usageModule_settings.endPoints.newSession,
+        endpoint: DynamoFM_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 DynamoNTS_Usage_DataService({
-              usageSession: new Dynamo_UsageSession({
+              usageSession: new DynamoFM_UsageSession({
                 sessionStart: new Date(),
                 issuer: username,
               }),
@@ -56,7 +56,7 @@ export class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'updateUsage',
         type: DynamoNTS_HttpCallType.post,
-        endpoint: Dynamo_usageModule_settings.endPoints.updateUsage,
+        endpoint: DynamoFM_usageModule_settings.endPoints.updateUsage,
         logRequestsContent: false,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
@@ -78,7 +78,7 @@ export class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'closeSession',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_usageModule_settings.endPoints.closeSession,
+        endpoint: DynamoFM_usageModule_settings.endPoints.closeSession,
         tasks: [
           async (req: Request, res: Response, issuer: string): Promise<void> => {
             const usageService = new DynamoNTS_Usage_DataService({
@@ -98,11 +98,11 @@ export class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
       new DynamoNTS_Endpoint_Params({
         name: 'getUsageData',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: Dynamo_usageModule_settings.endPoints.getUsageData,
+        endpoint: DynamoFM_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 range: DynamoFM_RelativeDate = req.params.range as DynamoFM_RelativeDate;
 
             const usageService = new DynamoNTS_Usage_DataService();