X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FSharedLRUCache.ts;h=0da4558d4d46f4c4bd3d98f92eb2a7677856517d;hb=d9c13bcac891b8686dbba36ae5c10f87948e3614;hp=97f417e72fb8813e67bf7a384e2d7743697e0f53;hpb=a807045be19c1ed4996a44d8c2c8774e926dc6dc;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/SharedLRUCache.ts b/src/charging-station/SharedLRUCache.ts
index 97f417e7..0da4558d 100644
--- a/src/charging-station/SharedLRUCache.ts
+++ b/src/charging-station/SharedLRUCache.ts
@@ -1,17 +1,13 @@
 import { LRUMapWithDelete as LRUCache } from 'mnemonist'
+import { isEmpty } from 'rambda'
 
-import { Bootstrap } from './Bootstrap.js'
 import type { ChargingStationConfiguration, ChargingStationTemplate } from '../types/index.js'
-import {
-  isEmptyObject,
-  isNotEmptyArray,
-  isNotEmptyString,
-  isNullOrUndefined
-} from '../utils/index.js'
+import { isNotEmptyArray, isNotEmptyString } from '../utils/index.js'
+import { Bootstrap } from './Bootstrap.js'
 
 enum CacheType {
   chargingStationTemplate = 'chargingStationTemplate',
-  chargingStationConfiguration = 'chargingStationConfiguration',
+  chargingStationConfiguration = 'chargingStationConfiguration'
 }
 
 type CacheValueType = ChargingStationTemplate | ChargingStationConfiguration
@@ -23,7 +19,8 @@ export class SharedLRUCache {
   private constructor () {
     this.lruCache = new LRUCache<string, CacheValueType>(
       Bootstrap.getInstance().numberOfChargingStationTemplates +
-        Bootstrap.getInstance().numberOfChargingStations
+        Bootstrap.getInstance().numberOfConfiguredChargingStations +
+        Bootstrap.getInstance().numberOfProvisionedChargingStations
     )
   }
 
@@ -116,16 +113,14 @@ export class SharedLRUCache {
     chargingStationConfiguration: ChargingStationConfiguration
   ): boolean {
     return (
-      !isNullOrUndefined(chargingStationConfiguration?.configurationKey) &&
-      !isNullOrUndefined(chargingStationConfiguration?.stationInfo) &&
-      !isNullOrUndefined(chargingStationConfiguration?.automaticTransactionGenerator) &&
-      !isNullOrUndefined(chargingStationConfiguration?.configurationHash) &&
-      isNotEmptyArray(chargingStationConfiguration?.configurationKey) &&
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      !isEmptyObject(chargingStationConfiguration.stationInfo!) &&
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      !isEmptyObject(chargingStationConfiguration.automaticTransactionGenerator!) &&
-      isNotEmptyString(chargingStationConfiguration?.configurationHash)
+      chargingStationConfiguration.configurationKey != null &&
+      chargingStationConfiguration.stationInfo != null &&
+      chargingStationConfiguration.automaticTransactionGenerator != null &&
+      chargingStationConfiguration.configurationHash != null &&
+      isNotEmptyArray(chargingStationConfiguration.configurationKey) &&
+      !isEmpty(chargingStationConfiguration.stationInfo) &&
+      !isEmpty(chargingStationConfiguration.automaticTransactionGenerator) &&
+      isNotEmptyString(chargingStationConfiguration.configurationHash)
     )
   }
 }