refactor: split ChargingStationUtils class static methods into functions

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16ResponseService.ts

diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
index 5d87f633e1f262004fb1232a157c5b5abd417976..372c4d7216bf195b80a81970173e1b5ec1fcb2de 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@ -8,7 +8,7 @@ import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
   ChargingStationConfigurationUtils,
-  ChargingStationUtils,
+  resetConnectorStatus,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -50,7 +50,13 @@ import {
   type SetChargingProfileResponse,
   type UnlockConnectorResponse,
 } from '../../../types';
-import { Constants, Utils, buildUpdatedMessage, logger } from '../../../utils';
+import {
+  Constants,
+  buildUpdatedMessage,
+  convertToInt,
+  isNullOrUndefined,
+  logger,
+} from '../../../utils';
 import { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP16ResponseService';
@@ -442,7 +448,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         }
       }
     }
-    const authorizeConnectorIdDefined = !Utils.isNullOrUndefined(authorizeConnectorId);
+    const authorizeConnectorIdDefined = !isNullOrUndefined(authorizeConnectorId);
     if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) {
       authorizeConnectorIdDefined &&
         (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true);
@@ -589,7 +595,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
           payload.transactionId
         }, converting to integer`
       );
-      payload.transactionId = Utils.convertToInt(payload.transactionId);
+      payload.transactionId = convertToInt(payload.transactionId);
     }
 
     if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
@@ -639,7 +645,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       chargingStation.startMeterValues(
         transactionConnectorId,
         configuredMeterValueSampleInterval
-          ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000
+          ? convertToInt(configuredMeterValueSampleInterval.value) * 1000
           : Constants.DEFAULT_METER_VALUES_INTERVAL
       );
     } else {
@@ -656,7 +662,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     chargingStation: ChargingStation,
     connectorId: number
   ): Promise<void> {
-    ChargingStationUtils.resetConnectorStatus(chargingStation.getConnectorStatus(connectorId));
+    resetConnectorStatus(chargingStation.getConnectorStatus(connectorId));
     chargingStation.stopMeterValues(connectorId);
     parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     if (
@@ -678,7 +684,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     const transactionConnectorId = chargingStation.getConnectorIdByTransactionId(
       requestPayload.transactionId
     );
-    if (Utils.isNullOrUndefined(transactionConnectorId)) {
+    if (isNullOrUndefined(transactionConnectorId)) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${requestPayload.transactionId.toString()}`
       );
@@ -720,9 +726,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     if (chargingStation.stationInfo.powerSharedByConnectors) {
       chargingStation.powerDivider--;
     }
-    ChargingStationUtils.resetConnectorStatus(
-      chargingStation.getConnectorStatus(transactionConnectorId)
-    );
+    resetConnectorStatus(chargingStation.getConnectorStatus(transactionConnectorId));
     chargingStation.stopMeterValues(transactionConnectorId);
     parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     const logMsg = `${chargingStation.logPrefix()} Transaction with id ${requestPayload.transactionId.toString()} STOPPED on ${
@@ -731,7 +735,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       payload.idTagInfo?.status ?? 'undefined'
     }'`;
     if (
-      Utils.isNullOrUndefined(payload.idTagInfo) ||
+      isNullOrUndefined(payload.idTagInfo) ||
       payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED
     ) {
       logger.info(logMsg);