Revert "refactor(repository): use FilterBuilder.impose() to merge {deleted:false} filter (#52)"

This reverts commit 4f3b905.

Author: Samarpan Bhattacharya

src/repositories/default-transaction-soft-crud.repository.base.ts

@@ -1,7 +1,10 @@
 import {
+  AndClause,
+  Condition,
   DataObject,
   Filter,
   juggler,
+  OrClause,
   DefaultTransactionalRepository,
   Where,
   Getter,
@@ -13,7 +16,6 @@ import {SoftDeleteEntity} from '../models';
 import {IAuthUser} from 'loopback4-authentication';
 import {HttpErrors} from '@loopback/rest';
 import {ErrorKeys} from '../error-keys';
-import {produceSoftDeleteFilter, produceSoftDeleteWhere} from './repo-utils';
 
 export abstract class DefaultTransactionSoftCrudRepository<
   T extends SoftDeleteEntity,
@@ -32,7 +34,33 @@ export abstract class DefaultTransactionSoftCrudRepository<
 
   find(filter?: Filter<T>, options?: Options): Promise<(T & Relations)[]> {
     // Filter out soft deleted entries
-    filter = produceSoftDeleteFilter(filter);
+    if (
+      filter?.where &&
+      (filter.where as AndClause<T>).and &&
+      (filter.where as AndClause<T>).and.length > 0
+    ) {
+      (filter.where as AndClause<T>).and.push({
+        deleted: false,
+      } as Condition<T>);
+    } else if (
+      filter?.where &&
+      (filter.where as OrClause<T>).or &&
+      (filter.where as OrClause<T>).or.length > 0
+    ) {
+      (filter.where as AndClause<T>).and = [];
+      (filter.where as AndClause<T>).and.push(
+        {
+          deleted: false,
+        } as Condition<T>,
+        {
+          or: (filter.where as OrClause<T>).or,
+        },
+      );
+    } else {
+      filter = filter ?? {};
+      filter.where = filter.where ?? {};
+      (filter.where as Condition<T>).deleted = false;
+    }
 
     // Now call super
     return super.find(filter, options);
@@ -47,7 +75,34 @@ export abstract class DefaultTransactionSoftCrudRepository<
     filter?: Filter<T>,
     options?: Options,
   ): Promise<(T & Relations) | null> {
-    filter = produceSoftDeleteFilter(filter);
+    // Filter out soft deleted entries
+    if (
+      filter?.where &&
+      (filter.where as AndClause<T>).and &&
+      (filter.where as AndClause<T>).and.length > 0
+    ) {
+      (filter.where as AndClause<T>).and.push({
+        deleted: false,
+      } as Condition<T>);
+    } else if (
+      filter?.where &&
+      (filter.where as OrClause<T>).or &&
+      (filter.where as OrClause<T>).or.length > 0
+    ) {
+      (filter.where as AndClause<T>).and = [];
+      (filter.where as AndClause<T>).and.push(
+        {
+          deleted: false,
+        } as Condition<T>,
+        {
+          or: (filter.where as OrClause<T>).or,
+        },
+      );
+    } else {
+      filter = filter ?? {};
+      filter.where = filter.where ?? {};
+      (filter.where as Condition<T>).deleted = false;
+    }
 
     // Now call super
     return super.findOne(filter, options);
@@ -66,9 +121,40 @@ export abstract class DefaultTransactionSoftCrudRepository<
     filter?: Filter<T>,
     options?: Options,
   ): Promise<T & Relations> {
-    filter = produceSoftDeleteFilter(filter, {
-      id,
-    });
+    // Filter out soft deleted entries
+    // Filter out soft deleted entries
+    if (
+      filter?.where &&
+      (filter.where as AndClause<T>).and &&
+      (filter.where as AndClause<T>).and.length > 0
+    ) {
+      (filter.where as AndClause<T>).and.push({
+        deleted: false,
+        id: id,
+      } as Condition<T>);
+    } else if (
+      filter?.where &&
+      (filter.where as OrClause<T>).or &&
+      (filter.where as OrClause<T>).or.length > 0
+    ) {
+      filter.where = {
+        and: [
+          {
+            deleted: false,
+            id: id,
+          } as Condition<T>,
+          {
+            or: (filter.where as OrClause<T>).or,
+          },
+        ],
+      };
+    } else {
+      filter = filter ?? {};
+      filter.where = {
+        deleted: false,
+        id: id,
+      } as Condition<T>;
+    }
 
     //As parent method findById have filter: FilterExcludingWhere<T>
     //so we need add check here.
@@ -95,15 +181,66 @@ export abstract class DefaultTransactionSoftCrudRepository<
     where?: Where<T>,
     options?: Options,
   ): Promise<Count> {
-    where = produceSoftDeleteWhere(where);
+    // Filter out soft deleted entries
+    if (
+      where &&
+      (where as AndClause<T>).and &&
+      (where as AndClause<T>).and.length > 0
+    ) {
+      (where as AndClause<T>).and.push({
+        deleted: false,
+      } as Condition<T>);
+    } else if (
+      where &&
+      (where as OrClause<T>).or &&
+      (where as OrClause<T>).or.length > 0
+    ) {
+      (where as AndClause<T>).and = [];
+      (where as AndClause<T>).and.push(
+        {
+          deleted: false,
+        } as Condition<T>,
+        {
+          or: (where as OrClause<T>).or,
+        },
+      );
+    } else {
+      where = where ?? {};
+      (where as Condition<T>).deleted = false;
+    }
 
     // Now call super
     return super.updateAll(data, where, options);
   }
 
   count(where?: Where<T>, options?: Options): Promise<Count> {
     // Filter out soft deleted entries
-    where = produceSoftDeleteWhere(where);
+    if (
+      where &&
+      (where as AndClause<T>).and &&
+      (where as AndClause<T>).and.length > 0
+    ) {
+      (where as AndClause<T>).and.push({
+        deleted: false,
+      } as Condition<T>);
+    } else if (
+      where &&
+      (where as OrClause<T>).or &&
+      (where as OrClause<T>).or.length > 0
+    ) {
+      (where as AndClause<T>).and = [];
+      (where as AndClause<T>).and.push(
+        {
+          deleted: false,
+        } as Condition<T>,
+        {
+          or: (where as OrClause<T>).or,
+        },
+      );
+    } else {
+      where = where ?? {};
+      (where as Condition<T>).deleted = false;
+    }
 
     // Now call super
     return super.count(where, options);