@futdevpro/nts-dynamo 1.9.43 → 1.9.45

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

@@ -2,13 +2,17 @@
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
 
-import { 
-  DyFM_Metadata, DyFM_DataModel_Params, DyFM_DataProperty_Params, DyFM_Error, 
-  DyFM_Log, DyFM_AnyError, DyFM_Error_Settings, DyFM_ErrorLevel 
+import {
+  DyFM_AnyError,
+  DyFM_DataModel_Params, DyFM_DataProperty_Params,
+  DyFM_DBFilter, DyFM_DBFilterSimple, DyFM_DBSort,
+  DyFM_Error,
+  DyFM_Error_Settings, DyFM_ErrorLevel,
+  DyFM_Log,
+  DyFM_Metadata
 } from '@futdevpro/fsm-dynamo';
-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';
+import { DyNTS_DBUpdate } from '../../_models/types/db-update.type';
 
 /**
  * DB Service for MongoDB
@@ -339,22 +343,34 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
   }
 
   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,
-      });
-    });
+    await this.dataModel.findByIdAndUpdate(
+      id, 
+      { 
+        _deleted: new Date(), 
+        _deletedBy: issuer,
+      }, 
+      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 }
+      { 
+        _deleted: new Date(),
+        _deletedBy: issuer,
+      }
     ).catch((error): void => {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings('markDeletedByDependencyId', error, issuer),
@@ -411,7 +427,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
 
   async getDeletedDataList(): Promise<T[]> {
     const dataList: T[] = await this.dataModel
-      .find({ _deleted: true })
+      .getAll()
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
@@ -421,7 +437,9 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    return dataList.map((data: T): T => this.stringifyDataId(data, 'getDeletedData'));
+    return dataList.filter(
+      (data: T): boolean => Boolean(data._deleted)
+    ).map((data: T): T => this.stringifyDataId(data, 'getDeletedData'));
   }
 
   /**
@@ -491,7 +509,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @returns dataList
    */
   async searchData(
-    filterBy: DyNTS_DBFilter<T>, 
+    filterBy: DyFM_DBFilter<T>, 
     narrowByDependencyIds?: string[]
   ): Promise<T[]> {
     const filter = {};
@@ -529,7 +547,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
             ) {
               filter[modelParam.key] = {
                 from: { $lte: filterBy[searchParamKeyWithoutRange] },
-                to: { $gte: filterBy[searchParamKeyWithoutRange] }
+                to: { $gte: filterBy[searchParamKeyWithoutRange] },
               };
             }
           } else {
@@ -575,7 +593,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
       
-    if ((filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined) {
+    if ((filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
       dataList = dataList.filter((data: T): boolean => !data._deleted);
     }
 
@@ -613,7 +631,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * //
    * @returns {T} data: T
    */
-  async findOne(filterBy: DyNTS_DBFilter<T>): Promise<T> {
+  async findOne(filterBy: DyFM_DBFilter<T>): Promise<T> {
     const data: T = await this.dataModel
       .findOne(filterBy)
       .then((res): T => res as T ?? null)
@@ -656,8 +674,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * //
    * @returns {T[]} dataList: T[]
    */
-  async find(filterBy: DyNTS_DBFilter<T>): Promise<T[]> {
-
+  async find(filterBy: DyFM_DBFilter<T>): Promise<T[]> {
     let dataList: T[] = await this.dataModel
       .find(filterBy)
       .then((res): T[] => res as T[] ?? [])
@@ -670,9 +687,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    if (
-      (filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined
-    ) {
+    if ((filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
       dataList = dataList.filter((data: T): boolean => !data._deleted);
     }
 
@@ -713,12 +728,16 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @returns {T[]} dataList: T[]
    */
   async findWithPaging(
-    filterBy: DyNTS_DBFilter<T>, 
+    filterBy: DyFM_DBFilter<T>, 
     page: number, 
     pageSize: number, 
-    sort?: any
+    sort?: DyFM_DBSort<T>
   ): Promise<T[]> {
-    let dataList: T[] = await this.dataModel
+    if (filterBy['_deleted'] === undefined) {
+      filterBy['_deleted'] = null;
+    }
+
+    const dataList: T[] = await this.dataModel
       .find(filterBy)
       .sort(sort)
       .skip(page * pageSize)
@@ -733,9 +752,9 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    if ((filterBy as DyNTS_DBFilterSimple<T>)._deleted === undefined) {
+    /* if ((filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
       dataList = dataList.filter((data: T): boolean => !data._deleted);
-    }
+    } */
 
     return dataList.map((data: T): T => this.stringifyDataId(data, 'find'));
   }
@@ -828,7 +847,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * //
    */
   async updateOne(
-    filterBy: DyNTS_DBFilter<T>, 
+    filterBy: DyFM_DBFilter<T>, 
     update: DyNTS_DBUpdate<T>, 
     issuer: string, 
     dontUpdateModified?: boolean
@@ -903,7 +922,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * //
    */
   async updateMany(
-    filterBy: DyNTS_DBFilter<T>, 
+    filterBy: DyFM_DBFilter<T>, 
     update: DyNTS_DBUpdate<T>, 
     issuer: string, 
     dontUpdateModified?: boolean
@@ -1108,6 +1127,22 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       (modelParams: DyFM_DataProperty_Params): boolean => modelParams.isDependencyHook
     );
     
+    if (this.dataParams.properties.filter(
+      (modelParams: DyFM_DataProperty_Params): boolean => modelParams.isDependencyHook).length > 1
+    ) {
+      throw new DyFM_Error({
+        ...this._getDefaultErrorSettings(
+          'lookForDependencyDataSettings',
+          new Error(
+            `Multiple "isDependencyHook" found for this dataModel (${this.dataParams.dbName}) ` +
+            `(NTS DB)` +
+            `\nSorry, but this is not supported yet! (Donate to Dynamo to get this feature!)`
+          )
+        ),
+        errorCode: 'NTS-DBS-LFDD0',
+      });        
+    }
+    
     if (dependencyParam) {
       this.depDataName = dependencyParam.key;
     }

package/src/index.ts

@@ -6,8 +6,8 @@ export * from './_collections/global-settings.const';
 // ENUMS
 export * from './_enums/data-model-type.enum';
 export * from './_enums/data-service-function.enum';
-export * from './_enums/route-security.enum';
 export * from './_enums/predefined-data-types.enum';
+export * from './_enums/route-security.enum';
 
 // enums/HTTP
 export * from './_enums/http/http-call-type.enum';
@@ -16,19 +16,18 @@ export * from './_enums/http/http-response-type.enum';
 
 // MODELS (CONTROL-MODELS, INTERFACES, TYPES)
 // models/INTERFACES
-export * from './_models/interfaces/global-service-settings.interface';
 export * from './_models/interfaces/certification-settings.interface';
+export * from './_models/interfaces/global-service-settings.interface';
 export * from './_models/interfaces/global-settings.interface';
 export * from './_models/interfaces/routing-module-settings.interface';
 
 // models/CONTROL MODELS
 export * from './_models/control-models/api-call-params.control-model';
 export * from './_models/control-models/app-params.control-model';
-export * from './_models/control-models/http-settings.control-model';
 export * from './_models/control-models/endpoint-params.control-model';
+export * from './_models/control-models/http-settings.control-model';
 
 // models/TYPES
-export * from './_models/types/db-filter.type';
 export * from './_models/types/db-update.type';
 
 
@@ -51,7 +50,6 @@ 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';
 
 // services/SHARED

package/build/_models/types/db-filter.type.d.ts

@@ -1,97 +0,0 @@
-/**
- * @example
- * // by email:
- * { email: email }
- * //
- * @example
- * // or by id that is in list:
- * { userIds: { $in: this.userId } }
- * //
- * @example
- * // or by number or Date that is Greater Than AND Less Than:
- * { points: { $gt: 2, $lt: 14 } }
- * // further tools (syntax matches with $gt):
- * $eq:  // Matches values that are EQual to a specified value.
- * $gte: // Matches values that are Greater Than OR Equal to a specified value.
- * $lte: // Matches values that are Less Than or Equal to a specified value.
- * $ne:  // Matches all values that are Not Equal to a specified value.
- * $nin: // Matches None of the values specified IN an array.
- * //
- * @returns {T} data: T
- */
-export type DyNTS_DBFilter<T> = DyNTS_DBFilterSimple<T> | DyNTS_DBFilterOR<T> | DyNTS_DBFilterNOR<T>;
-/**
- * A simple filter for a DynamoDB query.
- */
-export type DyNTS_DBFilterSimple<T> = {
-    [K in keyof T]?: T[K] | DyNTS_DBFilterExpressions<T[K] | boolean>;
-} & {
-    [path: string]: any;
-};
-export type DyNTS_DBFilterExpressions<T> = {
-    /**
-     * Matches values that are includes the value; This works only when T[K] is an array!
-     */
-    $in?: any;
-    /**
-     * Matches values that are EQual to a specified value.
-     */
-    $eq?: T;
-    /**
-     * Matches values that are Greater Than a specified value.
-     */
-    $gt?: number | Date;
-    /**
-     * Matches values that are Greater Than OR Equal to a specified value.
-     */
-    $gte?: number | Date;
-    /**
-     * Matches values that are Less Than a specified value.
-     */
-    $lt?: number | Date;
-    /**
-     * Matches values that are Less Than or Equal to a specified value.
-     */
-    $lte?: number | Date;
-    /**
-     * Matches all values that are Not Equal to a specified value.
-     */
-    $ne?: T;
-    /**
-     * Matches None of the values specified IN an array.
-     */
-    $nin?: T;
-    /**
-     * Inverts the effect of a query expression and returns documents that do not match the query expression.
-     */
-    $not?: T | {
-        $regex?: RegExp | string;
-    };
-    /**
-     * Performs a regular expression on the field's value, and selects documents that match the regular expression.
-     */
-    $exists?: boolean;
-    /**
-     * Selects documents if a field is of the specified type.
-     */
-    $type?: string;
-};
-/**
- * Joins query clauses with a logical AND returns all documents that match the conditions of both clauses.
- */
-export type DyNTS_DBFilterNOR<T> = {
-    /**
-     * Joins query clauses with a logical NOR returns all documents that fail to match both clauses.
-     */
-    $nor: DyNTS_DBFilterSimple<T>[];
-};
-/**
- * Joins query clauses with a logical AND returns all documents that match the conditions of both clauses.
- */
-export type DyNTS_DBFilterOR<T> = {
-    /**
-     * Joins query clauses with a logical OR returns all documents that match the conditions of either clause.
-     */
-    $or: DyNTS_DBFilterSimple<T>[];
-};
-//# sourceMappingURL=db-filter.type.d.ts.map

package/build/_models/types/db-filter.type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"db-filter.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-filter.type.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAC1B,oBAAoB,CAAC,CAAC,CAAC,GACvB,gBAAgB,CAAC,CAAC,CAAC,GACnB,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEvB;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;KACnC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAClE,GAAG;IACF,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;IACzC;;OAEG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IACV;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;IACR;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;IACR;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,CAAC;IACT;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,GAAG;QACT,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAC1B,CAAC;IACF;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC;;OAEG;IACH,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;CACjC,CAAA;AAGD;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC;;OAEG;IACH,GAAG,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;CAChC,CAAA"}

package/build/_models/types/db-filter.type.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=db-filter.type.js.map

package/build/_models/types/db-filter.type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"db-filter.type.js","sourceRoot":"","sources":["../../../src/_models/types/db-filter.type.ts"],"names":[],"mappings":""}

package/src/_models/types/db-filter.type.ts

@@ -1,108 +0,0 @@
-
-/**
- * @example 
- * // by email: 
- * { email: email }
- * //
- * @example 
- * // or by id that is in list:
- * { userIds: { $in: this.userId } }
- * //
- * @example 
- * // or by number or Date that is Greater Than AND Less Than:
- * { points: { $gt: 2, $lt: 14 } }
- * // further tools (syntax matches with $gt):
- * $eq:  // Matches values that are EQual to a specified value.
- * $gte: // Matches values that are Greater Than OR Equal to a specified value.
- * $lte: // Matches values that are Less Than or Equal to a specified value.
- * $ne:  // Matches all values that are Not Equal to a specified value.
- * $nin: // Matches None of the values specified IN an array.
- * //
- * @returns {T} data: T
- */
-export type DyNTS_DBFilter<T> = 
-  DyNTS_DBFilterSimple<T> | 
-  DyNTS_DBFilterOR<T> |
-  DyNTS_DBFilterNOR<T>;
-
-/**
- * A simple filter for a DynamoDB query.
- */
-export type DyNTS_DBFilterSimple<T> = {
-  [K in keyof T]?: T[K] | DyNTS_DBFilterExpressions<T[K] | boolean>;
-} & {
-  [path: string]: any;
-};
-
-export type DyNTS_DBFilterExpressions<T> = { 
-  /**
-   * Matches values that are includes the value; This works only when T[K] is an array!
-   */
-  $in?: any,
-  /**
-   * Matches values that are EQual to a specified value.
-   */
-  $eq?: T,
-  /**
-   * Matches values that are Greater Than a specified value.
-   */
-  $gt?: number | Date,
-  /**
-   * Matches values that are Greater Than OR Equal to a specified value.
-   */
-  $gte?: number | Date,
-  /**
-   * Matches values that are Less Than a specified value.
-   */
-  $lt?: number | Date,
-  /**
-   * Matches values that are Less Than or Equal to a specified value.
-   */
-  $lte?: number | Date,
-  /**
-   * Matches all values that are Not Equal to a specified value.
-   */
-  $ne?: T,
-  /**
-   * Matches None of the values specified IN an array.
-   */
-  $nin?: T,
-  /**
-   * Inverts the effect of a query expression and returns documents that do not match the query expression.
-   */
-  $not?: T | {
-    $regex?: RegExp | string,
-  },
-  /**
-   * Performs a regular expression on the field's value, and selects documents that match the regular expression.
-   */
-  $exists?: boolean,
-  /**
-   * Selects documents if a field is of the specified type.
-   */
-  $type?: string,
-};
-
-
-/**
- * Joins query clauses with a logical AND returns all documents that match the conditions of both clauses.
- */
-export type DyNTS_DBFilterNOR<T> = {
-  /**
-   * Joins query clauses with a logical NOR returns all documents that fail to match both clauses.
-   */
-  $nor: DyNTS_DBFilterSimple<T>[];
-}
-
-
-/**
- * Joins query clauses with a logical AND returns all documents that match the conditions of both clauses.
- */
-export type DyNTS_DBFilterOR<T> = {
-  /**
-   * Joins query clauses with a logical OR returns all documents that match the conditions of either clause.
-   */
-  $or: DyNTS_DBFilterSimple<T>[];
-}
-
-