Merge pull request #5 from yepes/master

withDeleted not working with relations
gid-oss · Sep 8, 2022 · ab8dee8 · ab8dee8
2 parents 4d93111 + 6398238
commit ab8dee8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts
@@ -308,6 +308,13 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
     const select = this.getSelect(parsed, options.query);
     // select fields
     builder.select(select);
+
+    // if soft deleted is enabled add where statement to filter deleted records
+    if (this.entityHasDeleteColumn && options.query.softDelete) {
+      if (parsed.includeDeleted === 1 || withDeleted) {
+        builder.withDeleted();
+      }
+    }
 
     // search
     this.setSearchCondition(builder, parsed.search, options.operators?.custom);
@@ -340,13 +347,6 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
       }
     }
 
-    // if soft deleted is enabled add where statement to filter deleted records
-    if (this.entityHasDeleteColumn && options.query.softDelete) {
-      if (parsed.includeDeleted === 1 || withDeleted) {
-        builder.withDeleted();
-      }
-    }
-
     /* istanbul ignore else */
     if (many) {
       // set sort (order by)