@futdevpro/nts-dynamo 1.15.1 → 1.15.3

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

@@ -0,0 +1,52 @@
+
+import { DyNTS_AppExtSysControls } from './app-ext-system-controls.control-model';
+import { DyNTS_SystemControl } from './system-control.control-model';
+
+describe('| DyNTS_AppExtSysControls', () => {
+  let appExtSysControls: DyNTS_AppExtSysControls;
+
+  beforeEach(() => {
+    appExtSysControls = new DyNTS_AppExtSysControls();
+  });
+
+  it('| should create an instance of DyNTS_AppExtSysControls', () => {
+    expect(appExtSysControls).toBeTruthy();
+  });
+
+  it('| should initialize "appExtended" as an instance of DyNTS_SystemControl', () => {
+    expect(appExtSysControls.appExtended).toBeInstanceOf(DyNTS_SystemControl);
+  });
+
+  it('| should initialize "httpSocketServer" as an instance of DyNTS_SystemControl', () => {
+    expect(appExtSysControls.httpSocketServer).toBeInstanceOf(DyNTS_SystemControl);
+  });
+
+  it('| should initialize "httpsSocketServer" as an instance of DyNTS_SystemControl', () => {
+    expect(appExtSysControls.httpsSocketServer).toBeInstanceOf(DyNTS_SystemControl);
+  });
+
+  it('| should have independent SystemControl instances', () => {
+    expect(appExtSysControls.appExtended).not.toBe(appExtSysControls.httpSocketServer);
+    expect(appExtSysControls.appExtended).not.toBe(appExtSysControls.httpsSocketServer);
+    expect(appExtSysControls.httpSocketServer).not.toBe(appExtSysControls.httpsSocketServer);
+  });
+
+  it('| should allow setting init and started on appExtended', () => {
+    appExtSysControls.appExtended.init = true;
+    appExtSysControls.appExtended.started = true;
+    expect(appExtSysControls.appExtended.getIsReady()).toBeTrue();
+  });
+
+  it('| should allow setting init and started on httpSocketServer', () => {
+    appExtSysControls.httpSocketServer.init = true;
+    appExtSysControls.httpSocketServer.started = false;
+    expect(appExtSysControls.httpSocketServer.getIsReady()).toBeFalse();
+  });
+
+  it('| should allow setting init and started on httpsSocketServer', () => {
+    appExtSysControls.httpsSocketServer.init = true;
+    appExtSysControls.httpsSocketServer.started = true;
+    expect(appExtSysControls.httpsSocketServer.getIsReady()).toBeTrue();
+  });
+});
+

package/src/_models/control-models/app-params.control-model.spec.ts

@@ -1,14 +1,40 @@
 
 import { DyNTS_App_Params } from './app-params.control-model';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
+import { DyFM_EnvironmentFlag } from '@futdevpro/fsm-dynamo';
 
 describe('| DyNTS_App_Params', () => {
+  let originalEnv: any;
+
+  // Ensure env_settings exists before tests
+  beforeAll(() => {
+    if (!DyNTS_global_settings.env_settings) {
+      (DyNTS_global_settings as any).env_settings = {
+        environment: DyFM_EnvironmentFlag.local,
+        discord: {},
+        mongoUri: undefined,
+        openAi: {},
+      };
+    }
+  });
+
+  beforeEach(() => {
+    originalEnv = DyNTS_global_settings.env_settings?.environment;
+    DyNTS_global_settings.env_settings.environment = DyFM_EnvironmentFlag.local;
+  });
+
+  afterEach(() => {
+    if (DyNTS_global_settings.env_settings) {
+      DyNTS_global_settings.env_settings.environment = originalEnv;
+    }
+  });
   it('| should initialize with provided values', () => {
     const params: DyNTS_App_Params = {
       name: 'TestApp',
       title: 'Test Application',
       version: '1.0.0',
       dbName: 'testdb',
-      dbUri: 'mongodb://0.0.0.0:27017/testdb',
+      dbUri: 'mongodb://0.0.0.0:29017/testdb',
       systemName: 'Test-App',
       systemShortCodeName: 'TA'
     };
@@ -19,12 +45,14 @@ describe('| DyNTS_App_Params', () => {
     expect(appParams.title).toBe('Test Application');
     expect(appParams.version).toBe('1.0.0');
     expect(appParams.dbName).toBe('testdb');
-    expect(appParams.dbUri).toBe('mongodb://0.0.0.0:27017/testdb');
+    expect(appParams.dbUri).toBe('mongodb://0.0.0.0:29017/testdb');
     expect(appParams.systemName).toBe('Test-App');
     expect(appParams.systemShortCodeName).toBe('TA_LOCAL');
   });
 
   it('| should set default values when optional parameters are not provided', () => {
+    (DyNTS_global_settings.env_settings as any).mongoUri = undefined;
+
     const params: DyNTS_App_Params = {
       name: 'TestApp',
       version: '1.0.0',
@@ -66,4 +94,132 @@ describe('| DyNTS_App_Params', () => {
 
     expect(appParams.systemName).toBe('Test-Application');
   });
+
+  it('| should generate dbUri from global mongoUri when dbUri is not provided', () => {
+    // This test assumes global settings have mongoUri set
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.dbUri).toBeDefined();
+    expect(appParams.dbName).toBe('testdb');
+  });
+
+  it('| should use provided dbUri when set', () => {
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+      dbUri: 'mongodb://custom:27017/testdb',
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.dbUri).toBe('mongodb://custom:27017/testdb');
+  });
+
+  it('| should set default dbOptions when not provided', () => {
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.dbOptions).toBeDefined();
+    expect(appParams.dbOptions?.directConnection).toBe(true);
+  });
+
+  it('| should use provided dbOptions', () => {
+    const customOptions = {
+      directConnection: false,
+      maxPoolSize: 10,
+    };
+
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+      dbOptions: customOptions,
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.dbOptions).toEqual(customOptions);
+  });
+
+  it('| should set default openHost and secureHost', () => {
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.openHost).toBe('0.0.0.0');
+    expect(appParams.secureHost).toBe('0.0.0.0');
+  });
+
+  it('| should set default expressBacklog', () => {
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+    };
+
+    const appParams = new DyNTS_App_Params(params);
+
+    expect(appParams.expressBacklog).toBe(0);
+  });
+
+  it('| should log error when dbName is not set', () => {
+    const { DyFM_Log } = require('@futdevpro/fsm-dynamo');
+    const logSpy = spyOn(DyFM_Log, 'error');
+
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+    } as any;
+
+    new DyNTS_App_Params(params);
+
+    expect(logSpy).toHaveBeenCalled();
+  });
+
+  it('| should log warning when dbName contains uppercase letters', () => {
+    const { DyFM_Log } = require('@futdevpro/fsm-dynamo');
+    const logSpy = spyOn(DyFM_Log, 'warn');
+
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'TestDB',
+    };
+
+    new DyNTS_App_Params(params);
+
+    expect(logSpy).toHaveBeenCalled();
+  });
+
+  it('| should log warning when dbUri contains multiple //', () => {
+    const { DyFM_Log } = require('@futdevpro/fsm-dynamo');
+    const logSpy = spyOn(DyFM_Log, 'warn');
+
+    const params: DyNTS_App_Params = {
+      name: 'TestApp',
+      version: '1.0.0',
+      dbName: 'testdb',
+      dbUri: 'mongodb://localhost:27017//testdb',
+    };
+
+    new DyNTS_App_Params(params);
+
+    expect(logSpy).toHaveBeenCalled();
+  });
 });

package/src/_models/control-models/app-params.control-model.ts

@@ -1,4 +1,4 @@
-import { DyFM_Log } from '@futdevpro/fsm-dynamo';
+import { DyFM_Log, DyFM_String } from '@futdevpro/fsm-dynamo';
 import { ConnectOptions } from 'mongoose';
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
@@ -61,6 +61,9 @@ export class DyNTS_App_Params {
     this.name = set.name;
     this.title = set.title ?? '';
     this.version = set.version;
+    if (DyNTS_global_settings.systemVersion === 'unknown-version') {
+      DyNTS_global_settings.systemVersion = this.version;
+    }
 
     if (set.dbName || set.dbUri || set.dbOptions) {
       this.dbName = set.dbName;
@@ -92,12 +95,15 @@ export class DyNTS_App_Params {
     }
     
     this.systemName = set.systemName ?? this.name.replace(' ', '-');
+    DyNTS_global_settings.systemName ??= this.systemName;
+
     let sysShortCodeName: string;
-    sysShortCodeName = set.systemShortCodeName ?? this.systemName.replace(/[^A-Z]/g, '');
+    sysShortCodeName = set.systemShortCodeName ?? DyFM_String.anyNameToShortCode(this.systemName);
     //if (!set.dontUseEnvInSystemShortCodeName) {
     sysShortCodeName += '_' + DyNTS_global_settings.env_settings.environment.toUpperCase();
     //}
     this.systemShortCodeName = sysShortCodeName;
+    DyNTS_global_settings.systemShortCodeName ??= this.systemShortCodeName;
 
     this.openHost = set.openHost ?? '0.0.0.0';
     this.secureHost = set.secureHost ?? '0.0.0.0';