X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=6e857089d96a567c99e0599de561dd56eaccb990;hb=933e253b07b60f598e94a40cb817e334fb0f1995;hp=4cc9109cfc0e34ad46a7f94ecc85e9dbbdbc06b6;hpb=31f59c6d2def2ab2b53240c1d3d35333ac00933b;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts index 4cc9109c..6e857089 100644 --- 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 { @@ -16,12 +18,8 @@ import { type RequestParams, } from '../../../types'; import { Utils } from '../../../utils'; -import { - OCPP20ServiceUtils, - OCPPConstants, - OCPPRequestService, - type OCPPResponseService, -} from '../internal'; +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( - '../../../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( - '../../../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( - '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json', + 'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json', moduleName, 'constructor' ), @@ -101,7 +99,7 @@ export class OCPP20RequestService extends OCPPRequestService { case OCPP20RequestCommand.BOOT_NOTIFICATION: return commandParams as unknown as Request; case OCPP20RequestCommand.HEARTBEAT: - return OCPPConstants.OCPP_RESPONSE_EMPTY as unknown as Request; + return OCPP20Constants.OCPP_RESPONSE_EMPTY as unknown as Request; case OCPP20RequestCommand.STATUS_NOTIFICATION: return { timestamp: new Date(),