Cleanups.

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/ChargingStation.js b/src/charging-station/ChargingStation.js
index 91232e5f0c172e404ea7cf09facf01c2a705761c..b0a461fadd6f8269af2c902f727dccbecffc40a7 100644 (file)
--- a/src/charging-station/ChargingStation.js
+++ b/src/charging-station/ChargingStation.js
@@ -336,7 +336,7 @@ class ChargingStation {
 
   sendError(messageId, err) {
     // Check exception: only OCPP error are accepted
-    const error = (err instanceof OCPPError ? err : new OCPPError(Constants.OCPP_ERROR_INTERNAL_ERROR, err.message));
+    const error = err instanceof OCPPError ? err : new OCPPError(Constants.OCPP_ERROR_INTERNAL_ERROR, err.message);
     // Send error
     return this.sendMessage(messageId, error, Constants.OCPP_JSON_CALL_ERROR_MESSAGE);
   }
@@ -514,8 +514,8 @@ class ChargingStation {
           this.sendStatusNotification(requestPayload.connectorId, 'Charging');
           const configuredMeterValueSampleInterval = this._configuration.configurationKey.find((value) => value.key === 'MeterValueSampleInterval');
           this.startMeterValues(requestPayload.connectorId,
-              (configuredMeterValueSampleInterval ? configuredMeterValueSampleInterval.value * 1000 : 60000),
-              this);
+            configuredMeterValueSampleInterval ? configuredMeterValueSampleInterval.value * 1000 : 60000,
+            this);
         }
       }
     } else {
@@ -607,7 +607,7 @@ class ChargingStation {
   }
 
   async handleRemoteStartTransaction(commandPayload) {
-    const transactionConnectorID = (commandPayload.connectorId ? commandPayload.connectorId : '1');
+    const transactionConnectorID = commandPayload.connectorId ? commandPayload.connectorId : '1';
     if (this.hasAuthorizedTags() && this._getLocalAuthListEnabled() && this._getAuthorizeRemoteTxRequests()) {
       // Check if authorized
       if (this._authorizedTags.find((value) => value === commandPayload.idTag)) {
@@ -685,7 +685,7 @@ class ChargingStation {
           sampledValueLcl.sampledValue[index].value = Math.floor(Math.random() * 100) + 1;
           if (sampledValueLcl.sampledValue[index].value > 100) {
             logger.info(self._basicFormatLog() + ' MeterValues measurand: ' +
-              (sampledValueLcl.sampledValue[index].measurand ? sampledValueLcl.sampledValue[index].measurand : 'default') +
+              sampledValueLcl.sampledValue[index].measurand ? sampledValueLcl.sampledValue[index].measurand : 'Energy.Active.Import.Register' +
               ', value: ' + sampledValueLcl.sampledValue[index].value);
           }
         } else {
@@ -703,7 +703,7 @@ class ChargingStation {
           sampledValueLcl.sampledValue[index].value = connector.lastConsumptionValue;
           if (sampledValueLcl.sampledValue[index].value > (self._stationInfo.maxPower * 3600 / interval) || sampledValueLcl.sampledValue[index].value < 500) {
             logger.info(self._basicFormatLog() + ' MeterValues measurand: ' +
-              (sampledValueLcl.sampledValue[index].measurand ? sampledValueLcl.sampledValue[index].measurand : 'default') +
+              sampledValueLcl.sampledValue[index].measurand ? sampledValueLcl.sampledValue[index].measurand : 'Energy.Active.Import.Register' +
               ', value: ' + sampledValueLcl.sampledValue[index].value + '/' + (self._stationInfo.maxPower * 3600 / interval));
           }
         }

diff --git a/src/charging-station/OcppError.js b/src/charging-station/OcppError.js
index 1793eae3cded9cc8fe34aa6d06d35587509279f3..89ead59a953473e53cb58098e08fb6c50f0578b1 100644 (file)
--- a/src/charging-station/OcppError.js
+++ b/src/charging-station/OcppError.js
@@ -8,7 +8,7 @@ class OCPPError extends Error {
 
     Object.setPrototypeOf(this, OCPPError.prototype); // for instanceof
 
-    Error.captureStackTrace ? (Error.captureStackTrace(this, this.constructor)) : (this.stack = (new Error()).stack);
+    Error.captureStackTrace ? Error.captureStackTrace(this, this.constructor) : (this.stack = (new Error()).stack);
   }
 }
 

diff --git a/src/utils/Constants.js b/src/utils/Constants.js
index 3c7e13a05939c2afed7824ca65b4a5520220d234..b5b55cc330638e54e333184c2315da4920e60aa8 100644 (file)
--- a/src/utils/Constants.js
+++ b/src/utils/Constants.js
@@ -32,7 +32,7 @@ class Constants {
   static ENTITY_LOGGING = 'Logging';
   static ENTITY_PRICING = 'Pricing';
 
-  static NOTIF_TYPE_CHARGING_STATION_CONFIGURATION = 'Configuration';
+  static NOTIFICATION_TYPE_CHARGING_STATION_CONFIGURATION = 'Configuration';
 
   static ACTION_READ = 'Read';
   static ACTION_CREATE = 'Create';

diff --git a/src/utils/Statistics.js b/src/utils/Statistics.js
index edbec26221680267b35122e5a40c2a84ab1d6d6d..bc3405806d1235707a3b94f76903dfd0313abc48 100644 (file)
--- a/src/utils/Statistics.js
+++ b/src/utils/Statistics.js
@@ -52,10 +52,10 @@ class Statistics {
 
     if (currentStatistics) {
       // Update current statistics timers
-      currentStatistics.countTime = (currentStatistics.countTime ? currentStatistics.countTime + 1 : 1);
-      currentStatistics.minTime = (currentStatistics.minTime ? (currentStatistics.minTime > duration ? duration : currentStatistics.minTime) : duration);
-      currentStatistics.maxTime = (currentStatistics.maxTime ? (currentStatistics.maxTime < duration ? duration : currentStatistics.maxTime) : duration);
-      currentStatistics.totalTime = (currentStatistics.totalTime ? currentStatistics.totalTime + duration : duration);
+      currentStatistics.countTime = currentStatistics.countTime ? currentStatistics.countTime + 1 : 1;
+      currentStatistics.minTime = currentStatistics.minTime ? (currentStatistics.minTime > duration ? duration : currentStatistics.minTime) : duration;
+      currentStatistics.maxTime = currentStatistics.maxTime ? (currentStatistics.maxTime < duration ? duration : currentStatistics.maxTime) : duration;
+      currentStatistics.totalTime = currentStatistics.totalTime ? currentStatistics.totalTime + duration : duration;
       currentStatistics.avgTime = currentStatistics.totalTime / currentStatistics.countTime;
     }
   }

diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 446f524150c1cff7ddadc00863c35fc547f4cb12..216790bc368bc0e7664810138391d0e41129aa13 100644 (file)
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -74,30 +74,33 @@ class Utils {
     return changedID;
   }
 
-  static convertToInt(id) {
-    let changedID = id;
-    if (!id) {
+  static convertToInt(value) {
+    let changedValue = value;
+    if (!value) {
       return 0;
     }
+    if (Number.isSafeInteger(value)) {
+      return value;
+    }
     // Check
-    if (typeof id === 'string') {
+    if (typeof value === 'string') {
       // Create Object
-      changedID = parseInt(id);
+      changedValue = parseInt(value);
     }
-    return changedID;
+    return changedValue;
   }
 
-  static convertToFloat(id) {
-    let changedID = id;
-    if (!id) {
+  static convertToFloat(value) {
+    let changedValue = value;
+    if (!value) {
       return 0;
     }
     // Check
-    if (typeof id === 'string') {
+    if (typeof value === 'string') {
       // Create Object
-      changedID = parseFloat(id);
+      changedValue = parseFloat(value);
     }
-    return changedID;
+    return changedValue;
   }
 
   static convertToBoolean(value) {