@futdevpro/fsm-dynamo 1.5.46 → 1.5.49

package/src/_collections/_tools/dynamo-regions.ts

@@ -30,36 +30,36 @@ export class Dynamo_Regions {
       iso.phoneCode = this.phoneCodes.find((pc: CountryPhoneCode) => pc.iso === iso.iso2)?.code;
       iso.divisions = this.divisions.filter((d: CountryDivision) => d.iso === iso.iso2);
     });
-    return 
+    return result;
   }
 
-  static iso1ToCountryIso(iso1: string): CountryISO {
-    const country: CountryISO = this.ISOs.find(iso => iso.iso2 == iso1);
+  static isoToCountryIso(iso2: string): CountryISO {
+    const country: CountryISO = this.ISOs.find(iso => iso.iso2 == iso2);
     if (!country) {
       throw new Dynamo_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso1}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}` 
       });
     } else {
       return country;
     }
   }
 
-  static iso1ToRegion(iso1: string): Region {
-    const region: Region = this.ISOs.find(iso => iso.iso2 == iso1).region;
+  static isoToRegion(iso2: string): Region {
+    const region: Region = this.ISOs.find(iso => iso.iso2 == iso2).region;
     if (!region) {
       throw new Dynamo_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso1}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}` 
       });
     } else {
       return region;
     }
   }
 
-  static iso1ToPhoneCode(iso1: string): CountryPhoneCode {
-    const phoneCode: CountryPhoneCode = this.phoneCodes.find(code => code.iso == iso1);
+  static isoToPhoneCode(iso2: string): CountryPhoneCode {
+    const phoneCode: CountryPhoneCode = this.phoneCodes.find(code => code.iso == iso2);
     if (!phoneCode) {
       throw new Dynamo_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso1}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}` 
       });
     } else {
       return phoneCode;

package/src/_constants/index.ts

@@ -4,4 +4,5 @@ export * from './times';
 // Module Settings
 export * from './module-settings/test-module-settings';
 export * from './module-settings/usage-module-settings';
+export * from './module-settings/custom-data-module-settings';
 

package/src/_constants/module-settings/custom-data-module-settings.ts

@@ -0,0 +1,10 @@
+
+import { Dynamo_RouteSettings } from '../../_models/control-models/dynamo-route-settings';
+
+export const customDataModuleSettings: Dynamo_RouteSettings = {
+  mainRoute: '/custom',
+  endPoints: {
+    getCustomData: '/get/:customId',
+    modifyCustomData: '/post',
+  }
+};

package/src/_constants/module-settings/test-module-settings.ts

@@ -1,7 +1,7 @@
 
-import { DynamoNTS_ModuleSettings } from '../../_models/control-models/dynamo-nts-module-settings';
+import { Dynamo_RouteSettings } from '../../_models/control-models/dynamo-route-settings';
 
-export const testModuleSettings: DynamoNTS_ModuleSettings = {
+export const testModuleSettings: Dynamo_RouteSettings = {
   mainRoute: '/test',
   endPoints: {
     testGet: '/test-get',
@@ -9,7 +9,6 @@ export const testModuleSettings: DynamoNTS_ModuleSettings = {
     testPut: '/test-put',
     testPatch: '/test-patch',
     testDelete: '/test-delete',
-    getCustomData: '/custom/get/:customId',
-    modifyCustomData: '/custom/post'
+    getServerStatus: '/server-status',
   }
 };

package/src/_constants/module-settings/usage-module-settings.ts

@@ -1,7 +1,7 @@
 
-import { DynamoNTS_ModuleSettings } from '../../_models/control-models/dynamo-nts-module-settings';
+import { Dynamo_RouteSettings } from '../../_models/control-models/dynamo-route-settings';
 
-export const usageModuleSettings: DynamoNTS_ModuleSettings = {
+export const usageModuleSettings: Dynamo_RouteSettings = {
   mainRoute: '/usage',
   endPoints: {
     newSession: '/new-session',

package/src/_enums/basic-property-type.enum.ts

@@ -0,0 +1,9 @@
+
+
+export enum BasicPropertyType {
+  string = 'string',
+  number = 'number',
+  boolean = 'boolean',
+  date = 'Date',
+  object = 'object',
+}

package/src/_models/control-models/dynamo-daily-usage-data.ts

@@ -22,13 +22,14 @@ export class Dynamo_DailyUsageData {
     }
   ) {
     if (set) {
-      this.date = set.date;
+      Object.assign(this, set)
+      /* this.date = set.date;
       this.totalVisitTime = set.totalVisitTime ? set.totalVisitTime : 0;
       this.averageVisitTime = set.averageVisitTime ? set.averageVisitTime : 0;
       this.visitorsHun = set.visitorsHun ? set.visitorsHun : 0;
       this.visitorsElse = set.visitorsElse ? set.visitorsElse : 0;
 
-      this.visitations = set.visitations ? set.visitations : [];
+      this.visitations = set.visitations ? set.visitations : []; */
     }
   }
 }

package/src/_models/control-models/{dynamo-nts-data-params.ts → dynamo-data-params.ts}

@@ -1,18 +1,22 @@
 
 import { DataModelType } from '../../_enums';
-import { DynamoNTS_DataPropertyParams } from './dynamo-nts-data-property-params';
+import { Dynamo_DataPropertyParams } from './dynamo-data-property-params';
 
-export class DynamoNTS_DataParams {
+export class Dynamo_DataParams {
   dataName: string;
   modelType?: DataModelType;
   dbName: string;
-  modelParams: DynamoNTS_DataPropertyParams[];
+  modelParams: Dynamo_DataPropertyParams[] = [];
+
+  /** format info */
+  logicalBreakpoints?: number[] = []; 
 
   constructor(
     set: {
       dataName: string,
       modelType?: DataModelType,
-      modelParams: DynamoNTS_DataPropertyParams[],
+      modelParams?: Dynamo_DataPropertyParams[],
+      logicalBreakpoints?: number[],
     }
   ) {
     this.dataName = set.dataName;
@@ -22,6 +26,7 @@ export class DynamoNTS_DataParams {
       this.modelType = DataModelType.dataModel;
       this.dbName = set.dataName.charAt(0).toUpperCase() + set.dataName.slice(1);
     }
-    this.modelParams = set.modelParams ? set.modelParams : [];
+    this.modelParams = set.modelParams ?? [];
+    this.logicalBreakpoints = set.logicalBreakpoints ?? [];
   }
 }

package/src/_models/control-models/{dynamo-nts-data-property-params.ts → dynamo-data-property-params.ts}

@@ -1,10 +1,11 @@
+import { BasicPropertyType } from '../../_enums/basic-property-type.enum';
 
 /**
  * This will be used for setting up db. DataServices also uses this to prehook tools, as db service and dependency db service.
  */
-export class DynamoNTS_DataPropertyParams {
+export class Dynamo_DataPropertyParams {
   key?: string;
-  type?: 'string' | 'number' | 'boolean' | 'Date' | 'object' | string;
+  type?: BasicPropertyType | string;
 
   unique?: boolean;
   required?: boolean;
@@ -23,14 +24,14 @@ export class DynamoNTS_DataPropertyParams {
   minlength?: number;
   maxlength?: number;
 
-  subObjectParams?: DynamoNTS_DataPropertyParams[] = [];
+  subObjectParams?: Dynamo_DataPropertyParams[] = [];
 
   additionalValidators?: ((data: any) => void)[];
 
   constructor(
     set: {
       key: string,
-      type: 'string' | 'number' | 'boolean' | 'Date' | 'object' | string,
+      type: BasicPropertyType | string,
 
       unique?: boolean,
       required?: boolean,
@@ -49,7 +50,7 @@ export class DynamoNTS_DataPropertyParams {
       minlength?: number,
       maxlength?: number,
 
-      subObjectParams?: DynamoNTS_DataPropertyParams[],
+      subObjectParams?: Dynamo_DataPropertyParams[],
 
       additionalValidators?: ((data: any) => void)[],
     }
@@ -83,15 +84,15 @@ export class DynamoNTS_DataPropertyParams {
   // tslint:disable-next-line: ban-types
   getBEType?(): String | Number | Boolean | Object | Function | Array<any> | Date {
     switch (this.type) {
-      case 'string':
+      case BasicPropertyType.string:
         return String;
-      case 'number':
+      case BasicPropertyType.number:
         return Number;
-      case 'boolean':
+      case BasicPropertyType.boolean:
         return Boolean;
-      case 'Date':
+      case BasicPropertyType.date:
         return Date;
-      case 'object':
+      case BasicPropertyType.object:
       default:
         if (this.type?.includes('[]')) {
           return Array;

package/src/_models/control-models/dynamo-range-value.ts

@@ -0,0 +1,15 @@
+
+
+
+export class Dynamo_RangeValue<T> {
+  from: T;
+  to: T;
+
+  constructor(
+    from: T,
+    to: T,
+  ) {
+    this.from = from;
+    this.to = to;
+  }
+}

package/src/_models/control-models/{dynamo-nts-module-settings.ts → dynamo-route-settings.ts}

@@ -1,5 +1,5 @@
 
-export interface DynamoNTS_ModuleSettings {
+export interface Dynamo_RouteSettings {
   mainRoute: string;
 
   endPoints: {

package/src/_models/control-models/dynamo-usage-action.ts

@@ -10,8 +10,9 @@ export class Dynamo_UsageAction {
     }
   ) {
     if (set) {
-      this.action = set.action;
-      this.time = set.time;
+      Object.assign(this, set)
+      /* this.action = set.action;
+      this.time = set.time; */
     }
   }
 }

package/src/_models/control-models/dynamo-usage-data.ts

@@ -16,10 +16,11 @@ export class Dynamo_UsageData {
     }
   ) {
     if (set) {
-      this.page = set.page;
+      Object.assign(this, set)
+      /* this.page = set.page;
       this.opened = set.opened;
       this.timeSpentOnPage = set.timeSpentOnPage;
-      this.actions = set.actions ? set.actions : [];
+      this.actions = set.actions ? set.actions : []; */
     }
   }
 }

package/src/_models/data-models/dynamo-custom-data.ts

@@ -1,5 +1,5 @@
 
-import { DynamoNTS_DataParams } from '../control-models/dynamo-nts-data-params';
+import { Dynamo_DataParams } from '../control-models/dynamo-data-params';
 import { Dynamo_Metadata } from './dynamo-metadata';
 
 export class Dynamo_CustomData extends Dynamo_Metadata {
@@ -18,21 +18,22 @@ export class Dynamo_CustomData extends Dynamo_Metadata {
       __lastModifiedBy?: string,
     }
   ) {
-    super({
+    super(set/* {
       _id: set?._id,
       __v: set?.__v,
       __created: set?.__created,
       __createdBy: set?.__createdBy,
       __lastModified: set?.__lastModified,
       __lastModifiedBy: set?.__lastModifiedBy,
-    })
+    } */)
     if (set) {
-      this.data = set.data;
+      Object.assign(this, set);
+      /* this.data = set.data; */
     }
   }
 }
 
-export const customDataModelParams = new DynamoNTS_DataParams({
+export const customDataModelParams = new Dynamo_DataParams({
   dataName: 'customData',
   modelParams: [
     { key: 'data', type: 'string', required: true },

package/src/_models/data-models/dynamo-metadata.ts

@@ -21,13 +21,17 @@ export class Dynamo_Metadata {
     } | Dynamo_Metadata
   ){
     if (set) {
-      this._id = set._id;
+      if (!set._id && set._id !== undefined) { 
+        delete set._id;
+      }
 
-      this.__created = set.__created;
+      Object.assign(this, set);
+
+      /* this.__created = set.__created;
       this.__createdBy = set.__createdBy;
       this.__lastModified = set.__lastModified;
       this.__lastModifiedBy = set.__lastModifiedBy;
-      this.__v = set.__v;
+      this.__v = set.__v; */
     }
   }
 }

package/src/_models/data-models/dynamo-usage-session.ts

@@ -2,7 +2,7 @@
 import { GeoIpLocation } from '../control-models/geo-ip-location';
 import { Dynamo_Metadata } from './dynamo-metadata';
 import { Dynamo_UsageData } from '../control-models/dynamo-usage-data';
-import { DynamoNTS_DataParams } from '../control-models/dynamo-nts-data-params';
+import { Dynamo_DataParams } from '../control-models/dynamo-data-params';
 
 export class Dynamo_UsageSession extends Dynamo_Metadata {
   date?: string;
@@ -12,7 +12,7 @@ export class Dynamo_UsageSession extends Dynamo_Metadata {
   issuer?: string;
   locationData?: GeoIpLocation;
 
-  usageData?: Dynamo_UsageData[];
+  usageData?: Dynamo_UsageData[] = [];
   totalSessionTime?: number;
   loggedInAs?: string;
 
@@ -36,23 +36,15 @@ export class Dynamo_UsageSession extends Dynamo_Metadata {
       __lastModified?: Date,
       __lastModifiedBy?: string,
       __v?: number
-    }
+    } | Dynamo_UsageSession
   ) {
-    super({
-      _id: set?._id,
-      __created: set?.__created,
-      __createdBy: set?.__createdBy,
-      __lastModified: set?.__lastModified,
-      __lastModifiedBy: set?.__lastModifiedBy,
-      __v: set?.__v,
-    });
+    super(set);
     if (set) {
-      if (set.date) {
-        this.date = set.date;
-      } else if (set.sessionStart) {
-        this.date = set.sessionStart.toISOString().substring(0, 10);
+      if (!set.date && set.sessionStart) {
+        set.date = set.sessionStart.toISOString().substring(0, 10);
       }
-      this.sessionStart = set.sessionStart;
+      Object.assign(this, set);
+      /* this.sessionStart = set.sessionStart;
       this.sessionEnd = set.sessionEnd;
       this.address = set.address;
       this.issuer = set.issuer;
@@ -60,12 +52,12 @@ export class Dynamo_UsageSession extends Dynamo_Metadata {
 
       this.usageData = set.usageData ? set.usageData : [];
       this.totalSessionTime = set.totalSessionTime;
-      this.loggedInAs = set.loggedInAs;
+      this.loggedInAs = set.loggedInAs; */
     }
   }
 }
 
-export const usageSessionModelParams = new DynamoNTS_DataParams({
+export const usageSessionModelParams = new Dynamo_DataParams({
   dataName: 'usageSession',
   modelParams: [
     { key: 'date', type: 'string',

package/src/_models/index.ts

@@ -5,10 +5,11 @@ export * from './control-models/country-iso';
 export * from './control-models/country-phone-code';
 export * from './control-models/dynamo-daily-usage-data';
 export * from './control-models/dynamo-error';
-export * from './control-models/dynamo-nts-data-params';
-export * from './control-models/dynamo-nts-data-property-params';
-export * from './control-models/dynamo-nts-module-settings';
+export * from './control-models/dynamo-data-params';
+export * from './control-models/dynamo-data-property-params';
+export * from './control-models/dynamo-route-settings';
 export * from './control-models/dynamo-poll';
+export * from './control-models/dynamo-range-value';
 export * from './control-models/dynamo-usage-action';
 export * from './control-models/dynamo-usage-data';
 export * from './control-models/geo-ip-location';

package/src/_modules/custom-data-module.index.ts

@@ -0,0 +1,6 @@
+
+// CUSTOM-DATA MODULE
+export * from '../_models/data-models/dynamo-custom-data';
+export * from '../_constants/module-settings/custom-data-module-settings';
+
+

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

@@ -1,8 +1,8 @@
 
 // DATA MODULE
 export * from '../_models/data-models/dynamo-metadata';
-export * from '../_models/control-models/dynamo-nts-data-params';
-export * from '../_models/control-models/dynamo-nts-data-property-params';
+export * from '../_models/control-models/dynamo-data-params';
+export * from '../_models/control-models/dynamo-data-property-params';
 export * from '../_models/control-models/dynamo-error';
 export * from '../_enums/data-model-type.enum';
 

package/src/_modules/test-module.index.ts

@@ -1,6 +1,5 @@
 
 // TEST MODULE
-export * from '../_models/data-models/dynamo-custom-data';
 export * from '../_constants/module-settings/test-module-settings';