From 21f68e222da0b9ac5d43a70b96beaf3f13ff3926 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 10 Jun 2024 17:11:34 +0200 Subject: [PATCH] refactor: cleanup power limitation code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/charging-station/Helpers.ts | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/charging-station/Helpers.ts b/src/charging-station/Helpers.ts index cc0422e1..6163f678 100644 --- a/src/charging-station/Helpers.ts +++ b/src/charging-station/Helpers.ts @@ -715,7 +715,7 @@ export const getConnectorChargingProfilesLimit = ( chargingProfiles ) if (chargingProfilesLimit != null) { - let limit = buildChargingProfilesLimit(chargingStation, chargingProfilesLimit) + const limit = buildChargingProfilesLimit(chargingStation, chargingProfilesLimit) const connectorMaximumPower = // eslint-disable-next-line @typescript-eslint/no-non-null-assertion chargingStation.stationInfo!.maximumPower! / chargingStation.powerDivider! @@ -726,7 +726,7 @@ export const getConnectorChargingProfilesLimit = ( } limit ${limit} is greater than connector ${connectorId} maximum ${connectorMaximumPower}: %j`, chargingProfilesLimit ) - limit = connectorMaximumPower + return connectorMaximumPower } return limit } @@ -737,27 +737,29 @@ const buildChargingProfilesLimit = ( chargingStation: ChargingStation, chargingProfilesLimit: ChargingProfilesLimit ): number => { - let { limit, chargingProfile } = chargingProfilesLimit + const errorMsg = `Unknown ${chargingStation.stationInfo?.currentOutType} currentOutType in charging station information, cannot build charging profiles limit` + const { limit, chargingProfile } = chargingProfilesLimit switch (chargingStation.stationInfo?.currentOutType) { case CurrentType.AC: - limit = - chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT - ? limit - : ACElectricUtils.powerTotal( - chargingStation.getNumberOfPhases(), - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - chargingStation.stationInfo.voltageOut!, - limit - ) - break + return chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT + ? limit + : ACElectricUtils.powerTotal( + chargingStation.getNumberOfPhases(), + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + chargingStation.stationInfo.voltageOut!, + limit + ) case CurrentType.DC: - limit = - chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT - ? limit - : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - DCElectricUtils.power(chargingStation.stationInfo.voltageOut!, limit) + return chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT + ? limit + : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + DCElectricUtils.power(chargingStation.stationInfo.voltageOut!, limit) + default: + logger.error( + `${chargingStation.logPrefix()} ${moduleName}.buildChargingProfilesLimit: ${errorMsg}` + ) + throw new BaseError(errorMsg) } - return limit } export const getDefaultVoltageOut = ( -- 2.34.1