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

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 32367462..2cd2f369 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,5 +1,3 @@
-import type ChargingStation from '../../charging-station/ChargingStation';
-import type { JsonType } from '../JsonType';
 import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityStatus,
@@ -12,17 +10,16 @@ import {
   type OCPP16DiagnosticsStatusNotificationResponse,
   type OCPP16FirmwareStatusNotificationResponse,
   type OCPP16HeartbeatResponse,
+  OCPP16ReservationStatus,
   type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
   OCPP16UnlockStatus,
 } from './1.6/Responses';
-import type {
-  OCPP20BootNotificationResponse,
-  OCPP20ClearCacheResponse,
-  OCPP20StatusNotificationResponse,
-} from './2.0/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];
 
@@ -31,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,11 +37,9 @@ export type BootNotificationResponse =
 
 export type HeartbeatResponse = OCPP16HeartbeatResponse;
 
-export type ClearCacheResponse = DefaultResponse | OCPP20ClearCacheResponse;
+export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse;
 
-export type StatusNotificationResponse =
-  | OCPP16StatusNotificationResponse
-  | OCPP20StatusNotificationResponse;
+export type StatusNotificationResponse = OCPP16StatusNotificationResponse;
 
 export type MeterValuesResponse = OCPP16MeterValuesResponse;
 
@@ -54,14 +49,14 @@ export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotif
 
 export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse;
 
-export enum DefaultStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected',
+export enum GenericStatus {
+  Accepted = 'Accepted',
+  Rejected = 'Rejected',
 }
 
-export type DefaultResponse = {
-  status: DefaultStatus;
-};
+export interface GenericResponse extends JsonObject {
+  status: GenericStatus;
+}
 
 export enum RegistrationStatusEnumType {
   ACCEPTED = 'Accepted',
@@ -103,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;