@futdevpro/nts-dynamo 1.9.45 → 1.9.50

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

@@ -4,7 +4,9 @@ import { Schema } from 'mongoose';
 
 import {
   DyFM_AnyError,
-  DyFM_DataModel_Params, DyFM_DataProperty_Params,
+  DyFM_DataModel_Params,
+  DyFM_DataProperties,
+  DyFM_DataProperty_Params,
   DyFM_DBFilter, DyFM_DBFilterSimple, DyFM_DBSort,
   DyFM_Error,
   DyFM_Error_Settings, DyFM_ErrorLevel,
@@ -36,7 +38,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * schemaSettings also MUST contain specific types that differs from the listed above (Array, Date)
    */
   constructor(
-    public dataParams: DyFM_DataModel_Params
+    public dataParams: DyFM_DataModel_Params<T>
   ){
     try {
       this.serviceName = this.constructor?.name;
@@ -349,7 +351,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         _deleted: new Date(), 
         _deletedBy: issuer,
       }, 
-      issuer
+      /* issuer */
     ).catch(
       (error): void => {
         throw new DyFM_Error({ 
@@ -392,7 +394,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         __lastModified: new Date(),
         __lastModifiedBy: issuer,
       }, 
-      issuer
+      /* issuer */
     ).catch((error): void => {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings('restoreDeletedById', error, issuer),
@@ -531,55 +533,63 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       filter[this.depDataName] = { $in: narrowByDependencyIds };      
     }
 
-    this.dataParams.properties.forEach((modelParam: DyFM_DataProperty_Params): void => {
-      if (
-        (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) || 
-        filterBy[modelParam.key + 'Range']
-      ) {
-        if (modelParam.key.includes('Range') || modelParam.type.includes('[]')) {
-          // inverz search filter (for Range and Array functions)
-          if (modelParam.key.includes('Range')) {
-            const searchParamKeyWithoutRange = modelParam.key.split('Range')[0];
-
-            if (
-              filterBy[searchParamKeyWithoutRange] !== null && 
-              filterBy[searchParamKeyWithoutRange] !== undefined
-            ) {
-              filter[modelParam.key] = {
-                from: { $lte: filterBy[searchParamKeyWithoutRange] },
-                to: { $gte: filterBy[searchParamKeyWithoutRange] },
-              };
+    Object.values(this.dataParams.properties).forEach(
+      (modelParam: DyFM_DataProperty_Params<any>): void => {
+        if (
+          (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) || 
+          filterBy[modelParam.key + 'Range']
+        ) {
+          if (modelParam.key.includes('Range') || modelParam.type.includes('[]')) {
+            // inverz search filter (for Range and Array functions)
+            if (modelParam.key.includes('Range')) {
+              const searchParamKeyWithoutRange = modelParam.key.split('Range')[0];
+
+              if (
+                filterBy[searchParamKeyWithoutRange] !== null && 
+                filterBy[searchParamKeyWithoutRange] !== undefined
+              ) {
+                filter[modelParam.key] = {
+                  from: { $lte: filterBy[searchParamKeyWithoutRange] },
+                  to: { $gte: filterBy[searchParamKeyWithoutRange] },
+                };
+              }
+            } else {
+              if (
+                filterBy[modelParam.key] !== null && 
+                filterBy[modelParam.key] !== undefined
+              ) {
+                filter[modelParam.key] = { $in: filterBy[modelParam.key] };
+              }
             }
           } else {
-            if (
+            // basic search filter
+            if (filterBy[modelParam.key + 'Range']) {
+              if (
+                filterBy[modelParam.key + 'Range'].from || 
+                filterBy[modelParam.key + 'Range'].to
+              ) {
+                filter[modelParam.key] = {};
+
+                if (filterBy[modelParam.key + 'Range'].from) {
+                  filter[modelParam.key].$gte = filterBy[modelParam.key + 'Range'].from;
+                }
+
+                if (filterBy[modelParam.key + 'Range'].to) {
+                  filter[modelParam.key].$lte = filterBy[modelParam.key + 'Range'].to;
+                }
+              }
+            } else if (
               filterBy[modelParam.key] !== null && 
               filterBy[modelParam.key] !== undefined
             ) {
-              filter[modelParam.key] = { $in: filterBy[modelParam.key] };
-            }
-          }
-        } else {
-          // basic search filter
-          if (filterBy[modelParam.key + 'Range']) {
-            if (filterBy[modelParam.key + 'Range'].from || filterBy[modelParam.key + 'Range'].to) {
-              filter[modelParam.key] = {};
-
-              if (filterBy[modelParam.key + 'Range'].from) {
-                filter[modelParam.key].$gte = filterBy[modelParam.key + 'Range'].from;
-              }
-
-              if (filterBy[modelParam.key + 'Range'].to) {
-                filter[modelParam.key].$lte = filterBy[modelParam.key + 'Range'].to;
+              if (filterBy[modelParam.key].lenght > 0) {
+                filter[modelParam.key] = { $in: filterBy[modelParam.key] };
               }
             }
-          } else if (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) {
-            if (filterBy[modelParam.key].lenght > 0) {
-              filter[modelParam.key] = { $in: filterBy[modelParam.key] };
-            }
           }
         }
       }
-    });
+    );
 
     let dataList: T[] = await this.dataModel
       .find(filter)
@@ -1013,23 +1023,23 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
 
   /**
    * builds mongoose schema building settings object by dynamoDataModelParamsList
-   * @param params DynamoBEDataPropertyParams
+   * @param properties DynamoBEDataPropertyParams
    * @returns mongoose schema object
    */
-  private buildMongooseSchemaByModelParams(params?: DyFM_DataProperty_Params[]): any {
+  private buildMongooseSchemaByModelParams(properties?: DyFM_DataProperties<T>): any {
     const schemaSettingsObj = {};
 
-    if (!params) {
-      params = this.dataParams.properties;
+    if (!properties) {
+      properties = this.dataParams.properties;
     }
 
-    params.forEach((property: DyFM_DataProperty_Params): void => {
+    Object.values(properties).forEach((property: DyFM_DataProperty_Params<any>): void => {
       const beType = this.getBEType(property.type);
 
       if (
         beType !== Object || 
         !property?.subObjectParams || 
-        property?.subObjectParams?.length == 0
+        (property?.subObjectParams && Object.keys(property.subObjectParams).length == 0)
       ) {
         schemaSettingsObj[property.key] = {
           type: beType,
@@ -1123,12 +1133,15 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * sets depDataKey
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: DyFM_DataProperty_Params = this.dataParams.properties.find(
-      (modelParams: DyFM_DataProperty_Params): boolean => modelParams.isDependencyHook
-    );
+    const dependencyParam: DyFM_DataProperty_Params<any> = 
+      Object.values(this.dataParams.properties).find(
+        (modelParams: DyFM_DataProperty_Params<any>): boolean => modelParams.isDependencyHook
+      );
     
-    if (this.dataParams.properties.filter(
-      (modelParams: DyFM_DataProperty_Params): boolean => modelParams.isDependencyHook).length > 1
+    if (
+      Object.values(this.dataParams.properties).filter(
+        (modelParams: DyFM_DataProperty_Params<any>): boolean => modelParams.isDependencyHook
+      ).length > 1
     ) {
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(

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

@@ -1,15 +1,15 @@
 
-import * as Axios from 'axios';
-import { 
-  DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log 
+import {
+  DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log
 } from '@futdevpro/fsm-dynamo';
+import * as Axios from 'axios';
 
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
 import {
   DyNTS_ApiCall_Params
 } from '../../_models/control-models/api-call-params.control-model';
-import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 export interface DyNTS_ApiCallInput_Params<T_Body = any> {
   pathParams?: {
@@ -77,7 +77,7 @@ export class DyNTS_ApiService {
       switch (callParams.type) {
         case DyNTS_HttpCallType.get:
           if (inputParams?.body) {
-            DyFM_Log.warn('WARNING you cant send body in get calls');
+            DyFM_Log.warn(`WARNING you cant send body in get calls (${callParams.name})`);
           }
 
           a = await this.get<T_Response>(axios, url, callParams);

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

@@ -1,18 +1,20 @@
 
 
-import { Request, Response } from 'express';
 
-import { 
-  DyFM_Metadata, DyFM_DataModel_Params, DyFM_Log, DyFM_Error, DyFM_Array, 
-  DyFM_errorFlag,
+import {
   DyFM_AnyError,
-  DyFM_Error_Settings
+  DyFM_Array,
+  DyFM_DataModel_Params,
+  DyFM_Error,
+  DyFM_Error_Settings,
+  DyFM_Log,
+  DyFM_Metadata
 } from '@futdevpro/fsm-dynamo';
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
-import { 
+import {
   DyNTS_GlobalErrorHandlerFn,
-  DyNTS_GlobalService_Settings 
+  DyNTS_GlobalService_Settings
 } from '../../_models/interfaces/global-service-settings.interface';
 
 import { DyNTS_AuthService } from './auth.service';
@@ -21,8 +23,8 @@ import { DyNTS_DBService } from '../base/db.service';
 import { DyNTS_EmailService } from './email.service';
 import { DyNTS_Service_Collection } from './service-collection.service';
 /* import { DyNTS_EmailServiceCollection } from './email-service-collection.service'; */
-import { DyNTS_SingletonService } from '../base/singleton.service';
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
+import { DyNTS_SingletonService } from '../base/singleton.service';
 /* import { DyNTS_archiveFlag } from '../../_collections/archive-flag.const'; */
 import { DyNTS_getArchivedDBName } from '../../_collections/archive.util';
 
@@ -84,11 +86,11 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
     }
   }
 
-  private static async setDBServices(dbModels?: DyFM_DataModel_Params[]): Promise<void> {    
+  private static async setDBServices(dbModels?: DyFM_DataModel_Params<any>[]): Promise<void> {    
     try {
       this.instance.dbServiceCollection = {};
 
-      dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
+      dbModels?.forEach((dbModel: DyFM_DataModel_Params<any>): void => {
         if (!dbModel) {
           throw new DyFM_Error({
             ...this.getDefaultErrorSettings(
@@ -100,13 +102,13 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
             errorCode: 'NTS-GS0-SDBS2',
             additionalContent: {
               dbModels: dbModels,
-              dbModelNames: dbModels.map((dbModel: DyFM_DataModel_Params) => dbModel.dataName),
+              dbModelNames: dbModels.map((dbModel: DyFM_DataModel_Params<any>) => dbModel.dataName),
             },
           });
         }
 
         if (dbModel.addArchive) {
-          const archiveModel: DyFM_DataModel_Params = new DyFM_DataModel_Params({
+          const archiveModel: DyFM_DataModel_Params<any> = new DyFM_DataModel_Params<any>({
             ...dbModel,
             dataName: DyNTS_getArchivedDBName(dbModel.dataName),
           });
@@ -115,7 +117,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
         }
       });
 
-      dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
+      dbModels?.forEach((dbModel: DyFM_DataModel_Params<any>): void => {
         if (!dbModel.constructed) {
           throw new DyFM_Error({
             ...this.getDefaultErrorSettings(
@@ -280,7 +282,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
    * @returns 
    */
   static getDBService<T extends DyFM_Metadata>(
-    dataParams: DyFM_DataModel_Params
+    dataParams: DyFM_DataModel_Params<T>
   ): DyNTS_DBService<T> {
     return this.getDBServiceByKey<T>(dataParams.dataName);
   }

package/src/_services/route/controller.service.ts

@@ -1,8 +1,7 @@
 
 
-import { DyFM_Error, DyFM_ErrorLevel, DyFM_Log } from '@futdevpro/fsm-dynamo';
-import { 
-  DyNTS_Endpoint_Params 
+import {
+  DyNTS_Endpoint_Params
 } from '../../_models/control-models/endpoint-params.control-model';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';