refactor: factor out change availability helper

[e-mobility-charging-stations-simulator.git] / src / types / ocpp / 1.6 / Requests.ts

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index 786ea617be0fb38e518003d52ffcacd007ca82af..c6f041e58581e40c7d92ad81b43dccaeb16f48b0 100644 (file)
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -39,6 +39,8 @@ export enum OCPP16IncomingRequestCommand {
   TRIGGER_MESSAGE = 'TriggerMessage',
   DATA_TRANSFER = 'DataTransfer',
   UPDATE_FIRMWARE = 'UpdateFirmware',
+  RESERVE_NOW = 'ReserveNow',
+  CANCEL_RESERVATION = 'CancelReservation',
 }
 
 export type OCPP16HeartbeatRequest = EmptyObject;
@@ -117,7 +119,7 @@ export enum OCPP16AvailabilityType {
   Operative = 'Operative',
 }
 
-export interface ChangeAvailabilityRequest extends JsonObject {
+export interface OCPP16ChangeAvailabilityRequest extends JsonObject {
   connectorId: number;
   type: OCPP16AvailabilityType;
 }
@@ -184,14 +186,14 @@ export interface OCPP16DataTransferRequest extends JsonObject {
   data?: string;
 }
 
-export interface OCPP16ReserveNowRequest {
-  connectorId: string;
+export interface OCPP16ReserveNowRequest extends JsonObject {
+  connectorId: number;
   expiryDate: Date;
   idTag: string;
   parentIdTag?: string;
   reservationId: number;
 }
 
-export interface OCPP16CancelReservationRequest {
+export interface OCPP16CancelReservationRequest extends JsonObject {
   reservationId: number;
 }