@futdevpro/nts-dynamo 1.6.17 → 1.6.18

package/src/_constants/mocks/app-server.mock.ts

@@ -0,0 +1,102 @@
+
+
+import { usageSessionModelParams } from '@futdevpro/fsm-dynamo/usage-module';
+import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module';
+
+import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
+import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
+import { DynamoNTS_PortSettings } from '../../_models/interfaces/port-settings.interface';
+import { getTestRoutingModule } from '../../_modules/test';
+import { getUsageRoutingModule } from '../../_modules/usage';
+import { DynamoNTS_SingletonService } from '../../_services';
+import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
+import { DynamoNTS_App } from '../../_services/server/app.server';
+import { DynamoNTS_Controller_Mock } from './controller.mock';
+import { AuthService_Mock } from './auth-service.mock';
+
+/**
+ * 
+ */
+export class DynamoNTS_AppBase_Mock extends DynamoNTS_App {
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-base',
+      version: '1.0.1',
+      dbName: 'test-base',
+    });
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {};
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [];
+  }
+}  
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+/**
+ * 
+ */
+export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-full',
+      version: 'x.0.101',
+      dbName: 'test-full',
+    });
+  }
+  
+  
+  overrideDynamoNTSGlobalSettings(): void {
+    /* dynamoNTS_globalSettings.defaultRouteSecurity = DynamoNTS_RouteSecurity.open;  */
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+      /* emailServiceCollection: EmailServiceCollectionService.getInstance(), */
+      dbModels: [
+
+        usageSessionModelParams,
+        customDataModelParams,
+      ],      
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {
+      httpPort: 39393
+    };
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [
+      new DynamoNTS_RoutingModule({
+        route: '/test-0',
+        controllers: [
+          DynamoNTS_Controller_Mock.getInstance(),
+        ],
+      }),
+
+      getTestRoutingModule(),
+      getUsageRoutingModule()
+    ];
+  }
+
+  getRootServices(): DynamoNTS_SingletonService[] {
+    return [
+      
+    ];
+  }
+}

package/src/_constants/mocks/auth-service.mock.ts

@@ -0,0 +1,34 @@
+
+
+import { NextFunction, Request, Response } from 'express';
+import { DynamoNTS_AuthService } from '../../_services';
+
+
+export class AuthService_Mock extends DynamoNTS_AuthService {
+
+  static getInstance(): AuthService_Mock {
+    return AuthService_Mock.getSingletonInstance();
+  }
+
+  async authenticateToken(req: Request, res: Response, next: NextFunction): Promise<void> {
+    next();
+  }
+
+  async authenticateTokenSelf(req: Request, res: Response, next: NextFunction): Promise<void> {
+    next();
+  }
+
+  getAccountIdFromRequest(req: Request): string {
+    return 'accountId_mock';
+  }
+
+  getUsernameFromRequest(req: Request): string {
+    return 'username_mock';
+  }
+  
+  async authTokenPermAccUsageData(req: Request, res: Response, next: NextFunction): Promise<void> {
+    next();
+  }
+
+}
+

package/src/_constants/mocks/controller.mock.ts

@@ -0,0 +1,16 @@
+import { DynamoNTS_Controller } from '../../_services/route/controller.service';
+import { DynamoNTS_endpoints_mock } from './endpoint.mock';
+
+
+export class DynamoNTS_Controller_Mock extends DynamoNTS_Controller {
+  
+  static getInstance(): DynamoNTS_Controller_Mock {
+    return DynamoNTS_Controller_Mock.getSingletonInstance();
+  }
+
+  setupEndpoints(): void {
+    this.endpoints = DynamoNTS_endpoints_mock;
+  }
+
+}
+

package/src/_constants/mocks/endpoint.mock.ts

@@ -0,0 +1,85 @@
+import { DynamoNTS_HttpCallType } from '../../_enums';
+import { DynamoNTS_EndpointParams } from '../../_models';
+
+
+
+export const DynamoNTS_endpointBase_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testBase',
+  type: DynamoNTS_HttpCallType.get,
+  endpoint: '/test-base',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      res.send('test-base');
+    }
+  ]
+});
+
+export const DynamoNTS_endpointSimple_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testSimple',
+  type: DynamoNTS_HttpCallType.get,
+  endpoint: '/test-simple',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      res.send('test-simple');
+    }
+  ]
+});
+
+export const DynamoNTS_endpointPost_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testPost',
+  type: DynamoNTS_HttpCallType.post,
+  endpoint: '/test-post',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      res.send('test-post');
+    }
+  ]
+});
+
+export const DynamoNTS_endpointPut_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testPut',
+  type: DynamoNTS_HttpCallType.put,
+  endpoint: '/test-put',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      res.send('test-put');
+    }
+  ]
+});
+
+export const DynamoNTS_endpointDelete_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testDelete',
+  type: DynamoNTS_HttpCallType.delete,
+  endpoint: '/test-delete',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      res.send('test-delete');
+    }
+  ]
+});
+
+export const DynamoNTS_endpointThrow_mock: DynamoNTS_EndpointParams = new DynamoNTS_EndpointParams({
+  name: 'testThrow',
+  type: DynamoNTS_HttpCallType.get,
+  endpoint: '/test-throw',
+  preProcessess: [],
+  tasks: [
+    async (req, res) => {
+      throw new Error('test-throw');
+    }
+  ]
+});
+  
+export const DynamoNTS_endpoints_mock: DynamoNTS_EndpointParams[] = [
+  DynamoNTS_endpointBase_mock,
+  DynamoNTS_endpointSimple_mock,
+  DynamoNTS_endpointPost_mock,
+  DynamoNTS_endpointPut_mock,
+  DynamoNTS_endpointDelete_mock,
+  DynamoNTS_endpointThrow_mock,
+];

package/src/_constants/mocks/socket-server.mock.ts

@@ -0,0 +1,27 @@
+import { Socket } from 'socket.io';
+import { DynamoNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
+import { DynamoNTS_SocketPresence } from '../../_models/control-models/socket-presence.control-model';
+import { DynamoNTS_SocketServerServiceParams } from '../../_models/control-models/socket-server-service-params.control-model';
+import { DynamoNTS_SocketServerService } from '../../_services/socket/socket-server.service';
+
+
+
+export class DynamoNTS_SocketServer_Mock extends DynamoNTS_SocketServerService<DynamoNTS_SocketPresence> {
+  
+  getServiceParams(): DynamoNTS_SocketServerServiceParams<any> {
+    return new DynamoNTS_SocketServerServiceParams({
+      name: 'test',
+      port: 3000,
+    });
+  }
+
+  getIncomingEvents(): DynamoNTS_SocketEvent<any>[] {
+    return [];
+  }
+
+  protected async getPresenceFromSubscrioptionEventContent(socketSubscription: any, socket: Socket): Promise<DynamoNTS_SocketPresence> {
+    return new DynamoNTS_SocketPresence({ issuerId: socketSubscription.issuerId, sockets: [ socket ] });
+  }
+}
+
+

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

@@ -5,8 +5,8 @@ import { NextFunction, Request, Response } from 'express';
 import { Dynamo_Error, Dynamo_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';
-import { DynamoNTS_GlobalService } from '../../_services/global.service';
+import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DynamoNTS_GlobalService } from '../../_services/core/global.service';
 
 /**
  * High level endpoint for API
@@ -80,7 +80,7 @@ export class DynamoNTS_EndpointParams{
   ) {
     try {
       this.name = set.name ?? set.endpoint;
-      this.security = set.security ?? dynamoNTS_GlobalSettings.defaultRouteSecurity;
+      this.security = set.security ?? dynamoNTS_globalSettings.defaultRouteSecurity;
 
       this.type = set.type;
       this.endpoint = set.endpoint;
@@ -103,9 +103,9 @@ export class DynamoNTS_EndpointParams{
       this.preProcessess = set.preProcessess ?? [];
       this.tasks = set.tasks;
 
-      this.logRequest = set.logRequest ?? dynamoNTS_GlobalSettings.logRequest;
-      this.logRequestsContent = set.logRequestsContent ?? dynamoNTS_GlobalSettings.logRequestsContent;
-      this.logResponseContent = set.logResponseContent ?? dynamoNTS_GlobalSettings.logResponseContent;
+      this.logRequest = set.logRequest ?? dynamoNTS_globalSettings.logRequest;
+      this.logRequestsContent = set.logRequestsContent ?? dynamoNTS_globalSettings.logRequestsContent;
+      this.logResponseContent = set.logResponseContent ?? dynamoNTS_globalSettings.logResponseContent;
 
       if (this.logRequest) {
         this.preProcessess.unshift(this.getPreLog());
@@ -150,6 +150,29 @@ export class DynamoNTS_EndpointParams{
       }
     };
   }
+  
+  getPreProcessExecution(): ((req: Request, res: Response, next: NextFunction) => Promise<void>)[] {
+    return this.preProcessess.map(
+      (
+        preProcess: (req: Request, res: Response, next: NextFunction) => Promise<void>
+      ) => async (req: Request, res: Response, next: NextFunction) => {
+        try {  
+          await preProcess(req, res, next)
+    
+          if (this.logRequest) {
+            if (this.logResponseContent) {
+              Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
+              Dynamo_Log.warn('sorry, the logResponseContent is not implemented yet.');
+            } else {
+              Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
+            }
+          }
+        } catch (error) {
+          this.error(res, error);
+        }
+      }
+    );
+  }
 
   /**
    * 
@@ -167,7 +190,7 @@ export class DynamoNTS_EndpointParams{
         if (this.logRequest) {
           if (this.logResponseContent) {
             Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
-            Dynamo_Log.success('sorry, the logResponseContent is not implemented yet.');
+            Dynamo_Log.warn('sorry, the logResponseContent is not implemented yet.');
           } else {
             Dynamo_Log.success(`  <<<=====   ${this.name} result sent.`);
           }
@@ -183,20 +206,26 @@ export class DynamoNTS_EndpointParams{
    * @param res 
    * @param error 
    */
-  error(res: Response, error): void {
+  error(res: Response, error: Error | Dynamo_Error): void {
     try {
+
       Dynamo_Log.error(
         `Endpoint catched an error. ${this.name} (${this.endpoint})` +
-        `\nERROR:`, error?.flag.includes('DYNAMO') ? (error as Dynamo_Error).getErrorSimplified() : error, '\n'
+        `\nERROR:`, (error as Dynamo_Error)?.flag.includes('DYNAMO') ? (error as Dynamo_Error).getErrorSimplified() : error, '\n'
       );
-      res.status(error?.status ?? 501);
+
+      /* error = new Dynamo_Error({
+        message: `Endpoint catched an error. ${this.name} (${this.endpoint})`
+      }); */
+
+      res.status((error as Dynamo_Error)?.___status ?? 501);
       res.send(error);
 
       if (this.logRequest) {
         if (this.logResponseContent) {
           Dynamo_Log.error(
             `  <<<=====   ${this.name} error sent.` + 
-            error?.userMessage ? ` (${error.userMessage})` : ''
+            (error as Dynamo_Error)?.__userMessage ? ` (${(error as Dynamo_Error).__userMessage})` : ''
           );
           Dynamo_Log.error(
             'sorry, the logResponseContent is not implemented yet.'
@@ -204,7 +233,7 @@ export class DynamoNTS_EndpointParams{
         } else {
           Dynamo_Log.error(
             `  <<<=====   ${this.name} error sent.` + 
-            error?.userMessage ? ` (${error.userMessage})` : ''
+            (error as Dynamo_Error)?.__userMessage ? ` (${(error as Dynamo_Error).__userMessage})` : ''
           );
         }
       }

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

@@ -1,6 +1,6 @@
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { dynamoNTS_GlobalSettings } from '../../_constants/global-settings.const';
+import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DynamoNTS_SocketEventType } from '../../_enums/http/socket-event-type.enum';
 
 
@@ -33,11 +33,11 @@ export class DynamoNTS_SocketEvent<T>{
       if (set.logEvent !== undefined) {
         this.logEvent = set.logEvent;
       } else if (([ DynamoNTS_SocketEventType.connection, DynamoNTS_SocketEventType.connect, DynamoNTS_SocketEventType.disconnect ] as string[]).includes(this.eventType)) {
-        this.logEvent = dynamoNTS_GlobalSettings.logMainSocketEvent;
+        this.logEvent = dynamoNTS_globalSettings.logMainSocketEvent;
       } else {
-        this.logEvent = dynamoNTS_GlobalSettings.logAllSocketEvent;
+        this.logEvent = dynamoNTS_globalSettings.logAllSocketEvent;
       }
-      this.logEventContent = set.logEventContent !== undefined ? set.logEventContent : dynamoNTS_GlobalSettings.logEventContent;
+      this.logEventContent = set.logEventContent !== undefined ? set.logEventContent : dynamoNTS_globalSettings.logEventContent;
 
       if (this.logEvent) {
         this.preProcessess.unshift(this.getPreLog());

package/src/_models/control-models/socket-server-service-params.control-model.ts

@@ -1,5 +1,5 @@
 
-import { dynamoNTS_GlobalSettings } from '../../_constants/global-settings.const';
+import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 
 /**
@@ -15,6 +15,6 @@ export class DynamoNTS_SocketServerServiceParams<T = any> {
   ) {
     this.name = set.name;
     this.port = set.port;
-    this.security = set.security ? set.security : dynamoNTS_GlobalSettings.defaultSocketSecurity;
+    this.security = set.security ? set.security : dynamoNTS_globalSettings.defaultSocketSecurity;
   }
 }

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

@@ -1,15 +1,15 @@
 
 import { Dynamo_DataParams } from '@futdevpro/fsm-dynamo';
 
-import { DynamoNTS_ServiceCollection } from '../../_services/service-collection.service';
-import { DynamoNTS_EmailService } from '../../_services/email.service';
-import { DynamoNTS_AuthService } from '../../_services/auth.service';
+import { DynamoNTS_ServiceCollection } from '../../_services/core/service-collection.service';
+import { DynamoNTS_EmailService } from '../../_services/core/email.service';
+import { DynamoNTS_AuthService } from '../../_services/core/auth.service';
 
 export interface DynamoNTS_GlobalServiceSettings {
   /**
    * You need to setup your Own Auth Service extending the DynamoNTS_AuthService class
    */
-  authService?: DynamoNTS_AuthService,
+  authService: DynamoNTS_AuthService,
 
   /**
    * You can setup your Own Email Service extending the DynamoNTS_EmailServiceCollection class

package/src/_modules/api-service.index.ts

@@ -1,7 +1,7 @@
 
 // SERVICES
-export * from '../_services/api.service';
-export * from '../_services/singleton.service';
+export * from '../_services/core/api.service';
+export * from '../_services/base/singleton.service';
 
 // MODELS
 export * from '../_models/control-models/api-call-params.control-model';

package/src/_modules/app-extended.index.ts

@@ -1,11 +1,11 @@
 
 // SERVICES
-export * from '../_services/app-extended.server';
-export * from '../_services/global.service';
-export * from '../_services/routing-module.service';
+export * from '../_services/server/app-extended.server';
+export * from '../_services/core/global.service';
+export * from '../_services/route/routing-module.service';
 export * from '../_services/shared.static-service';
-export * from '../_services/socket-client.service';
-export * from '../_services/socket-server.service';
+export * from '../_services/socket/socket-client.service';
+export * from '../_services/socket/socket-server.service';
 
 // INTERFACES
 export * from '../_models/interfaces/global-service-settings.interface';

package/src/_modules/app.index.ts

@@ -1,8 +1,8 @@
 
 // SERVICES
-export * from '../_services/app.server';
-export * from '../_services/global.service';
-export * from '../_services/routing-module.service';
+export * from '../_services/server/app.server';
+export * from '../_services/core/global.service';
+export * from '../_services/route/routing-module.service';
 export * from '../_services/shared.static-service';
 
 // INTERFACES

package/src/_modules/auth.index.ts

@@ -1,6 +1,6 @@
 
 // SERVICES
-export * from '../_services/auth.service';
+export * from '../_services/core/auth.service';
 export * from '../_services/shared.static-service';
 
 // MODELS

package/src/_modules/controller.index.ts

@@ -1,6 +1,6 @@
 
 // SERVICES
-export * from '../_services/controller.service';
+export * from '../_services/route/controller.service';
 
 // CONTROL MODELS
 export * from '../_models/control-models/endpoint-params.control-model';

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

@@ -4,7 +4,7 @@ import { Request, Response } from 'express';
 import { customDataModuleSettings } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DynamoNTS_Controller } from '../../_services/controller.service';
+import { DynamoNTS_Controller } from '../../_services/route/controller.service';
 import { Dynamo_CustomDataService } from './custom-data.data-service';
 import { DynamoNTS_EndpointParams } from '../../_models/control-models/endpoint-params.control-model';
 

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

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

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

@@ -2,7 +2,7 @@
 import { customDataModuleSettings } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DynamoNTS_RoutingModuleSettings } from '../../_models/interfaces/routing-module-settings.interface';
-import { DynamoNTS_RoutingModule } from '../../_services/routing-module.service';
+import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
 import { CustomDataController } from './custom-data.controller';
 
 export function getCustomDataRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {

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

@@ -1,8 +1,8 @@
 
 // SERVICES
-export * from '../_services/data.service';
-export * from '../_services/db.service';
-export * from '../_services/global.service';
+export * from '../_services/base/data.service';
+export * from '../_services/base/db.service';
+export * from '../_services/core/global.service';
 export * from '../_services/shared.static-service';
 
 // MODELS

package/src/_modules/email.index.ts

@@ -1,8 +1,8 @@
 
 // SERVICES
-export * from '../_services/email.service';
+export * from '../_services/core/email.service';
 /* export * from '../_services/email-service-collection.service'; */
-export * from '../_services/service-collection.service';
+export * from '../_services/core/service-collection.service';
 
 // MODELS
 export * from '@futdevpro/fsm-dynamo/error-module';

package/src/_modules/extended.index.ts

@@ -1,7 +1,7 @@
 
 // SERVICES
-export * from '../_services/socket-client.service';
-export * from '../_services/socket-server.service';
+export * from '../_services/socket/socket-client.service';
+export * from '../_services/socket/socket-server.service';
 
 // CONTROL MODELS
 export * from '../_models/control-models/socket-client-service-params.control-model';

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

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

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

@@ -4,9 +4,9 @@ import { Request, Response } from 'express';
 import { testModuleSettings } from '@futdevpro/fsm-dynamo/test-module';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DynamoNTS_Controller } from '../../_services/controller.service';
+import { DynamoNTS_Controller } from '../../_services/route/controller.service';
 import { DynamoNTS_EndpointParams } from '../../_models/control-models/endpoint-params.control-model';
-import { DynamoNTS_GlobalService } from '../../_services/global.service';
+import { DynamoNTS_GlobalService } from '../../_services/core/global.service';
 
 export class TestController extends DynamoNTS_Controller {
 

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

@@ -2,7 +2,7 @@
 import { usageModuleSettings } from '@futdevpro/fsm-dynamo/usage-module';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DynamoNTS_RoutingModuleSettings } from '../../_models/interfaces/routing-module-settings.interface';
-import { DynamoNTS_RoutingModule } from '../../_services/routing-module.service';
+import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
 import { UsageController } from './usage.controller';
 
 export function getUsageRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {

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

@@ -4,9 +4,9 @@ import { Request, Response } from 'express';
 import { usageModuleSettings, Dynamo_UsageSession } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DynamoNTS_AuthService } from '../../_services/auth.service';
-import { DynamoNTS_Controller } from '../../_services/controller.service';
-import { DynamoNTS_GlobalService } from '../../_services/global.service';
+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 } from '../../_models/control-models/endpoint-params.control-model';
 import { UsageService } from './usage.data-service';
 

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

@@ -4,7 +4,7 @@ import { Dynamo_Error, Dynamo_Time } from '@futdevpro/fsm-dynamo';
 import { Dynamo_UsageSession, usageSessionModelParams, Dynamo_UsageData, 
   Dynamo_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
 
-import { DynamoNTS_DataService } from '../../_services/data.service';
+import { DynamoNTS_DataService } from '../../_services/base/data.service';
 import { DynamoNTS_Shared } from '../../_services/shared.static-service';
 
 export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {