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

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index a2f431d4..2cd2f369 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -2,7 +2,6 @@ import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityStatus,
   type OCPP16BootNotificationResponse,
-  OCPP16CancelReservationStatus,
   OCPP16ChargingProfileStatus,
   OCPP16ClearChargingProfileStatus,
   OCPP16ConfigurationStatus,
@@ -16,15 +15,11 @@ import {
   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 { JsonType } from '../JsonType';
+import type { JsonObject, JsonType } from '../JsonType';
 
 export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
 
@@ -33,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 =
@@ -44,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;
 
@@ -61,9 +54,9 @@ export enum GenericStatus {
   Rejected = 'Rejected',
 }
 
-export type GenericResponse = {
+export interface GenericResponse extends JsonObject {
   status: GenericStatus;
-};
+}
 
 export enum RegistrationStatusEnumType {
   ACCEPTED = 'Accepted',
@@ -111,7 +104,9 @@ export const ReservationStatus = {
   ...OCPP16ReservationStatus,
 };
 
-export type CancelReservationStatus = OCPP16CancelReservationStatus;
+export type CancelReservationStatus = GenericStatus;
 export const CancelReservationStatus = {
-  ...OCPP16CancelReservationStatus,
+  ...GenericStatus,
 };
+
+export type CancelReservationResponse = GenericResponse;