refactor: cleanup loops over object keys

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 2.0 / OCPP20RequestService.ts

diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index e65ff3d41e8ad4caa44ca9dcfadba6f6098f5f56..15a3b5023facc5da4f0ddff007da470f1f1d5a18 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -2,6 +2,8 @@
 
 import type { JSONSchemaType } from 'ajv';
 
+import { OCPP20Constants } from './OCPP20Constants';
+import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
 import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -15,13 +17,9 @@ import {
   OCPPVersion,
   type RequestParams,
 } from '../../../types';
-import { Utils } from '../../../utils';
-import {
-  OCPP20Constants,
-  OCPP20ServiceUtils,
-  OCPPRequestService,
-  type OCPPResponseService,
-} from '../internal';
+import { generateUUID } from '../../../utils';
+import { OCPPRequestService } from '../OCPPRequestService';
+import type { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP20RequestService';
 
@@ -37,7 +35,7 @@ export class OCPP20RequestService extends OCPPRequestService {
       [
         OCPP20RequestCommand.BOOT_NOTIFICATION,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
+          'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
           moduleName,
           'constructor'
         ),
@@ -45,7 +43,7 @@ export class OCPP20RequestService extends OCPPRequestService {
       [
         OCPP20RequestCommand.HEARTBEAT,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
+          'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
           moduleName,
           'constructor'
         ),
@@ -53,7 +51,7 @@ export class OCPP20RequestService extends OCPPRequestService {
       [
         OCPP20RequestCommand.STATUS_NOTIFICATION,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
+          'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
           moduleName,
           'constructor'
         ),
@@ -76,7 +74,7 @@ export class OCPP20RequestService extends OCPPRequestService {
     if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
       return (await this.sendMessage(
         chargingStation,
-        Utils.generateUUID(),
+        generateUUID(),
         this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
         commandName,
         params