Merge pull request #2671 from sap-labs-france/master-qa

Merge master-qa
sap-labs-france · Jul 18, 2021 · 64c72c6 · 64c72c6
2 parents 7e8c60b + f3f16c1
commit 64c72c6
Show file tree

Hide file tree

Showing 54 changed files with 920 additions and 582 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.4.76",
+  "version": "2.4.77",
   "engines": {
     "node": "14.x.x",
     "npm": "6.x.x"

diff --git a/src/assets/server/rest/v1/docs/e-mobility-oas.json b/src/assets/server/rest/v1/docs/e-mobility-oas.json
@@ -708,18 +708,33 @@
           {
             "$ref": "#/components/parameters/EndDateTime"
           },
+          {
+            "$ref": "#/components/parameters/WithChargingStation"
+          },
           {
             "$ref": "#/components/parameters/ChargingStationIDs"
           },
           {
             "$ref": "#/components/parameters/ConnectorIDs"
           },
+          {
+            "$ref": "#/components/parameters/WithCar"
+          },
+          {
+            "$ref": "#/components/parameters/WithUser"
+          },
           {
             "$ref": "#/components/parameters/UserIDs"
           },
+          {
+            "$ref": "#/components/parameters/WithTag"
+          },
           {
             "$ref": "#/components/parameters/TagIDs"
           },
+          {
+            "$ref": "#/components/parameters/VisualTagIDs"
+          },
           {
             "$ref": "#/components/parameters/SiteIDs"
           },
@@ -890,6 +905,15 @@
         "parameters": [
           {
             "$ref": "#/components/parameters/transactionID"
+          },
+          {
+            "$ref": "#/components/parameters/WithCar"
+          },
+          {
+            "$ref": "#/components/parameters/WithUser"
+          },
+          {
+            "$ref": "#/components/parameters/WithTag"
           }
         ],
         "tags": [
@@ -968,6 +992,15 @@
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "$ref": "#/components/parameters/WithCar"
+          },
+          {
+            "$ref": "#/components/parameters/WithUser"
+          },
+          {
+            "$ref": "#/components/parameters/WithTag"
           }
         ],
         "tags": [
@@ -1736,24 +1769,30 @@
                     "type": "string",
                     "example": ""
                   },
+                  "userID": {
+                    "type": "string",
+                    "example": ""
+                  },
                   "args": {
                     "type": "object",
                     "properties": {
                       "tagID": {
                         "type": "string",
-                        "description": "Required. The identifier that Charge Point must use to start a transaction.",
+                        "description": "The identifier that Charge Point must use to start a transaction.",
                         "example": "123456"
                       },
+                      "visualTagID": {
+                        "type": "string",
+                        "description": "The identifier that Charge Point must use to start a transaction.",
+                        "example": "123456-123456"
+                      },
                       "connectorId": {
                         "type": "integer",
                         "description": "Optional. Number of the connector on which to start the transaction. connectorId SHALL be > 0",
                         "minimum": 1,
                         "example": 1
                       }
-                    },
-                    "required": [
-                      "tagID"
-                    ]
+                    }
                   }
                 },
                 "required": [
@@ -2862,13 +2901,10 @@
             }
           },
           {
-            "in": "query",
-            "name": "TagID",
-            "description": "Pipe separated Tag IDs",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
+            "$ref": "#/components/parameters/TagIDs"
+          },
+          {
+            "$ref": "#/components/parameters/VisualTagIDs"
           },
           {
             "in": "query",
@@ -6206,6 +6242,15 @@
           "type": "string"
         }
       },
+      "VisualTagIDs": {
+        "in": "query",
+        "name": "VisualTagID",
+        "description": "Pipe separated Visual Tag IDs",
+        "required": false,
+        "schema": {
+          "type": "string"
+        }
+      },
       "TagIDs": {
         "in": "query",
         "name": "TagID",
@@ -6477,6 +6522,38 @@
           "type": "boolean"
         }
       },
+      "WithTag": {
+        "in": "query",
+        "name": "WithTag",
+        "description": "With tag attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
+      "WithUser": {
+        "in": "query",
+        "name": "WithUser",
+        "description": "With user attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
+      "WithCar": {
+        "in": "query",
+        "name": "WithCar",
+        "description": "With car attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
+      "WithChargingStation": {
+        "in": "query",
+        "name": "WithChargingStation",
+        "description": "With charging station attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
       "RefundStatus": {
         "in": "query",
         "name": "RefundStatus",

diff --git a/src/assets/server/rest/v1/schemas/chargingstation/chargingstation-action.json b/src/assets/server/rest/v1/schemas/chargingstation/chargingstation-action.json
@@ -8,6 +8,9 @@
     "carID": {
       "$ref": "common.json#/definitions/id"
     },
+    "userID": {
+      "$ref": "common.json#/definitions/id"
+    },
     "args": {
       "type": "object",
       "properties": {
@@ -46,7 +49,12 @@
           "$ref": "chargingstation.json#/definitions/chargingProfile/properties/profile/properties/stackLevel"
         },
         "tagID": {
-          "$ref": "tag.json#/definitions/id"
+          "type": "string",
+          "sanitize": "mongo"
+        },
+        "visualTagID": {
+          "type": "string",
+          "sanitize": "mongo"
         },
         "location": {
           "type": "string",

diff --git a/src/assets/server/rest/v1/schemas/tag/tag-get.json b/src/assets/server/rest/v1/schemas/tag/tag-get.json
@@ -6,6 +6,10 @@
     "ID": {
       "$ref": "tag.json#/definitions/id"
     },
+    "WithUser": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
     "ProjectFields": {
       "$ref": "common.json#/definitions/projectFields"
     }

diff --git a/src/assets/server/rest/v1/schemas/transaction/transactions-get.json b/src/assets/server/rest/v1/schemas/transaction/transactions-get.json
@@ -21,6 +21,22 @@
       "type": "boolean",
       "sanitize": "mongo"
     },
+    "WithTag": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
+    "WithUser": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
+    "WithCar": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
+    "WithChargingStation": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
     "ConnectorID": {
       "$ref": "chargingstation.json#/definitions/connectorIDs"
     },
@@ -34,11 +50,16 @@
       "$ref": "common.json#/definitions/ids"
     },
     "TagID": {
-      "$ref": "tag.json#/definitions/ids"
+      "type": "string",
+      "sanitize": "mongo"
+    },
+    "VisualTagID": {
+      "type": "string",
+      "sanitize": "mongo"
     },
     "StartDateTime": {
       "type": "string",
-      "format":"date-time",
+      "format": "date-time",
       "sanitize": "mongo"
     },
     "EndDateTime": {
@@ -67,15 +88,22 @@
     "Statistics": {
       "type": "string",
       "sanitize": "mongo",
-      "enum": ["refund", "history", "ongoing"]
+      "enum": [
+        "refund",
+        "history",
+        "ongoing"
+      ]
     },
     "ReportIDs": {
       "$ref": "common.json#/definitions/ids"
     },
     "Status": {
       "type": "string",
       "sanitize": "mongo",
-      "enum": ["completed", "active"]
+      "enum": [
+        "completed",
+        "active"
+      ]
     },
     "Search": {
       "$ref": "common.json#/definitions/search"

diff --git a/src/assets/server/rest/v1/schemas/user/user-get-default-tag-car.json b/src/assets/server/rest/v1/schemas/user/user-get-default-tag-car.json
@@ -0,0 +1,15 @@
+{
+  "title": "Get user default tag and car",
+  "type": "object",
+  "definitions": {
+    "UserID": {
+      "$ref": "common.json#/definitions/id"
+    },
+    "ProjectFields": {
+      "$ref": "common.json#/definitions/projectFields"
+    }
+  },
+  "required": [
+    "UserID"
+  ]
+}
diff --git a/src/assets/server/rest/v1/schemas/user/users-get.json b/src/assets/server/rest/v1/schemas/user/users-get.json
@@ -29,8 +29,9 @@
     "ExcludeSiteID": {
       "$ref": "common.json#/definitions/ids"
     },
-    "TagID": {
-      "$ref": "tag.json#/definitions/ids"
+    "VisualTagID": {
+      "type": "string",
+      "sanitize": "mongo"
     },
     "Search": {
       "$ref": "common.json#/definitions/search"

diff --git a/src/async-task/tasks/BillTransactionAsyncTask.ts b/src/async-task/tasks/BillTransactionAsyncTask.ts
@@ -44,7 +44,7 @@ export default class BillTransactionAsyncTask extends AbstractAsyncTask {
               // Save
               await TransactionStorage.saveTransaction(tenant.id, transaction);
             } finally {
-            // Release the lock
+              // Release the lock
               await LockingManager.release(transactionLock);
             }
           }