@futdevpro/nts-dynamo 1.6.19 → 1.6.21

package/src/_constants/mocks/app-extended-server.mock.ts

@@ -0,0 +1,191 @@
+
+
+import { usageSessionModelParams } from '@futdevpro/fsm-dynamo/usage-module';
+import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module';
+
+import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
+import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
+import { DynamoNTS_PortSettings } from '../../_models/interfaces/port-settings.interface';
+import { getTestRoutingModule } from '../../_modules/test';
+import { getUsageRoutingModule } from '../../_modules/usage';
+import { DynamoNTS_SingletonService } from '../../_services';
+import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
+import { DynamoNTS_App } from '../../_services/server/app.server';
+import { DynamoNTS_Controller_Mock } from './controller.mock';
+import { AuthService_Mock } from './auth-service.mock';
+import { DynamoNTS_AppExtended, dynamoNTS_globalSettings, DynamoNTS_SocketServerService } from '../../_modules/app-extended.index';
+import { DynamoNTS_SocketServer_Mock } from './socket-server.mock';
+import { SocketClient_Mock } from './socket-client.mock';
+import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
+import { dynamo_error_default } from '@futdevpro/fsm-dynamo';
+import { EmailServiceCollection_Mock } from './email-service-collection.mock';
+
+/**
+ * 
+ */
+export class DynamoNTS_AppExtendedBase_Mock extends DynamoNTS_AppExtended {
+
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-extended-base',
+      version: '1.0.1',
+      dbName: 'test-base',
+    });
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {};
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [];
+  }
+
+  getSocketServices(): DynamoNTS_SocketServerService[] {
+    return [];
+  }
+}  
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+/**
+ * 
+ */
+export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
+
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-extended-full',
+      version: 'x.0.101',
+      dbName: 'test-full',
+    });
+  }
+    
+  overrideDynamoNTSGlobalSettings(): void {
+    /* dynamoNTS_globalSettings.logSetup = true; */
+    /* dynamoNTS_globalSettings.defaultRouteSecurity = DynamoNTS_RouteSecurity.open;  */
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+      /* emailServiceCollection: EmailServiceCollectionService.getInstance(), */
+      dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
+
+        usageSessionModelParams,
+        customDataModelParams,
+      ],      
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {
+      httpPort: 53535,
+    };
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [
+      new DynamoNTS_RoutingModule({
+        route: '/test-0',
+        controllers: [
+          DynamoNTS_Controller_Mock.getInstance(),
+        ],
+      }),
+
+      getTestRoutingModule(),
+      getUsageRoutingModule()
+    ];
+  }
+
+  getSocketServices(): DynamoNTS_SocketServerService[] {
+    return [
+      DynamoNTS_SocketServer_Mock.getInstance(),
+    ];
+  }
+
+  async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
+    return [
+      SocketClient_Mock.getInstance(),
+    ];
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+/**
+ * 
+ */
+export class DynamoNTS_AppWbMock_Mock extends DynamoNTS_AppExtended {
+
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-wb-mock',
+      version: 'x.0.101',
+      dbName: 'test-full',
+    });
+  }
+    
+  overrideDynamoNTSGlobalSettings(): void {
+    dynamoNTS_globalSettings.logRequestsContent = true;
+    dynamo_error_default.issuerSystem = '-test-wb-mock-';
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+      emailServiceCollection: EmailServiceCollection_Mock.getInstance(),
+      dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
+
+        usageSessionModelParams,
+        customDataModelParams,
+      ],      
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {
+      httpPort: 53535,
+    };
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [
+      new DynamoNTS_RoutingModule({
+        route: '/test-0',
+        controllers: [
+          DynamoNTS_Controller_Mock.getInstance(),
+        ],
+      }),
+
+      getTestRoutingModule(),
+      getUsageRoutingModule()
+    ];
+  }
+
+  getSocketServices(): DynamoNTS_SocketServerService[] {
+    return [
+      DynamoNTS_SocketServer_Mock.getInstance(),
+    ];
+  }
+
+  async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
+    return [
+      SocketClient_Mock.getInstance(),
+    ];
+  }
+}

package/src/_constants/mocks/app-server.mock.ts

@@ -13,6 +13,8 @@ import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.se
 import { DynamoNTS_App } from '../../_services/server/app.server';
 import { DynamoNTS_Controller_Mock } from './controller.mock';
 import { AuthService_Mock } from './auth-service.mock';
+import { dynamoNTS_globalSettings } from '../global-settings.const';
+import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
 
 /**
  * 
@@ -21,7 +23,7 @@ export class DynamoNTS_AppBase_Mock extends DynamoNTS_App {
   getAppParams(): DynamoNTS_AppParams {
     return new DynamoNTS_AppParams({
       name: 'test-base',
-      version: '1.0.1',
+      version: 'x1.0.1',
       dbName: 'test-base',
     });
   }
@@ -52,13 +54,14 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
   getAppParams(): DynamoNTS_AppParams {
     return new DynamoNTS_AppParams({
       name: 'test-full',
-      version: 'x.0.101',
+      version: 'xx.0.101',
       dbName: 'test-full',
     });
   }
   
   
   overrideDynamoNTSGlobalSettings(): void {
+    /* dynamoNTS_globalSettings.logSetup = true; */
     /* dynamoNTS_globalSettings.defaultRouteSecurity = DynamoNTS_RouteSecurity.open;  */
   }
 
@@ -67,6 +70,8 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
       authService: AuthService_Mock.getInstance(),
       /* emailServiceCollection: EmailServiceCollectionService.getInstance(), */
       dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
 
         usageSessionModelParams,
         customDataModelParams,
@@ -76,14 +81,14 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
 
   getPortSettings(): DynamoNTS_PortSettings {
     return {
-      httpPort: 39393
+      httpPort: 10101,
     };
   }
 
   getRoutingModules(): DynamoNTS_RoutingModule[] {
     return [
       new DynamoNTS_RoutingModule({
-        route: '/test-0',
+        route: '/test-extended-0',
         controllers: [
           DynamoNTS_Controller_Mock.getInstance(),
         ],
@@ -94,7 +99,7 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
     ];
   }
 
-  getRootServices(): DynamoNTS_SingletonService[] {
+  async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
     return [];
   }
 }

package/src/_constants/mocks/data-model.mock.ts

@@ -0,0 +1,83 @@
+import { Dynamo_DataParams, Dynamo_Metadata } from '@futdevpro/fsm-dynamo';
+
+
+export class Depemndency_Mock extends Dynamo_Metadata {
+  string?: string;
+  number?: number;
+  date?: Date;
+  boolean?: boolean;
+  array?: string[];
+  object?: any;
+  objectArray?: any[];
+  objectArrayArray?: any[][];
+
+  constructor(
+    set?: Depemndent_Mock
+  ) {
+    super(set);
+
+    if (set) {
+      Object.assign(this, set);
+    }
+  }
+}
+
+export const dependency_mock_DataParams = new Dynamo_DataParams({
+  dataName: 'dependencyMock',
+  modelParams: [
+    { key: 'string', type: 'string', },
+    { key: 'number', type: 'number', },
+    { key: 'date', type: 'Date', },
+    { key: 'boolean', type: 'boolean', },
+    { key: 'array', type: 'string[]', },
+    { key: 'object', type: 'any', },
+    { key: 'objectArray', type: 'any[]', },
+    { key: 'objectArrayArray', type: 'any[][]', },
+  ]
+})
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+export class Depemndent_Mock extends Dynamo_Metadata {
+  dependencyId?: string;
+
+  string?: string;
+  number?: number;
+  date?: Date;
+  boolean?: boolean;
+  array?: string[];
+  object?: any;
+  objectArray?: any[];
+  objectArrayArray?: any[][];
+
+  constructor(
+    set?: Depemndent_Mock
+  ) {
+    super(set);
+
+    if (set) {
+      Object.assign(this, set);
+    }
+  }
+}
+
+export const dependent_mock_DataParams = new Dynamo_DataParams({
+  dataName: 'dependentMock',
+  modelParams: [
+    { key: 'dependencyId', type: 'string',
+      unique: true, required: true,
+      isDependencyHook: true,
+      dependencyDataName:  dependency_mock_DataParams.dataName,
+    },
+    { key: 'string', type: 'string', },
+    { key: 'number', type: 'number', },
+    { key: 'date', type: 'Date', },
+    { key: 'boolean', type: 'boolean', },
+    { key: 'array', type: 'string[]', },
+    { key: 'object', type: 'any', },
+    { key: 'objectArray', type: 'any[]', },
+    { key: 'objectArrayArray', type: 'any[][]', },
+  ]
+})

package/src/_constants/mocks/email-service-collection.mock.ts

@@ -0,0 +1,12 @@
+import { DynamoNTS_EmailService, DynamoNTS_ServiceCollection } from '../../_services';
+import { EmailService_Mock } from './email-service.mock';
+
+export class EmailServiceCollection_Mock extends DynamoNTS_ServiceCollection<DynamoNTS_EmailService> {
+
+  static getInstance(): EmailServiceCollection_Mock {
+    return EmailServiceCollection_Mock.getSingletonInstance();
+  }
+  
+  test: EmailService_Mock = new EmailService_Mock();
+
+}

package/src/_constants/mocks/email-service.mock.ts

@@ -0,0 +1,19 @@
+import { DynamoNTS_EmailService } from '../../_services';
+
+export class EmailService_Mock extends DynamoNTS_EmailService {
+
+  constructor() {
+    super({
+      host: 'smtp.forpsi.com',
+      port: 465,
+      senderName: 'FutDevPro - Auto',
+      email: 'auto@futdevpro.hu',
+      pass: 'a9wY992H4CpxYAG#',
+      rootPath: __dirname,
+      templatePaths: {
+        // test: './email-template.mock.html',
+      },
+    });
+  }
+}
+

package/src/_constants/mocks/email-template.mock.html

@@ -0,0 +1,15 @@
+
+<!DOCTYPE html>
+<html>
+  <body>
+    <h1>Hello!</h1>
+
+    This is a TEST!
+    {{ content }}
+
+    {{content}}}
+
+    <h4>Regards,</h4>
+
+  </body>
+</html> 

package/src/_constants/mocks/socket-client.mock.ts

@@ -0,0 +1,42 @@
+import { DynamoNTS_SocketEventType } from '../../_enums';
+import { DynamoNTS_SocketClientServiceParams, DynamoNTS_SocketEvent } from '../../_models';
+import { DynamoNTS_SocketClientService } from '../../_modules/app-extended.index';
+
+
+
+export class SocketClient_Mock extends DynamoNTS_SocketClientService {
+
+  private constructor() {
+    super();
+  } 
+  
+  static getInstance(): SocketClient_Mock {
+    return SocketClient_Mock.getSingletonInstance();
+  }
+
+  getIncomingEvents(): DynamoNTS_SocketEvent<any>[] {
+    return [
+      new DynamoNTS_SocketEvent({
+        eventType: DynamoNTS_SocketEventType.connect,
+        tasks: [
+          async (content: any, issuer: string) => {
+            console.log('SocketClient_Mock: connect event received');
+          }
+        ]
+      }),
+    ];
+  }
+
+  getParams(): DynamoNTS_SocketClientServiceParams {
+    return new DynamoNTS_SocketClientServiceParams({
+      service: '-test-socket-target-',
+      name: 'socket-client-mock',
+      port: 30303,
+      socketOptions: {
+        reconnection: true,
+      },
+    });
+  }
+
+}
+

package/src/_constants/mocks/socket-server.mock.ts

@@ -8,10 +8,14 @@ import { DynamoNTS_SocketServerService } from '../../_services/socket/socket-ser
 
 export class DynamoNTS_SocketServer_Mock extends DynamoNTS_SocketServerService<DynamoNTS_SocketPresence> {
   
+  static getInstance(): DynamoNTS_SocketServer_Mock {
+    return DynamoNTS_SocketServer_Mock.getSingletonInstance();
+  }
+  
   getServiceParams(): DynamoNTS_SocketServerServiceParams<any> {
     return new DynamoNTS_SocketServerServiceParams({
       name: 'test',
-      port: 3000,
+      port: 9393,
     });
   }
 

package/src/_models/control-models/app-system-controls.control-model copy.ts

@@ -0,0 +1,9 @@
+
+
+import { DynamoNTS_SystemControl } from './system-control.control-model'
+
+export class DynamoNTS_AppExtSysControls {
+  appExtended: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();
+  httpSocketServer: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();
+  httpsSocketServer: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();  
+}

package/src/_models/control-models/app-system-controls.control-model.ts

@@ -0,0 +1,9 @@
+import { DynamoNTS_SystemControl } from './system-control.control-model'
+
+
+export class DynamoNTS_AppSystemControls {
+  app: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();
+  mongoose: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();
+  httpServer: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();
+  httpsServer: DynamoNTS_SystemControl = new DynamoNTS_SystemControl();  
+}

package/src/_models/control-models/system-control.control-model.ts

@@ -0,0 +1,13 @@
+
+
+
+export class DynamoNTS_SystemControl {
+  init: boolean = false;
+  /* failed: boolean = false; */
+  started: boolean = false;
+
+  getReady(): boolean {
+    return this.init ? this.started : true;
+  }
+}
+

package/src/_services/base/db.service.ts

@@ -17,7 +17,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   serviceName: string;
 
-  dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());
+  dataModel; // = mongoose.model(this.dataParams.dbName, this.getSchema());
 
   private depDataName: string;
 
@@ -34,21 +34,31 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
   constructor(
     public dataParams: Dynamo_DataParams
   ){
-    try {
-      this.serviceName = this.constructor?.name;
-      this.lookForDependencyDataSettings();
-    } catch (error) {
-      Dynamo_Log.error(
-        `\nDynamoNTS_DBService ERROR, The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
-        new Error()
-      );
-      /* error = new Dynamo_Error({
-        message: `\nDynamoNTS_DBService ERROR, The construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
-        error
-      });
+    async () => {
+      try {
+        this.serviceName = this.constructor?.name;
+
+        try {
+          this.dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());
+        } catch {
+          this.dataModel = mongoose.models[this.dataParams.dbName];
+        }
 
-      throw error; */
-    }
+        this.lookForDependencyDataSettings();
+        // Dynamo_Log.testLog(`${this.dataParams.dbName}: ${this.dataModel === mongoose.models[this.dataParams.dbName]}`);
+      } catch (error) {
+        Dynamo_Log.error(
+          `\nDynamoNTS_DBService ERROR, The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
+          new Error()
+        );
+        /* error = new Dynamo_Error({
+          message: `\nDynamoNTS_DBService ERROR, The construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
+          error
+        });
+
+        throw error; */
+      }
+    };
   }
 
   /**

package/src/_services/core/email.service.ts

@@ -150,7 +150,6 @@ export class DynamoNTS_EmailService {
 
       await new Promise<void>((resolve, reject) => { 
         this.nmTransporter.sendMail(mailOptions, (error, info) => { 
-          /* err = error; */
           if (error) {
             reject(error);
           } else {

package/src/_services/server/app-extended.server.spec.ts

@@ -0,0 +1,66 @@
+import { DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock, DynamoNTS_AppWbMock_Mock } from '../../_constants/mocks/app-extended-server.mock';
+
+describe('DynamoNTS_AppExtended;', () => {
+  describe('a extended-base instance;', () => {
+    let app: DynamoNTS_AppExtendedBase_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppExtendedBase_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+  });
+
+  describe('a extended-full instance;', () => {
+    let app: DynamoNTS_AppExtendedFull_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppExtendedFull_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+      
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+  });
+
+  describe('a wb-mock instance;', () => {
+    let app: DynamoNTS_AppWbMock_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppWbMock_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+      
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+  });
+});