@futdevpro/nts-dynamo 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.04.04",
+  "version": "01.04.06",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Ltd.",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -37,7 +37,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",
@@ -50,7 +49,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",
@@ -75,12 +73,6 @@
       "types": "./lib/_modules/controller.index.d.ts",
       "typings": "./lib/_modules/controller.index.d.ts"
     },
-    "./data-models": {
-      "default": "./lib/_modules/data-models.index.js",
-      "module": "./lib/_modules/data-models.index.js",
-      "types": "./lib/_modules/data-models.index.d.ts",
-      "typings": "./lib/_modules/data-models.index.d.ts"
-    },
     "./data-service": {
       "default": "./lib/_modules/data-service.index.js",
       "module": "./lib/_modules/data-service.index.js",
@@ -102,14 +94,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"
       ],
@@ -122,9 +112,6 @@
       "controller": [
         "lib/_modules/controller.index.d.ts"
       ],
-      "data-models": [
-        "lib/_modules/data-models.index.d.ts"
-      ],
       "data-service": [
         "lib/_modules/data-service.index.d.ts"
       ]
@@ -143,6 +130,7 @@
     "nodets"
   ],
   "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
     "build": "npx tsc",
     "postbuild": "npm publish"
   },
@@ -153,6 +141,7 @@
   },
   "homepage": "https:/futdevpro.hu/projects/dynamo",
   "peerDependencies": {
+    "@futdevpro/fsm-dynamo": "~1.0.2",
     "@types/express": "~4.17.7",
     "@types/geoip-lite": "~1.4.1",
     "@types/nodemailer": "~6.4.4",
@@ -164,9 +153,9 @@
     "rxjs": "~7.4.0"
   },
   "dependencies": {
-    "tslib": "~2.0.1",
     "@types/node": "~14.0.27",
     "ts-node": "~8.10.2",
+    "tslib": "~2.0.1",
     "typescript": "~3.9.7"
   }
 }

package/src/_constants/index.ts

@@ -1,5 +1,2 @@
 
 export * from './dynamobe-global.settings';
-export * from './fullstack/times';
-export * from './fullstack/module-settings/test-module-settings';
-export * from './fullstack/module-settings/usage-module-settings';

package/src/_models/dynamobe-data-model-params.ts

@@ -1,6 +1,7 @@
 
+import { DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
+
 import { DataModelType } from '../_enums/data-model-type.enum';
-import { DynamoBEDataPropertyParams } from './fullstack/control-models/dynamobe-data-property-params';
 
 export class DynamoBEDataModelParams {
   dataName: string;

package/src/_models/index.ts

@@ -6,17 +6,4 @@ export * from './dynamobe-app-params';
 export * from './dynamobe-data-model-params';
 export * from './dynamobe-endpoint-params';
 export * from './dynamobe-global-settings';
-  // FULLSTACK - CONTROL MODELS
-export * from './fullstack/control-models/daily-usage-data';
-export * from './fullstack/control-models/dynamobe-data-property-params';
-export * from './fullstack/control-models/dynamobe-error';
-export * from './fullstack/control-models/geo-ip-location';
-export * from './fullstack/control-models/location-coordinates';
-export * from './fullstack/control-models/usage-action';
-export * from './fullstack/control-models/usage-data';
-export * from './fullstack/control-models/dynamobe-data-params';
-  // FULLSTACK - DATA MODELS
-export * from './fullstack/data-models/custom-data';
-export * from './fullstack/data-models/metadata';
-export * from './fullstack/data-models/usage-session';
 

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

@@ -5,7 +5,6 @@ export * from '../_services/dynamobe-singleton.service';
 
 // MODELS
 export * from '../_models/dynamobe-api-call-params';
-export * from '../_models/fullstack/control-models/dynamobe-error';
 
 // ENUMS
 export * from '../_enums/http/http-call-type.enum';

package/src/_modules/auth.index.ts

@@ -2,6 +2,3 @@
 // SERVICES
 export * from '../_services/dynamobe-auth.service';
 export * from '../_services/dynamobe-shared.service';
-
-// MODELS
-export * from '../_models/fullstack/control-models/dynamobe-error';

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

@@ -4,6 +4,3 @@ export * from '../_services/dynamobe-data.service';
 export * from '../_services/dynamobe-db.service';
 export * from '../_services/dynamobe-global.service';
 export * from '../_services/dynamobe-shared.service';
-
-// MODELS
-export * from '../_models/fullstack/control-models/dynamobe-error';

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

@@ -1,7 +1,8 @@
 
 
 
-import { CustomData, customDataModelParams } from '../../_models/fullstack/data-models/custom-data';
+import { CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
 
 export class CustomDataService extends DynamoBEDataService<CustomData> {

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

@@ -1,5 +1,6 @@
 
-import { testModuleSettings } from '../../_constants/fullstack/module-settings/test-module-settings';
+import { testModuleSettings } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
 import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
 import { TestController } from './test-controller';

package/src/_modules/test/index.ts

@@ -3,6 +3,4 @@
 export * from './test-controller';
 export * from './custom-data.service';
 export * from './get-test-routing-module';
-export * from '../../_models/fullstack/data-models/custom-data';
-/* export * from '../../_constants/fullstack/module-settings/test-module-settings'; */
 

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

@@ -1,6 +1,7 @@
 
 import { Request, Response } from 'express';
-import { testModuleSettings } from '../../_constants/fullstack/module-settings/test-module-settings';
+import { testModuleSettings } from '@futdevpro/fsm-dynamo';
+
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
 import { DynamoBEController } from '../../_services/dynamobe-controller.service';

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

@@ -1,5 +1,6 @@
 
-import { usageModuleSettings } from '../../_constants/fullstack/module-settings/usage-module-settings';
+import { usageModuleSettings } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
 import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
 import { UsageController } from './usage-controller';

package/src/_modules/usage/index.ts

@@ -3,6 +3,4 @@
 export * from './usage-controller';
 export * from './usage.service';
 export * from './get-usage-routing-module';
-export * from '../../_models/fullstack/data-models/usage-session';
-/* export * from '../../_constants/fullstack/module-settings/usage-module-settings'; */
 

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

@@ -1,9 +1,9 @@
 
 import { Request, Response } from 'express';
-import { usageModuleSettings } from '../../_constants/fullstack/module-settings/usage-module-settings';
+import { usageModuleSettings, DynamoUsageSession } from '@futdevpro/fsm-dynamo';
+
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
-import { DynamoUsageSession } from '../../_models/fullstack/data-models/usage-session';
 import { DynamoBEAuthService } from '../../_services/dynamobe-auth.service';
 import { DynamoBEController } from '../../_services/dynamobe-controller.service';
 import { DBE_Global_S } from '../../_services/dynamobe-global.service';

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

@@ -1,11 +1,10 @@
 
+import { Request } from 'express';
+import { DynamoUsageSession, DynamoUsageData, DailyUsageData, 
+  usageSessionModelParams, DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
-import { DynamoBEError } from '../../_models/fullstack/control-models/dynamobe-error';
 import { DBE_Shared_BE } from '../../_services/dynamobe-shared-be.service';
-import { Request } from 'express';
-import { DynamoUsageData } from '../../_models/fullstack/control-models/usage-data';
-import { DailyUsageData } from '../../_models/fullstack/control-models/daily-usage-data';
-import { DynamoUsageSession, usageSessionModelParams } from '../../_models/fullstack/data-models/usage-session';
 
 export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
   usageData: DynamoUsageData[] = [];

package/src/_services/dynamobe-api.service.ts

@@ -1,9 +1,10 @@
 
 import * as Axios from 'axios';
+import { DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { HttpResponseType } from '../_enums/http/http-response-type.enum';
 import { DynamoBEApiCallParams } from '../_models/dynamobe-api-call-params';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DBE_Shared } from './dynamobe-shared.service';
 
 export class DynamoBEApiService {

package/src/_services/dynamobe-auth.service.ts

@@ -1,6 +1,7 @@
 
 import { NextFunction, Request, Response } from 'express';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
+import { DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBESingletonService } from './dynamobe-singleton.service';
 
 /**

package/src/_services/dynamobe-data.service.ts

@@ -1,10 +1,9 @@
 
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
-import { Metadata } from '../_models/fullstack/data-models/metadata';
+import { Metadata, DynamoBEDataPropertyParams, DynamoBEDataParams, 
+  DynamoBEError } from '@futdevpro/fsm-dynamo';
+  
 import { DynamoBEDBService } from './dynamobe-db.service';
-import { DynamoBEDataPropertyParams } from '../_models/fullstack/control-models/dynamobe-data-property-params';
 import { DBE_Global_S } from './dynamobe-global.service';
-import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
 
 export class DynamoBEDataService<T extends Metadata> {
   dataDBService: DynamoBEDBService<T>;

package/src/_services/dynamobe-db.service.ts

@@ -1,10 +1,8 @@
 
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
-import { Metadata } from '../_models/fullstack/data-models/metadata';
-import { DynamoBEDataPropertyParams } from '../_models/fullstack/control-models/dynamobe-data-property-params';
-import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
+import { Metadata, DynamoBEDataParams, DynamoBEError, 
+  DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
 
 export class DynamoBEDBService<T extends Metadata> {
   dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());

package/src/_services/dynamobe-email.service.ts

@@ -3,7 +3,8 @@ import * as FileSystem from 'fs';
 import * as Path from 'path';
 import * as NodeMailer from 'nodemailer';
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
+import { DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { DBE_Shared } from './dynamobe-shared.service';
 
 export class DynamoBEEmailService {

package/src/_services/dynamobe-global.service.ts

@@ -1,12 +1,12 @@
 
 
-import { Metadata } from '../_models/fullstack/data-models/metadata';
+import { DynamoBEDataParams, Metadata } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBEAuthService } from './dynamobe-auth.service';
 import { DynamoBEDBServiceCollection } from './dynamobe-db-service-collection.service';
 import { DynamoBEDBService } from './dynamobe-db.service';
 import { DynamoBEEmailServiceCollection } from './dynamobe-email-service-collection.service';
 import { DynamoBESingletonService } from './dynamobe-singleton.service';
-import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 

package/src/_services/dynamobe-routing-module.service.ts

@@ -1,10 +1,11 @@
 
 import { Router } from 'express';
+import { DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { dynamoBEGlobalSettings } from '../_constants/dynamobe-global.settings';
 import { DynamoBERouteSecurity } from '../_enums/dynamobe-route-security.enum';
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../_models/dynamobe-endpoint-params';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DynamoBEController } from './dynamobe-controller.service';
 import { DBE_Shared } from './dynamobe-shared.service';
 

package/src/_services/dynamobe-shared-be.service.ts

@@ -2,7 +2,8 @@
 import * as ReadLine from 'readline';
 import { Request } from 'express';
 import * as GeoIp from 'geoip-lite';
-import { GeoIpLocation } from '../_models/fullstack/control-models/geo-ip-location';
+import { GeoIpLocation } from '@futdevpro/fsm-dynamo';
+
 import { DBE_Shared } from './dynamobe-shared.service';
 
 export class DBE_Shared_BE extends DBE_Shared {

package/src/_services/dynamobe-shared.service.ts

@@ -1,8 +1,7 @@
 
-import { day, hour, month, week, year } from '../_constants/fullstack/times';
+import { LocationCoordinates, DynamoBEError, 
+  year, hour, day, week, month } from '@futdevpro/fsm-dynamo';
 import { LogStyle } from '../_enums/log-style.enum';
-import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
-import { LocationCoordinates } from '../_models/fullstack/control-models/location-coordinates';
 
 export class DBE_Shared {
 

package/src/index.ts

@@ -15,9 +15,3 @@ export * from './_services';
 export * from './_modules/test/index';
 export * from './_modules/usage/index';
 
-/* export * from './_modules/app.index';
-export * from './_modules/api-service.index';
-export * from './_modules/auth.index';
-export * from './_modules/controller.index';
-export * from './_modules/data-models.index';
-export * from './_modules/data-service.index'; */

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

@@ -1,14 +0,0 @@
-import { DynamoModuleSettings } from '../../../_models/dynamo-module-settings';
-
-export const testModuleSettings: DynamoModuleSettings = {
-  mainRoute: '/test',
-  endPoints: {
-    testGet: '/test-get',
-    testPost: '/test-post',
-    testPut: '/test-put',
-    testPatch: '/test-patch',
-    testDelete: '/test-delete',
-    getCustomData: '/custom/get/:customId',
-    modifyCustomData: '/custom/post'
-  }
-};

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

@@ -1,12 +0,0 @@
-
-import { DynamoModuleSettings } from '../../../_models/dynamo-module-settings';
-
-export const usageModuleSettings: DynamoModuleSettings = {
-  mainRoute: '/usage',
-  endPoints: {
-    newSession: '/new-session',
-    closeSession: '/close-session/:sessionId',
-    updateUsage:  '/update/:sessionId',
-    getAllUsageData: '/get/all',
-  }
-};

package/src/_constants/fullstack/times.ts

@@ -1,8 +0,0 @@
-
-export const second = 1000;
-export const minute = second * 60;
-export const hour = minute * 60;
-export const day = hour * 24;
-export const week = day * 7;
-export const month = day * 30.4368499;
-export const year = day * 365.242199;

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

@@ -1,34 +0,0 @@
-
-import { DynamoUsageSession } from "../data-models/usage-session";
-
-export class DailyUsageData {
-  date?: string;
-  totalVisitTime?: number = 0;
-  averageVisitTime?: number = 0;
-  visitorsHun?: number = 0;
-  visitorsElse?: number = 0;
-
-  visitations?: DynamoUsageSession[] = [];
-
-  constructor(
-    set?: {
-      date?: string,
-      totalVisitTime?: number,
-      averageVisitTime?: number,
-      visitorsHun?: number,
-      visitorsElse?: number,
-
-      visitations?: DynamoUsageSession[],
-    }
-  ) {
-    if (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 : [];
-    }
-  }
-}

package/src/_models/fullstack/control-models/dynamobe-data-params.ts

@@ -1,19 +0,0 @@
-
-import { DynamoBEDataPropertyParams } from './dynamobe-data-property-params';
-
-export class DynamoBEDataParams {
-  dataName: string;
-  dbName: string;
-  modelParams: DynamoBEDataPropertyParams[];
-
-  constructor(
-    set: {
-      dataName: string,
-      modelParams: DynamoBEDataPropertyParams[],
-    }
-  ) {
-    this.dataName = set.dataName;
-    this.dbName = set.dataName.charAt(0).toUpperCase() + set.dataName.slice(1);
-    this.modelParams = set.modelParams ? set.modelParams : [];
-  }
-}

package/src/_models/fullstack/control-models/dynamobe-data-property-params.ts

@@ -1,98 +0,0 @@
-
-import { DynamoBEError } from './dynamobe-error';
-
-export class DynamoBEDataPropertyParams {
-  key: string;
-  type: 'string' | 'number' | 'boolean' | 'Date' | 'object' | string;
-
-  unique?: boolean;
-  required?: boolean;
-  index?: boolean;
-
-  isDependencyHook?: boolean;
-  dependencyName?: string;
-
-  minlength?: number;
-  maxlength?: number;
-
-  subObjectParams?: DynamoBEDataPropertyParams[] = [];
-
-  additionalValidators?: ((data) => void)[];
-
-  constructor(
-    set: {
-      key: string,
-      type: 'string' | 'number' | 'boolean' | 'Date' | 'object' | string,
-
-      unique?: boolean,
-      required?: boolean,
-      index?: boolean,
-
-      isDependencyHook?: boolean,
-      dependencyDBServiceName?: string,
-
-      minlength?: number,
-      maxlength?: number,
-
-      subObjectParams?: DynamoBEDataPropertyParams[],
-
-      additionalValidators?: ((data) => void)[],
-    }
-  ) {
-
-    if (set) {
-      this.key = set.key;
-      this.type = set.type;
-
-      if (this.getBEType() === Object) {
-        if (set?.subObjectParams) {
-          this.subObjectParams = set.subObjectParams;
-        } else {
-          console.log('DYNAMO ERROR: \n subObjectParams missing', '\n\n', new Error());
-          throw new DynamoBEError({ message: 'subObjectParams missing' });
-        }
-      }
-
-      if (set.isDependencyHook) {
-        if (set.dependencyDBServiceName) {
-          this.isDependencyHook = set.isDependencyHook;
-          this.dependencyName = set.dependencyDBServiceName;
-        } else {
-          this.isDependencyHook = set.isDependencyHook;
-          console.log('DYNAMO ERROR: \n dependencyDBServiceName missing for dependencyHook', '\n\n', new Error());
-        }
-      }
-      this.unique = set.unique;
-      this.required = set.required;
-      this.index = set.index;
-      this.minlength = set.minlength;
-      this.maxlength = set.maxlength;
-      this.additionalValidators = set.additionalValidators;
-    } else {
-      console.log('DYNAMO ERROR: \nMISSING DynamoBEDataPropertyParams constructor input', '\n\n', new Error());
-    }
-  }
-
-  // tslint:disable-next-line: ban-types
-  getBEType?(): String | Number | Boolean | Object | Function | Array<any> | Date {
-    switch (this.type) {
-      case 'string':
-        return String;
-      case 'number':
-        return Number;
-      case 'boolean':
-        return Boolean;
-      case 'Date':
-        return Date;
-      case 'object':
-      default:
-        if (this.type.includes('[]')) {
-          return Array;
-        } else if (this.type.includes('=>') || this.type.includes('function')) {
-          return Function;
-        } else {
-          return Object;
-        }
-    }
-  }
-}