X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FSharedLRUCache.ts;h=0da4558d4d46f4c4bd3d98f92eb2a7677856517d;hb=30695dcf67470f149e349d196b3d016482d11a17;hp=ef965b1b7366e760aca7111e50d885cc99f8fc98;hpb=e61f0f6e8773ec7e3fe3c94cff4e5e1d9a62cc9e;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/SharedLRUCache.ts b/src/charging-station/SharedLRUCache.ts index ef965b1b..0da4558d 100644 --- a/src/charging-station/SharedLRUCache.ts +++ b/src/charging-station/SharedLRUCache.ts @@ -1,12 +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 } 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 @@ -18,7 +19,8 @@ export class SharedLRUCache { private constructor () { this.lruCache = new LRUCache( Bootstrap.getInstance().numberOfChargingStationTemplates + - Bootstrap.getInstance().numberOfChargingStations + Bootstrap.getInstance().numberOfConfiguredChargingStations + + Bootstrap.getInstance().numberOfProvisionedChargingStations ) } @@ -111,14 +113,14 @@ export class SharedLRUCache { chargingStationConfiguration: ChargingStationConfiguration ): boolean { return ( - chargingStationConfiguration?.configurationKey != null && - chargingStationConfiguration?.stationInfo != null && - chargingStationConfiguration?.automaticTransactionGenerator != null && - chargingStationConfiguration?.configurationHash != null && - isNotEmptyArray(chargingStationConfiguration?.configurationKey) && - !isEmptyObject(chargingStationConfiguration.stationInfo) && - !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) ) } }