X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=60b2379b77577757f4f5d883e828662645acb8f1;hb=129fdda549b8c7dc7c43ec5893d14a1151ed61a9;hp=7999e14ae86074a0f4a8ac798e1da9c3f835cd58;hpb=72f041bd50fc25ca5d233565cbc0ea836220ec0f;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 7999e14a..60b2379b 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 {
-  countRequest: number;
-  countResponse: number;
-  countError: number;
-  countTimeMeasurement: number;
-  timeMeasurementSeries: CircularArray<number>;
+export interface TimestampedData {
+  timestamp: number;
+  value: number;
+}
+
+export type StatisticsData = Partial<{
+  requestCount: number;
+  responseCount: number;
+  errorCount: number;
+  timeMeasurementCount: number;
+  measurementTimeSeries: CircularArray<TimestampedData>;
   currentTimeMeasurement: number;
   minTimeMeasurement: number;
   maxTimeMeasurement: number;
@@ -14,11 +21,13 @@ export interface StatisticsData {
   medTimeMeasurement: number;
   ninetyFiveThPercentileTimeMeasurement: number;
   stdDevTimeMeasurement: number;
-}
+}>;
 
-export default interface Statistics {
+export type Statistics = {
   id: string;
+  name: string;
+  uri: string;
   createdAt: Date;
-  lastUpdatedAt?: Date;
-  statisticsData: Record<string, StatisticsData>;
-}
+  updatedAt?: Date;
+  statisticsData: Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>;
+} & WorkerData;