ACElectricUtils,
Constants,
DCElectricUtils,
- cloneObject,
+ clone,
convertToDate,
convertToInt,
isArraySorted,
isEmptyString,
isNotEmptyArray,
isNotEmptyString,
- isNullOrUndefined,
- isUndefined,
- isValidTime,
+ isValidDate,
logger,
secureRandom
} from '../utils/index.js'
}
// In case of multiple instances: add instance index to charging station id
const instanceIndex = env.CF_INSTANCE_INDEX ?? 0
- const idSuffix = stationTemplate?.nameSuffix ?? ''
+ const idSuffix = stationTemplate.nameSuffix ?? ''
const idStr = `000000000${index.toString()}`
- return stationTemplate?.fixedName === true
+ return stationTemplate.fixedName === true
? stationTemplate.baseName
: `${stationTemplate.baseName}-${instanceIndex.toString()}${idStr.substring(
idStr.length - 4
const chargingStationInfo = {
chargePointModel: stationTemplate.chargePointModel,
chargePointVendor: stationTemplate.chargePointVendor,
- ...(!isUndefined(stationTemplate.chargeBoxSerialNumberPrefix) && {
+ ...(stationTemplate.chargeBoxSerialNumberPrefix !== undefined && {
chargeBoxSerialNumber: stationTemplate.chargeBoxSerialNumberPrefix
}),
- ...(!isUndefined(stationTemplate.chargePointSerialNumberPrefix) && {
+ ...(stationTemplate.chargePointSerialNumberPrefix !== undefined && {
chargePointSerialNumber: stationTemplate.chargePointSerialNumberPrefix
}),
- ...(!isUndefined(stationTemplate.meterSerialNumberPrefix) && {
+ ...(stationTemplate.meterSerialNumberPrefix !== undefined && {
meterSerialNumber: stationTemplate.meterSerialNumberPrefix
}),
- ...(!isUndefined(stationTemplate.meterType) && {
+ ...(stationTemplate.meterType !== undefined && {
meterType: stationTemplate.meterType
})
}
}
}
-export const getMaxNumberOfEvses = (evses: Record<string, EvseTemplate>): number => {
+export const getMaxNumberOfEvses = (evses: Record<string, EvseTemplate> | undefined): number => {
if (evses == null) {
return -1
}
return Object.keys(evses).length
}
-const getMaxNumberOfConnectors = (connectors: Record<string, ConnectorStatus>): number => {
+const getMaxNumberOfConnectors = (
+ connectors: Record<string, ConnectorStatus> | undefined
+): number => {
if (connectors == null) {
return -1
}
): ConnectorStatusEnum => {
let connectorBootStatus: ConnectorStatusEnum
if (
- connectorStatus?.status == null &&
+ connectorStatus.status == null &&
(!chargingStation.isChargingStationAvailable() ||
!chargingStation.isConnectorAvailable(connectorId))
) {
connectorBootStatus = ConnectorStatusEnum.Unavailable
- } else if (connectorStatus?.status == null && connectorStatus?.bootStatus != null) {
+ } else if (connectorStatus.status == null && connectorStatus.bootStatus != null) {
// Set boot status in template at startup
- connectorBootStatus = connectorStatus?.bootStatus
- } else if (connectorStatus?.status != null) {
+ connectorBootStatus = connectorStatus.bootStatus
+ } else if (connectorStatus.status != null) {
// Set previous status at startup
- connectorBootStatus = connectorStatus?.status
+ connectorBootStatus = connectorStatus.status
} else {
// Set default status
connectorBootStatus = ConnectorStatusEnum.Available
}
export const checkTemplate = (
- stationTemplate: ChargingStationTemplate,
+ stationTemplate: ChargingStationTemplate | undefined,
logPrefix: string,
templateFile: string
): void => {
Constants.DEFAULT_ATG_CONFIGURATION
)
}
- if (isNullOrUndefined(stationTemplate.idTagsFile) || isEmptyString(stationTemplate.idTagsFile)) {
+ if (stationTemplate.idTagsFile == null || isEmptyString(stationTemplate.idTagsFile)) {
logger.warn(
`${logPrefix} Missing id tags file in template file ${templateFile}. That can lead to issues with the Automatic Transaction Generator`
)
} => {
const configuredMaxConnectors = getConfiguredMaxNumberOfConnectors(stationTemplate)
checkConfiguredMaxConnectors(configuredMaxConnectors, logPrefix, templateFile)
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- const templateMaxConnectors = getMaxNumberOfConnectors(stationTemplate.Connectors!)
+ const templateMaxConnectors = getMaxNumberOfConnectors(stationTemplate.Connectors)
checkTemplateMaxConnectors(templateMaxConnectors, logPrefix, templateFile)
const templateMaxAvailableConnectors =
stationTemplate.Connectors?.[0] != null ? templateMaxConnectors - 1 : templateMaxConnectors
if (
configuredMaxConnectors > templateMaxAvailableConnectors &&
- stationTemplate?.randomConnectors === false
+ stationTemplate.randomConnectors !== true
) {
logger.warn(
`${logPrefix} Number of connectors exceeds the number of connector configurations in template ${templateFile}, forcing random connector configurations affectation`
logPrefix: string,
templateFile: string
): void => {
- if (connectorStatus?.status != null) {
+ if (connectorStatus.status != null) {
logger.warn(
`${logPrefix} Charging station information from template ${templateFile} with connector id ${connectorId} status configuration defined, undefine it`
)
const connectorStatus = connectors[connector]
const connectorId = convertToInt(connector)
checkStationInfoConnectorStatus(connectorId, connectorStatus, logPrefix, templateFile)
- connectorsMap.set(connectorId, cloneObject<ConnectorStatus>(connectorStatus))
+ connectorsMap.set(connectorId, clone<ConnectorStatus>(connectorStatus))
}
} else {
logger.warn(
for (const connectorId of connectors.keys()) {
if (connectorId > 0 && connectors.get(connectorId)?.transactionStarted === true) {
logger.warn(
- `${logPrefix} Connector id ${connectorId} at initialization has a transaction started with id ${connectors.get(
- connectorId
- )?.transactionId}`
+ `${logPrefix} Connector id ${connectorId} at initialization has a transaction started with id ${
+ connectors.get(connectorId)?.transactionId
+ }`
)
}
if (connectorId === 0) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
connectors.get(connectorId)!.availability = AvailabilityType.Operative
- if (isUndefined(connectors.get(connectorId)?.chargingProfiles)) {
+ if (connectors.get(connectorId)?.chargingProfiles == null) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
connectors.get(connectorId)!.chargingProfiles = []
}
- } else if (
- connectorId > 0 &&
- isNullOrUndefined(connectors.get(connectorId)?.transactionStarted)
- ) {
+ } else if (connectorId > 0 && connectors.get(connectorId)?.transactionStarted == null) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
initializeConnectorStatus(connectors.get(connectorId)!)
}
}
}
-export const resetConnectorStatus = (connectorStatus: ConnectorStatus): void => {
+export const resetConnectorStatus = (connectorStatus: ConnectorStatus | undefined): void => {
+ if (connectorStatus == null) {
+ return
+ }
connectorStatus.chargingProfiles =
connectorStatus.transactionId != null && isNotEmptyArray(connectorStatus.chargingProfiles)
- ? connectorStatus.chargingProfiles?.filter(
- (chargingProfile) => chargingProfile.transactionId !== connectorStatus.transactionId
+ ? connectorStatus.chargingProfiles.filter(
+ chargingProfile => chargingProfile.transactionId !== connectorStatus.transactionId
)
: []
connectorStatus.idTagLocalAuthorized = false
connectorStatus.idTagAuthorized = false
connectorStatus.transactionRemoteStarted = false
connectorStatus.transactionStarted = false
- delete connectorStatus?.transactionStart
- delete connectorStatus?.transactionId
- delete connectorStatus?.localAuthorizeIdTag
- delete connectorStatus?.authorizeIdTag
- delete connectorStatus?.transactionIdTag
+ delete connectorStatus.transactionStart
+ delete connectorStatus.transactionId
+ delete connectorStatus.localAuthorizeIdTag
+ delete connectorStatus.authorizeIdTag
+ delete connectorStatus.transactionIdTag
connectorStatus.transactionEnergyActiveImportRegisterValue = 0
- delete connectorStatus?.transactionBeginMeterValue
+ delete connectorStatus.transactionBeginMeterValue
}
export const createBootNotificationRequest = (
stationInfo: ChargingStationInfo,
bootReason: BootReasonEnumType = BootReasonEnumType.PowerUp
-): BootNotificationRequest => {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- const ocppVersion = stationInfo.ocppVersion!
+): BootNotificationRequest | undefined => {
+ const ocppVersion = stationInfo.ocppVersion
switch (ocppVersion) {
case OCPPVersion.VERSION_16:
return {
chargePointModel: stationInfo.chargePointModel,
chargePointVendor: stationInfo.chargePointVendor,
- ...(!isUndefined(stationInfo.chargeBoxSerialNumber) && {
+ ...(stationInfo.chargeBoxSerialNumber !== undefined && {
chargeBoxSerialNumber: stationInfo.chargeBoxSerialNumber
}),
- ...(!isUndefined(stationInfo.chargePointSerialNumber) && {
+ ...(stationInfo.chargePointSerialNumber !== undefined && {
chargePointSerialNumber: stationInfo.chargePointSerialNumber
}),
- ...(!isUndefined(stationInfo.firmwareVersion) && {
+ ...(stationInfo.firmwareVersion !== undefined && {
firmwareVersion: stationInfo.firmwareVersion
}),
- ...(!isUndefined(stationInfo.iccid) && { iccid: stationInfo.iccid }),
- ...(!isUndefined(stationInfo.imsi) && { imsi: stationInfo.imsi }),
- ...(!isUndefined(stationInfo.meterSerialNumber) && {
+ ...(stationInfo.iccid !== undefined && { iccid: stationInfo.iccid }),
+ ...(stationInfo.imsi !== undefined && { imsi: stationInfo.imsi }),
+ ...(stationInfo.meterSerialNumber !== undefined && {
meterSerialNumber: stationInfo.meterSerialNumber
}),
- ...(!isUndefined(stationInfo.meterType) && {
+ ...(stationInfo.meterType !== undefined && {
meterType: stationInfo.meterType
})
} satisfies OCPP16BootNotificationRequest
chargingStation: {
model: stationInfo.chargePointModel,
vendorName: stationInfo.chargePointVendor,
- ...(!isUndefined(stationInfo.firmwareVersion) && {
+ ...(stationInfo.firmwareVersion !== undefined && {
firmwareVersion: stationInfo.firmwareVersion
}),
- ...(!isUndefined(stationInfo.chargeBoxSerialNumber) && {
+ ...(stationInfo.chargeBoxSerialNumber !== undefined && {
serialNumber: stationInfo.chargeBoxSerialNumber
}),
- ...((!isUndefined(stationInfo.iccid) || !isUndefined(stationInfo.imsi)) && {
+ ...((stationInfo.iccid !== undefined || stationInfo.imsi !== undefined) && {
modem: {
- ...(!isUndefined(stationInfo.iccid) && { iccid: stationInfo.iccid }),
- ...(!isUndefined(stationInfo.imsi) && { imsi: stationInfo.imsi })
+ ...(stationInfo.iccid !== undefined && { iccid: stationInfo.iccid }),
+ ...(stationInfo.imsi !== undefined && { imsi: stationInfo.imsi })
}
})
}
templateKey.deprecatedKey,
logPrefix,
templateFile,
- !isUndefined(templateKey.key) ? `Use '${templateKey.key}' instead` : undefined
+ templateKey.key !== undefined ? `Use '${templateKey.key}' instead` : undefined
)
convertDeprecatedTemplateKey(stationTemplate, templateKey.deprecatedKey, templateKey.key)
}
export const stationTemplateToStationInfo = (
stationTemplate: ChargingStationTemplate
): ChargingStationInfo => {
- stationTemplate = cloneObject<ChargingStationTemplate>(stationTemplate)
+ stationTemplate = clone<ChargingStationTemplate>(stationTemplate)
delete stationTemplate.power
delete stationTemplate.powerUnit
delete stationTemplate.Connectors
): void => {
params = { ...{ randomSerialNumberUpperCase: true, randomSerialNumber: true }, ...params }
const serialNumberSuffix =
- params?.randomSerialNumber === true
+ params.randomSerialNumber === true
? getRandomSerialNumberSuffix({
upperCase: params.randomSerialNumberUpperCase
})
: ''
- isNotEmptyString(stationTemplate?.chargePointSerialNumberPrefix) &&
+ isNotEmptyString(stationTemplate.chargePointSerialNumberPrefix) &&
(stationInfo.chargePointSerialNumber = `${stationTemplate.chargePointSerialNumberPrefix}${serialNumberSuffix}`)
- isNotEmptyString(stationTemplate?.chargeBoxSerialNumberPrefix) &&
+ isNotEmptyString(stationTemplate.chargeBoxSerialNumberPrefix) &&
(stationInfo.chargeBoxSerialNumber = `${stationTemplate.chargeBoxSerialNumberPrefix}${serialNumberSuffix}`)
- isNotEmptyString(stationTemplate?.meterSerialNumberPrefix) &&
+ isNotEmptyString(stationTemplate.meterSerialNumberPrefix) &&
(stationInfo.meterSerialNumber = `${stationTemplate.meterSerialNumberPrefix}${serialNumberSuffix}`)
}
export const propagateSerialNumber = (
- stationTemplate: ChargingStationTemplate,
- stationInfoSrc: ChargingStationInfo,
+ stationTemplate: ChargingStationTemplate | undefined,
+ stationInfoSrc: ChargingStationInfo | undefined,
stationInfoDst: ChargingStationInfo
): void => {
if (stationInfoSrc == null || stationTemplate == null) {
'Missing charging station template or existing configuration to propagate serial number'
)
}
- stationTemplate?.chargePointSerialNumberPrefix != null &&
- stationInfoSrc?.chargePointSerialNumber != null
+ stationTemplate.chargePointSerialNumberPrefix != null &&
+ stationInfoSrc.chargePointSerialNumber != null
? (stationInfoDst.chargePointSerialNumber = stationInfoSrc.chargePointSerialNumber)
- : stationInfoDst?.chargePointSerialNumber != null &&
+ : stationInfoDst.chargePointSerialNumber != null &&
delete stationInfoDst.chargePointSerialNumber
- stationTemplate?.chargeBoxSerialNumberPrefix != null &&
- stationInfoSrc?.chargeBoxSerialNumber != null
+ stationTemplate.chargeBoxSerialNumberPrefix != null &&
+ stationInfoSrc.chargeBoxSerialNumber != null
? (stationInfoDst.chargeBoxSerialNumber = stationInfoSrc.chargeBoxSerialNumber)
- : stationInfoDst?.chargeBoxSerialNumber != null && delete stationInfoDst.chargeBoxSerialNumber
- stationTemplate?.meterSerialNumberPrefix != null && stationInfoSrc?.meterSerialNumber != null
+ : stationInfoDst.chargeBoxSerialNumber != null && delete stationInfoDst.chargeBoxSerialNumber
+ stationTemplate.meterSerialNumberPrefix != null && stationInfoSrc.meterSerialNumber != null
? (stationInfoDst.meterSerialNumber = stationInfoSrc.meterSerialNumber)
- : stationInfoDst?.meterSerialNumber != null && delete stationInfoDst.meterSerialNumber
+ : stationInfoDst.meterSerialNumber != null && delete stationInfoDst.meterSerialNumber
}
export const hasFeatureProfile = (
chargingStation: ChargingStation,
connectorId: number
): ChargingProfile[] => {
- return cloneObject<ChargingProfile[]>(
+ return clone<ChargingProfile[]>(
(chargingStation.getConnectorStatus(connectorId)?.chargingProfiles ?? [])
.sort((a, b) => b.stackLevel - a.stackLevel)
.concat(
chargingProfiles,
chargingStation.logPrefix()
)
- if (!isNullOrUndefined(result)) {
- limit = result?.limit
- chargingProfile = result?.chargingProfile
+ if (result != null) {
+ limit = result.limit
+ chargingProfile = result.chargingProfile
switch (chargingStation.stationInfo?.currentOutType) {
case CurrentType.AC:
limit =
- chargingProfile?.chargingSchedule?.chargingRateUnit === ChargingRateUnitType.WATT
+ chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT
? limit
: ACElectricUtils.powerTotal(
chargingStation.getNumberOfPhases(),
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
chargingStation.stationInfo.voltageOut!,
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- limit!
+ limit
)
break
case CurrentType.DC:
limit =
- chargingProfile?.chargingSchedule?.chargingRateUnit === ChargingRateUnitType.WATT
+ chargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT
? limit
: // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- DCElectricUtils.power(chargingStation.stationInfo.voltageOut!, limit!)
+ DCElectricUtils.power(chargingStation.stationInfo.voltageOut!, limit)
}
const connectorMaximumPower =
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingStation.stationInfo.maximumPower! / chargingStation.powerDivider
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- if (limit! > connectorMaximumPower) {
+ chargingStation.stationInfo!.maximumPower! / chargingStation.powerDivider!
+ if (limit > connectorMaximumPower) {
logger.error(
- `${chargingStation.logPrefix()} ${moduleName}.getChargingStationConnectorChargingProfilesPowerLimit: Charging profile id ${chargingProfile?.chargingProfileId} limit ${limit} is greater than connector id ${connectorId} maximum ${connectorMaximumPower}: %j`,
+ `${chargingStation.logPrefix()} ${moduleName}.getChargingStationConnectorChargingProfilesPowerLimit: Charging profile id ${
+ chargingProfile.chargingProfileId
+ } limit ${limit} is greater than connector id ${connectorId} maximum ${connectorMaximumPower}: %j`,
result
)
limit = connectorMaximumPower
event: ChargingStationWorkerMessageEvents,
eventsToWait: number
): Promise<number> => {
- return await new Promise<number>((resolve) => {
+ return await new Promise<number>(resolve => {
let events = 0
if (eventsToWait === 0) {
resolve(events)
const getConfiguredMaxNumberOfConnectors = (stationTemplate: ChargingStationTemplate): number => {
let configuredMaxNumberOfConnectors = 0
if (isNotEmptyArray(stationTemplate.numberOfConnectors)) {
- const numberOfConnectors = stationTemplate.numberOfConnectors as number[]
+ const numberOfConnectors = stationTemplate.numberOfConnectors
configuredMaxNumberOfConnectors =
numberOfConnectors[Math.floor(secureRandom() * numberOfConnectors.length)]
- } else if (!isUndefined(stationTemplate.numberOfConnectors)) {
- configuredMaxNumberOfConnectors = stationTemplate.numberOfConnectors as number
+ } else if (stationTemplate.numberOfConnectors != null) {
+ configuredMaxNumberOfConnectors = stationTemplate.numberOfConnectors
} else if (stationTemplate.Connectors != null && stationTemplate.Evses == null) {
configuredMaxNumberOfConnectors =
- stationTemplate.Connectors?.[0] != null
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+ stationTemplate.Connectors[0] != null
? getMaxNumberOfConnectors(stationTemplate.Connectors) - 1
: getMaxNumberOfConnectors(stationTemplate.Connectors)
} else if (stationTemplate.Evses != null && stationTemplate.Connectors == null) {
connectorStatus.transactionStarted = false
connectorStatus.energyActiveImportRegisterValue = 0
connectorStatus.transactionEnergyActiveImportRegisterValue = 0
- if (isUndefined(connectorStatus.chargingProfiles)) {
+ if (connectorStatus.chargingProfiles == null) {
connectorStatus.chargingProfiles = []
}
}
templateFile: string,
logMsgToAppend = ''
): void => {
- if (!isUndefined(template?.[key as keyof ChargingStationTemplate])) {
+ if (template[key as keyof ChargingStationTemplate] !== undefined) {
const logMsg = `Deprecated template key '${key}' usage in file '${templateFile}'${
isNotEmptyString(logMsgToAppend) ? `. ${logMsgToAppend}` : ''
}`
deprecatedKey: string,
key?: string
): void => {
- if (!isUndefined(template?.[deprecatedKey as keyof ChargingStationTemplate])) {
- if (!isUndefined(key)) {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- (template as unknown as Record<string, unknown>)[key!] =
+ if (template[deprecatedKey as keyof ChargingStationTemplate] !== undefined) {
+ if (key !== undefined) {
+ (template as unknown as Record<string, unknown>)[key] =
template[deprecatedKey as keyof ChargingStationTemplate]
}
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
): ChargingProfilesLimit | undefined => {
const debugLogMsg = `${logPrefix} ${moduleName}.getLimitFromChargingProfiles: Matching charging profile found for power limitation: %j`
const currentDate = new Date()
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- const connectorStatus = chargingStation.getConnectorStatus(connectorId)!
+ const connectorStatus = chargingStation.getConnectorStatus(connectorId)
for (const chargingProfile of chargingProfiles) {
const chargingSchedule = chargingProfile.chargingSchedule
- if (
- isNullOrUndefined(chargingSchedule?.startSchedule) &&
- connectorStatus?.transactionStarted === true
- ) {
+ if (chargingSchedule.startSchedule == null) {
logger.debug(
`${logPrefix} ${moduleName}.getLimitFromChargingProfiles: Charging profile id ${chargingProfile.chargingProfileId} has no startSchedule defined. Trying to set it to the connector current transaction start date`
)
// OCPP specifies that if startSchedule is not defined, it should be relative to start of the connector transaction
chargingSchedule.startSchedule = connectorStatus?.transactionStart
}
- if (
- !isNullOrUndefined(chargingSchedule?.startSchedule) &&
- !isDate(chargingSchedule?.startSchedule)
- ) {
+ if (!isDate(chargingSchedule.startSchedule)) {
logger.warn(
`${logPrefix} ${moduleName}.getLimitFromChargingProfiles: Charging profile id ${chargingProfile.chargingProfileId} startSchedule property is not a Date instance. Trying to convert it to a Date instance`
)
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingSchedule.startSchedule = convertToDate(chargingSchedule?.startSchedule)!
+ chargingSchedule.startSchedule = convertToDate(chargingSchedule.startSchedule)!
}
- if (
- !isNullOrUndefined(chargingSchedule?.startSchedule) &&
- isNullOrUndefined(chargingSchedule?.duration)
- ) {
+ if (chargingSchedule.duration == null) {
logger.debug(
`${logPrefix} ${moduleName}.getLimitFromChargingProfiles: Charging profile id ${chargingProfile.chargingProfileId} has no duration defined and will be set to the maximum time allowed`
)
// OCPP specifies that if duration is not defined, it should be infinite
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingSchedule.duration = differenceInSeconds(maxTime, chargingSchedule.startSchedule!)
+ chargingSchedule.duration = differenceInSeconds(maxTime, chargingSchedule.startSchedule)
}
if (!prepareChargingProfileKind(connectorStatus, chargingProfile, currentDate, logPrefix)) {
continue
// Check if the charging profile is active
if (
isWithinInterval(currentDate, {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- start: chargingSchedule.startSchedule!,
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- end: addSeconds(chargingSchedule.startSchedule!, chargingSchedule.duration!)
+ start: chargingSchedule.startSchedule,
+ end: addSeconds(chargingSchedule.startSchedule, chargingSchedule.duration)
})
) {
if (isNotEmptyArray(chargingSchedule.chargingSchedulePeriod)) {
// Find the right schedule period
if (
isAfter(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- addSeconds(chargingSchedule.startSchedule!, chargingSchedulePeriod.startPeriod),
+ addSeconds(chargingSchedule.startSchedule, chargingSchedulePeriod.startPeriod),
currentDate
)
) {
(index < chargingSchedule.chargingSchedulePeriod.length - 1 &&
differenceInSeconds(
addSeconds(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingSchedule.startSchedule!,
+ chargingSchedule.startSchedule,
chargingSchedule.chargingSchedulePeriod[index + 1].startPeriod
),
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingSchedule.startSchedule!
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- ) > chargingSchedule.duration!)
+ chargingSchedule.startSchedule
+ ) > chargingSchedule.duration)
) {
const result: ChargingProfilesLimit = {
limit: previousChargingSchedulePeriod.limit,
}
export const prepareChargingProfileKind = (
- connectorStatus: ConnectorStatus,
+ connectorStatus: ConnectorStatus | undefined,
chargingProfile: ChargingProfile,
- currentDate: Date,
+ currentDate: string | number | Date,
logPrefix: string
): boolean => {
switch (chargingProfile.chargingProfileKind) {
prepareRecurringChargingProfile(chargingProfile, currentDate, logPrefix)
break
case ChargingProfileKindType.RELATIVE:
- if (!isNullOrUndefined(chargingProfile.chargingSchedule.startSchedule)) {
+ if (chargingProfile.chargingSchedule.startSchedule != null) {
logger.warn(
`${logPrefix} ${moduleName}.prepareChargingProfileKind: Relative charging profile id ${chargingProfile.chargingProfileId} has a startSchedule property defined. It will be ignored or used if the connector has a transaction started`
)
delete chargingProfile.chargingSchedule.startSchedule
}
if (connectorStatus?.transactionStarted === true) {
- chargingProfile.chargingSchedule.startSchedule = connectorStatus?.transactionStart
+ chargingProfile.chargingSchedule.startSchedule = connectorStatus.transactionStart
}
// FIXME: Handle relative charging profile duration
break
export const canProceedChargingProfile = (
chargingProfile: ChargingProfile,
- currentDate: Date,
+ currentDate: string | number | Date,
logPrefix: string
): boolean => {
if (
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- (isValidTime(chargingProfile.validFrom) && isBefore(currentDate, chargingProfile.validFrom!)) ||
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- (isValidTime(chargingProfile.validTo) && isAfter(currentDate, chargingProfile.validTo!))
+ (isValidDate(chargingProfile.validFrom) && isBefore(currentDate, chargingProfile.validFrom)) ||
+ (isValidDate(chargingProfile.validTo) && isAfter(currentDate, chargingProfile.validTo))
) {
logger.debug(
`${logPrefix} ${moduleName}.canProceedChargingProfile: Charging profile id ${
chargingProfile.chargingProfileId
- } is not valid for the current date ${currentDate.toISOString()}`
+ } is not valid for the current date ${
+ isDate(currentDate) ? currentDate.toISOString() : currentDate
+ }`
)
return false
}
if (
- isNullOrUndefined(chargingProfile.chargingSchedule.startSchedule) ||
- isNullOrUndefined(chargingProfile.chargingSchedule.duration)
+ chargingProfile.chargingSchedule.startSchedule == null ||
+ chargingProfile.chargingSchedule.duration == null
) {
logger.error(
`${logPrefix} ${moduleName}.canProceedChargingProfile: Charging profile id ${chargingProfile.chargingProfileId} has no startSchedule or duration defined`
)
return false
}
- if (
- !isNullOrUndefined(chargingProfile.chargingSchedule.startSchedule) &&
- !isValidTime(chargingProfile.chargingSchedule.startSchedule)
- ) {
+ if (!isValidDate(chargingProfile.chargingSchedule.startSchedule)) {
logger.error(
`${logPrefix} ${moduleName}.canProceedChargingProfile: Charging profile id ${chargingProfile.chargingProfileId} has an invalid startSchedule date defined`
)
return false
}
- if (
- !isNullOrUndefined(chargingProfile.chargingSchedule.duration) &&
- !Number.isSafeInteger(chargingProfile.chargingSchedule.duration)
- ) {
+ if (!Number.isSafeInteger(chargingProfile.chargingSchedule.duration)) {
logger.error(
`${logPrefix} ${moduleName}.canProceedChargingProfile: Charging profile id ${chargingProfile.chargingProfileId} has non integer duration defined`
)
): boolean => {
if (
chargingProfile.chargingProfileKind === ChargingProfileKindType.RECURRING &&
- isNullOrUndefined(chargingProfile.recurrencyKind)
+ chargingProfile.recurrencyKind == null
) {
logger.error(
`${logPrefix} ${moduleName}.canProceedRecurringChargingProfile: Recurring charging profile id ${chargingProfile.chargingProfileId} has no recurrencyKind defined`
}
if (
chargingProfile.chargingProfileKind === ChargingProfileKindType.RECURRING &&
- isNullOrUndefined(chargingProfile.chargingSchedule.startSchedule)
+ chargingProfile.chargingSchedule.startSchedule == null
) {
logger.error(
`${logPrefix} ${moduleName}.canProceedRecurringChargingProfile: Recurring charging profile id ${chargingProfile.chargingProfileId} has no startSchedule defined`
*/
const prepareRecurringChargingProfile = (
chargingProfile: ChargingProfile,
- currentDate: Date,
+ currentDate: string | number | Date,
logPrefix: string
): boolean => {
const chargingSchedule = chargingProfile.chargingSchedule
let recurringIntervalTranslated = false
- let recurringInterval: Interval
+ let recurringInterval: Interval | undefined
switch (chargingProfile.recurrencyKind) {
case RecurrencyKindType.DAILY:
recurringInterval = {
`${logPrefix} ${moduleName}.prepareRecurringChargingProfile: Recurring ${
chargingProfile.recurrencyKind
} charging profile id ${chargingProfile.chargingProfileId} recurrency time interval [${toDate(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- recurringInterval!.start
+ recurringInterval?.start as Date
).toISOString()}, ${toDate(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- recurringInterval!.end
- ).toISOString()}] has not been properly translated to current date ${currentDate.toISOString()} `
+ recurringInterval?.end as Date
+ ).toISOString()}] has not been properly translated to current date ${
+ isDate(currentDate) ? currentDate.toISOString() : currentDate
+ } `
)
}
return recurringIntervalTranslated
interval: Interval,
logPrefix: string
): void => {
- if (isNullOrUndefined(chargingProfile.chargingSchedule.duration)) {
+ if (chargingProfile.chargingSchedule.duration == null) {
logger.warn(
`${logPrefix} ${moduleName}.checkRecurringChargingProfileDuration: Recurring ${
chargingProfile.chargingProfileKind
)
chargingProfile.chargingSchedule.duration = differenceInSeconds(interval.end, interval.start)
} else if (
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- chargingProfile.chargingSchedule.duration! > differenceInSeconds(interval.end, interval.start)
+ chargingProfile.chargingSchedule.duration > differenceInSeconds(interval.end, interval.start)
) {
logger.warn(
`${logPrefix} ${moduleName}.checkRecurringChargingProfileDuration: Recurring ${
repositories / e-mobility-charging-stations-simulator.git / blobdiff