X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16RequestService.ts;h=571ac066fc5710159c7bc5f968b9554689eb26de;hb=a95873d8d308a20a7151346ac70d9a551f1a06f5;hp=acc7fd2eb532131ada1f72ff243cf39d438fe2b7;hpb=443c064190213667582c916489760732147c48aa;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index acc7fd2e..571ac066 100644
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -12,14 +12,13 @@ import {
   OCPP16RequestCommand,
   StatusNotificationRequest,
 } from '../../../types/ocpp/1.6/Requests';
-import { MeterValuesRequest, OCPP16MeterValue } from '../../../types/ocpp/1.6/MeterValues';
 import { ResponseType, SendParams } from '../../../types/ocpp/Requests';
 
 import type ChargingStation from '../../ChargingStation';
 import Constants from '../../../utils/Constants';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
 import { JsonType } from '../../../types/JsonType';
-import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus';
+import { MeterValuesRequest } from '../../../types/ocpp/1.6/MeterValues';
 import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import OCPPError from '../../../exception/OCPPError';
 import OCPPRequestService from '../OCPPRequestService';
@@ -57,32 +56,6 @@ export default class OCPP16RequestService extends OCPPRequestService {
     );
   }
 
-  public async sendTransactionEndMeterValues(
-    connectorId: number,
-    transactionId: number,
-    endMeterValue: OCPP16MeterValue
-  ): Promise<void> {
-    const payload: MeterValuesRequest = {
-      connectorId,
-      transactionId,
-      meterValue: [endMeterValue],
-    };
-    await this.sendMessage(Utils.generateUUID(), payload, OCPP16RequestCommand.METER_VALUES);
-  }
-
-  public async sendDiagnosticsStatusNotification(
-    diagnosticsStatus: OCPP16DiagnosticsStatus
-  ): Promise<void> {
-    const payload: DiagnosticsStatusNotificationRequest = {
-      status: diagnosticsStatus,
-    };
-    await this.sendMessage(
-      Utils.generateUUID(),
-      payload,
-      OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
-    );
-  }
-
   private buildCommandPayload(
     commandName: OCPP16RequestCommand,
     commandParams?: JsonType
@@ -127,8 +100,8 @@ export default class OCPP16RequestService extends OCPPRequestService {
         return {
           connectorId: commandParams?.connectorId,
           transactionId: commandParams?.transactionId,
-          meterValue: Array.isArray(commandParams?.meterValues)
-            ? commandParams?.meterValues
+          meterValue: Array.isArray(commandParams?.meterValue)
+            ? commandParams?.meterValue
             : [commandParams?.meterValue],
         } as MeterValuesRequest;
       case OCPP16RequestCommand.STATUS_NOTIFICATION:
@@ -149,16 +122,9 @@ export default class OCPP16RequestService extends OCPPRequestService {
           timestamp: new Date().toISOString(),
         } as StartTransactionRequest;
       case OCPP16RequestCommand.STOP_TRANSACTION:
-        for (const id of this.chargingStation.connectors.keys()) {
-          if (
-            id > 0 &&
-            this.chargingStation.getConnectorStatus(id)?.transactionId ===
-              commandParams?.transactionId
-          ) {
-            connectorId = id;
-            break;
-          }
-        }
+        connectorId = this.chargingStation.getConnectorIdByTransactionId(
+          commandParams?.transactionId as number
+        );
         return {
           transactionId: commandParams?.transactionId,
           ...(!Utils.isUndefined(commandParams?.idTag) && { idTag: commandParams.idTag }),