repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: use keyof to build the reservation filter key
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
1.6
/
OCPP16IncomingRequestService.ts
diff --git
a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 6e9e64cde55fd07c0ced291b86a75c424a9375a1..2659458f70401bdad6fbd7d6b250ccce6888f9cb 100644
(file)
--- a/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@
-80,7
+80,6
@@
import {
OCPPVersion,
type RemoteStartTransactionRequest,
type RemoteStopTransactionRequest,
OCPPVersion,
type RemoteStartTransactionRequest,
type RemoteStopTransactionRequest,
- ReservationFilterKey,
ReservationTerminationReason,
type ResetRequest,
type SetChargingProfileRequest,
ReservationTerminationReason,
type ResetRequest,
type SetChargingProfileRequest,
@@
-886,7
+885,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
};
if (reserved || reservedOnConnectorZero) {
const reservation = chargingStation.getReservationBy(
};
if (reserved || reservedOnConnectorZero) {
const reservation = chargingStation.getReservationBy(
-
ReservationFilterKey.CONNECTOR_ID
,
+
'connectorId'
,
reservedOnConnectorZero ? 0 : transactionConnectorId,
)!;
startTransactionPayload.reservationId = reservation.reservationId;
reservedOnConnectorZero ? 0 : transactionConnectorId,
)!;
startTransactionPayload.reservationId = reservation.reservationId;
@@
-1615,10
+1614,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
}
try {
const { reservationId } = commandPayload;
}
try {
const { reservationId } = commandPayload;
- const reservation = chargingStation.getReservationBy(
- ReservationFilterKey.RESERVATION_ID,
- reservationId,
- );
+ const reservation = chargingStation.getReservationBy('reservationId', reservationId);
if (isUndefined(reservation)) {
logger.error(
`${chargingStation.logPrefix()} Reservation with ID ${reservationId}
if (isUndefined(reservation)) {
logger.error(
`${chargingStation.logPrefix()} Reservation with ID ${reservationId}