X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=60b2379b77577757f4f5d883e828662645acb8f1;hb=041365be4e6cfcec381c895a203815dd933afff5;hp=120f258ef247005fd00129a9762b18471ef8951d;hpb=a6b3c6c313f1c0314a1445ed630cac85edf55b2c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 120f258e..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,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: Record<string, StatisticsData>;
-}
+  statisticsData: Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>;
+} & WorkerData;