X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FTransaction.ts;h=58f7e96c0f8ce8863bfd5e81f5e9b0a1f05774f7;hb=a807045be19c1ed4996a44d8c2c8774e926dc6dc;hp=c7777db20fd721a7f40171b05d1eff8e59304e2b;hpb=f738a0e9257a5bd6d46a79a5845b929c4a06e94f;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 c7777db2..58f7e96c 100644
--- a/src/types/ocpp/1.6/Transaction.ts
+++ b/src/types/ocpp/1.6/Transaction.ts
@@ -1,7 +1,7 @@
-import { MeterValue } from './MeterValues';
+import type { OCPP16MeterValue } from './MeterValues.js'
+import type { JsonObject } from '../../JsonType.js'
 
-export enum StopTransactionReason {
-  NONE = '',
+export enum OCPP16StopTransactionReason {
   EMERGENCY_STOP = 'EmergencyStop',
   EV_DISCONNECTED = 'EVDisconnected',
   HARD_RESET = 'HardReset',
@@ -12,45 +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',
-  CONCURENT_TX = 'ConcurrentTx'
+  CONCURRENT_TX = 'ConcurrentTx',
 }
 
-export interface IdTagInfo {
-  status: AuthorizationStatus;
-  parentIdTag?: string;
-  expiryDate?: Date;
+interface IdTagInfo extends JsonObject {
+  status: OCPP16AuthorizationStatus
+  parentIdTag?: string
+  expiryDate?: Date
 }
 
-export interface StartTransactionRequest {
-  connectorId: number;
-  idTag: string;
-  meterStart: number;
-  reservationId?: number;
-  timestamp: string;
+export interface OCPP16AuthorizeRequest extends JsonObject {
+  idTag: string
 }
 
-export interface StartTransactionResponse {
-  idTagInfo: IdTagInfo;
-  transactionId: number;
+export interface OCPP16AuthorizeResponse extends JsonObject {
+  idTagInfo: IdTagInfo
 }
 
-export interface StopTransactionRequest {
-  idTag?: string;
-  meterStop: number;
-  timestamp: string;
-  transactionId: number;
-  reason?: StopTransactionReason;
-  transactionData?: MeterValue[];
+export interface OCPP16StartTransactionRequest extends JsonObject {
+  connectorId: number
+  idTag: string
+  meterStart: number
+  timestamp: Date
+  reservationId?: number
 }
 
-export interface StopTransactionResponse {
-  idTagInfo?: IdTagInfo;
+export interface OCPP16StartTransactionResponse extends JsonObject {
+  idTagInfo: IdTagInfo
+  transactionId: number
+}
+
+export interface OCPP16StopTransactionRequest extends JsonObject {
+  idTag?: string
+  meterStop: number
+  timestamp: Date
+  transactionId: number
+  reason?: OCPP16StopTransactionReason
+  transactionData?: OCPP16MeterValue[]
+}
+
+export interface OCPP16StopTransactionResponse extends JsonObject {
+  idTagInfo?: IdTagInfo
 }