From 43be4c0834fe806a68f99036805779f29058d74e Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Sat, 13 Jan 2024 23:10:14 +0100
Subject: [PATCH] refactor: update MikroORM entities definition
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/charging-station/ChargingStation.ts     |  3 +-
 src/types/orm/entities/PerformanceData.ts   | 78 ++++++++++++---------
 src/types/orm/entities/PerformanceRecord.ts | 33 +++++----
 3 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 6cfcd707..7534f66e 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -1763,7 +1763,8 @@ export class ChargingStation extends EventEmitter {
           })
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           this.bootNotificationResponse.currentTime = convertToDate(
-            this.bootNotificationResponse.currentTime
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            this.bootNotificationResponse?.currentTime
           )!
           if (!this.isRegistered()) {
             this.stationInfo?.registrationMaxRetries !== -1 && ++registrationRetryCount
diff --git a/src/types/orm/entities/PerformanceData.ts b/src/types/orm/entities/PerformanceData.ts
index 28f2b346..b5cc8027 100644
--- a/src/types/orm/entities/PerformanceData.ts
+++ b/src/types/orm/entities/PerformanceData.ts
@@ -1,41 +1,51 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { PerformanceRecord } from './PerformanceRecord.js'
 
 @Entity()
 export class PerformanceData {
-  // @PrimaryKey()
-  //   pk!: number
-  // @Property()
-  //   commandName!: string
-  // @Property()
-  //   countRequest!: number
-  // @Property()
-  //   countResponse!: number
-  // @Property()
-  //   countError!: number
-  // @Property()
-  //   countTimeMeasurement!: number
-  // @Property()
-  //   timeMeasurementSeries!: number[]
-  // @Property()
-  //   currentTimeMeasurement!: number
-  // @Property()
-  //   minTimeMeasurement!: number
-  // @Property()
-  //   maxTimeMeasurement!: number
-  // @Property()
-  //   totalTimeMeasurement!: number
-  // @Property()
-  //   avgTimeMeasurement!: number
-  // @Property()
-  //   medTimeMeasurement!: number
-  // @Property()
-  //   ninetyFiveThPercentileTimeMeasurement!: number
-  // @Property()
-  //   stdDevTimeMeasurement!: number
-  // @ManyToOne('PerformanceRecord')
-  //   performanceRecord!: PerformanceRecord
+  @PrimaryKey()
+    commandName!: string
+
+  @Property()
+    requestCount!: number
+
+  @Property()
+    responseCount!: number
+
+  @Property()
+    errorCount!: number
+
+  @Property()
+    timeMeasurementCount!: number
+
+  @Property()
+    measurementTimeSeries!: number[]
+
+  @Property()
+    currentTimeMeasurement!: number
+
+  @Property()
+    minTimeMeasurement!: number
+
+  @Property()
+    maxTimeMeasurement!: number
+
+  @Property()
+    totalTimeMeasurement!: number
+
+  @Property()
+    avgTimeMeasurement!: number
+
+  @Property()
+    medTimeMeasurement!: number
+
+  @Property()
+    ninetyFiveThPercentileTimeMeasurement!: number
+
+  @Property()
+    stdDevTimeMeasurement!: number
+
+  @ManyToOne(() => PerformanceRecord)
+    performanceRecord!: PerformanceRecord
 }
diff --git a/src/types/orm/entities/PerformanceRecord.ts b/src/types/orm/entities/PerformanceRecord.ts
index 36db5c5b..a0ee77e7 100644
--- a/src/types/orm/entities/PerformanceRecord.ts
+++ b/src/types/orm/entities/PerformanceRecord.ts
@@ -1,21 +1,24 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import type { PerformanceData } from './PerformanceData.js'
+import { PerformanceData } from './PerformanceData.js'
 
 @Entity()
 export class PerformanceRecord {
-  // @PrimaryKey()
-  //   pk!: number
-  // @Property()
-  //   id!: string
-  // @Property()
-  //   URI!: string
-  // @Property()
-  //   createdAt!: Date
-  // @Property()
-  //   updatedAt?: Date
-  // @OneToMany('PerformanceData', 'performanceRecord')
-  //   performanceData? = new Collection<PerformanceData>(this)
+  @PrimaryKey()
+    id!: string
+
+  @Property()
+    name!: string
+
+  @Property()
+    uri!: string
+
+  @Property()
+    createdAt!: Date
+
+  @Property()
+    updatedAt?: Date
+
+  @OneToMany(() => PerformanceData, performanceData => performanceData.performanceRecord)
+    performanceData? = new Collection<PerformanceData>(this)
 }
-- 
2.34.1