fix: add populate support for delete

etienne-bechara · Aug 8, 2021 · ece90a1 · ece90a1
1 parent 8a4e846
commit ece90a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/source/orm/orm.interface/orm.delete.options.ts b/source/orm/orm.interface/orm.delete.options.ts
@@ -1,3 +1,6 @@
-export interface OrmDeleteOptions {
+import { Populate } from '@mikro-orm/core';
+
+export interface OrmDeleteOptions<Entity> {
   disableFlush?: boolean;
+  populate?: Populate<Entity>;
 }
diff --git a/source/orm/orm.repository/orm.repository.delete.ts b/source/orm/orm.repository/orm.repository.delete.ts
@@ -18,11 +18,15 @@ export abstract class OrmDeleteRepository<Entity> extends OrmUpdateRepository<En
    * @param entities
    * @param options
    */
-  public async delete(entities: Entity | Entity[], options: OrmDeleteOptions = { }): Promise<Entity[]> {
-    const { disableFlush } = options;
+  public async delete(entities: Entity | Entity[], options: OrmDeleteOptions<Entity> = { }): Promise<Entity[]> {
+    const { disableFlush, populate } = options;
     const entityArray = Array.isArray(entities) ? entities : [ entities ];
     if (!entities || entityArray.length === 0) return [ ];
 
+    if (populate) {
+      await this.populate(entityArray, populate);
+    }
+
     try {
       disableFlush
         ? this.remove(entityArray)
@@ -40,7 +44,7 @@ export abstract class OrmDeleteRepository<Entity> extends OrmUpdateRepository<En
    * @param id
    * @param options
    */
-  public async deleteById(id: string | number, options: OrmDeleteOptions = { }): Promise<Entity> {
+  public async deleteById(id: string | number, options: OrmDeleteOptions<Entity> = { }): Promise<Entity> {
     const entity = await this.readByIdOrFail(id);
     await this.delete(entity, options);
     return entity;
@@ -51,7 +55,7 @@ export abstract class OrmDeleteRepository<Entity> extends OrmUpdateRepository<En
    * @param entity
    * @param options
    */
-  public async deleteOne(entity: Entity, options: OrmDeleteOptions = { }): Promise<Entity> {
+  public async deleteOne(entity: Entity, options: OrmDeleteOptions<Entity> = { }): Promise<Entity> {
     const [ deletedEntity ] = await this.delete(entity, options);
     return deletedEntity;
   }