X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FSharedLRUCache.ts;h=ba0a47d59b70962ab75517aab0215dda6b0b3424;hb=933e253b07b60f598e94a40cb817e334fb0f1995;hp=3e2e0de0f32b5319e43e18b9f95b788fc7c6a7bf;hpb=53ac516c575adaacd199a68d39b5ace22876ee83;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/SharedLRUCache.ts b/src/charging-station/SharedLRUCache.ts
index 3e2e0de0..ba0a47d5 100644
--- a/src/charging-station/SharedLRUCache.ts
+++ b/src/charging-station/SharedLRUCache.ts
@@ -1,23 +1,22 @@
-import LRUCache from 'mnemonist/lru-map-with-delete';
+import LRUCache from 'mnemonist/lru-map-with-delete.js';
 
-import { Bootstrap } from '../internal';
-import type { ChargingStationConfiguration } from '../types/ChargingStationConfiguration';
-import type { ChargingStationTemplate } from '../types/ChargingStationTemplate';
-import Utils from '../utils/Utils';
+import { Bootstrap } from './Bootstrap';
+import type { ChargingStationConfiguration, ChargingStationTemplate } from '../types';
+import { Utils } from '../utils';
 
 enum CacheType {
-  CHARGING_STATION_TEMPLATE = 'chargingStationTemplate',
-  CHARGING_STATION_CONFIGURATION = 'chargingStationConfiguration',
+  chargingStationTemplate = 'chargingStationTemplate',
+  chargingStationConfiguration = 'chargingStationConfiguration',
 }
 
-type CacheableType = ChargingStationTemplate | ChargingStationConfiguration;
+type CacheValueType = ChargingStationTemplate | ChargingStationConfiguration;
 
-export default class SharedLRUCache {
+export class SharedLRUCache {
   private static instance: SharedLRUCache | null = null;
-  private readonly lruCache: LRUCache<string, CacheableType>;
+  private readonly lruCache: LRUCache<string, CacheValueType>;
 
   private constructor() {
-    this.lruCache = new LRUCache<string, CacheableType>(
+    this.lruCache = new LRUCache<string, CacheValueType>(
       Bootstrap.getInstance().numberOfChargingStationTemplates +
         Bootstrap.getInstance().numberOfChargingStations
     );
@@ -83,22 +82,22 @@ export default class SharedLRUCache {
   }
 
   private getChargingStationConfigurationKey(hash: string): string {
-    return `${CacheType.CHARGING_STATION_CONFIGURATION}${hash}`;
+    return `${CacheType.chargingStationConfiguration}${hash}`;
   }
 
   private getChargingStationTemplateKey(hash: string): string {
-    return `${CacheType.CHARGING_STATION_TEMPLATE}${hash}`;
+    return `${CacheType.chargingStationTemplate}${hash}`;
   }
 
   private has(key: string): boolean {
     return this.lruCache.has(key);
   }
 
-  private get(key: string): CacheableType | undefined {
+  private get(key: string): CacheValueType | undefined {
     return this.lruCache.get(key);
   }
 
-  private set(key: string, value: CacheableType): void {
+  private set(key: string, value: CacheValueType): void {
     this.lruCache.set(key, value);
   }
 
@@ -112,9 +111,12 @@ export default class SharedLRUCache {
     return (
       Utils.isNullOrUndefined(chargingStationConfiguration?.configurationKey) === false &&
       Utils.isNullOrUndefined(chargingStationConfiguration?.stationInfo) === false &&
+      Utils.isNullOrUndefined(chargingStationConfiguration?.automaticTransactionGenerator) ===
+        false &&
       Utils.isNullOrUndefined(chargingStationConfiguration?.configurationHash) === false &&
       Utils.isNotEmptyArray(chargingStationConfiguration?.configurationKey) === true &&
       Utils.isEmptyObject(chargingStationConfiguration?.stationInfo) === false &&
+      Utils.isEmptyObject(chargingStationConfiguration?.automaticTransactionGenerator) === false &&
       Utils.isNotEmptyString(chargingStationConfiguration?.configurationHash) === true
     );
   }