refactor(database): ConnectionPool class to handle null client and pool ended state

m-mdy-m · m-mdy-m · commit 86846410f2b2 · 2024-12-19T10:52:07.000+03:30
diff --git a/src/database/ConnectionPool.ts b/src/database/ConnectionPool.ts
@@ -10,7 +10,7 @@ export class ConnectionPool {
     this._pool = this.initializePool(connectionString);
   }
   async connect(): Promise<boolean> {
-    let client;
+    let client: PoolClient | null = null;
     try {
       client = await this._pool.connect();
       logger.info('Database connection successful');
@@ -37,7 +37,6 @@ export class ConnectionPool {
         return false;
       }
     } finally {
-      // Release client only if it was successfully acquired
       if (client) {
         client.release();
       }
@@ -77,7 +76,7 @@ export class ConnectionPool {
     });
   }
   async reinitializePool() {
-    if (this._pool) {
+    if (this._pool && !this._pool.ended) {
       await this._pool.end();
     }
     const newConnectionString = this.getConnectionString();

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export class ConnectionPool {`
`10`	`10`	`this._pool = this.initializePool(connectionString);`
`11`	`11`	`}`
`12`	`12`	`async connect(): Promise<boolean> {`
`13`		`- let client;`
	`13`	`+ let client: PoolClient \| null = null;`
`14`	`14`	`try {`
`15`	`15`	`client = await this._pool.connect();`
`16`	`16`	`logger.info('Database connection successful');`
`@@ -37,7 +37,6 @@ export class ConnectionPool {`
`37`	`37`	`return false;`
`38`	`38`	`}`
`39`	`39`	`} finally {`
`40`		`- // Release client only if it was successfully acquired`
`41`	`40`	`if (client) {`
`42`	`41`	`client.release();`
`43`	`42`	`}`
`@@ -77,7 +76,7 @@ export class ConnectionPool {`
`77`	`76`	`});`
`78`	`77`	`}`
`79`	`78`	`async reinitializePool() {`
`80`		`- if (this._pool) {`
	`79`	`+ if (this._pool && !this._pool.ended) {`
`81`	`80`	`await this._pool.end();`
`82`	`81`	`}`
`83`	`82`	`const newConnectionString = this.getConnectionString();`