X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FMongoDBStorage.ts;h=f10481a0f96622cbe000e22def7da71e22936516;hb=9d73266c8bb85d7e2bc1fab9954a76910fd689eb;hp=851df0a1ba8248a582153056ce1bad688fd37d92;hpb=a6b3c6c313f1c0314a1445ed630cac85edf55b2c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/MongoDBStorage.ts b/src/performance/storage/MongoDBStorage.ts
index 851df0a1..f10481a0 100644
--- a/src/performance/storage/MongoDBStorage.ts
+++ b/src/performance/storage/MongoDBStorage.ts
@@ -1,56 +1,73 @@
 // Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import Constants from '../../utils/Constants';
 import { MongoClient } from 'mongodb';
-import Statistics from '../../types/Statistics';
-import { Storage } from './Storage';
+
+import type Statistics from '../../types/Statistics';
 import { StorageType } from '../../types/Storage';
+import Constants from '../../utils/Constants';
+import { Storage } from './Storage';
 
 export class MongoDBStorage extends Storage {
-  private client: MongoClient;
+  private readonly client: MongoClient | null;
   private connected: boolean;
 
-  constructor(storageURI: string, logPrefix: string) {
-    super(storageURI, logPrefix);
-    this.client = new MongoClient(this.storageURI.toString());
+  constructor(storageUri: string, logPrefix: string) {
+    super(storageUri, logPrefix);
+    this.client = new MongoClient(this.storageUri.toString());
     this.connected = false;
-    this.dbName = this.storageURI.pathname.replace(/(?:^\/)|(?:\/$)/g, '') ?? Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME;
+    this.dbName =
+      this.storageUri.pathname.replace(/(?:^\/)|(?:\/$)/g, '') ??
+      Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME;
   }
 
   public async storePerformanceStatistics(performanceStatistics: Statistics): Promise<void> {
     try {
       this.checkDBConnection();
-      await this.client.db(this.dbName).collection<Statistics>(Constants.PERFORMANCE_RECORDS_TABLE).insertOne(performanceStatistics);
+      await this.client
+        .db(this.dbName)
+        .collection<Statistics>(Constants.PERFORMANCE_RECORDS_TABLE)
+        .insertOne(performanceStatistics);
     } catch (error) {
-      this.handleDBError(StorageType.MONGO_DB, error, Constants.PERFORMANCE_RECORDS_TABLE);
+      this.handleDBError(StorageType.MONGO_DB, error as Error, Constants.PERFORMANCE_RECORDS_TABLE);
     }
   }
 
   public async open(): Promise<void> {
     try {
-      if (!this.connected) {
+      if (!this.connected && this?.client) {
         await this.client.connect();
         this.connected = true;
       }
     } catch (error) {
-      this.handleDBError(StorageType.MONGO_DB, error);
+      this.handleDBError(StorageType.MONGO_DB, error as Error);
     }
   }
 
   public async close(): Promise<void> {
     try {
-      if (this.connected) {
+      if (this.connected && this?.client) {
         await this.client.close();
         this.connected = false;
       }
     } catch (error) {
-      this.handleDBError(StorageType.MONGO_DB, error);
+      this.handleDBError(StorageType.MONGO_DB, error as Error);
     }
   }
 
   private checkDBConnection() {
+    if (!this?.client) {
+      throw new Error(
+        `${this.logPrefix} ${this.getDBNameFromStorageType(
+          StorageType.MONGO_DB
+        )} client initialization failed while trying to issue a request`
+      );
+    }
     if (!this.connected) {
-      throw new Error(`${this.logPrefix} ${this.getDBNameFromStorageType(StorageType.MONGO_DB)} connection not opened while trying to issue a request`);
+      throw new Error(
+        `${this.logPrefix} ${this.getDBNameFromStorageType(
+          StorageType.MONGO_DB
+        )} connection not opened while trying to issue a request`
+      );
     }
   }
 }