Merge pull request #4153 from sap-labs-france/master-labs

Version 2.7.6
sap-labs-france · Mar 21, 2023 · 14309d9 · 14309d9
2 parents 33ff54b + 3afb296
commit 14309d9
Show file tree

Hide file tree

Showing 25 changed files with 797 additions and 179 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ev-server",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "engines": {
     "node": "16.x.x",
     "npm": "8.x.x"
@@ -153,8 +153,8 @@
     "role-acl": "^4.5.4",
     "simple-odata-server": "^1.1.2",
     "source-map-support": "^0.5.21",
-    "stripe": "^9.16.0",
-    "strong-soap": "^3.4.0",
+    "stripe": "^11.14.0",
+    "strong-soap": "^3.4.3",
     "swagger-ui-express": "^4.5.0",
     "tslib": "^2.4.0",
     "tz-lookup": "^6.1.25",

diff --git a/src/assets/configs-ci b/src/assets/configs-ci
diff --git a/src/assets/schemas/common/common.json b/src/assets/schemas/common/common.json
@@ -125,6 +125,25 @@
         }
       }
     },
+    "smartChargingSessionParameters": {
+      "type": "object",
+      "properties": {
+        "departureTime": {
+          "type": "string",
+          "sanitize": "mongo",
+          "pattern": "^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$",
+          "nullable": true
+        },
+        "carStateOfCharge": {
+          "type": "integer",
+          "sanitize": "mongo"
+        },
+        "targetStateOfCharge": {
+          "type": "integer",
+          "sanitize": "mongo"
+        }
+      }
+    },
     "acceptEula": {
       "type": "boolean",
       "sanitize": "mongo"

diff --git a/src/assets/server/rest/v1/schemas/setting/setting-smart-charging-set.json b/src/assets/server/rest/v1/schemas/setting/setting-smart-charging-set.json
@@ -9,13 +9,15 @@
         "sapSmartCharging": {
           "type": "object",
           "properties": {
-            "limitBufferAC" : {
+            "limitBufferAC": {
               "type": "number",
-              "sanitize": "mongo"
+              "sanitize": "mongo",
+              "minimum": 1
             },
             "limitBufferDC": {
               "type": "number",
-              "sanitize": "mongo"
+              "sanitize": "mongo",
+              "minimum": 1
             },
             "optimizerUrl": {
               "type": "string",
@@ -32,13 +34,19 @@
             "user": {
               "type": "string",
               "sanitize": "mongo"
+            },
+            "prioritizationParametersActive": {
+              "type": "boolean",
+              "sanitize": "mongo"
             }
           }
         },
         "type": {
           "type": "string",
           "sanitize": "mongo",
-          "enum": ["sapSmartCharging"]
+          "enum": [
+            "sapSmartCharging"
+          ]
         }
       },
       "links": {
@@ -55,7 +63,9 @@
     "identifier": {
       "type": "string",
       "sanitize": "mongo",
-      "enum": ["smartCharging"]
+      "enum": [
+        "smartCharging"
+      ]
     },
     "sensitiveData": {
       "$ref": "setting#/definitions/sensitiveData"

diff --git a/src/assets/server/rest/v1/schemas/site-area/site-area-create.json b/src/assets/server/rest/v1/schemas/site-area/site-area-create.json
@@ -22,6 +22,9 @@
       "$ref": "site-area#/definitions/smartCharging",
       "default": false
     },
+    "smartChargingSessionParameters": {
+      "$ref": "common#/definitions/smartChargingSessionParameters"
+    },
     "accessControl": {
       "$ref": "site-area#/definitions/accessControl"
     },

diff --git a/src/assets/server/rest/v1/schemas/site-area/site-area-update.json b/src/assets/server/rest/v1/schemas/site-area/site-area-update.json
@@ -25,6 +25,9 @@
       "$ref": "site-area#/definitions/smartCharging",
       "default": false
     },
+    "smartChargingSessionParameters": {
+      "$ref": "common#/definitions/smartChargingSessionParameters"
+    },
     "accessControl": {
       "$ref": "site-area#/definitions/accessControl"
     },

diff --git a/src/assets/server/rest/v1/schemas/user/user-session-context-get.json b/src/assets/server/rest/v1/schemas/user/user-session-context-get.json
@@ -14,6 +14,12 @@
     },
     "ProjectFields": {
       "$ref": "common#/definitions/projectFields"
+    },
+    "CarID": {
+      "$ref": "car#/definitions/id"
+    },
+    "TagID": {
+      "$ref": "tag#/definitions/id"
     }
   },
   "required": [

diff --git a/src/authorization/AuthorizationsDefinition.ts b/src/authorization/AuthorizationsDefinition.ts
@@ -413,7 +413,8 @@ export const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         resource: Entity.SITE_AREA,
         action: [Action.READ, Action.READ_CHARGING_STATIONS_FROM_SITE_AREA],
         attributes: [
-          'id', 'name', 'issuer', 'image', 'maximumPower', 'numberOfPhases', 'voltage', 'smartCharging', 'accessControl',
+          'id', 'name', 'issuer', 'image', 'maximumPower', 'numberOfPhases', 'voltage', 'smartCharging', 'smartChargingSessionParameters',
+          'smartChargingSessionParameters.departureTime', 'smartChargingSessionParameters.carStateOfCharge', 'smartChargingSessionParameters.targetStateOfCharge', 'accessControl',
           'connectorStats', 'siteID', 'site.name', 'site.public', 'parentSiteAreaID', 'parentSiteArea.name', 'tariffID',
           'address.address1', 'address.address2', 'address.postalCode', 'address.city',
           'address.department', 'address.region', 'address.country', 'address.coordinates'
@@ -1309,6 +1310,7 @@ export const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'name', 'issuer', 'image', 'maximumPower', 'numberOfPhases',
           'voltage', 'smartCharging', 'accessControl', 'connectorStats', 'siteID',
+          'smartChargingSessionParameters.departureTime', 'smartChargingSessionParameters.carStateOfCharge', 'smartChargingSessionParameters.targetStateOfCharge',
           'parentSiteAreaID', 'site.name', 'parentSiteArea.name',
           'address.address1', 'address.address2', 'address.postalCode', 'address.city',
           'address.department', 'address.region', 'address.country', 'address.coordinates'
@@ -1865,6 +1867,7 @@ export const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'name', 'issuer', 'image', 'maximumPower', 'numberOfPhases',
           'voltage', 'smartCharging', 'accessControl', 'connectorStats',
+          'smartChargingSessionParameters.departureTime', 'smartChargingSessionParameters.carStateOfCharge', 'smartChargingSessionParameters.targetStateOfCharge',
           'siteID', 'parentSiteAreaID', 'site.name', 'parentSiteArea.name',
           'address.address1', 'address.address2', 'address.postalCode', 'address.city',
           'address.department', 'address.region', 'address.country', 'address.coordinates'
@@ -2336,6 +2339,7 @@ export const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'name', 'issuer', 'image', 'maximumPower', 'numberOfPhases',
           'voltage', 'smartCharging', 'accessControl', 'connectorStats',
+          'smartChargingSessionParameters.departureTime', 'smartChargingSessionParameters.carStateOfCharge', 'smartChargingSessionParameters.targetStateOfCharge',
           'siteID', 'site.name', 'site.public', 'tariffID',
           'address.address1', 'address.address2', 'address.postalCode', 'address.city',
           'address.department', 'address.region', 'address.country', 'address.coordinates'