@futdevpro/nts-dynamo 1.9.41 → 1.9.43

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

@@ -6,7 +6,7 @@ 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_DBFilter, DyNTS_DBFilterNOR, DyNTS_DBFilterOR, DyNTS_DBFilterSimple } from '../../_models/types/db-filter.type';
 import { DyNTS_DBUpdate } from '../../_models/types/db-update.type';
 import { DyNTS_archiveSuffix } from '../../_collections/archive.util';
 
@@ -57,12 +57,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         additionalContent: { dataParams: this.dataParams },
         error,
       });
-      /* DyFM_Log.error(
-        `\nDyNTS_DBService ERROR, ` +
-        `The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}` +
-        `\nERROR: `, error,
-        new Error()
-      ); */
     }
   }
 
@@ -78,7 +72,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     data.__lastModifiedBy = issuer;
 
     const dataModel = new this.dataModel(data);
-    let newData: T = await dataModel.save().then((res): T => {
+    const newData: T = await dataModel.save().then((res): T => {
       if (res) {
         return res?.toObject() as T;
         
@@ -91,8 +85,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             ),
             issuer
           ),
-
-          status: 544, 
           errorCode: 'NTS-DBS-CD1',
           additionalContent: { data },
           issuer,
@@ -105,8 +97,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       } else {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('createData', error, issuer),
-
-          status: 522, 
           errorCode: 'NTS-DBS-CD0',
           additionalContent: { data, dataModel },
           message: 
@@ -116,9 +106,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       }
     });
 
-    newData = this.stringifyDataId(newData, 'createData');
-
-    return newData;
+    return this.stringifyDataId(newData, 'createData');
   }
 
   /**
@@ -136,8 +124,9 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
      * EZ A SZAR TELJESEN SZAR, nem friss, nem a db-be mentett adatokat ad vissza, 
      * átír random value-kat össze vissza, WTF 
      * */
-    /* let newData: T = */ await this.dataModel.findByIdAndUpdate(data._id, data).then((res) => {
-      /* if (res) {
+    /* let newData: T = */ 
+    await this.dataModel.findByIdAndUpdate(data._id, data)/* .then((res) => {
+      if (res) {
         //return res?.toObject() as T;
       } else {
         throw new DyFM_Error({ 
@@ -152,21 +141,18 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
           additionalContent: { data },
           issuer,
         });
-      } */
-    }).catch((error): void => {
-      throw new DyFM_Error({ 
-        ...this._getDefaultErrorSettings('modifyData', error, issuer),
-
-        errorCode: 'NTS-DBS-FU0',
-        additionalContent: { data },
-        message: `modifyData "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
-        issuer,
+      }
+    }) */.catch((error): void => {
+        throw new DyFM_Error({ 
+          ...this._getDefaultErrorSettings('modifyData', error, issuer),
+          errorCode: 'NTS-DBS-FU0',
+          additionalContent: { data },
+          message: `modifyData "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
+          issuer,
+        });
       });
-    });
 
-    /* newData = this.stringifyDataId(newData, 'modifyData'); */
-
-    return data;
+    return this.stringifyDataId(data, 'modifyData');
   }
 
   /**
@@ -184,22 +170,19 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       });
     }
 
-    let data: T = await this.dataModel
+    const data: T = await this.dataModel
       .findById(id)
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('getDataById', error),
-
           errorCode: 'NTS-DBS-GI0',
           additionalContent: { id },
           message: `get "${this.dataParams.dbName}" by ID was unsuccessful (NTS DB)`, 
         });
       });
 
-    data = this.stringifyDataId(data, 'getDataById');
-
-    return data;
+    return this.stringifyDataId(data, 'getDataById');
   }
 
   /**
@@ -219,13 +202,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             `(NTS DB)`
           )
         ),
-        
-        status: 500, 
         errorCode: 'NTS-DBS-GD0',
       });
     }
 
-    let data: T = await this.dataModel
+    const data: T = await this.dataModel
       .findOne({ [this.depDataName]: dependencyId })
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
@@ -239,9 +220,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    data = this.stringifyDataId(data, 'getDataByDependencyId');
-
-    return data;
+    return this.stringifyDataId(data, 'getDataByDependencyId');
   }
 
   /**
@@ -261,8 +240,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             `(NTS DB)`
           )
         ),
-
-        status: 500, 
         errorCode: 'NTS-DBS-GLD0',
         additionalContent: {
           dataModel: this.dataModel,
@@ -271,12 +248,13 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     const dataList: T[] = await this.dataModel
-      .find({ [this.depDataName]: dependencyId })
+      .find({ 
+        [this.depDataName]: dependencyId,
+      })
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
-          
           errorCode: 'NTS-DBS-GLD1',
           additionalContent: { dependencyId },
           message: 
@@ -284,11 +262,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'getDataListByDependencyId');
-    });
-
-    return dataList;
+    return dataList.filter(
+      (data: T): boolean => !data._deleted
+    ).map(
+      (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
+    );
   }
 
   /**
@@ -308,68 +286,31 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             `(${this.dataParams.dbName}) (NTS DB)`
           )
         ),
-
-        status: 500,
         errorCode: 'NTS-DBS-GLDS0',
       });
     }
 
     const dataList: T[] = await this.dataModel
-      .find({ [this.depDataName]: { $in: dependencyIds }})
+      .find({ 
+        [this.depDataName]: { $in: dependencyIds },
+      })
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({
           ...this._getDefaultErrorSettings('getDataListByDependencyIds', error),
-
           errorCode: 'NTS-DBS-GLDS1',
           additionalContent: { dependencyIds },
-          message: `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
-        });
-      });
-
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'getDataListByDependencyIds');
-    });
-
-    return dataList;
-  }
-
-  /* async getDataListByDependencyIds(ids: string[]): Promise<T[]> {
-    if (!this.depDataName) {
-      throw new DyFM_Error({ 
-        ...this._getDefaultErrorSettings(
-          'getDataListByDependencyIds',
-          new Error(
-            `dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
-            `(NTS DB)`
-          )
-        ),
-
-        status: 500, 
-        errorCode: 'NTS-DBS-GLDS0',
-      });
-    }
-
-    const dataList: T[] = await this.dataModel
-      .find({ [this.depDataName]: { $in: ids } })
-      .then((res): T[] => res as T[] ?? [])
-      .catch((error): void => {
-        throw new DyFM_Error({ 
-          ...this._getDefaultErrorSettings('getDataListByDependencyIds', error),
-          
-          errorCode: 'NTS-DBS-GLDS1',
-          additionalContent: { ids },
           message: 
-            `get ${this.dataParams.dbName}s by ${this.depDataName}s was unsuccessful (NTS DB)`, 
+            `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
         });
       });
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'getDataListByDependencyIds');
-    });
-
-    return dataList;
-  } */
+    return dataList.filter(
+      (data: T): boolean => !data._deleted
+    ).map(
+      (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyIds')
+    );
+  }
 
   /**
    * returns all data from database, 
@@ -379,7 +320,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    */
   async getAll(): Promise<T[]> {
     const dataList: T[] = await this.dataModel
-      .find({})
+      .find()
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
@@ -390,11 +331,97 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'getAll');
+    return dataList.filter(
+      (data: T): boolean => !data._deleted
+    ).map(
+      (data: T): T => this.stringifyDataId(data, 'getAll')
+    );
+  }
+
+  async markDeletedById(id: string, issuer: string): Promise<void> {
+    await this.dataModel.findByIdAndUpdate(id, { _deleted: true }, issuer).catch((error): void => {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings('markDeletedById', error, issuer),
+        
+        errorCode: 'NTS-DBS-MD0',
+        additionalContent: { id },
+        message: `mark deleted "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
+        issuer,
+      });
+    });
+  }
+
+  async markDeletedByDependencyId(dependencyId: string, issuer: string): Promise<void> {
+    await this.dataModel.updateMany(
+      { [this.depDataName]: dependencyId }, 
+      { _deleted: true }
+    ).catch((error): void => {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings('markDeletedByDependencyId', error, issuer),
+        errorCode: 'NTS-DBS-MDD0',
+        additionalContent: { dependencyId },
+        message: 
+          `markDeleted "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful ` +
+          `(NTS DB)`, 
+        issuer,
+      });
+    });
+  }
+
+  async restoreDeletedById(id: string, issuer: string): Promise<void> {
+    await this.dataModel.findByIdAndUpdate(
+      id, 
+      { 
+        _deleted: null,
+        __lastModified: new Date(),
+        __lastModifiedBy: issuer,
+      }, 
+      issuer
+    ).catch((error): void => {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings('restoreDeletedById', error, issuer),
+        errorCode: 'NTS-DBS-RD0',
+        additionalContent: { id },
+        message: `restoreDeleted "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
+        issuer,
+      });
     });
+  }
+
+  async restoreDeletedByDependencyId(dependencyId: string, issuer: string): Promise<void> {
+    await this.dataModel.updateMany(
+      { [this.depDataName]: dependencyId }, 
+      { 
+        _deleted: null,
+        __lastModified: new Date(),
+        __lastModifiedBy: issuer,
+      }
+    ).catch((error): void => {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings('restoreDeletedByDependencyId', error, issuer),
+        errorCode: 'NTS-DBS-RDD0',
+        additionalContent: { dependencyId },
+        message: 
+          `restoreDeleted "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful ` +
+          `(NTS DB)`, 
+        issuer,
+      });
+    });
+  }
+
+  async getDeletedDataList(): Promise<T[]> {
+    const dataList: T[] = await this.dataModel
+      .find({ _deleted: true })
+      .then((res): T[] => res as T[] ?? [])
+      .catch((error): void => {
+        throw new DyFM_Error({ 
+          ...this._getDefaultErrorSettings('getDeletedData', error),
+          errorCode: 'NTS-DBS-GDD0',
+          message: `get deleted "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
+        });
+      });
 
-    return dataList as T[];
+    return dataList.map((data: T): T => this.stringifyDataId(data, 'getDeletedData'));
   }
 
   /**
@@ -407,7 +434,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('deleteDataById', error),
-          
           errorCode: 'NTS-DBS-DD0',
           additionalContent: { id },
           message: `delete "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
@@ -429,8 +455,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             `(NTS DB)`
           )
         ),
-
-        status: 500, 
         errorCode: 'NTS-DBS-DDD0',
       });
     }
@@ -440,7 +464,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('deleteDataByDependencyId', error),
-
           errorCode: 'NTS-DBS-DDD1',
           additionalContent: { dependencyId },
           message: 
@@ -449,6 +472,16 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       });
   }
 
+  async deleteAllData(): Promise<void> {
+    await this.dataModel.deleteMany().catch((error): void => {
+      throw new DyFM_Error({ 
+        ...this._getDefaultErrorSettings('deleteAllData', error),
+        errorCode: 'NTS-DBS-DAD0',
+        message: `delete all "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
+      });
+    });
+  }
+
   /**
    * returns search result for searchBy object params
    * can use lists or xRange values for searchBy obj properties
@@ -473,8 +506,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
               `(NTS DB)`
             )
           ),
-
-          status: 500, 
           errorCode: 'NTS-DBS-SD0',
         });
       }
@@ -482,7 +513,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       filter[this.depDataName] = { $in: narrowByDependencyIds };      
     }
 
-    await this.dataParams.properties.forEach((modelParam: DyFM_DataProperty_Params): void => {
+    this.dataParams.properties.forEach((modelParam: DyFM_DataProperty_Params): void => {
       if (
         (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) || 
         filterBy[modelParam.key + 'Range']
@@ -532,24 +563,23 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       }
     });
 
-    const dataList: T[] = await this.dataModel
+    let dataList: T[] = await this.dataModel
       .find(filter)
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('searchData', error),
-          
           errorCode: 'NTS-DBS-SD1',
           additionalContent: { filterBy, narrowByDependencyIds },
           message: `search "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
         });
       });
+      
+    if ((filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined) {
+      dataList = dataList.filter((data: T): boolean => !data._deleted);
+    }
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'searchData');
-    });
-
-    return dataList;
+    return dataList.map((data: T): T => this.stringifyDataId(data, 'searchData'));
   }
 
   // ----------------------------------------------------------------------------------
@@ -584,22 +614,19 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @returns {T} data: T
    */
   async findOne(filterBy: DyNTS_DBFilter<T>): Promise<T> {
-    let data: T = await this.dataModel
+    const data: T = await this.dataModel
       .findOne(filterBy)
       .then((res): T => res as T ?? null)
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('findOne', error),
-
           errorCode: 'NTS-DBS-FO0',
           additionalContent: { filterBy },
           message: `findOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
         });
       });
 
-    data = this.stringifyDataId(data, 'findOne');
-
-    return data;
+    return this.stringifyDataId(data, 'findOne');
   }
 
   /**
@@ -630,24 +657,26 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @returns {T[]} dataList: T[]
    */
   async find(filterBy: DyNTS_DBFilter<T>): Promise<T[]> {
-    const dataList: T[] = await this.dataModel
+
+    let dataList: T[] = await this.dataModel
       .find(filterBy)
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('find', error),
-          
           errorCode: 'NTS-DBS-F0',
           additionalContent: { filterBy },
           message: `find "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
         });
       });
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'find');
-    });
+    if (
+      (filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined
+    ) {
+      dataList = dataList.filter((data: T): boolean => !data._deleted);
+    }
 
-    return dataList as T[];
+    return dataList.map((data: T): T => this.stringifyDataId(data, 'find'));
   }
 
   /**
@@ -689,7 +718,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     pageSize: number, 
     sort?: any
   ): Promise<T[]> {
-    const dataList: T[] = await this.dataModel
+    let dataList: T[] = await this.dataModel
       .find(filterBy)
       .sort(sort)
       .skip(page * pageSize)
@@ -698,24 +727,22 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('findWithPaging', error),
-          
           errorCode: 'NTS-DBS-WP0',
           additionalContent: { filterBy, page, pageSize, sort },
           message: `findWithPaging "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
         });
       });
 
-    dataList.forEach((data: T): void => {
-      data = this.stringifyDataId(data, 'findWithPaging');
-    });
+    if ((filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined) {
+      dataList = dataList.filter((data: T): boolean => !data._deleted);
+    }
 
-    return dataList;
+    return dataList.map((data: T): T => this.stringifyDataId(data, 'find'));
   }
 
   /**
    * #MONGOOSE FUNCTION
    * Find data by _id and update
-   * !!!: throws error if not found (errorCode on not found: )
    * 
    * @param id id
    * @param update update
@@ -732,13 +759,12 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       update.__lastModifiedBy = issuer;
     }
 
-    let newData: T = await this.dataModel
+    const data: T = await this.dataModel
       .findByIdAndUpdate(id, update)
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('findByIdAndUpdate', error, issuer),
-          
           errorCode: 'NTS-DBS-FIU0',
           additionalContent: { id, update },
           message: `findByIdAndUpdate "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
@@ -746,9 +772,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    newData = this.stringifyDataId(newData, 'findByIdAndUpdate');
-
-    return newData;
+    return this.stringifyDataId(data, 'findByIdAndUpdate');
   }
 
   /**
@@ -819,7 +843,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       .catch((error): void => {
         throw new DyFM_Error({
           ...this._getDefaultErrorSettings('updateOne', error, issuer),
-          
           errorCode: 'NTS-DBS-UO0',
           additionalContent: { filterBy, update },
           message: `updateOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
@@ -895,7 +918,6 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('updateMany', error, issuer),
-          
           errorCode: 'NTS-DBS-UM0',
           additionalContent: { filterBy, update },
           message: `updateMany "${this.dataParams.dbName}" was unsuccessful (NTS DB)`, 
@@ -1064,6 +1086,9 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     schema.__createdBy = { type: String };
     schema.__lastModified = { type: Date };
     schema.__lastModifiedBy = { type: String };
+
+    schema._deleted = { type: Date };
+    schema._deletedBy = { type: String };
     
     return schema;
   }

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

@@ -1,4 +1,4 @@
-import { DyFM_AnyError, DyFM_Error_Settings, DyFM_Error } from '@futdevpro/fsm-dynamo';
+import { DyFM_AnyError, DyFM_Error, DyFM_Error_Settings } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_SingletonServiceBase } from './singleton.service-base';
@@ -19,8 +19,7 @@ export class DyNTS_SingletonService extends DyNTS_SingletonServiceBase {
   ): DyFM_Error_Settings {
     return {
       status: (error as DyFM_Error)?.___status ?? 500,
-      message: (error as Error)?.message ?? 
-        (error as DyFM_Error)?._message ??
+      message: (error as Error)?.message ??
         `${fnName} was UNSUCCESSFUL (${DyNTS_global_settings.systemShortCodeName})`,
       addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
       userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,

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

@@ -52,6 +52,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
 
   authService: DyNTS_AuthService;
   dbServiceCollection: DyNTS_Service_Collection<DyNTS_DBService<any>>;
+  /* dataServiceCollection: DyNTS_Service_Collection<any>; */
   emailServiceCollection: DyNTS_Service_Collection<DyNTS_EmailService>; 
   
   static readonly defaultErrorUserMsg: string =