X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FStatistics.ts;h=9bb614ee2654509daec9b1a90551a5e52650b9bd;hb=3000c1258ccda0c8828f4e4fffb988e5ffaa84da;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..9bb614ee 100644
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,32 +1,33 @@
-import { CircularArray } from '../utils/CircularArray';
-import { WorkerData } from './Worker';
+import type { IncomingRequestCommand, RequestCommand } from './ocpp/Requests.js'
+import type { CircularArray } from '../utils/index.js'
+import type { WorkerData } from '../worker/index.js'
 
-export interface TimeSeries {
-  timestamp: number;
-  value: number;
+export interface TimestampedData {
+  timestamp: number
+  value: number
 }
 
-export interface StatisticsData {
-  countRequest: number;
-  countResponse: number;
-  countError: number;
-  countTimeMeasurement: number;
-  timeMeasurementSeries: CircularArray<TimeSeries>;
-  currentTimeMeasurement: number;
-  minTimeMeasurement: number;
-  maxTimeMeasurement: number;
-  totalTimeMeasurement: number;
-  avgTimeMeasurement: number;
-  medTimeMeasurement: number;
-  ninetyFiveThPercentileTimeMeasurement: number;
-  stdDevTimeMeasurement: number;
-}
+export type StatisticsData = Partial<{
+  requestCount: number
+  responseCount: number
+  errorCount: number
+  timeMeasurementCount: number
+  measurementTimeSeries: CircularArray<TimestampedData>
+  currentTimeMeasurement: number
+  minTimeMeasurement: number
+  maxTimeMeasurement: number
+  totalTimeMeasurement: number
+  avgTimeMeasurement: number
+  medTimeMeasurement: number
+  ninetyFiveThPercentileTimeMeasurement: number
+  stdDevTimeMeasurement: number
+}>
 
-export default interface Statistics extends WorkerData {
-  id: string;
-  name: string;
-  uri: string;
-  createdAt: Date;
-  updatedAt?: Date;
-  statisticsData: Map<string, Partial<StatisticsData>>;
-}
+export type Statistics = {
+  id: string
+  name: string
+  uri: string
+  createdAt: Date
+  updatedAt?: Date
+  statisticsData: Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>
+} & WorkerData