X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=fcb35a4df0507569d941edbcb1aac223561e6be4;hb=e302df1d4573ef07df7c44a210a34e429f571814;hp=8a8808e9baa7af069a2834a2afe14a796ccaca1d;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 8a8808e9..fcb35a4d 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,12 +1,13 @@
-// Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+
+import fs from 'node:fs';
 
-import Constants from '../../utils/Constants';
-import FileUtils from '../../utils/FileUtils';
-import Statistics from '../../types/Statistics';
-import { Storage } from './Storage';
-import fs from 'fs';
 import lockfile from 'proper-lockfile';
 
+import { FileType, type Statistics } from '../../types';
+import { Constants, FileUtils, Utils } from '../../utils';
+import { Storage } from '../internal';
+
 export class JsonFileStorage extends Storage {
   private fd: number | null = null;
 
@@ -28,47 +29,33 @@ export class JsonFileStorage extends Storage {
           performanceRecords.push(performanceStatistics);
           fs.writeFileSync(
             this.dbName,
-            JSON.stringify(
-              performanceRecords,
-              (key, value) => {
-                if (value instanceof Map) {
-                  return {
-                    dataType: 'Map',
-                    value: [...value],
-                  };
-                }
-                return value as Statistics;
-              },
-              2
-            ),
+            Utils.JSONStringifyWithMapSupport(performanceRecords, 2),
             'utf8'
           );
         } catch (error) {
           FileUtils.handleFileException(
-            this.logPrefix,
-            Constants.PERFORMANCE_RECORDS_FILETYPE,
             this.dbName,
-            error as NodeJS.ErrnoException
+            FileType.PerformanceRecords,
+            error as NodeJS.ErrnoException,
+            this.logPrefix
           );
         }
         await release();
       })
-      .catch(() => {
-        /* This is intentional */
-      });
+      .catch(Constants.EMPTY_FUNCTION);
   }
 
   public open(): void {
     try {
-      if (!this?.fd) {
+      if (Utils.isNullOrUndefined(this?.fd)) {
         this.fd = fs.openSync(this.dbName, 'a+');
       }
     } catch (error) {
       FileUtils.handleFileException(
-        this.logPrefix,
-        Constants.PERFORMANCE_RECORDS_FILETYPE,
         this.dbName,
-        error as NodeJS.ErrnoException
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix
       );
     }
   }
@@ -81,10 +68,10 @@ export class JsonFileStorage extends Storage {
       }
     } catch (error) {
       FileUtils.handleFileException(
-        this.logPrefix,
-        Constants.PERFORMANCE_RECORDS_FILETYPE,
         this.dbName,
-        error as NodeJS.ErrnoException
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix
       );
     }
   }