Fixed ChargeBox ID is not an ObjectID

sap-labs-france · Oct 9, 2018 · 7c2da08 · 7c2da08
1 parent b3acdae
commit 7c2da08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/server/front-end/service/security/SiteSecurity.js b/src/server/front-end/service/security/SiteSecurity.js
@@ -119,9 +119,6 @@ class SiteSecurity {
 			if (site.company) {
 				filteredSite.company = SiteSecurity.getCompanySecurity().filterCompanyResponse(site.company, loggedUser);;
 			}
-			if (site.siteAreas) {
-				filteredSite.siteAreas = SiteSecurity.getSiteAreaSecurity().filterSiteAreasResponse(site.siteAreas, loggedUser);
-			}
 			if (site.users) {
 				filteredSite.users = site.users.map((user) => {
 					return SiteSecurity.getUserSecurity().filterMinimalUserResponse(user, loggedUser);

diff --git a/src/utils/Database.js b/src/utils/Database.js
@@ -147,10 +147,8 @@ class Database {
 	static updateStatusNotification(src, dest, forFrontEnd=true) {
 		if (forFrontEnd) {
 			Database.updateID(src, dest);
-			dest.chargeBoxID = Database.validateId(src.chargeBoxID);
-		} else {
-			dest.chargeBoxID = Utils.convertToObjectID(src.chargeBoxID);
 		}
+		dest.chargeBoxID = src.chargeBoxID;
 		dest.connectorId = Utils.convertToInt(src.connectorId);
 		dest.timestamp = Utils.convertToDate(src.timestamp);
 		dest.status = src.status;
@@ -185,10 +183,8 @@ class Database {
 	static updateMeterValue(src, dest, forFrontEnd=true) {
 		if (forFrontEnd) {
 			Database.updateID(src, dest);
-			dest.chargeBoxID = Database.validateId(src.chargeBoxID);
-		} else {
-			dest.chargeBoxID = Utils.convertToObjectID(src.chargeBoxID);
 		}
+		dest.chargeBoxID = src.chargeBoxID
 		dest.connectorId = Utils.convertToInt(src.connectorId);
 		dest.transactionId = Utils.convertToInt(src.transactionId);
 		dest.timestamp = Utils.convertToDate(src.timestamp);
@@ -428,12 +424,11 @@ class Database {
 				dest.totalDurationSecs = src.totalDurationSecs;
 			}
 			dest.userID = Database.validateId(src.userID);
-			dest.chargeBoxID = Database.validateId(src.chargeBoxID);
 		} else {
 			dest.userID = Utils.convertToObjectID(src.userID);
-			dest.chargeBoxID = Utils.convertToObjectID(src.chargeBoxID);
 		}
 		// ChargeBox
+		dest.chargeBoxID = src.chargeBoxID
 		if (forFrontEnd && !Utils.isEmptyJSon(src.chargeBox)) {
 			dest.chargeBox = {};
 			Database.updateChargingStation(src.chargeBox, dest.chargeBox);