X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FMessageChannelUtils.ts;h=11ecd3ca5644662db9cd45c351c8cbd087ed4615;hb=12f26d4a81773cf8ede8bad4255e36aadf10bce0;hp=77adae8e5c44d7ef033c36a7c359db9b0c9ea44b;hpb=e0b0ee2176a4dc5a8914a3fb094ec16b4966a740;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/MessageChannelUtils.ts b/src/charging-station/MessageChannelUtils.ts
index 77adae8e..11ecd3ca 100644
--- a/src/charging-station/MessageChannelUtils.ts
+++ b/src/charging-station/MessageChannelUtils.ts
@@ -1,10 +1,10 @@
+import type { ChargingStation } from './internal';
 import {
   type ChargingStationData,
   type ChargingStationWorkerMessage,
   ChargingStationWorkerMessageEvents,
-} from '../types/ChargingStationWorker';
-import type { Statistics } from '../types/Statistics';
-import type ChargingStation from './ChargingStation';
+  type Statistics,
+} from '../types';
 
 export class MessageChannelUtils {
   private constructor() {
@@ -15,7 +15,7 @@ export class MessageChannelUtils {
     chargingStation: ChargingStation
   ): ChargingStationWorkerMessage<ChargingStationData> {
     return {
-      id: ChargingStationWorkerMessageEvents.STARTED,
+      id: ChargingStationWorkerMessageEvents.started,
       data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
     };
   }
@@ -24,7 +24,7 @@ export class MessageChannelUtils {
     chargingStation: ChargingStation
   ): ChargingStationWorkerMessage<ChargingStationData> {
     return {
-      id: ChargingStationWorkerMessageEvents.STOPPED,
+      id: ChargingStationWorkerMessageEvents.stopped,
       data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
     };
   }
@@ -33,7 +33,7 @@ export class MessageChannelUtils {
     chargingStation: ChargingStation
   ): ChargingStationWorkerMessage<ChargingStationData> {
     return {
-      id: ChargingStationWorkerMessageEvents.UPDATED,
+      id: ChargingStationWorkerMessageEvents.updated,
       data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
     };
   }
@@ -42,7 +42,7 @@ export class MessageChannelUtils {
     statistics: Statistics
   ): ChargingStationWorkerMessage<Statistics> {
     return {
-      id: ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS,
+      id: ChargingStationWorkerMessageEvents.performanceStatistics,
       data: statistics,
     };
   }
@@ -51,18 +51,28 @@ export class MessageChannelUtils {
     chargingStation: ChargingStation
   ): ChargingStationData {
     return {
-      stationInfo: chargingStation.stationInfo,
       started: chargingStation.started,
-      wsState: chargingStation?.wsConnection?.readyState,
-      bootNotificationResponse: chargingStation.bootNotificationResponse,
+      stationInfo: chargingStation.stationInfo,
       connectors: [...chargingStation.connectors.values()].map(
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
       ),
+      evses: [...chargingStation.evses.values()].map((evseStatus) => {
+        return {
+          ...evseStatus,
+          connectors: [...evseStatus.connectors.values()].map(
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
+          ),
+        };
+      }),
+      ocppConfiguration: chargingStation.ocppConfiguration,
+      wsState: chargingStation?.wsConnection?.readyState,
+      bootNotificationResponse: chargingStation.bootNotificationResponse,
       ...(chargingStation.automaticTransactionGenerator && {
         automaticTransactionGenerator: {
           automaticTransactionGenerator:
-            chargingStation.automaticTransactionGenerator.configuration,
+            chargingStation.getAutomaticTransactionGeneratorConfiguration(),
           automaticTransactionGeneratorStatuses: [
             ...chargingStation.automaticTransactionGenerator.connectorsStatus.values(),
           ],