@futdevpro/nts-dynamo 1.9.17 → 1.9.19

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

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