@futdevpro/nts-dynamo 1.9.39 → 1.9.41

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

@@ -3,12 +3,12 @@ import {
   DyFM_Metadata, DyFM_DataModel_Params, DyFM_DataProperty_Params, DyFM_Error,
   DyFM_Log, DyFM_AnyError, DyFM_Error_Settings, DyFM_ErrorLevel 
 } from '@futdevpro/fsm-dynamo';
+
 import { DyNTS_DBFilter } from '../../_models/types/db-filter.type';
 import { DyNTS_DBUpdate } from '../../_models/types/db-update.type';
-
-import { DyNTS_DBService } from './db.service';
-import { DyNTS_GlobalService } from '../core/global.service';
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
+import { DyNTS_GlobalService } from '../core/global.service';
+import { DyNTS_DBService } from './db.service';
 
 // TODO: 2 type of archiving service system: within list, or separate db elements
 
@@ -79,12 +79,13 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
     } catch (error) {
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings('constructor', error),
-        message: `The dataService construction failed for "${dataParams?.dataName}". ` +
-          `at "${this.serviceName}" (${this.constructor.name})` +
-          `\nMaybe you forgot to add the dbService to the GlobalService?\n\n`,
-        level: DyFM_ErrorLevel.critical,
         
         errorCode: 'NTS-DS0-C00',
+        message: 
+          `The dataService construction failed for "${dataParams?.dataName}". ` +
+          `at "${this.serviceName}" (${this.constructor.name})` +
+          `\nMaybe you forgot to add the dbService to the GlobalService?`,
+        level: DyFM_ErrorLevel.critical,        
       });
       /* DyFM_Log.error(
         `\nDyNTS_DataService ERROR: ` +
@@ -371,7 +372,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
           
           errorCode: 'NTS-DS0-GLD2',
           additionalContent: { 
-            data: this.data 
+            data: this.data, 
           },
         });
       }
@@ -579,24 +580,32 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
    * //
    */
   async updateData(
-    set: { filterBy?: DyNTS_DBFilter<T>, update: DyNTS_DBUpdate<T> }
+    set: { filterBy?: DyNTS_DBFilter<T>, update: DyNTS_DBUpdate<T> }, 
+    dontUpdateModified?: boolean
   ): Promise<void> {
     try {
       if (set.filterBy) {
-        await this.dataDBService.updateOne(set.filterBy, set.update, this.issuer);
+        await this.dataDBService.updateOne(
+          set.filterBy, 
+          set.update, 
+          this.issuer, 
+          dontUpdateModified
+        );
 
       } else if (this.data._id) {
         await this.dataDBService.updateOne(
           { _id: this.data._id } as DyNTS_DBFilter<T>, 
           set.update, 
-          this.issuer
+          this.issuer,
+          dontUpdateModified
         );
 
       } else if (this.depKey && this.data[this.depKey]) {
         await this.dataDBService.updateOne(
           { [this.depKey]: this.data[this.depKey] } as DyNTS_DBFilter<T>, 
           set.update, 
-          this.issuer
+          this.issuer,
+          dontUpdateModified
         );
 
       } else {
@@ -629,6 +638,25 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
     }
   }
 
+  protected ensureData(data?: T): T {
+    if (!data && this.data) {
+      data = this.data;
+    }
+
+    if (!data) {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings(
+          'saveData', 
+          new Error(`no data to save! (${this.dataParams.dataName})`)
+        ),
+        
+        errorCode: 'NTS-DS0-ED0',
+      });
+    }
+
+    return data;
+  }
+
   /**
    * modifies data if the data have ID and already exists in the DB, 
    * creates new if the ID is not present or cant find in DB, 
@@ -640,22 +668,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
    * (when you simultaneously trying to change the same data's 
    * different values from different flows)
    */
-  async saveData(data?: T, dontSetToService?: boolean): Promise<T> {
+  async saveData(data?: T, dontSetToService?: boolean, dontUpdateModified?: boolean): Promise<T> {
     try {
-      if (!data && this.data) {
-        data = this.data;
-      }
-
-      if (!data) {
-        throw new DyFM_Error({ 
-          ...this._getDefaultErrorSettings(
-            'saveData', 
-            new Error(`no data to save! (${this.dataParams.dataName})`)
-          ),
-          
-          errorCode: 'NTS-DS0-SD4',
-        });
-      }
+      data = this.ensureData(data);
 
       await this.validateForSave(data);
 
@@ -694,7 +709,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         }
 
         // if data exists do modify
-        data = await this.dataDBService.modifyData(data, this.issuer);
+        data = await this.dataDBService.modifyData(data, this.issuer, dontUpdateModified);
 
         if (!dontSetToService) {
           this.data = data;
@@ -726,7 +741,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
 
           if (dataExists) {
             // if data exists do modify
-            data = await this.dataDBService.modifyData(data, this.issuer);
+            data = await this.dataDBService.modifyData(data, this.issuer, dontUpdateModified);
 
             if (!dontSetToService) {
               this.data = data;
@@ -800,8 +815,12 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
           errorCode: 'NTS-DS0-DD1',
         });
       }
-          
+
       await this.dataDBService.deleteDataById(id);
+
+      if (this.data._id === id) {
+        delete this.data._id;
+      }
     } catch (error) {
       if (error?.errorCode == 'NTS-DS0-DD1') {
         throw error;
@@ -820,21 +839,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
    */
   async validateForSave(data?: T): Promise<void> {
     try {
-      if (!data) {
-        data = this.data;
-      }
-
-      if (!data) {
-        throw new DyFM_Error({ 
-          ...this._getDefaultErrorSettings(
-            'validateForSave',
-            new Error(`validateForSave failed, no data provided! (${this.dataParams.dataName})`)
-          ),
-          
-          status: 522, 
-          errorCode: 'NTS-DS0-VD4',
-        });
-      }
+      data = this.ensureData(data);
 
       for (const element of this.dataParams.properties) {
         // basic required validations

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

@@ -8,6 +8,7 @@ import {
 } from '@futdevpro/fsm-dynamo';
 import { DyNTS_DBFilter } from '../../_models/types/db-filter.type';
 import { DyNTS_DBUpdate } from '../../_models/types/db-update.type';
+import { DyNTS_archiveSuffix } from '../../_collections/archive.util';
 
 /**
  * DB Service for MongoDB
@@ -125,9 +126,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param data data
    * @returns data
    */
-  async modifyData(data: T, issuer: string): Promise<T> {
-    data.__lastModified = new Date();
-    data.__lastModifiedBy = issuer;
+  async modifyData(data: T, issuer: string, dontUpdateModified?: boolean): Promise<T> {
+    if (!dontUpdateModified) {
+      data.__lastModified = new Date();
+      data.__lastModifiedBy = issuer;
+    }
 
     /** 
      * EZ A SZAR TELJESEN SZAR, nem friss, nem a db-be mentett adatokat ad vissza, 
@@ -718,9 +721,16 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param update update
    * @returns data
    */
-  async findByIdAndUpdate(id: string, update: DyNTS_DBUpdate<T>, issuer: string): Promise<T> {
-    update.__lastModified = new Date();
-    update.__lastModifiedBy = issuer;
+  async findByIdAndUpdate(
+    id: string, 
+    update: DyNTS_DBUpdate<T>, 
+    issuer: string, 
+    dontUpdateModified?: boolean
+  ): Promise<T> {
+    if (!dontUpdateModified) {
+      update.__lastModified = new Date();
+      update.__lastModifiedBy = issuer;
+    }
 
     let newData: T = await this.dataModel
       .findByIdAndUpdate(id, update)
@@ -796,10 +806,13 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
   async updateOne(
     filterBy: DyNTS_DBFilter<T>, 
     update: DyNTS_DBUpdate<T>, 
-    issuer: string
+    issuer: string, 
+    dontUpdateModified?: boolean
   ): Promise<void> {
-    update.__lastModified = new Date();
-    update.__lastModifiedBy = issuer;
+    if (!dontUpdateModified) {
+      update.__lastModified = new Date();
+      update.__lastModifiedBy = issuer;
+    }
     
     await this.dataModel
       .updateOne(filterBy, update)
@@ -869,10 +882,13 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
   async updateMany(
     filterBy: DyNTS_DBFilter<T>, 
     update: DyNTS_DBUpdate<T>, 
-    issuer: string
+    issuer: string, 
+    dontUpdateModified?: boolean
   ): Promise<void> {
-    update.__lastModified = new Date();
-    update.__lastModifiedBy = issuer;
+    if (!dontUpdateModified) {
+      update.__lastModified = new Date();
+      update.__lastModifiedBy = issuer;
+    }
 
     await this.dataModel
       .updateMany(filterBy, update)
@@ -939,7 +955,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
   private getSchema(): mongoose.Schema {
     let schema: any = this.buildMongooseSchemaByModelParams();
 
-    schema = this.addDyFM_MetadataToSchema(schema);
+    schema = this.addMetadataToSchema(schema);
+
+    if (this.dataParams.dataName.includes(DyNTS_archiveSuffix)) {
+      schema = this.addArchiveMetadataToSchema(schema);
+    }
 
     // tslint:disable-next-line: no-string-literal
     if (schema['_id']) {
@@ -1039,7 +1059,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param schema schema to update
    * @returns updated schema
    */
-  private addDyFM_MetadataToSchema(schema: any): any {
+  private addMetadataToSchema(schema: any): any {
     schema.__created = { type: Date };
     schema.__createdBy = { type: String };
     schema.__lastModified = { type: Date };
@@ -1048,6 +1068,13 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     return schema;
   }
 
+  private addArchiveMetadataToSchema(schema: any): any {
+    schema._originalId = { type: String, required: true, index: true, unique: true };
+    schema._archived = { type: Date, required: true };
+
+    return schema;
+  }
+
   /**
    * sets depDataKey
    */

package/src/_services/base/singleton.service-base.ts

@@ -10,7 +10,8 @@ export class DyNTS_SingletonServiceBase {
   /// ---     ---     ---     SINGLETON     ---     ---     --- \\\
   protected static instance;
   
-  static getSingletonInstance() {
+  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+  protected static getSingletonInstance() {
     if (!this.instance) {
       this.instance = new this();
     }

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

@@ -23,6 +23,8 @@ 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_archiveFlag } from '../../_collections/archive-flag.const'; */
+import { DyNTS_getArchivedDBName } from '../../_collections/archive.util';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 
@@ -84,6 +86,34 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
   private static async setDBServices(dbModels?: DyFM_DataModel_Params[]): Promise<void> {    
     try {
       this.instance.dbServiceCollection = {};
+
+      dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
+        if (!dbModel) {
+          throw new DyFM_Error({
+            ...this.getDefaultErrorSettings(
+              'setDBServices', 
+              new Error(`given dbModel is empty!`), 
+              'DyNTS_GlobalService'
+            ),
+            
+            errorCode: 'NTS-GS0-SDBS2',
+            additionalContent: {
+              dbModels: dbModels,
+              dbModelNames: dbModels.map((dbModel: DyFM_DataModel_Params) => dbModel.dataName),
+            },
+          });
+        }
+
+        if (dbModel.addArchive) {
+          const archiveModel: DyFM_DataModel_Params = new DyFM_DataModel_Params({
+            ...dbModel,
+            dataName: DyNTS_getArchivedDBName(dbModel.dataName),
+          });
+
+          dbModels.push(archiveModel);
+        }
+      });
+
       dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
         if (!dbModel.constructed) {
           throw new DyFM_Error({
@@ -164,35 +194,39 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
 
   private static async setErrorHandler(errorHandler?: DyNTS_GlobalErrorHandlerFn): Promise<void> {
     try {
-      DyNTS_GlobalService.globalErrorHandler = 
-        errorHandler ?? 
-        (async (error: any): Promise<void> => {
-          try {
-            DyFM_Log.warn(
-              `globalErrorHandler not set! (set in app.getGlobalServiceCollection)`,
-              '\nwill use default-logging',
+      DyNTS_GlobalService.globalErrorHandler = (async (error: any): Promise<void> => {
+        try {
+          if (errorHandler) {
+            await errorHandler(error);
+
+            return;
+          }
+
+          DyFM_Log.warn(
+            `globalErrorHandler not set! (set in app.getGlobalServiceCollection)`,
+            '\nwill use default-logging',
+          );
+
+          if (
+            DyNTS_global_settings.log_settings.highDetailedLogs ||
+            !(error instanceof DyFM_Error)
+          ) {
+            DyFM_Log.H_error(
+              `Error caught by globalErrorHandler.`,
+              `\n    ERROR:`, error?.replaceAll?.('at', '  at') ?? error
             );
-  
-            if (
-              DyNTS_global_settings.log_settings.highDetailedLogs ||
-              !(error instanceof DyFM_Error)
-            ) {
-              DyFM_Log.H_error(
-                `Error caught by globalErrorHandler.`,
-                `\n    ERROR:`, error?.replaceAll?.('at', '  at') ?? error
-              );
-            } else /* if (!error.___logged) */ {
-              error.logSimple(
-                `Error caught by globalErrorHandler.`
-              );
-            }
-          } catch (error) {
-            DyFM_Log.error(
-              `NTS GLOBAL MULTILEVEL ERROR: \nFailed to handle error on globalErrorHandler.`,
-              error
+          } else /* if (!error.___logged) */ {
+            error.logSimple(
+              `Error caught by globalErrorHandler.`
             );
           }
-        });
+        } catch (error) {
+          DyFM_Log.error(
+            `NTS GLOBAL MULTILEVEL ERROR: \nFailed to handle error on globalErrorHandler.`,
+            error
+          );
+        }
+      });
     } catch (error) {
       throw new DyFM_Error({
         ...this.getDefaultErrorSettings('setErrorHandler', error, 'DyNTS_GlobalService'),
@@ -261,15 +295,11 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
     if (collection[key]) {
       return collection[key] as DyNTS_DBService<T>;
     } else {
-      let keys: string = `${Object.keys(collection)}`;
-
-      keys = keys.replace(/,/g, '\n                ');
-
       throw new Error(
         `\n  DyNTS_GlobalService.getDBService failed, ERROR: ` +
-        `\n    no dbService on collection with this key: ${key}!` +
+        `\n    no dbService on collection with this key: "${key}"!` +
         `\n      The available dbServices on collection:` +
-        `\n        ${keys}\n`
+        `\n        ${Object.keys(collection).join(', ')}\n`
       );
     }
   }
@@ -279,12 +309,14 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
    * @returns 
    */
   static getEmailServiceCollection(): DyNTS_Service_Collection<DyNTS_EmailService> {
-    if (!this.instance?.emailServiceCollection) {
+    if (!this.instance.emailServiceCollection) {
       throw new Error(
         `\n  Unique Email Service Collection missing!` + 
         `\n    Please create a Unique Email Service Collection extending ` +
           `DynamoBEEmailServiceCollection, ` + 
-        `\n      and Setup with DyNTS_GlobalServiceC.setServices(...)\n`
+        `\n      and Setup with DyNTS_GlobalServiceC.setServices(...)\n` +
+        `\n      available emailServiceCollection: ` +
+        `${Object().keys(this.instance.emailServiceCollection).join(', ')}\n`
       );
     }
 

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

@@ -65,7 +65,7 @@ export class DyNTS_RoutingModule {
   security: DyNTS_RouteSecurity;
   route: string;
 
-  private controllers: DyNTS_Controller[];
+  private readonly controllers: DyNTS_Controller[];
   endpoints: DyNTS_Endpoint_Params[] = [];
 
   openRouter: Router = Router();
@@ -93,13 +93,29 @@ export class DyNTS_RoutingModule {
         `routing module setup done: ${this.route} security: ${this.security}\n`
       );
     } catch (error) {
+      /* if (
+        DyNTS_global_settings.log_settings.highDetailedLogs ||
+        !(error instanceof DyFM_Error)
+      ) {
+        DyFM_Log.H_error(
+          `Routing module setup failed (${this.route}).`,
+          `\n    ERROR:`, error
+        );
+      } else {
+        error.logSimple(
+          `Routing module setup failed (${this.route}).` +
+          '\nmessages:\n' + error._messages.join('        \n')
+        );
+      } */
+
       /* DyFM_Log.error(`\nRouting module setup failed (${this.route})`, error); */
       throw new DyFM_Error({
         ...this.getDefaultErrorSettings(
-          'constructor', 
-          new Error(`Routing module setup failed (${this.route}).`)
+          'DyNTS_RoutingModule.constructor', 
+          error
         ),
 
+        message: `Routing module setup failed (${this.route}).`,
         errorCode: 'NTS-RMS-000',
         additionalContent: set,
       });
@@ -117,9 +133,12 @@ export class DyNTS_RoutingModule {
         throw new DyFM_Error({
           ...this.getDefaultErrorSettings(
             'setupRoutes', 
-            new Error(`DynamoBEController setup failed. Please check the setupEndpoints() method.`)
+            error
           ),
 
+          message: 
+            `DyNTS_Controller setup failed. (${controller?.constructor?.name}) ` +
+            `Please check the setupEndpoints() method.`,
           errorCode: 'NTS-RMS-SR1',
           level: DyFM_ErrorLevel.critical,
         });

package/src/_services/server/app.server.ts

@@ -268,37 +268,50 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
   }
   debugLog: boolean = DyNTS_global_settings.log_settings.server_debug;
 
-  constructor(extended?: boolean){
+  constructor(/* extended?: boolean */){
     super();
     
-    process.on('unhandledRejection', (reason: object, p_passWhatIsThis: any): void => {
-      DyFM_Log.H_error(
-        'Unhandled Rejection: ', p_passWhatIsThis?.toString()?.split('at')?.[0], 
-        '\n    Rejection reason:', reason?.toString()?.split('at')?.[0],
-        '\n\n    Stack:', 
-        (reason as any)?.stack?.replaceAll?.('\n    at', '\n      at'),
-      );
-
-      try {
-        DyNTS_GlobalService.globalErrorHandler?.(
-          new DyFM_Error({
-            errorCode: 'NTS-AS0-BASE-UR',
-            message: 'Unhandled Rejection!',
-            error: new Error(p_passWhatIsThis),
-            additionalContent: { 
-              reason: reason, 
-              p_noIdeaWhatIsThisFromProcessRejection: p_passWhatIsThis,
-            },
-            level: DyFM_ErrorLevel.critical,
-          })
+    process.on(
+      'unhandledRejection', 
+      (reason_theError: object, p_passWhatIsThis_maybeThePromise: any): void => {
+        DyFM_Log.H_error(
+          'Unhandled Rejection:', (p_passWhatIsThis_maybeThePromise as Promise<any>)?.toString(), 
+          '\n    Rejection reason:', (reason_theError as Error)?.stack?.split('at')?.[0],
+          /* '\n    ErrorCode:', (reason as any)?.code, */
+          '\n\n    Stack:', 
+          (reason_theError as Error)?.stack?.replaceAll?.('\n    at', '\n      at'),
         );
 
-      } catch (error) {
-        DyFM_Log.error('globalErrorHandler (MULTILEVEL) ERROR:', error);
+        try {
+          DyNTS_GlobalService.globalErrorHandler?.(
+            new DyFM_Error({
+              errorCode: 'NTS-AS0-BASE-UR',
+              message: 
+                `Unhandled Rejection!: "${(reason_theError as Error)?.stack?.split('at')?.[0]}"`,
+              userMessage: this.defaultErrorUserMsg,
+              addECToUserMsg: true,
+              error: reason_theError as Error,
+              additionalContent: { 
+                reason: reason_theError, 
+                rejectedPromise: p_passWhatIsThis_maybeThePromise,
+              },
+              level: DyFM_ErrorLevel.critical,
+            })
+          );
+        } catch (error) {
+          DyFM_Log.error('globalErrorHandler (MULTILEVEL) ERROR:', error);
+        }
+      }
+    );
+
+    this.asyncConstruct(/* extended */).catch((error: any): void => {
+      if (error instanceof DyFM_Error) {
+        DyFM_Log.H_warn(
+          '(constructor asyncConstruct.catch) additional error content:\n', 
+          error?.additionalContent
+        );
       }
-    });
 
-    this.asyncConstruct(extended).catch((error: any): void => {
       if (
         DyNTS_global_settings.log_settings.highDetailedLogs ||
         !(error instanceof DyFM_Error)
@@ -309,15 +322,15 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
         );
       } else {
         error.logSimple(
-          `Application: "${this.params?.name}" start failed. (constructor asyncConstruct.catch)`
+          `Application: "${this.params?.name}" start failed. (constructor asyncConstruct.catch)` +
+          '\n      all error messages (from this stack):\n\n"' + 
+          error._messages.join('"\n\n"') + '"\n\n'
         );
       }
-
-      DyFM_Log.H_warn('T1000\n', error?.additionalContent);
     });
   }
 
-  private async asyncConstruct(extended?: boolean): Promise<void> {
+  protected async asyncConstruct(extended?: boolean): Promise<void> {
     if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. asyncConstruct');
 
     try {

package/src/index.ts

@@ -33,19 +33,29 @@ export * from './_models/types/db-update.type';
 
 
 // SERVICES
+// services/CORE
 export * from './_services/core/api.service';
-export * from './_services/server/app.server';
 export * from './_services/core/auth.service';
-export * from './_services/route/controller.service';
-export * from './_services/base/data.service';
-export * from './_services/base/db.service';
 export * from './_services/core/email.service';
 export * from './_services/core/global.service';
+export * from './_services/core/service-collection.service';
+
+// services/BASE
+export * from './_services/base/archive-data.service';
+export * from './_services/base/data.service';
+export * from './_services/base/db.service';
+export * from './_services/base/singleton.service';
+
+// services/SERVER
+export * from './_services/server/app.server';
+
+// services/ROUTE
+export * from './_services/route/controller.service';
 export * from './_services/route/controller.service';
 export * from './_services/route/routing-module.service';
-export * from './_services/core/service-collection.service';
+
+// services/SHARED
 export * from './_services/shared.static-service';
-export * from './_services/base/singleton.service';