Merge pull request #1 from jiho-kr/destory-synchronous

fix: `dataSource.destroy` runs as synchronously
kibae · Oct 16, 2022 · 7313c02 · 7313c02
2 parents 5cf388d + ede8c9d
commit 7313c02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/sharding-manager.ts b/src/sharding-manager.ts
@@ -73,10 +73,6 @@ export class ShardingManager {
 
     async destroy() {
         this._destroyed = true;
-        await Promise.all(
-            this.dataSources.map((dataSource) => {
-                dataSource.destroy();
-            })
-        );
+        await Promise.all(this.dataSources.map((dataSource) => dataSource.destroy()));
     }
 }
diff --git a/src/test/repository-service.spec.ts b/src/test/repository-service.spec.ts
@@ -31,7 +31,10 @@ describe('Repository Service', () => {
     });
 
     afterEach(async () => {
-        dataSource?.destroy();
+        if (dataSource) {
+            await dataSource.destroy();
+            dataSource.dataSources.forEach((dataSource) => expect(dataSource.isInitialized).toEqual(false));
+        }
     });
 
     it('Case1 - insert into last shard', async () => {

diff --git a/src/test/sharding-manager.spec.ts b/src/test/sharding-manager.spec.ts
@@ -29,7 +29,10 @@ describe('ShardingManager', () => {
     });
 
     afterEach(async () => {
-        dataSource?.destroy();
+        if (dataSource) {
+            await dataSource.destroy();
+            dataSource.dataSources.forEach((dataSource) => expect(dataSource.isInitialized).toEqual(false));
+        }
     });
 
     it('DataSource', async () => {