fix: refactor em reset

etienne-bechara · Aug 27, 2021 · 01ffa2d · 01ffa2d
1 parent 5b7a96a
commit 01ffa2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/source/orm/orm.interceptor/orm.entity.manager.ts b/source/orm/orm.interceptor/orm.entity.manager.ts
@@ -23,7 +23,7 @@ export class OrmEntityManager implements NestInterceptor {
    */
   public intercept(context: ExecutionContext, next: CallHandler): any {
     const store = this.requestService.getStore();
-    const entityManager = this.mikroOrm.em.fork(true, true);
+    let entityManager = this.mikroOrm.em.fork(true, true);
     store.set(OrmStoreKey.ENTITY_MANAGER, entityManager);
 
     return next
@@ -34,6 +34,7 @@ export class OrmEntityManager implements NestInterceptor {
 
           if (flushPending) {
             try {
+              entityManager = store.get(OrmStoreKey.ENTITY_MANAGER);
               await entityManager.flush();
             }
             catch (e) {

diff --git a/source/orm/orm.repository/orm.repository.base.ts b/source/orm/orm.repository/orm.repository.base.ts
@@ -24,11 +24,11 @@ export abstract class OrmBaseRepository<Entity> extends EntityRepository<Entity>
   }
 
   /**
-   * Clear all persisted entities.
+   * Resets the entity manager.
    */
-  public clear(): void {
-    const em: EntityManager = this.getStore().get(OrmStoreKey.ENTITY_MANAGER);
-    em.clear();
+  public reset(): void {
+    const cleanEntityManager = this.entityManager.fork(true);
+    this.getStore().set(OrmStoreKey.ENTITY_MANAGER, cleanEntityManager);
   }
 
   /**