@futdevpro/nts-dynamo 1.14.45 → 1.14.47

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

@@ -267,7 +267,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
   }
 
   // TODO: Missing issuer
-  async getDataListByIds(ids: string[]): Promise<T[]> {
+  async getDataListByIds(ids: string[], findDeleted?: boolean): Promise<T[]> {
     const dataList: T[] = await this.dataModel
       .find({ _id: { $in: ids } })
       .then((res): T[] => res as T[] ?? [])
@@ -282,11 +282,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    return dataList.filter(
-      (data: T): boolean => !data._deleted
-    ).map(
-      (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
-    );
+    if (!findDeleted) {
+      return dataList.filter(
+        (data: T): boolean => !data._deleted
+      ).map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
+      );
+    } else {
+      return dataList.map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
+      );
+    }
   }
 
   // TODO: Missing issuer
@@ -297,7 +303,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param dependencyIdsFilter id
    * @returns dataList
    */
-  async getDataListByDependencyId(dependencyIdsFilter: { [key: string]: string }): Promise<T[]> {
+  async getDataListByDependencyId(dependencyIdsFilter: { [key: string]: string }, findDeleted?: boolean): Promise<T[]> {
     if (!this.depKeys.length) {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
@@ -328,11 +334,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    return dataList.filter(
-      (data: T): boolean => !data._deleted
-    ).map(
-      (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
-    );
+    if (!findDeleted) {
+      return dataList.filter(
+        (data: T): boolean => !data._deleted
+      ).map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
+      );
+    } else {
+      return dataList.map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyId')
+      );
+    }
   }
 
   // TODO: Missing issuer
@@ -343,7 +355,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param ids ids
    * @returns dataList
    */
-  async getDataListByDependencyIds(dependencyKey: string, dependencyIds: string[]): Promise<T[]> {
+  async getDataListByDependencyIds(dependencyKey: string, dependencyIds: string[], findDeleted?: boolean): Promise<T[]> {
     if (!this.depKeys.length) {
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(
@@ -395,11 +407,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    return dataList.filter(
-      (data: T): boolean => !data._deleted
-    ).map(
-      (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyIds')
-    );
+    if (!findDeleted) {
+      return dataList.filter(
+        (data: T): boolean => !data._deleted
+      ).map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyIds')
+      );
+    } else {
+      return dataList.map(
+        (data: T): T => this.stringifyDataId(data, 'getDataListByDependencyIds')
+      );
+    }
   }
 
   // TODO: Missing issuer
@@ -409,7 +427,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * 
    * @returns dataList
    */
-  async getAll(): Promise<T[]> {
+  async getAll(findDeleted?: boolean): Promise<T[]> {
     const dataList: T[] = await this.dataModel
       .find()
       .then((res): T[] => res as T[] ?? [])
@@ -424,11 +442,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    return dataList.filter(
-      (data: T): boolean => !data._deleted
-    ).map(
-      (data: T): T => this.stringifyDataId(data, 'getAll')
-    );
+    if (!findDeleted) {
+      return dataList.filter(
+        (data: T): boolean => !data._deleted
+      ).map(
+        (data: T): T => this.stringifyDataId(data, 'getAll')
+      );
+    } else {
+      return dataList.map(
+        (data: T): T => this.stringifyDataId(data, 'getAll')
+      );
+    }
   }
 
   async markDeletedById(id: string, issuer: string): Promise<void> {
@@ -645,6 +669,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     filterBy: DyFM_DBFilter<T>, 
     narrowByDependencyIds?: string[],
     narrowByDependencyKey?: string,
+    findDeleted?: boolean
   ): Promise<T[]> {
     const filter = {};
 
@@ -749,7 +774,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
       
-    if ((filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
+    if (!findDeleted && (filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
       dataList = dataList.filter((data: T): boolean => !data._deleted);
     }
 
@@ -836,7 +861,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * //
    * @returns {T[]} dataList: T[]
    */
-  async find(filterBy: DyFM_DBFilter<T>): Promise<T[]> {
+  async find(filterBy: DyFM_DBFilter<T>, findDeleted?: boolean): Promise<T[]> {
     let dataList: T[] = await this.dataModel
       .find(filterBy)
       .then((res): T[] => res as T[] ?? [])
@@ -851,7 +876,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
         });
       });
 
-    if ((filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
+    if (!findDeleted && (filterBy as DyFM_DBFilterSimple<T>)._deleted === undefined) {
       dataList = dataList.filter((data: T): boolean => !data._deleted);
     }