X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=ab2e826ae147039d96ae37b1ad5813ec589ddb89;hb=9d5b181b6165ba6b47b7ea9fb026747a9bb54b29;hp=00c73052f98d132de8bfc2dbb3a2bc81c444f00e;hpb=ff4b895e48c7e0c0ba57aa9e811ece2a9877340f;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 00c73052..ab2e826a 100644
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,11 +1,18 @@
-import { CircularArray } from '../utils/CircularArray';
+import type { IncomingRequestCommand, RequestCommand } from './ocpp/Requests';
+import type { CircularArray } from '../utils';
+import type { WorkerData } from '../worker';
 
-export interface StatisticsData {
+export type TimestampedData = {
+  timestamp: number;
+  value: number;
+};
+
+type StatisticsData = Partial<{
   countRequest: number;
   countResponse: number;
   countError: number;
   countTimeMeasurement: number;
-  timeMeasurementSeries: CircularArray<number>;
+  measurementTimeSeries: CircularArray<TimestampedData>;
   currentTimeMeasurement: number;
   minTimeMeasurement: number;
   maxTimeMeasurement: number;
@@ -14,12 +21,13 @@ export interface StatisticsData {
   medTimeMeasurement: number;
   ninetyFiveThPercentileTimeMeasurement: number;
   stdDevTimeMeasurement: number;
-}
+}>;
 
-export default interface Statistics {
+export type Statistics = {
   id: string;
-  URI: string;
+  name: string;
+  uri: string;
   createdAt: Date;
   updatedAt?: Date;
-  statisticsData: Map<string, Partial<StatisticsData>>;
-}
+  statisticsData: Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>;
+} & WorkerData;