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 8703c7e5cda5a110daba61ae257ddc255ae19d3a..372c4d7216bf195b80a81970173e1b5ec1fcb2de 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@ -8,8 +8,7 @@ import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
   ChargingStationConfigurationUtils,
-  ChargingStationUtils,
-  MessageChannelUtils,
+  resetConnectorStatus,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -36,6 +35,7 @@ import {
   type OCPP16MeterValuesRequest,
   type OCPP16MeterValuesResponse,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowResponse,
   OCPP16StandardParametersKey,
   type OCPP16StartTransactionRequest,
   type OCPP16StartTransactionResponse,
@@ -50,7 +50,13 @@ import {
   type SetChargingProfileResponse,
   type UnlockConnectorResponse,
 } from '../../../types';
-import { Constants, Utils, logger } from '../../../utils';
+import {
+  Constants,
+  buildUpdatedMessage,
+  convertToInt,
+  isNullOrUndefined,
+  logger,
+} from '../../../utils';
 import { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP16ResponseService';
@@ -85,7 +91,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.BOOT_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16BootNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -93,7 +99,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.HEARTBEAT,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16HeartbeatResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json',
+          'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json',
           moduleName,
           'constructor'
         ),
@@ -101,7 +107,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.AUTHORIZE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16AuthorizeResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json',
+          'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json',
           moduleName,
           'constructor'
         ),
@@ -109,7 +115,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.START_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StartTransactionResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -117,7 +123,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StopTransactionResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -125,7 +131,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -133,7 +139,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.METER_VALUES,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16MeterValuesResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json',
+          'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json',
           moduleName,
           'constructor'
         ),
@@ -141,7 +147,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DiagnosticsStatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -149,7 +155,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
+          'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
           'constructor'
         ),
@@ -157,7 +163,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16FirmwareStatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -167,7 +173,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.RESET,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ResetResponse.json',
+          'assets/json-schemas/ocpp/1.6/ResetResponse.json',
           moduleName,
           'constructor'
         ),
@@ -175,7 +181,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CLEAR_CACHE,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearCacheResponse.json',
+          'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json',
           moduleName,
           'constructor'
         ),
@@ -183,7 +189,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json',
+          'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json',
           moduleName,
           'constructor'
         ),
@@ -191,7 +197,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json',
+          'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json',
           moduleName,
           'constructor'
         ),
@@ -199,7 +205,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -207,7 +213,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json',
+          'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -215,7 +221,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json',
           moduleName,
           'constructor'
         ),
@@ -223,7 +229,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json',
+          'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json',
           moduleName,
           'constructor'
         ),
@@ -231,7 +237,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json',
+          'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json',
           moduleName,
           'constructor'
         ),
@@ -239,7 +245,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -247,7 +253,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -255,7 +261,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json',
           moduleName,
           'constructor'
         ),
@@ -263,7 +269,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json',
+          'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json',
           moduleName,
           'constructor'
         ),
@@ -271,7 +277,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
+          'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
           'constructor'
         ),
@@ -279,7 +285,23 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json',
+          'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json',
+          moduleName,
+          'constructor'
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowResponse>(
+          'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json',
+          moduleName,
+          'constructor'
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
+          'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -426,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);
@@ -573,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) {
@@ -613,7 +635,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         }#${transactionConnectorId.toString()} for idTag '${requestPayload.idTag}'`
       );
       if (chargingStation.stationInfo.powerSharedByConnectors) {
-        chargingStation.powerDivider++;
+        ++chargingStation.powerDivider;
       }
       const configuredMeterValueSampleInterval =
         ChargingStationConfigurationUtils.getConfigurationKey(
@@ -623,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 {
@@ -640,9 +662,9 @@ 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(MessageChannelUtils.buildUpdatedMessage(chargingStation));
+    parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     if (
       chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available
     ) {
@@ -662,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()}`
       );
@@ -704,18 +726,16 @@ 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(MessageChannelUtils.buildUpdatedMessage(chargingStation));
+    parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     const logMsg = `${chargingStation.logPrefix()} Transaction with id ${requestPayload.transactionId.toString()} STOPPED on ${
       chargingStation.stationInfo.chargingStationId
     }#${transactionConnectorId?.toString()} with status '${
       payload.idTagInfo?.status ?? 'undefined'
     }'`;
     if (
-      Utils.isNullOrUndefined(payload.idTagInfo) ||
+      isNullOrUndefined(payload.idTagInfo) ||
       payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED
     ) {
       logger.info(logMsg);