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

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