@futdevpro/nts-dynamo 1.5.30 → 1.5.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.05.30",
+  "version": "01.05.31",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Ltd.",
   "scripts": {
     "build": "npx tsc",
@@ -41,7 +41,6 @@
       "types": "./lib/_services/index.d.ts",
       "typings": "./lib/_services/index.d.ts"
     },
-
     "./test-module": {
       "default": "./lib/_modules/test/index.js",
       "module": "./lib/_modules/test/index.js",
@@ -54,7 +53,6 @@
       "types": "./lib/_modules/usage/index.d.ts",
       "typings": "./lib/_modules/usage/index.d.ts"
     },
-
     "./app": {
       "default": "./lib/_modules/app.index.js",
       "module": "./lib/_modules/app.index.js",
@@ -112,14 +110,12 @@
       "services": [
         "lib/_services/index.d.ts"
       ],
-
       "test-module": [
         "lib/_modules/test/index.d.ts"
       ],
       "usage-module": [
         "lib/_modules/usage/index.d.ts"
       ],
-
       "app": [
         "lib/_modules/app.index.d.ts"
       ],
@@ -163,7 +159,6 @@
   "homepage": "https:/futdevpro.hu/projects/dynamo",
   "peerDependencies": {
     "@futdevpro/fsm-dynamo": "^1.5.23",
-    
     "@types/express": "^4.17.7",
     "@types/geoip-lite": "^1.4.1",
     "@types/nodemailer": "^6.4.4",
@@ -176,6 +171,7 @@
   },
   "dependencies": {
     "@types/node": "~14.0.27",
+    "socket.io": "^4.5.2",
     "ts-node": "~8.10.2",
     "tslib": "~2.0.1",
     "typescript": "~3.9.7"

package/src/_constants/dynamo-nts-global.settings.ts

@@ -0,0 +1,12 @@
+
+import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
+import { DynamoNTS_GlobalSettings } from '../_models/dynamo-nts-global-settings';
+
+export const dynamoNTS_GlobalSettings: DynamoNTS_GlobalSettings = {
+  baseUrl: '/api',
+  defaultRouteSecurity: DynamoNTS_RouteSecurity.open,
+  logSetup: false,
+  logRequests: true,
+  logRequestsContent: true,
+  logResponseContent: false,
+};

package/src/_constants/index.ts

@@ -1,2 +1,2 @@
 
-export * from './dynamobe-global.settings';
+export * from './dynamo-nts-global.settings';

package/src/_enums/{dynamobe-data-service-function.enum.ts → dynamo-nts-data-service-function.enum.ts}

@@ -1,6 +1,6 @@
 
 /* DataServiceFunction */
-export enum DynamoBEDSF {
+export enum DynamoNTS_DSF {
   getAll = 'getAll',
   getDataById = 'getDataById',
   /* checkIfDataExists = 'checkIfDataExists',

package/src/_enums/{dynamobe-route-security.enum.ts → dynamo-nts-route-security.enum.ts}

@@ -1,5 +1,5 @@
 
-export enum DynamoBERouteSecurity {
+export enum DynamoNTS_RouteSecurity {
   open = 'open',
   secure = 'secure',
   both = 'both',

package/src/_enums/index.ts

@@ -2,8 +2,8 @@
 
 // ENUMS
 export * from './data-model-type.enum';
-export * from './dynamobe-data-service-function.enum';
-export * from './dynamobe-route-security.enum';
+export * from './dynamo-nts-data-service-function.enum';
+export * from './dynamo-nts-route-security.enum';
 export * from './predefined-data-types.enum';
   // HTTP ENUMS
 export * from './http/http-call-type.enum';

package/src/_models/dynamo-module-settings.ts

@@ -2,9 +2,9 @@
 /**
  * 
  */
-export interface DynamoModuleSettings {
+/* export interface DynamoModuleSettings {
   mainRoute: string;
   endPoints: {
     [endpointName: string]: string
   }
-}
+} */

package/src/_models/{dynamobe-api-call-params.ts → dynamo-nts-api-call-params.ts}

@@ -2,7 +2,7 @@
 import { HttpCallType } from "../_enums/http/http-call-type.enum";
 import { HttpResponseType } from "../_enums/http/http-response-type.enum";
 
-export class DynamoBEApiCallParams {
+export class DynamoNTS_ApiCallParams {
   name: string;
   type: HttpCallType;
   baseUrl: string;

package/src/_models/{dynamobe-app-params.ts → dynamo-nts-app-params.ts}

@@ -2,7 +2,7 @@
 /**
  * 
  */
-export class DynamoBEAppParams {
+export class DynamoNTS_AppParams {
   name: string;
   title: string;
   version: string;

package/src/_models/{dynamobe-endpoint-params.ts → dynamo-nts-endpoint-params.ts}

@@ -3,17 +3,17 @@
 import { NextFunction, Request, Response } from 'express';
 
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
-import { DynamoBERouteSecurity } from '../_enums/dynamobe-route-security.enum';
-import { DBE_Shared } from '../_services/dynamobe-shared.service';
-import { DBE_Global_S } from '../_services/dynamobe-global.service';
-import { dynamoBEGlobalSettings } from '../_constants';
+import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
+import { DynamoNTS_Shared } from '../_services/dynamo-nts-shared.service';
+import { DynamoNTS_GlobalService } from '../_services/dynamo-nts-global.service';
+import { dynamoNTS_GlobalSettings } from '../_constants';
 
 /**
  * 
  */
-export class DynamoBEEndpointParams{
+export class DynamoNTS_EndpointParams{
   name: string;
-  security: DynamoBERouteSecurity;
+  security: DynamoNTS_RouteSecurity;
 
   type: HttpCallType;
   endpoint: string;
@@ -30,7 +30,7 @@ export class DynamoBEEndpointParams{
   constructor(
     set: {
       name: string,
-      security?: DynamoBERouteSecurity,
+      security?: DynamoNTS_RouteSecurity,
 
       type: HttpCallType,
       endpoint: string,
@@ -45,7 +45,7 @@ export class DynamoBEEndpointParams{
   ) {
     try {
       this.name = set.name ? set.name : set.endpoint;
-      this.security = set.security ? set.security : dynamoBEGlobalSettings.defaultRouteSecurity;
+      this.security = set.security ? set.security : dynamoNTS_GlobalSettings.defaultRouteSecurity;
 
       this.type = set.type;
       this.endpoint = set.endpoint;
@@ -58,15 +58,15 @@ export class DynamoBEEndpointParams{
       this.preProcessess = set.preProcessess ? set.preProcessess : [];
       this.tasks = set.tasks;
 
-      this.logRequest = set.logRequest !== undefined ? set.logRequest : dynamoBEGlobalSettings.logRequests;
-      this.logRequestsContent = set.logRequestsContent !== undefined ? set.logRequestsContent : dynamoBEGlobalSettings.logRequestsContent;
-      this.logResponseContent = set.logResponseContent !== undefined ? set.logResponseContent : dynamoBEGlobalSettings.logResponseContent;
+      this.logRequest = set.logRequest !== undefined ? set.logRequest : dynamoNTS_GlobalSettings.logRequests;
+      this.logRequestsContent = set.logRequestsContent !== undefined ? set.logRequestsContent : dynamoNTS_GlobalSettings.logRequestsContent;
+      this.logResponseContent = set.logResponseContent !== undefined ? set.logResponseContent : dynamoNTS_GlobalSettings.logResponseContent;
 
       if (this.logRequest) {
         this.preProcessess.unshift(this.getPreLog());
       }
     } catch (error) {
-      DBE_Shared.logError(
+      DynamoNTS_Shared.logError(
         `\nEndpoint params setup failed: ${set.name} (${set.security}): ${set.endpoint}`, error);
       throw error;
     }
@@ -113,7 +113,7 @@ export class DynamoBEEndpointParams{
   getTasksExecution(): (req: Request, res: Response) => Promise<void> {
     return async (req: Request, res: Response) => {
       try {  
-        const issuer: string = DBE_Global_S.getAuthService().getAccountIdFromRequest(req);
+        const issuer: string = DynamoNTS_GlobalService.getAuthService().getAccountIdFromRequest(req);
   
         for (let i = 0; i < this.tasks.length; i++) {
           await this.tasks[i](req, res, issuer);
@@ -121,10 +121,10 @@ export class DynamoBEEndpointParams{
   
         if (this.logRequest) {
           if (this.logResponseContent) {
-            DBE_Shared.logSuccess(`  <<<=====   ${this.name} result sent.`);
-            DBE_Shared.logSuccess('sorry, the logResponseContent is not implemented yet.');
+            DynamoNTS_Shared.logSuccess(`  <<<=====   ${this.name} result sent.`);
+            DynamoNTS_Shared.logSuccess('sorry, the logResponseContent is not implemented yet.');
           } else {
-            DBE_Shared.logSuccess(`  <<<=====   ${this.name} result sent.`);
+            DynamoNTS_Shared.logSuccess(`  <<<=====   ${this.name} result sent.`);
           }
         }
       } catch (error) {
@@ -139,16 +139,16 @@ export class DynamoBEEndpointParams{
    * @param error 
    */
   error(res: Response, error): void {
-    DBE_Shared.logError(`${this.name} ERROR`, error, '\n');
+    DynamoNTS_Shared.logError(`${this.name} ERROR`, error, '\n');
     res.status(error.status ? error.status : 501);
     res.send(error);
 
     if (this.logRequest) {
       if (this.logResponseContent) {
-        DBE_Shared.logError(`  <<<=====   ${this.name} error sent.`);
-        DBE_Shared.logError('sorry, the logResponseContent is not implemented yet.');
+        DynamoNTS_Shared.logError(`  <<<=====   ${this.name} error sent.`);
+        DynamoNTS_Shared.logError('sorry, the logResponseContent is not implemented yet.');
       } else {
-        DBE_Shared.logError(`  <<<=====   ${this.name} error sent.`);
+        DynamoNTS_Shared.logError(`  <<<=====   ${this.name} error sent.`);
       }
     }
   }

package/src/_models/dynamo-nts-global-settings.ts

@@ -0,0 +1,13 @@
+import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
+
+/**
+ * 
+ */
+export interface DynamoNTS_GlobalSettings {
+  baseUrl: string;
+  defaultRouteSecurity: DynamoNTS_RouteSecurity;
+  logSetup?: boolean;
+  logRequests?: boolean;
+  logRequestsContent?: boolean;
+  logResponseContent?: boolean;
+}

package/src/_models/index.ts

@@ -1,9 +1,8 @@
 
 
 // MODELS
-export * from './dynamobe-api-call-params';
-export * from './dynamobe-app-params';
-/* export * from './dynamobe-data-model-params'; */
-export * from './dynamobe-endpoint-params';
-export * from './dynamobe-global-settings';
+export * from './dynamo-nts-api-call-params';
+export * from './dynamo-nts-app-params';
+export * from './dynamo-nts-endpoint-params';
+export * from './dynamo-nts-global-settings';
 

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

@@ -1,10 +1,10 @@
 
 // SERVICES
-export * from '../_services/dynamobe-api.service';
-export * from '../_services/dynamobe-singleton.service';
+export * from '../_services/dynamo-nts-api.service';
+export * from '../_services/dynamo-nts-singleton.service';
 
 // MODELS
-export * from '../_models/dynamobe-api-call-params';
+export * from '../_models/dynamo-nts-api-call-params';
 export * from '@futdevpro/fsm-dynamo/error-module';
 
 // ENUMS

package/src/_modules/app.index.ts

@@ -1,18 +1,18 @@
 
 // SERVICES
-export * from '../_services/dynamobe-app';
-export * from '../_services/dynamobe-global.service';
-export * from '../_services/dynamobe-routing-module.service';
-export * from '../_services/dynamobe-shared.service';
+export * from '../_services/dynamo-nts-app';
+export * from '../_services/dynamo-nts-global.service';
+export * from '../_services/dynamo-nts-routing-module.service';
+export * from '../_services/dynamo-nts-shared.service';
 
 // MODELS
-export * from '../_models/dynamobe-app-params';
-export * from '../_models/dynamobe-endpoint-params';
-export * from '../_models/dynamobe-global-settings';
+export * from '../_models/dynamo-nts-app-params';
+export * from '../_models/dynamo-nts-endpoint-params';
+export * from '../_models/dynamo-nts-global-settings';
 
 // ENUMS
-export * from '../_enums/dynamobe-route-security.enum';
+export * from '../_enums/dynamo-nts-route-security.enum';
 
 // CONSTANTS
-export * from '../_constants/dynamobe-global.settings';
+export * from '../_constants/dynamo-nts-global.settings';
 

package/src/_modules/auth.index.ts

@@ -1,7 +1,7 @@
 
 // SERVICES
-export * from '../_services/dynamobe-auth.service';
-export * from '../_services/dynamobe-shared.service';
+export * from '../_services/dynamo-nts-auth.service';
+export * from '../_services/dynamo-nts-shared.service';
 
 // MODELS
 export * from '@futdevpro/fsm-dynamo/error-module';

package/src/_modules/controller.index.ts

@@ -1,10 +1,10 @@
 
 // SERVICES
-export * from '../_services/dynamobe-controller.service';
+export * from '../_services/dynamo-nts-controller.service';
 
 // MODELS
-export * from '../_models/dynamobe-endpoint-params';
+export * from '../_models/dynamo-nts-endpoint-params';
 
 // ENUMS
-export * from '../_enums/dynamobe-route-security.enum';
+export * from '../_enums/dynamo-nts-route-security.enum';
 export * from '../_enums/http/http-call-type.enum';

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

@@ -1,9 +1,9 @@
 
 // SERVICES
-export * from '../_services/dynamobe-data.service';
-export * from '../_services/dynamobe-db.service';
-export * from '../_services/dynamobe-global.service';
-export * from '../_services/dynamobe-shared.service';
+export * from '../_services/dynamo-nts-data.service';
+export * from '../_services/dynamo-nts-db.service';
+export * from '../_services/dynamo-nts-global.service';
+export * from '../_services/dynamo-nts-shared.service';
 
 // MODELS
 export * from '@futdevpro/fsm-dynamo/error-module';

package/src/_modules/email.index.ts

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

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

@@ -2,9 +2,9 @@
 
 
 import { CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo/test-module';
-import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
+import { DynamoNTS_DataService } from '../../_services/dynamo-nts-data.service';
 
-export class CustomDataService extends DynamoBEDataService<CustomData> {
+export class CustomDataService extends DynamoNTS_DataService<CustomData> {
 
   constructor(
     customData?: CustomData,

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

@@ -1,16 +1,16 @@
 
 import { testModuleSettings } from '@futdevpro/fsm-dynamo/test-module';
-import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
-import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
+import { DynamoNTS_RouteSecurity } from '../../_enums/dynamo-nts-route-security.enum';
+import { DynamoNTS_RoutingModule, DynamoNTS_RoutingModuleSettings } from '../../_services/dynamo-nts-routing-module.service';
 import { TestController } from './test-controller';
 
-export function getTestRoutingModule(securityOverride?: DynamoBERouteSecurity): DynamoBERoutingModule {
-  const set: DynamoBERoutingModuleSettings = {
+export function getTestRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {
+  const set: DynamoNTS_RoutingModuleSettings = {
     route: testModuleSettings.mainRoute,
     controllers: [ TestController.getInstance() ]
   }
   if (securityOverride) {
     set.securityOverride = securityOverride;
   }
-  return new DynamoBERoutingModule(set);
+  return new DynamoNTS_RoutingModule(set);
 }

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

@@ -2,11 +2,11 @@
 import { Request, Response } from 'express';
 import { testModuleSettings } from '@futdevpro/fsm-dynamo/test-module';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
-import { DynamoBEController } from '../../_services/dynamobe-controller.service';
+import { DynamoNTS_EndpointParams } from '../../_models/dynamo-nts-endpoint-params';
+import { DynamoNTS_Controller } from '../../_services/dynamo-nts-controller.service';
 import { CustomDataService } from './custom-data.service';
 
-export class TestController extends DynamoBEController {
+export class TestController extends DynamoNTS_Controller {
 
     static getInstance(): TestController {
       return TestController.getSingletonInstance();
@@ -15,7 +15,7 @@ export class TestController extends DynamoBEController {
     setupEndpoints(): void {
         this.endpoints = [
             // TESTS
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'testGet',
                 type: HttpCallType.get,
                 endpoint: testModuleSettings.endPoints.testGet,
@@ -30,7 +30,7 @@ export class TestController extends DynamoBEController {
                 ]
             }),
             
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'testPost',
                 type: HttpCallType.post,
                 endpoint: testModuleSettings.endPoints.testPost,
@@ -45,7 +45,7 @@ export class TestController extends DynamoBEController {
                 ]
             }),
 
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'testPut',
                 type: HttpCallType.put,
                 endpoint: testModuleSettings.endPoints.testPut,
@@ -60,7 +60,7 @@ export class TestController extends DynamoBEController {
                 ]
             }),
 
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'testPatch',
                 type: HttpCallType.patch,
                 endpoint: testModuleSettings.endPoints.testPatch,
@@ -75,7 +75,7 @@ export class TestController extends DynamoBEController {
                 ]
             }),
 
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'testDelete',
                 type: HttpCallType.delete,
                 endpoint: testModuleSettings.endPoints.testDelete,
@@ -91,7 +91,7 @@ export class TestController extends DynamoBEController {
             }),
             
             // CUSTOM DATA
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'getCustomData',
                 type: HttpCallType.get,
                 endpoint: testModuleSettings.endPoints.getCustomData,
@@ -111,7 +111,7 @@ export class TestController extends DynamoBEController {
                 ]
             }),
             
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'modifyCustomData',
                 type: HttpCallType.post,
                 endpoint: testModuleSettings.endPoints.modifyCustomData,

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

@@ -1,16 +1,16 @@
 
 import { usageModuleSettings } from '@futdevpro/fsm-dynamo/usage-module';
-import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
-import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
+import { DynamoNTS_RouteSecurity } from '../../_enums/dynamo-nts-route-security.enum';
+import { DynamoNTS_RoutingModule, DynamoNTS_RoutingModuleSettings } from '../../_services/dynamo-nts-routing-module.service';
 import { UsageController } from './usage-controller';
 
-export function getUsageRoutingModule(securityOverride?: DynamoBERouteSecurity): DynamoBERoutingModule {
-  const set: DynamoBERoutingModuleSettings = {
+export function getUsageRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule {
+  const set: DynamoNTS_RoutingModuleSettings = {
     route: usageModuleSettings.mainRoute,
     controllers: [ UsageController.getInstance() ]
   }
   if (securityOverride) {
     set.securityOverride = securityOverride;
   }
-  return new DynamoBERoutingModule(set);
+  return new DynamoNTS_RoutingModule(set);
 }

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

@@ -2,32 +2,32 @@
 import { Request, Response } from 'express';
 import { usageModuleSettings, DynamoUsageSession } from '@futdevpro/fsm-dynamo/usage-module';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
-import { DynamoBEAuthService } from '../../_services/dynamobe-auth.service';
-import { DynamoBEController } from '../../_services/dynamobe-controller.service';
-import { DBE_Global_S } from '../../_services/dynamobe-global.service';
+import { DynamoNTS_EndpointParams } from '../../_models/dynamo-nts-endpoint-params';
+import { DynamoNTS_AuthService } from '../../_services/dynamo-nts-auth.service';
+import { DynamoNTS_Controller } from '../../_services/dynamo-nts-controller.service';
+import { DynamoNTS_GlobalService } from '../../_services/dynamo-nts-global.service';
 import { UsageService } from './usage.service';
 
-export class UsageController extends DynamoBEController {
+export class UsageController extends DynamoNTS_Controller {
     
     static getInstance(): UsageController {
       return UsageController.getSingletonInstance();
     }
   
     // SERVICES
-    private authService: DynamoBEAuthService;
+    private authService: DynamoNTS_AuthService;
 
     setupEndpoints(): void {
-        this.authService = DBE_Global_S.getAuthService();
+        this.authService = DynamoNTS_GlobalService.getAuthService();
 
         this.endpoints = [
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'newSession',
                 type: HttpCallType.get,
                 endpoint: usageModuleSettings.endPoints.newSession,
                 tasks: [ 
                     async (req: Request, res: Response, issuer: string) => {
-                        const authService = DBE_Global_S.getAuthService();
+                        const authService = DynamoNTS_GlobalService.getAuthService();
                         const username = authService.getUsernameFromRequest(req);
                         const usageService = new UsageService({
                             usageSession: new DynamoUsageSession({ 
@@ -47,7 +47,7 @@ export class UsageController extends DynamoBEController {
                 ]
             }),
             
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'updateUsage',
                 type: HttpCallType.post,
                 endpoint: usageModuleSettings.endPoints.updateUsage,
@@ -69,7 +69,7 @@ export class UsageController extends DynamoBEController {
                 ]
             }),
             
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'closeSession',
                 type: HttpCallType.get,
                 endpoint: usageModuleSettings.endPoints.closeSession,
@@ -90,7 +90,7 @@ export class UsageController extends DynamoBEController {
                 ]
             }),
             
-            new DynamoBEEndpointParams({
+            new DynamoNTS_EndpointParams({
                 name: 'getAllUsageData',
                 type: HttpCallType.get,
                 endpoint: usageModuleSettings.endPoints.getAllUsageData,

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

@@ -4,10 +4,10 @@ import { DynamoBEError } from '@futdevpro/fsm-dynamo';
 import { DynamoUsageSession, usageSessionModelParams, DynamoUsageData, 
   DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
 
-import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
-import { DBE_Shared } from '../../_services/dynamobe-shared.service';
+import { DynamoNTS_DataService } from '../../_services/dynamo-nts-data.service';
+import { DynamoNTS_Shared } from '../../_services/dynamo-nts-shared.service';
 
-export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
+export class UsageService extends DynamoNTS_DataService<DynamoUsageSession> {
   usageData: DynamoUsageData[] = [];
   simplifiedDailyUsage: DailyUsageData[] = [];
 
@@ -28,8 +28,8 @@ export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
 
   getLocationDataFromRequest(req: Request): void {
     try {
-      this.data.address = DBE_Shared.getIpFromRequest(req);
-      this.data.locationData = DBE_Shared.getLocationDataByRequest(req);
+      this.data.address = DynamoNTS_Shared.getIpFromRequest(req);
+      this.data.locationData = DynamoNTS_Shared.getLocationDataByRequest(req);
 
       /* console.log(`...getLocationDataFromRequest... ip: ${this.data.address}`, this.data.locationData); */
     } catch (error) {
@@ -44,7 +44,7 @@ export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
   async getLastWeekUsage(): Promise<void> {
     try {
       await this.dataDBService.find({
-        sessionStart: { $gte: DBE_Shared.oneWeekAgo() }
+        sessionStart: { $gte: DynamoNTS_Shared.oneWeekAgo() }
       }).then((res: DynamoUsageSession[]) => {
         this.dataList = res;
       });