X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FTransaction.ts;h=215628f79a650aeaf7069aeb4d2a971f79efe7cf;hb=0ac97927984473fcb11a177f013b0e112638e050;hp=22fb6080efadc697771178715dbd86b69cf81ae2;hpb=f29f53d00da5e3fb216e7b98b891bb2fc678d450;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/1.6/Transaction.ts b/src/types/ocpp/1.6/Transaction.ts
index 22fb6080..215628f7 100644
--- a/src/types/ocpp/1.6/Transaction.ts
+++ b/src/types/ocpp/1.6/Transaction.ts
@@ -1,6 +1,6 @@
-import { MeterValue } from './MeterValues';
+import type { JsonObject, OCPP16MeterValue } from '../../internal';
 
-export enum StopTransactionReason {
+export enum OCPP16StopTransactionReason {
   NONE = '',
   EMERGENCY_STOP = 'EmergencyStop',
   EV_DISCONNECTED = 'EVDisconnected',
@@ -12,53 +12,53 @@ export enum StopTransactionReason {
   REMOTE = 'Remote',
   SOFT_RESET = 'SoftReset',
   UNLOCK_COMMAND = 'UnlockCommand',
-  DE_AUTHORIZED = 'DeAuthorized'
+  DE_AUTHORIZED = 'DeAuthorized',
 }
 
-export enum AuthorizationStatus {
+export enum OCPP16AuthorizationStatus {
   ACCEPTED = 'Accepted',
   BLOCKED = 'Blocked',
   EXPIRED = 'Expired',
   INVALID = 'Invalid',
-  CONCURRENT_TX = 'ConcurrentTx'
+  CONCURRENT_TX = 'ConcurrentTx',
 }
 
-export interface IdTagInfo {
-  status: AuthorizationStatus;
+interface IdTagInfo extends JsonObject {
+  status: OCPP16AuthorizationStatus;
   parentIdTag?: string;
   expiryDate?: Date;
 }
 
-export interface AuthorizeRequest {
+export interface OCPP16AuthorizeRequest extends JsonObject {
   idTag: string;
-
 }
-export interface AuthorizeResponse {
+
+export interface OCPP16AuthorizeResponse extends JsonObject {
   idTagInfo: IdTagInfo;
 }
 
-export interface StartTransactionRequest {
+export interface OCPP16StartTransactionRequest extends JsonObject {
   connectorId: number;
   idTag: string;
   meterStart: number;
+  timestamp: Date;
   reservationId?: number;
-  timestamp: string;
 }
 
-export interface StartTransactionResponse {
+export interface OCPP16StartTransactionResponse extends JsonObject {
   idTagInfo: IdTagInfo;
   transactionId: number;
 }
 
-export interface StopTransactionRequest {
+export interface OCPP16StopTransactionRequest extends JsonObject {
   idTag?: string;
   meterStop: number;
-  timestamp: string;
+  timestamp: Date;
   transactionId: number;
-  reason?: StopTransactionReason;
-  transactionData?: MeterValue[];
+  reason?: OCPP16StopTransactionReason;
+  transactionData?: OCPP16MeterValue[];
 }
 
-export interface StopTransactionResponse {
+export interface OCPP16StopTransactionResponse extends JsonObject {
   idTagInfo?: IdTagInfo;
 }