X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=44c941e70bee6e2b7ee828f657c75463a5ffef73;hb=3e8d029bbd0a072ae80c45e9a50770de3218cbc1;hp=5c7191a8609f1d152aae142bf9c165b0a2a46a70;hpb=32de5a575189d226213641f5ee36004f8454cb50;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 5c7191a8..44c941e7 100644
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,17 +1,18 @@
-import { CircularArray } from '../utils/CircularArray';
-import { WorkerData } from './Worker';
+import type { IncomingRequestCommand, RequestCommand } from './ocpp/Requests';
+import type { CircularArray } from '../utils';
+import type { WorkerData } from '../worker';
 
-export interface TimeSeries {
+export type TimestampedData = {
   timestamp: number;
   value: number;
-}
+};
 
-export interface StatisticsData {
-  countRequest: number;
-  countResponse: number;
-  countError: number;
-  countTimeMeasurement: number;
-  timeMeasurementSeries: CircularArray<TimeSeries>;
+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 interface 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;