Merge pull request #574 from JulianHBuecher/reservation-feature

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

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 6e61fcc1ccdf9200cbb08232287952fe7cc1f280..9ca43da713e29ad1112b074ab1dd78dc49e6f123 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -3,6 +3,7 @@ import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
+  type OCPP16CancelReservationRequest,
   type OCPP16DataTransferRequest,
   type OCPP16DiagnosticsStatusNotificationRequest,
   OCPP16FirmwareStatus,
@@ -11,8 +12,10 @@ import {
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
   type OCPP16StatusNotificationRequest,
 } from './1.6/Requests';
+import { OperationalStatusEnumType } from './2.0/Common';
 import {
   type OCPP20BootNotificationRequest,
   OCPP20IncomingRequestCommand,
@@ -20,8 +23,8 @@ import {
   type OCPP20StatusNotificationRequest,
 } from './2.0/Requests';
 import type { MessageType } from './MessageType';
-import type ChargingStation from '../../charging-station/ChargingStation';
-import type OCPPError from '../../exception/OCPPError';
+import type { ChargingStation } from '../../charging-station';
+import type { OCPPError } from '../../exception';
 import type { JsonType } from '../JsonType';
 
 export const RequestCommand = {
@@ -85,8 +88,9 @@ export type IncomingRequestHandler = (
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
+  ...OperationalStatusEnumType,
 } as const;
-export type AvailabilityType = OCPP16AvailabilityType;
+export type AvailabilityType = OCPP16AvailabilityType | OperationalStatusEnumType;
 
 export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus,
@@ -99,3 +103,7 @@ export const FirmwareStatus = {
 export type FirmwareStatus = OCPP16FirmwareStatus;
 
 export type ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;