X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=60b2379b77577757f4f5d883e828662645acb8f1;hb=6aa3cf498d985013c4a592d5f3f8784727e09063;hp=26f6bc9fc39281a9e1777721b6e0b53408d42c8b;hpb=83e00df1c1ba02de8b637ca4cb0464eb909ebb18;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 26f6bc9f..60b2379b 100644
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,17 +1,18 @@
-import type { CircularArray } from '../utils/CircularArray';
-import type { WorkerData } from './Worker';
+import type { IncomingRequestCommand, RequestCommand } from './ocpp/Requests';
+import type { CircularArray } from '../utils';
+import type { WorkerData } from '../worker';
 
-export type TimeSeries = {
+export interface TimestampedData {
   timestamp: number;
   value: number;
-};
+}
 
-export type StatisticsData = {
-  countRequest: number;
-  countResponse: number;
-  countError: number;
-  countTimeMeasurement: number;
-  timeMeasurementSeries: CircularArray<TimeSeries>;
+export type StatisticsData = Partial<{
+  requestCount: number;
+  responseCount: number;
+  errorCount: number;
+  timeMeasurementCount: number;
+  measurementTimeSeries: CircularArray<TimestampedData>;
   currentTimeMeasurement: number;
   minTimeMeasurement: number;
   maxTimeMeasurement: number;
@@ -20,13 +21,13 @@ export type StatisticsData = {
   medTimeMeasurement: number;
   ninetyFiveThPercentileTimeMeasurement: number;
   stdDevTimeMeasurement: number;
-};
+}>;
 
-export default interface Statistics extends WorkerData {
+export type Statistics = {
   id: string;
   name: string;
   uri: string;
   createdAt: Date;
   updatedAt?: Date;
-  statisticsData: Map<string, Partial<StatisticsData>>;
-}
+  statisticsData: Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>;
+} & WorkerData;