@futdevpro/nts-dynamo 1.6.58 → 1.6.71

package/lib/_services/base/db.service.js

@@ -9,6 +9,12 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
  * DB Service for MongoDB
  */
 class DynamoNTS_DBService {
+    dataParams;
+    serviceName;
+    dataModel; // = mongoose.model(this.dataParams.dbName, this.getSchema());
+    depDataName;
+    defaultErrorUserMsg = `We encountered an unhandled DB Error, ` +
+        `\nplease contact the responsible development team.`;
     /**
      * @param dataName name the model
      * @param typeSample sample data for scheme creation (dont include Dynamo_Metadata!)
@@ -16,12 +22,9 @@ class DynamoNTS_DBService {
      * schemaSettings also MUST contain specific types that differs from the listed above (Array, Date)
      */
     constructor(dataParams) {
-        var _a;
         this.dataParams = dataParams;
-        this.defaultErrorUserMsg = `We encountered an unhandled DB Error, ` +
-            `\nplease contact the responsible development team.`;
         try {
-            this.serviceName = (_a = this.constructor) === null || _a === void 0 ? void 0 : _a.name;
+            this.serviceName = this.constructor?.name;
             try {
                 this.dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());
             }
@@ -44,76 +47,97 @@ class DynamoNTS_DBService {
      * @param data data
      * @returns data
      */
-    createData(data, issuer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            data.__created = new Date();
-            data.__lastModified = new Date();
-            data.__createdBy = issuer;
-            data.__lastModifiedBy = issuer;
-            const dataModel = new this.dataModel(data);
-            let newData = yield dataModel.save().then(res => {
-                if (res) {
-                    return res === null || res === void 0 ? void 0 : res.toObject();
-                }
-                else {
-                    throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('createData', new Error(`createData failed, save ${this.dataParams.dbName} result not found! (NTS DB)`), issuer)), { status: 204, errorCode: 'NTS-DBS-CD1', issuer }));
-                }
-            }).catch(error => {
-                var _a;
-                if ((_a = error === null || error === void 0 ? void 0 : error.flag) === null || _a === void 0 ? void 0 : _a.includes('DYNAMO')) {
-                    throw error;
-                }
-                else {
-                    throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('createData', error, issuer)), { status: 422, errorCode: 'NTS-DBS-CD0', message: `createData failed, Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`, issuer }));
-                }
-            });
-            data = this.stringifyDataId(newData, 'createData');
-            return data;
+    async createData(data, issuer) {
+        data.__created = new Date();
+        data.__lastModified = new Date();
+        data.__createdBy = issuer;
+        data.__lastModifiedBy = issuer;
+        const dataModel = new this.dataModel(data);
+        let newData = await dataModel.save().then(res => {
+            if (res) {
+                return res?.toObject();
+            }
+            else {
+                throw new fsm_dynamo_1.Dynamo_Error({
+                    ...this._getDefaultErrorSettings('createData', new Error(`createData failed, save ${this.dataParams.dbName} result not found! (NTS DB)`), issuer),
+                    status: 204,
+                    errorCode: 'NTS-DBS-CD1',
+                    issuer,
+                });
+            }
+        }).catch(error => {
+            if (error?.flag?.includes('DYNAMO')) {
+                throw error;
+            }
+            else {
+                throw new fsm_dynamo_1.Dynamo_Error({
+                    ...this._getDefaultErrorSettings('createData', error, issuer),
+                    status: 422,
+                    errorCode: 'NTS-DBS-CD0',
+                    message: `createData failed, Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+                    issuer,
+                });
+            }
         });
+        data = this.stringifyDataId(newData, 'createData');
+        return data;
     }
     /**
      * Find data by _id and update
      * @param data data
      * @returns data
      */
-    modifyData(data, issuer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            data.__lastModified = new Date();
-            data.__lastModifiedBy = issuer;
-            const dataModel = new this.dataModel(data);
-            let newData = yield this.dataModel.findByIdAndUpdate(data._id, dataModel).then(res => {
-                if (res) {
-                    return res === null || res === void 0 ? void 0 : res.toObject();
-                }
-                else {
-                    throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('modifyData', new Error(`modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`), issuer)), { status: 204, errorCode: 'NTS-DBS-FU1', issuer }));
-                }
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('modifyData', error, issuer)), { errorCode: 'NTS-DBS-FU0', message: `modifyData ${this.dataParams.dbName} was unsuccessful (NTS DB)`, issuer }));
+    async modifyData(data, issuer) {
+        data.__lastModified = new Date();
+        data.__lastModifiedBy = issuer;
+        const dataModel = new this.dataModel(data);
+        let newData = await this.dataModel.findByIdAndUpdate(data._id, dataModel).then(res => {
+            if (res) {
+                return res?.toObject();
+            }
+            else {
+                throw new fsm_dynamo_1.Dynamo_Error({
+                    ...this._getDefaultErrorSettings('modifyData', new Error(`modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`), issuer),
+                    status: 204,
+                    errorCode: 'NTS-DBS-FU1',
+                    issuer,
+                });
+            }
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('modifyData', error, issuer),
+                errorCode: 'NTS-DBS-FU0',
+                message: `modifyData ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+                issuer,
             });
-            data = this.stringifyDataId(newData, 'modifyData');
-            return data;
         });
+        data = this.stringifyDataId(newData, 'modifyData');
+        return data;
     }
     /**
      * returns data by _id,
      * @param id id
      * @returns data
      */
-    getDataById(id) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!id) {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`))), { errorCode: 'NTS-DBS-GI1', message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)` }));
-            }
-            let data = yield this.dataModel.findById(id).then(res => {
-                var _a;
-                return (_a = res === null || res === void 0 ? void 0 : res.toObject()) !== null && _a !== void 0 ? _a : null;
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataById', error)), { errorCode: 'NTS-DBS-GI0', message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)` }));
+    async getDataById(id) {
+        if (!id) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`)),
+                errorCode: 'NTS-DBS-GI1',
+                message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
+            });
+        }
+        let data = await this.dataModel.findById(id).then(res => {
+            return res?.toObject() ?? null;
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataById', error),
+                errorCode: 'NTS-DBS-GI0',
+                message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
             });
-            data = this.stringifyDataId(data, 'getDataById');
-            return data;
         });
+        data = this.stringifyDataId(data, 'getDataById');
+        return data;
     }
     /**
      * get data by dependency data id,
@@ -122,20 +146,25 @@ class DynamoNTS_DBService {
      * @param dependencyId id
      * @returns data
      */
-    getDataByDependencyId(dependencyId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.depDataName) {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`))), { status: 501, errorCode: 'NTS-DBS-GD0' }));
-            }
-            let data = yield this.dataModel.findOne({ [this.depDataName]: dependencyId }).then(res => {
-                var _a;
-                return (_a = res === null || res === void 0 ? void 0 : res.toObject()) !== null && _a !== void 0 ? _a : null;
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataByDependencyId', error)), { errorCode: 'NTS-DBS-GD1', message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)` }));
+    async getDataByDependencyId(dependencyId) {
+        if (!this.depDataName) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                status: 501,
+                errorCode: 'NTS-DBS-GD0',
+            });
+        }
+        let data = await this.dataModel.findOne({ [this.depDataName]: dependencyId }).then(res => {
+            return res?.toObject() ?? null;
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataByDependencyId', error),
+                errorCode: 'NTS-DBS-GD1',
+                message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
             });
-            data = this.stringifyDataId(data, 'getDataByDependencyId');
-            return data;
         });
+        data = this.stringifyDataId(data, 'getDataByDependencyId');
+        return data;
     }
     /**
      * get data by dependency data id,
@@ -144,24 +173,49 @@ class DynamoNTS_DBService {
      * @param dependencyId id
      * @returns dataList
      */
-    getDataListByDependencyId(dependencyId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.depDataName) {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`))), { status: 501, errorCode: 'NTS-DBS-GLD0' }));
-            }
-            let dataList = yield this.dataModel.find({ [this.depDataName]: dependencyId }).then(res => {
-                var _a;
-                return (_a = res) !== null && _a !== void 0 ? _a : [];
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataListByDependencyId', error)), { errorCode: 'NTS-DBS-GLD1', message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)` }));
+    async getDataListByDependencyId(dependencyId) {
+        if (!this.depDataName) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                status: 501,
+                errorCode: 'NTS-DBS-GLD0',
             });
-            if (0 < dataList.length) {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'getDataListByDependencyId');
-                });
-            }
-            return dataList;
+        }
+        let dataList = await this.dataModel.find({ [this.depDataName]: dependencyId }).then(res => {
+            return res ?? [];
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
+                errorCode: 'NTS-DBS-GLD1',
+                message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
+            });
+        });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'getDataListByDependencyId');
+        });
+        return dataList;
+    }
+    async getDatasByDependencyIds(dependencyIds) {
+        if (!this.depDataName) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDatasByDependencyIds', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                status: 501,
+                errorCode: 'NTS-DBS-GLDS0',
+            });
+        }
+        let dataList = await this.dataModel.find({ [this.depDataName]: { $in: dependencyIds } }).then(res => {
+            return res ?? [];
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDatasByDependencyIds', error),
+                errorCode: 'NTS-DBS-GLDS1',
+                message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
+            });
+        });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'getDatasByDependencyIds');
         });
+        return dataList;
     }
     /**
      * get multiple data objects by a list of DependencyIDs,
@@ -170,24 +224,27 @@ class DynamoNTS_DBService {
      * @param ids ids
      * @returns dataList
      */
-    getDataListByDependencyIds(ids) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.depDataName) {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataListByDependencyIds', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`))), { status: 501, errorCode: 'NTS-DBS-GLDS0' }));
-            }
-            let dataList = yield this.dataModel.find({ [this.depDataName]: { $in: ids } }).then(res => {
-                var _a;
-                return (_a = res) !== null && _a !== void 0 ? _a : [];
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getDataListByDependencyIds', error)), { errorCode: 'NTS-DBS-GLDS1', message: `get ${this.dataParams.dbName}s by ${this.depDataName}s was unsuccessful (NTS DB)` }));
+    async getDataListByDependencyIds(ids) {
+        if (!this.depDataName) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataListByDependencyIds', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                status: 501,
+                errorCode: 'NTS-DBS-GLDS0',
+            });
+        }
+        let dataList = await this.dataModel.find({ [this.depDataName]: { $in: ids } }).then(res => {
+            return res ?? [];
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getDataListByDependencyIds', error),
+                errorCode: 'NTS-DBS-GLDS1',
+                message: `get ${this.dataParams.dbName}s by ${this.depDataName}s was unsuccessful (NTS DB)`,
             });
-            if (0 < dataList.length) {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'getDataListByDependencyIds');
-                });
-            }
-            return dataList;
         });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'getDataListByDependencyIds');
+        });
+        return dataList;
     }
     /**
      * returns all data from database,
@@ -195,31 +252,32 @@ class DynamoNTS_DBService {
      *
      * @returns dataList
      */
-    getAll() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let dataList = yield this.dataModel.find({})
-                .then(res => {
-                var _a;
-                return (_a = res) !== null && _a !== void 0 ? _a : [];
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('getAll', error)), { errorCode: 'NTS-DBS-GA0', message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)` }));
+    async getAll() {
+        let dataList = await this.dataModel.find({})
+            .then(res => {
+            return res ?? [];
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('getAll', error),
+                errorCode: 'NTS-DBS-GA0',
+                message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
             });
-            if (0 < dataList.length && typeof dataList[0]._id === 'object') {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'getAll');
-                });
-            }
-            return dataList;
         });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'getAll');
+        });
+        return dataList;
     }
     /**
      * deleted data by id
      * @param id id
      */
-    deleteDataById(id) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield this.dataModel.findByIdAndDelete(id).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('deleteDataById', error)), { errorCode: 'NTS-DBS-DD0', message: `delete ${this.dataParams.dbName} was unsuccessful (NTS DB)` }));
+    async deleteDataById(id) {
+        await this.dataModel.findByIdAndDelete(id).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('deleteDataById', error),
+                errorCode: 'NTS-DBS-DD0',
+                message: `delete ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
             });
         });
     }
@@ -227,13 +285,19 @@ class DynamoNTS_DBService {
      * deleted data by id
      * @param dependencyId id
      */
-    deleteDataByDependencyId(dependencyId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.depDataName) {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('deleteDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`))), { status: 501, errorCode: 'NTS-DBS-DDD0' }));
-            }
-            yield this.dataModel.deleteMany({ [this.depDataName]: dependencyId }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('deleteDataByDependencyId', error)), { errorCode: 'NTS-DBS-DDD1', message: `delete ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)` }));
+    async deleteDataByDependencyId(dependencyId) {
+        if (!this.depDataName) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('deleteDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                status: 501,
+                errorCode: 'NTS-DBS-DDD0',
+            });
+        }
+        await this.dataModel.deleteMany({ [this.depDataName]: dependencyId }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('deleteDataByDependencyId', error),
+                errorCode: 'NTS-DBS-DDD1',
+                message: `delete ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
             });
         });
     }
@@ -245,71 +309,75 @@ class DynamoNTS_DBService {
      * @param narrowByDependencyIds id
      * @returns dataList
      */
-    searchData(filterBy, narrowByDependencyIds) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const filter = {};
-            if (0 < narrowByDependencyIds.length) {
-                if (!this.depDataName) {
-                    throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('searchData', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`))), { status: 501, errorCode: 'NTS-DBS-SD0' }));
-                }
-                filter[this.depDataName] = { $in: narrowByDependencyIds };
+    async searchData(filterBy, narrowByDependencyIds) {
+        const filter = {};
+        if (0 < narrowByDependencyIds.length) {
+            if (!this.depDataName) {
+                throw new fsm_dynamo_1.Dynamo_Error({
+                    ...this._getDefaultErrorSettings('searchData', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) (NTS DB)`)),
+                    status: 501,
+                    errorCode: 'NTS-DBS-SD0',
+                });
             }
-            yield this.dataParams.modelParams.forEach((modelParam) => {
-                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] };
-                            }
+            filter[this.depDataName] = { $in: narrowByDependencyIds };
+        }
+        await this.dataParams.modelParams.forEach((modelParam) => {
+            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 {
-                        // 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] !== null &&
+                            filterBy[modelParam.key] !== undefined) {
+                            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] };
+                    }
+                }
+                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;
+                            }
+                        }
+                    }
+                    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 = yield this.dataModel
-                .find(filter)
-                .then(res => res !== null && res !== void 0 ? res : [])
-                .catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('searchData', error)), { errorCode: 'NTS-DBS-SD1', message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)` }));
-            });
-            if (0 < dataList.length) {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'searchData');
-                });
             }
-            return dataList;
         });
+        let dataList = await this.dataModel
+            .find(filter)
+            .then(res => res ?? [])
+            .catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('searchData', error),
+                errorCode: 'NTS-DBS-SD1',
+                message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+            });
+        });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'searchData');
+        });
+        return dataList;
     }
     // ----------------------------------------------------------------------------------
     // ----------------------------------------------------------------------------------
@@ -341,17 +409,18 @@ class DynamoNTS_DBService {
      * //
      * @returns {T} data: T
      */
-    findOne(filterBy) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let data = yield this.dataModel.findOne(filterBy).then(res => {
-                var _a;
-                return (_a = res) !== null && _a !== void 0 ? _a : null;
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('findOne', error)), { errorCode: 'NTS-DBS-FO0', message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB) fliter: ${filterBy}` }));
+    async findOne(filterBy) {
+        let data = await this.dataModel.findOne(filterBy).then(res => {
+            return res ?? null;
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('findOne', error),
+                errorCode: 'NTS-DBS-FO0',
+                message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB) fliter: ${filterBy}`,
             });
-            data = this.stringifyDataId(data, 'findOne');
-            return data;
         });
+        data = this.stringifyDataId(data, 'findOne');
+        return data;
     }
     /**
      * #MONGOOSE FUNCTION
@@ -380,22 +449,21 @@ class DynamoNTS_DBService {
      * //
      * @returns {T[]} dataList: T[]
      */
-    find(filterBy) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let dataList = yield this.dataModel.find(filterBy)
-                .then(res => {
-                var _a;
-                return (_a = res) !== null && _a !== void 0 ? _a : [];
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('find', error)), { errorCode: 'NTS-DBS-F0', message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)` }));
+    async find(filterBy) {
+        let dataList = await this.dataModel.find(filterBy)
+            .then(res => {
+            return res ?? [];
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('find', error),
+                errorCode: 'NTS-DBS-F0',
+                message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
             });
-            if (0 < dataList.length) {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'find');
-                });
-            }
-            return dataList;
         });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'find');
+        });
+        return dataList;
     }
     /**
      * #MONGOOSE FUNCTION
@@ -430,23 +498,23 @@ class DynamoNTS_DBService {
      * //
      * @returns {T[]} dataList: T[]
      */
-    findWithPaging(filterBy, page, pageSize, sort) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let dataList = yield this.dataModel.find(filterBy)
-                .sort(sort)
-                .skip(page * pageSize)
-                .limit(pageSize)
-                .then(res => res !== null && res !== void 0 ? res : [])
-                .catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('findWithPaging', error)), { errorCode: 'NTS-DBS-WP0', message: `findWithPaging ${this.dataParams.dbName} was unsuccessful (NTS DB)` }));
+    async findWithPaging(filterBy, page, pageSize, sort) {
+        let dataList = await this.dataModel.find(filterBy)
+            .sort(sort)
+            .skip(page * pageSize)
+            .limit(pageSize)
+            .then(res => res ?? [])
+            .catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('findWithPaging', error),
+                errorCode: 'NTS-DBS-WP0',
+                message: `findWithPaging ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
             });
-            if (0 < dataList.length) {
-                dataList.forEach((data) => {
-                    data = this.stringifyDataId(data, 'findWithPaging');
-                });
-            }
-            return dataList;
         });
+        dataList.forEach((data) => {
+            data = this.stringifyDataId(data, 'findWithPaging');
+        });
+        return dataList;
     }
     /**
      * #MONGOOSE FUNCTION
@@ -457,19 +525,21 @@ class DynamoNTS_DBService {
      * @param update update
      * @returns data
      */
-    findByIdAndUpdate(id, update, issuer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            update.__lastModified = new Date();
-            update.__lastModifiedBy = issuer;
-            let newData = yield this.dataModel.findByIdAndUpdate(id, update).then(res => {
-                var _a;
-                return (_a = res === null || res === void 0 ? void 0 : res.toObject()) !== null && _a !== void 0 ? _a : null;
-            }).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('findByIdAndUpdate', error, issuer)), { errorCode: 'NTS-DBS-FIU0', message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`, issuer }));
+    async findByIdAndUpdate(id, update, issuer) {
+        update.__lastModified = new Date();
+        update.__lastModifiedBy = issuer;
+        let newData = await this.dataModel.findByIdAndUpdate(id, update).then(res => {
+            return res?.toObject() ?? null;
+        }).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('findByIdAndUpdate', error, issuer),
+                errorCode: 'NTS-DBS-FIU0',
+                message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+                issuer,
             });
-            newData = this.stringifyDataId(newData, 'findByIdAndUpdate');
-            return newData;
         });
+        newData = this.stringifyDataId(newData, 'findByIdAndUpdate');
+        return newData;
     }
     /**
      * #MONGOOSE FUNCTION
@@ -523,12 +593,15 @@ class DynamoNTS_DBService {
      * $unset:       // Removes the specified field from a document. (set: "" to value)
      * //
      */
-    updateOne(filterBy, update, issuer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            update.__lastModified = new Date();
-            update.__lastModifiedBy = issuer;
-            yield this.dataModel.updateOne(filterBy, update).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('updateOne', error, issuer)), { errorCode: 'NTS-DBS-UO0', message: `updateOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`, issuer }));
+    async updateOne(filterBy, update, issuer) {
+        update.__lastModified = new Date();
+        update.__lastModifiedBy = issuer;
+        await this.dataModel.updateOne(filterBy, update).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('updateOne', error, issuer),
+                errorCode: 'NTS-DBS-UO0',
+                message: `updateOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+                issuer,
             });
         });
     }
@@ -583,12 +656,15 @@ class DynamoNTS_DBService {
      * $unset:       // Removes the specified field from a document. (set: "" to value)
      * //
      */
-    updateMany(filterBy, update, issuer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            update.__lastModified = new Date();
-            update.__lastModifiedBy = issuer;
-            yield this.dataModel.updateMany(filterBy, update).catch(error => {
-                throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('updateMany', error, issuer)), { errorCode: 'NTS-DBS-UM0', message: `updateMany ${this.dataParams.dbName} was unsuccessful (NTS DB)`, issuer }));
+    async updateMany(filterBy, update, issuer) {
+        update.__lastModified = new Date();
+        update.__lastModifiedBy = issuer;
+        await this.dataModel.updateMany(filterBy, update).catch(error => {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                ...this._getDefaultErrorSettings('updateMany', error, issuer),
+                errorCode: 'NTS-DBS-UM0',
+                message: `updateMany ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
+                issuer,
             });
         });
     }
@@ -597,7 +673,7 @@ class DynamoNTS_DBService {
     // ----------------------------------------------------------------------------------
     // PRIVATE FUNCTIONS
     stringifyDataId(data, fnName) {
-        if ((data === null || data === void 0 ? void 0 : data._id) && (typeof data._id !== 'string' || typeof data._id === 'object')) {
+        if (data?._id && (typeof data._id !== 'string' || typeof data._id === 'object')) {
             data._id = `${data._id}`;
             if (typeof data._id !== 'string' || typeof data._id === 'object') {
                 data = JSON.parse(JSON.stringify(data));
@@ -609,10 +685,9 @@ class DynamoNTS_DBService {
         return data;
     }
     _getDefaultErrorSettings(fnName, error, issuer) {
-        var _a, _b;
         return {
-            status: (_a = error === null || error === void 0 ? void 0 : error.___status) !== null && _a !== void 0 ? _a : 500,
-            message: (_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : `${fnName} was UNSUCCESFUL (NTS-DB)`,
+            status: error?.___status ?? 500,
+            message: error?.message ?? `${fnName} was UNSUCCESFUL (NTS-DB)`,
             addECToUserMsg: true,
             userMessage: this.defaultErrorUserMsg,
             issuer: issuer,
@@ -647,9 +722,8 @@ class DynamoNTS_DBService {
             params = this.dataParams.modelParams;
         }
         params.forEach((property) => {
-            var _a;
             const beType = this.getBEType(property.type);
-            if (beType !== Object || !(property === null || property === void 0 ? void 0 : property.subObjectParams) || ((_a = property === null || property === void 0 ? void 0 : property.subObjectParams) === null || _a === void 0 ? void 0 : _a.length) == 0) {
+            if (beType !== Object || !property?.subObjectParams || property?.subObjectParams?.length == 0) {
                 schemaSettingsObj[property.key] = {
                     type: beType
                 };