X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FResponses.ts;h=2cd2f36902e49a6bd130d22a86fc7d53b424fcaa;hb=ec4a242aa5f1a9d4201d0ec9988f9dd931978589;hp=ae6ae45d67d6404b9ac9f6153d8af8550d438191;hpb=2896e06dc8d72adf7150b23c941079f622f6f37c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index ae6ae45d..2cd2f369 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,8 +1,5 @@
-import type { ChargingStation } from '../../charging-station';
+import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
 import {
-  type ErrorType,
-  type JsonType,
-  type MessageType,
   OCPP16AvailabilityStatus,
   type OCPP16BootNotificationResponse,
   OCPP16ChargingProfileStatus,
@@ -13,14 +10,16 @@ import {
   type OCPP16DiagnosticsStatusNotificationResponse,
   type OCPP16FirmwareStatusNotificationResponse,
   type OCPP16HeartbeatResponse,
-  type OCPP16MeterValuesResponse,
+  OCPP16ReservationStatus,
   type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
   OCPP16UnlockStatus,
-  type OCPP20BootNotificationResponse,
-  type OCPP20ClearCacheResponse,
-  type OCPP20StatusNotificationResponse,
-} from '../internal';
+} from './1.6/Responses';
+import type { OCPP20BootNotificationResponse, OCPP20ClearCacheResponse } from './2.0/Responses';
+import type { ErrorType } from './ErrorType';
+import type { MessageType } from './MessageType';
+import type { ChargingStation } from '../../charging-station';
+import type { JsonObject, JsonType } from '../JsonType';
 
 export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
 
@@ -29,7 +28,7 @@ export type ErrorResponse = [MessageType.CALL_ERROR_MESSAGE, string, ErrorType,
 export type ResponseHandler = (
   chargingStation: ChargingStation,
   payload: JsonType,
-  requestPayload?: JsonType
+  requestPayload?: JsonType,
 ) => void | Promise<void>;
 
 export type BootNotificationResponse =
@@ -40,9 +39,7 @@ export type HeartbeatResponse = OCPP16HeartbeatResponse;
 
 export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse;
 
-export type StatusNotificationResponse =
-  | OCPP16StatusNotificationResponse
-  | OCPP20StatusNotificationResponse;
+export type StatusNotificationResponse = OCPP16StatusNotificationResponse;
 
 export type MeterValuesResponse = OCPP16MeterValuesResponse;
 
@@ -53,13 +50,13 @@ export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotif
 export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse;
 
 export enum GenericStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected',
+  Accepted = 'Accepted',
+  Rejected = 'Rejected',
 }
 
-export type GenericResponse = {
+export interface GenericResponse extends JsonObject {
   status: GenericStatus;
-};
+}
 
 export enum RegistrationStatusEnumType {
   ACCEPTED = 'Accepted',
@@ -101,3 +98,15 @@ export const DataTransferStatus = {
   ...OCPP16DataTransferStatus,
 } as const;
 export type DataTransferStatus = OCPP16DataTransferStatus;
+
+export type ReservationStatus = OCPP16ReservationStatus;
+export const ReservationStatus = {
+  ...OCPP16ReservationStatus,
+};
+
+export type CancelReservationStatus = GenericStatus;
+export const CancelReservationStatus = {
+  ...GenericStatus,
+};
+
+export type CancelReservationResponse = GenericResponse;