@futdevpro/nts-dynamo 1.7.28 → 1.9.1

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

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

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

@@ -1,18 +1,18 @@
 
-import { testModuleSettings } 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_RoutingModuleSettings 
+  DynamoNTS_RoutingModule_Settings 
 } from '../../_models/interfaces/routing-module-settings.interface';
 import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
-import { TestController } from './test.controller';
+import { DynamoNTS_Test_Controller } from './test.controller';
 
-export function getTestRoutingModule(
+export function DynamoNTS_getTestRoutingModule(
   securityOverride?: DynamoNTS_RouteSecurity
 ): DynamoNTS_RoutingModule {
-  const set: DynamoNTS_RoutingModuleSettings = {
-    route: testModuleSettings.mainRoute,
-    controllers: [ TestController.getInstance() ]
+  const set: DynamoNTS_RoutingModule_Settings = {
+    route: DynamoFM_testModule_settings.mainRoute,
+    controllers: [ DynamoNTS_Test_Controller.getInstance() ],
   };
 
   if (securityOverride) {

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

@@ -1,103 +1,103 @@
 
 import { Request, Response } from 'express';
 
-import { testModuleSettings } 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';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
 import { DynamoNTS_GlobalService } from '../../_services/core/global.service';
 
-export class TestController extends DynamoNTS_Controller {
+export class DynamoNTS_Test_Controller extends DynamoNTS_Controller {
 
-  static getInstance(): TestController {
-    return TestController.getSingletonInstance();
+  static getInstance(): DynamoNTS_Test_Controller {
+    return DynamoNTS_Test_Controller.getSingletonInstance();
   }
 
   setupEndpoints(): void {
     this.endpoints = [
       // TESTS
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'testGet',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: testModuleSettings.endPoints.testGet,
+        endpoint: DynamoFM_testModule_settings.endPoints.testGet,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
               url: req.url,
               result: 'test-get call was successful!',
-              request: req.body
+              request: req.body,
             });
-          }
-        ]
+          },
+        ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'testPost',
         type: DynamoNTS_HttpCallType.post,
-        endpoint: testModuleSettings.endPoints.testPost,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPost,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
               url: req.url,
               result: 'test-post call was successful!',
-              request: req.body
+              request: req.body,
             });
-          }
-        ]
+          },
+        ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'testPut',
         type: DynamoNTS_HttpCallType.put,
-        endpoint: testModuleSettings.endPoints.testPut,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPut,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
               url: req.url,
               result: 'test-put call was successful!',
-              request: req.body
+              request: req.body,
             });
-          }
-        ]
+          },
+        ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'testPatch',
         type: DynamoNTS_HttpCallType.patch,
-        endpoint: testModuleSettings.endPoints.testPatch,
+        endpoint: DynamoFM_testModule_settings.endPoints.testPatch,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
               url: req.url,
               result: 'test-patch call was successful!',
-              request: req.body
+              request: req.body,
             });
-          }
-        ]
+          },
+        ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'testDelete',
         type: DynamoNTS_HttpCallType.delete,
-        endpoint: testModuleSettings.endPoints.testDelete,
+        endpoint: DynamoFM_testModule_settings.endPoints.testDelete,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
               url: req.url,
               result: 'test-delete call was successful!',
-              request: req.body
+              request: req.body,
             });
-          }
-        ]
+          },
+        ],
       }),
 
-      new DynamoNTS_EndpointParams({
+      new DynamoNTS_Endpoint_Params({
         name: 'getServerStatus',
         type: DynamoNTS_HttpCallType.get,
-        endpoint: testModuleSettings.endPoints.getServerStatus,
+        endpoint: DynamoFM_testModule_settings.endPoints.getServerStatus,
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
 
@@ -106,8 +106,8 @@ export class TestController extends DynamoNTS_Controller {
               version: DynamoNTS_GlobalService.params.version,
               upTime: DynamoNTS_GlobalService.upTime,
             });
-          }
-        ]
+          },
+        ],
       }),
     ];
   }

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

@@ -1,18 +1,18 @@
 
-import { usageModuleSettings } 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_RoutingModuleSettings 
+  DynamoNTS_RoutingModule_Settings 
 } from '../../_models/interfaces/routing-module-settings.interface';
 import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
-import { UsageController } from './usage.controller';
+import { DynamoNTS_Usage_Controller } from './usage.controller';
 
-export function getUsageRoutingModule(
+export function DynamoNTS_getUsageRoutingModule(
   securityOverride?: DynamoNTS_RouteSecurity
 ): DynamoNTS_RoutingModule {
-  const set: DynamoNTS_RoutingModuleSettings = {
-    route: usageModuleSettings.mainRoute,
-    controllers: [ UsageController.getInstance() ],
+  const set: DynamoNTS_RoutingModule_Settings = {
+    route: DynamoFM_usageModule_settings.mainRoute,
+    controllers: [ DynamoNTS_Usage_Controller.getInstance() ],
   };
 
   if (securityOverride) {

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

@@ -2,7 +2,7 @@
 import { Request, Response } from 'express';
 
 import { 
-  usageModuleSettings, 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';
@@ -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,16 +27,16 @@ 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: 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 UsageService({
-              usageSession: new Dynamo_UsageSession({
+            const usageService = new DynamoNTS_Usage_DataService({
+              usageSession: new DynamoFM_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: DynamoFM_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: DynamoFM_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: 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 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,26 +1,26 @@
 
 import { Request } from 'express';
-import { Dynamo_Error, Dynamo_Time, Dynamo_RelativeDate } from '@futdevpro/fsm-dynamo';
-import { Dynamo_UsageSession, usageSessionModelParams, Dynamo_UsageData, 
-  Dynamo_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
+import { DynamoFM_Error, DynamoFM_Time, DynamoFM_RelativeDate } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_UsageSession, DynamoFM_usageSessionModel_params, DynamoFM_UsageData, 
+  DynamoFM_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> {
-  usageData: Dynamo_UsageData[] = [];
-  simplifiedDailyUsage: Dynamo_DailyUsageData[] = [];
+export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<DynamoFM_UsageSession> {
+  usageData: DynamoFM_UsageData[] = [];
+  simplifiedDailyUsage: DynamoFM_DailyUsageData[] = [];
 
   constructor(
     set?: {
-      usageSession?: Dynamo_UsageSession,
-      usageData?: Dynamo_UsageData[],
+      usageSession?: DynamoFM_UsageSession,
+      usageData?: DynamoFM_UsageData[],
       issuer?: string,
     }
   ) {
     super(
-      new Dynamo_UsageSession(set?.usageSession),
-      usageSessionModelParams,
+      new DynamoFM_UsageSession(set?.usageSession),
+      DynamoFM_usageSessionModel_params,
       set?.issuer
     );
     this.usageData = set?.usageData ? set?.usageData : [];
@@ -33,7 +33,7 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
 
       /* console.log(`...getLocationDataFromRequest... ip: ${this.data.address}`, this.data.locationData); */
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('getLocationDataFromRequest', error),
         
         errorCode: 'NTS-US0-GLD',
@@ -42,23 +42,23 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
     }
   }
 
-  async getUsage(range: Dynamo_RelativeDate = Dynamo_RelativeDate.lastWeek): Promise<void> {
+  async getUsage(range: DynamoFM_RelativeDate = DynamoFM_RelativeDate.lastWeek): Promise<void> {
     try {
       await this.dataDBService.find({
-        sessionStart: { $gte: Dynamo_Time.getDateByRelativeDate(range) },
-      }).then((res: Dynamo_UsageSession[]): void => {
+        sessionStart: { $gte: DynamoFM_Time.getDateByRelativeDate(range) },
+      }).then((res: DynamoFM_UsageSession[]): void => {
         this.dataList = res;
       });
       this.simplifiedDailyUsage = [];
-      this.dataList.forEach((session: Dynamo_UsageSession): void => {
+      this.dataList.forEach((session: DynamoFM_UsageSession): void => {
         let dateIndex = this.simplifiedDailyUsage.findIndex(
-          (dailyData: Dynamo_DailyUsageData): boolean => dailyData.date === session.date
+          (dailyData: DynamoFM_DailyUsageData): boolean => dailyData.date === session.date
         );
 
         if (-1 < dateIndex) {
           this.simplifiedDailyUsage[dateIndex].visitations.push(session);
         } else {
-          const newUsageSimple = new Dynamo_DailyUsageData({ 
+          const newUsageSimple = new DynamoFM_DailyUsageData({ 
             date: session.date, 
             visitations: [ session ],
           });
@@ -82,18 +82,18 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
       });
 
       this.simplifiedDailyUsage.sort(
-        (a: Dynamo_DailyUsageData, b: Dynamo_DailyUsageData): number => 
+        (a: DynamoFM_DailyUsageData, b: DynamoFM_DailyUsageData): number => 
           +new Date(b.date) - +new Date(a.date)
       );
-      this.simplifiedDailyUsage.forEach((daily: Dynamo_DailyUsageData): void => {
+      this.simplifiedDailyUsage.forEach((daily: DynamoFM_DailyUsageData): void => {
         daily.visitations.sort(
-          (a: Dynamo_UsageSession, b: Dynamo_UsageSession): number => 
+          (a: DynamoFM_UsageSession, b: DynamoFM_UsageSession): number => 
             +a.sessionStart - +b.sessionStart
         );
       });
 
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('getLastWeekUsage', error),
         
         errorCode: 'NTS-US0-GLW',
@@ -108,7 +108,7 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
       this.data.usageData = this.usageData;
       let totalTime = 0;
 
-      this.data.usageData.forEach((data: Dynamo_UsageData): void => {
+      this.data.usageData.forEach((data: DynamoFM_UsageData): void => {
         totalTime += data.timeSpentOnPage;
       });
 
@@ -118,7 +118,7 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
       this.data.totalSessionTime = totalTime;
       await this.saveData();
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('updateUsageData', error),
         
         errorCode: 'NTS-US0-UU0',
@@ -140,12 +140,12 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
         this.getLocationDataFromRequest(req);
       }
       this.data.usageData.sort(
-        (a: Dynamo_UsageData, b: Dynamo_UsageData): number => +a.opened - +b.opened
+        (a: DynamoFM_UsageData, b: DynamoFM_UsageData): number => +a.opened - +b.opened
       );
       this.data.totalSessionTime = newTotalSessionTime;
       await this.saveData();
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('closeSession', error),
         
         errorCode: 'NTS-US0-CS0',
@@ -157,10 +157,10 @@ export class UsageService extends DynamoNTS_DataService<Dynamo_UsageSession> {
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   private getDefaultErrorSettings(
     fnName: string, 
-    error: Error | Dynamo_Error
-  )/* : Dynamo_ErrorSettings */ {
+    error: Error | DynamoFM_Error
+  )/* : DynamoFM_ErrorSettings */ {
     return {
-      status: (error as Dynamo_Error)?.___status ?? 417,
+      status: (error as DynamoFM_Error)?.___status ?? 417,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
       addECToUserMsg: true,
       userMessage: this.defaultErrorUserMsg,