@futdevpro/nts-dynamo 1.15.13 → 1.15.15

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

@@ -1,81 +1,81 @@
-
-import { DyNTS_Usage_Controller } from './usage.controller';
-import { DyNTS_GlobalService } from '../../_services/core/global.service';
-import { DyNTS_AuthService } from '../../_services/core/auth.service';
-import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
-
-describe('| DyNTS_Usage_Controller', () => {
-  let controller: DyNTS_Usage_Controller;
-  let mockAuthService: jasmine.SpyObj<DyNTS_AuthService>;
-
-  beforeEach(() => {
-    controller = DyNTS_Usage_Controller.getInstance();
-    mockAuthService = jasmine.createSpyObj<DyNTS_AuthService>('AuthService', [
-      'getUsernameFromRequest',
-    ]);
-
-    spyOn(DyNTS_GlobalService, 'getAuthService').and.returnValue(mockAuthService);
-  });
-
-  it('| should be a singleton instance', () => {
-    const instance1 = DyNTS_Usage_Controller.getInstance();
-    const instance2 = DyNTS_Usage_Controller.getInstance();
-
-    expect(instance1).toBe(instance2);
-    expect(instance1).toBeInstanceOf(DyNTS_Usage_Controller);
-  });
-
-  it('| should setup endpoints', () => {
-    controller.setupEndpoints();
-
-    expect(controller.endpoints).toBeDefined();
-    expect(controller.endpoints.length).toBeGreaterThan(0);
-  });
-
-  it('| should have newSession endpoint', () => {
-    controller.setupEndpoints();
-
-    const newSessionEndpoint = controller.endpoints.find(ep => ep.name === 'newSession');
-
-    expect(newSessionEndpoint).toBeDefined();
-    expect(newSessionEndpoint?.type).toBe(DyFM_HttpCallType.get);
-    expect((newSessionEndpoint as any)?.tasks).toBeDefined();
-    expect((newSessionEndpoint as any)?.tasks.length).toBeGreaterThan(0);
-  });
-
-  it('| should have updateUsage endpoint', () => {
-    controller.setupEndpoints();
-
-    const updateUsageEndpoint = controller.endpoints.find(ep => ep.name === 'updateUsage');
-
-    expect(updateUsageEndpoint).toBeDefined();
-    expect(updateUsageEndpoint?.type).toBe(DyFM_HttpCallType.post);
-    expect((updateUsageEndpoint as any)?.tasks).toBeDefined();
-    expect((updateUsageEndpoint as any)?.tasks.length).toBeGreaterThan(0);
-  });
-
-  it('| should have closeSession endpoint', () => {
-    controller.setupEndpoints();
-
-    const closeSessionEndpoint = controller.endpoints.find(ep => ep.name === 'closeSession');
-
-    expect(closeSessionEndpoint).toBeDefined();
-    expect(closeSessionEndpoint?.type).toBe(DyFM_HttpCallType.get);
-    expect((closeSessionEndpoint as any)?.tasks).toBeDefined();
-    expect((closeSessionEndpoint as any)?.tasks.length).toBeGreaterThan(0);
-  });
-
-  it('| should have getUsageData endpoint with authentication', () => {
-    controller.setupEndpoints();
-
-    const getUsageDataEndpoint = controller.endpoints.find(ep => ep.name === 'getUsageData');
-
-    expect(getUsageDataEndpoint).toBeDefined();
-    expect(getUsageDataEndpoint?.type).toBe(DyFM_HttpCallType.get);
-    expect((getUsageDataEndpoint as any)?.preProcesses).toBeDefined();
-    expect((getUsageDataEndpoint as any)?.preProcesses.length).toBeGreaterThan(0);
-    expect((getUsageDataEndpoint as any)?.tasks).toBeDefined();
-    expect((getUsageDataEndpoint as any)?.tasks.length).toBeGreaterThan(0);
-  });
-});
-
+
+import { DyNTS_Usage_Controller } from './usage.controller';
+import { DyNTS_GlobalService } from '../../_services/core/global.service';
+import { DyNTS_AuthService } from '../../_services/core/auth.service';
+import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
+
+describe('| DyNTS_Usage_Controller', () => {
+  let controller: DyNTS_Usage_Controller;
+  let mockAuthService: jasmine.SpyObj<DyNTS_AuthService>;
+
+  beforeEach(() => {
+    controller = DyNTS_Usage_Controller.getInstance();
+    mockAuthService = jasmine.createSpyObj<DyNTS_AuthService>('AuthService', [
+      'getUsernameFromRequest',
+    ]);
+
+    spyOn(DyNTS_GlobalService, 'getAuthService').and.returnValue(mockAuthService);
+  });
+
+  it('| should be a singleton instance', () => {
+    const instance1 = DyNTS_Usage_Controller.getInstance();
+    const instance2 = DyNTS_Usage_Controller.getInstance();
+
+    expect(instance1).toBe(instance2);
+    expect(instance1).toBeInstanceOf(DyNTS_Usage_Controller);
+  });
+
+  it('| should setup endpoints', () => {
+    controller.setupEndpoints();
+
+    expect(controller.endpoints).toBeDefined();
+    expect(controller.endpoints.length).toBeGreaterThan(0);
+  });
+
+  it('| should have newSession endpoint', () => {
+    controller.setupEndpoints();
+
+    const newSessionEndpoint = controller.endpoints.find(ep => ep.name === 'newSession');
+
+    expect(newSessionEndpoint).toBeDefined();
+    expect(newSessionEndpoint?.type).toBe(DyFM_HttpCallType.get);
+    expect((newSessionEndpoint as any)?.tasks).toBeDefined();
+    expect((newSessionEndpoint as any)?.tasks.length).toBeGreaterThan(0);
+  });
+
+  it('| should have updateUsage endpoint', () => {
+    controller.setupEndpoints();
+
+    const updateUsageEndpoint = controller.endpoints.find(ep => ep.name === 'updateUsage');
+
+    expect(updateUsageEndpoint).toBeDefined();
+    expect(updateUsageEndpoint?.type).toBe(DyFM_HttpCallType.post);
+    expect((updateUsageEndpoint as any)?.tasks).toBeDefined();
+    expect((updateUsageEndpoint as any)?.tasks.length).toBeGreaterThan(0);
+  });
+
+  it('| should have closeSession endpoint', () => {
+    controller.setupEndpoints();
+
+    const closeSessionEndpoint = controller.endpoints.find(ep => ep.name === 'closeSession');
+
+    expect(closeSessionEndpoint).toBeDefined();
+    expect(closeSessionEndpoint?.type).toBe(DyFM_HttpCallType.get);
+    expect((closeSessionEndpoint as any)?.tasks).toBeDefined();
+    expect((closeSessionEndpoint as any)?.tasks.length).toBeGreaterThan(0);
+  });
+
+  it('| should have getUsageData endpoint with authentication', () => {
+    controller.setupEndpoints();
+
+    const getUsageDataEndpoint = controller.endpoints.find(ep => ep.name === 'getUsageData');
+
+    expect(getUsageDataEndpoint).toBeDefined();
+    expect(getUsageDataEndpoint?.type).toBe(DyFM_HttpCallType.get);
+    expect((getUsageDataEndpoint as any)?.preProcesses).toBeDefined();
+    expect((getUsageDataEndpoint as any)?.preProcesses.length).toBeGreaterThan(0);
+    expect((getUsageDataEndpoint as any)?.tasks).toBeDefined();
+    expect((getUsageDataEndpoint as any)?.tasks.length).toBeGreaterThan(0);
+  });
+});
+

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

@@ -1,126 +1,126 @@
-
-import { Request, Response } from 'express';
-
-import { DyFM_HttpCallType, DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
-import {
-  DyFM_usageModule_settings, DyFM_UsageSession
-} from '@futdevpro/fsm-dynamo/usage';
-
-import {
-  DyNTS_Endpoint_Params
-} from '../../_models/control-models/endpoint-params.control-model';
-import { DyNTS_AuthService } from '../../_services/core/auth.service';
-import { DyNTS_GlobalService } from '../../_services/core/global.service';
-import { DyNTS_Controller } from '../../_services/route/controller.service';
-import { DyNTS_Usage_DataService } from './usage.data-service';
-
-export class DyNTS_Usage_Controller extends DyNTS_Controller {
-
-  static getInstance(): DyNTS_Usage_Controller {
-    return DyNTS_Usage_Controller.getSingletonInstance();
-  }
-
-  // SERVICES
-  private authService: DyNTS_AuthService;
-
-  setupEndpoints(): void {
-    this.authService = DyNTS_GlobalService.getAuthService();
-
-    this.endpoints = [
-      new DyNTS_Endpoint_Params({
-        name: 'newSession',
-        type: DyFM_HttpCallType.get,
-        endpoint: DyFM_usageModule_settings.endPoints.newSession,
-        tasks: [
-          async (req: Request, res: Response, issuer: string): Promise<void> => {
-            let username: string;
-            
-            try {
-              username = this.authService.getUsernameFromRequest(req);
-            } catch {
-              username = 'unknown';
-            }
-            const usageService = new DyNTS_Usage_DataService({
-              usageSession: new DyFM_UsageSession({
-                sessionStart: new Date(),
-                issuer: username,
-              }),
-              issuer,
-            });
-
-            await usageService.getLocationDataFromRequest(req);
-            await usageService.saveData();
-
-            res.send(
-              usageService.data
-            );
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'updateUsage',
-        type: DyFM_HttpCallType.post,
-        endpoint: DyFM_usageModule_settings.endPoints.updateUsage,
-        tasks: [
-          async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const usageService = new DyNTS_Usage_DataService({
-              usageSession: { _id: req.params.sessionId },
-              usageData: req.body,
-              issuer,
-            });
-
-            await usageService.updateUsageData(req);
-
-            res.send(
-              usageService.data
-            );
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'closeSession',
-        type: DyFM_HttpCallType.get,
-        endpoint: DyFM_usageModule_settings.endPoints.closeSession,
-        tasks: [
-          async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const usageService = new DyNTS_Usage_DataService({
-              usageSession: { _id: req.params.sessionId },
-              issuer,
-            });
-
-            await usageService.closeSession(req);
-
-            res.send(
-              usageService.data
-            );
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'getUsageData',
-        type: DyFM_HttpCallType.get,
-        endpoint: DyFM_usageModule_settings.endPoints.getUsageData,
-        preProcesses: [ this.authService.authenticate_tokenPerm_accUsageData ],
-        tasks: [
-          async (req: Request, res: Response, issuer: string): Promise<void> => {
-            const range: DyFM_RelativeDate = req.params.range as DyFM_RelativeDate;
-
-            const usageService = new DyNTS_Usage_DataService({
-              issuer: issuer,
-            });
-
-            await usageService.getUsage(range);
-
-            res.send(
-              usageService.simplifiedDailyUsage
-            );
-          },
-        ],
-      }),
-    ];
-  }
-}
-
+
+import { Request, Response } from 'express';
+
+import { DyFM_HttpCallType, DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
+import {
+  DyFM_usageModule_settings, DyFM_UsageSession
+} from '@futdevpro/fsm-dynamo/usage';
+
+import {
+  DyNTS_Endpoint_Params
+} from '../../_models/control-models/endpoint-params.control-model';
+import { DyNTS_AuthService } from '../../_services/core/auth.service';
+import { DyNTS_GlobalService } from '../../_services/core/global.service';
+import { DyNTS_Controller } from '../../_services/route/controller.service';
+import { DyNTS_Usage_DataService } from './usage.data-service';
+
+export class DyNTS_Usage_Controller extends DyNTS_Controller {
+
+  static getInstance(): DyNTS_Usage_Controller {
+    return DyNTS_Usage_Controller.getSingletonInstance();
+  }
+
+  // SERVICES
+  private authService: DyNTS_AuthService;
+
+  setupEndpoints(): void {
+    this.authService = DyNTS_GlobalService.getAuthService();
+
+    this.endpoints = [
+      new DyNTS_Endpoint_Params({
+        name: 'newSession',
+        type: DyFM_HttpCallType.get,
+        endpoint: DyFM_usageModule_settings.endPoints.newSession,
+        tasks: [
+          async (req: Request, res: Response, issuer: string): Promise<void> => {
+            let username: string;
+            
+            try {
+              username = this.authService.getUsernameFromRequest(req);
+            } catch {
+              username = 'unknown';
+            }
+            const usageService = new DyNTS_Usage_DataService({
+              usageSession: new DyFM_UsageSession({
+                sessionStart: new Date(),
+                issuer: username,
+              }),
+              issuer,
+            });
+
+            await usageService.getLocationDataFromRequest(req);
+            await usageService.saveData();
+
+            res.send(
+              usageService.data
+            );
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'updateUsage',
+        type: DyFM_HttpCallType.post,
+        endpoint: DyFM_usageModule_settings.endPoints.updateUsage,
+        tasks: [
+          async (req: Request, res: Response, issuer: string): Promise<void> => {
+            const usageService = new DyNTS_Usage_DataService({
+              usageSession: { _id: req.params.sessionId },
+              usageData: req.body,
+              issuer,
+            });
+
+            await usageService.updateUsageData(req);
+
+            res.send(
+              usageService.data
+            );
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'closeSession',
+        type: DyFM_HttpCallType.get,
+        endpoint: DyFM_usageModule_settings.endPoints.closeSession,
+        tasks: [
+          async (req: Request, res: Response, issuer: string): Promise<void> => {
+            const usageService = new DyNTS_Usage_DataService({
+              usageSession: { _id: req.params.sessionId },
+              issuer,
+            });
+
+            await usageService.closeSession(req);
+
+            res.send(
+              usageService.data
+            );
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'getUsageData',
+        type: DyFM_HttpCallType.get,
+        endpoint: DyFM_usageModule_settings.endPoints.getUsageData,
+        preProcesses: [ this.authService.authenticate_tokenPerm_accUsageData ],
+        tasks: [
+          async (req: Request, res: Response, issuer: string): Promise<void> => {
+            const range: DyFM_RelativeDate = req.params.range as DyFM_RelativeDate;
+
+            const usageService = new DyNTS_Usage_DataService({
+              issuer: issuer,
+            });
+
+            await usageService.getUsage(range);
+
+            res.send(
+              usageService.simplifiedDailyUsage
+            );
+          },
+        ],
+      }),
+    ];
+  }
+}
+