Merge branch 'main' into reservation-feature

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

diff --git a/src/types/ocpp/1.6/Transaction.ts b/src/types/ocpp/1.6/Transaction.ts
index 1b921d4ec01cd7aef1d771f8d2917e6038e12496..4af42747ede0040b50fffa78410a943d4909b4b2 100644 (file)
--- a/src/types/ocpp/1.6/Transaction.ts
+++ b/src/types/ocpp/1.6/Transaction.ts
@@ -1,5 +1,5 @@
-import { JsonType } from '../../JsonType';
-import { OCPP16MeterValue } from './MeterValues';
+import type { OCPP16MeterValue } from './MeterValues';
+import type { JsonObject } from '../../JsonType';
 
 export enum OCPP16StopTransactionReason {
   NONE = '',
@@ -24,42 +24,42 @@ export enum OCPP16AuthorizationStatus {
   CONCURRENT_TX = 'ConcurrentTx',
 }
 
-export interface IdTagInfo extends JsonType {
+interface IdTagInfo extends JsonObject {
   status: OCPP16AuthorizationStatus;
   parentIdTag?: string;
   expiryDate?: Date;
 }
 
-export interface AuthorizeRequest extends JsonType {
+export interface OCPP16AuthorizeRequest extends JsonObject {
   idTag: string;
 }
 
-export interface OCPP16AuthorizeResponse extends JsonType {
+export interface OCPP16AuthorizeResponse extends JsonObject {
   idTagInfo: IdTagInfo;
 }
 
-export interface StartTransactionRequest extends JsonType {
+export interface OCPP16StartTransactionRequest extends JsonObject {
   connectorId: number;
   idTag: string;
   meterStart: number;
+  timestamp: Date;
   reservationId?: number;
-  timestamp: string;
 }
 
-export interface OCPP16StartTransactionResponse extends JsonType {
+export interface OCPP16StartTransactionResponse extends JsonObject {
   idTagInfo: IdTagInfo;
   transactionId: number;
 }
 
-export interface StopTransactionRequest extends JsonType {
+export interface OCPP16StopTransactionRequest extends JsonObject {
   idTag?: string;
   meterStop: number;
-  timestamp: string;
+  timestamp: Date;
   transactionId: number;
   reason?: OCPP16StopTransactionReason;
   transactionData?: OCPP16MeterValue[];
 }
 
-export interface OCPP16StopTransactionResponse extends JsonType {
+export interface OCPP16StopTransactionResponse extends JsonObject {
   idTagInfo?: IdTagInfo;
 }