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

Merge master-qa
sap-labs-france · Jul 6, 2021 · 24799bb · 24799bb
2 parents 65d04dc + 0b3ff77
commit 24799bb
Show file tree

Hide file tree

Showing 68 changed files with 949 additions and 267 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.73",
+  "version": "2.4.74",
   "engines": {
     "node": "14.x.x",
     "npm": "6.x.x"

diff --git a/src/assets/charging-station-templates b/src/assets/charging-station-templates
diff --git a/src/assets/server/rest/v1/docs/e-mobility-oas.json b/src/assets/server/rest/v1/docs/e-mobility-oas.json
@@ -723,9 +723,18 @@
           {
             "$ref": "#/components/parameters/SiteIDs"
           },
+          {
+            "$ref": "#/components/parameters/WithSite"
+          },
           {
             "$ref": "#/components/parameters/SiteAreaIDs"
           },
+          {
+            "$ref": "#/components/parameters/WithSiteArea"
+          },
+          {
+            "$ref": "#/components/parameters/WithCompany"
+          },
           {
             "$ref": "#/components/parameters/InactivityStatuses"
           },
@@ -1066,6 +1075,9 @@
           {
             "$ref": "#/components/parameters/SiteAreaIDs"
           },
+          {
+            "$ref": "#/components/parameters/WithSiteArea"
+          },
           {
             "$ref": "#/components/parameters/ConnectorStatuses"
           },
@@ -6459,6 +6471,14 @@
           "type": "boolean"
         }
       },
+      "WithCompany": {
+        "in": "query",
+        "name": "WithCompany",
+        "description": "With company attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
       "WithSite": {
         "in": "query",
         "name": "WithSite",
@@ -6467,6 +6487,14 @@
           "type": "boolean"
         }
       },
+      "WithSiteArea": {
+        "in": "query",
+        "name": "WithSiteArea",
+        "description": "With site area attribute",
+        "schema": {
+          "type": "boolean"
+        }
+      },
       "RefundStatus": {
         "in": "query",
         "name": "RefundStatus",

diff --git a/src/assets/server/rest/v1/schemas/chargingstation/chargingstations-get.json b/src/assets/server/rest/v1/schemas/chargingstation/chargingstations-get.json
@@ -16,10 +16,17 @@
     "SiteID": {
       "$ref": "common.json#/definitions/ids"
     },
+    "CompanyID": {
+      "$ref": "common.json#/definitions/ids"
+    },
     "WithSite": {
       "type": "boolean",
       "sanitize": "mongo"
     },
+    "WithSiteArea": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
     "SiteAreaID": {
       "$ref": "common.json#/definitions/ids"
     },

diff --git a/src/assets/server/rest/v1/schemas/tag/tags-get.json b/src/assets/server/rest/v1/schemas/tag/tags-get.json
@@ -12,6 +12,10 @@
     "UserID": {
       "$ref": "user.json#/definitions/ids"
     },
+    "WithUser": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
     "Search": {
       "$ref": "common.json#/definitions/search"
     },

diff --git a/src/assets/server/rest/v1/schemas/transaction/transactions-get.json b/src/assets/server/rest/v1/schemas/transaction/transactions-get.json
@@ -9,6 +9,18 @@
       "type": "boolean",
       "sanitize": "mongo"
     },
+    "WithCompany": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
+    "WithSite": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
+    "WithSiteArea": {
+      "type": "boolean",
+      "sanitize": "mongo"
+    },
     "ConnectorID": {
       "$ref": "chargingstation.json#/definitions/connectorIDs"
     },

diff --git a/src/async-task/tasks/ocpi/OCPICheckCdrsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckCdrsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPICheckCdrsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPICheckLocationsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckLocationsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPICheckLocationsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPICheckSessionsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPICheckSessionsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPICheckSessionsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPullCdrsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullCdrsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPullCdrsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPullLocationsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullLocationsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPullLocationsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPullSessionsAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullSessionsAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPullSessionsAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPullTokensAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPullTokensAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPullTokensAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPushEVSEStatusesAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPushEVSEStatusesAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPushEVSEStatusesAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/async-task/tasks/ocpi/OCPIPushTokensAsyncTask.ts b/src/async-task/tasks/ocpi/OCPIPushTokensAsyncTask.ts
@@ -16,7 +16,7 @@ export default class OCPIPushTokensAsyncTask extends AbstractAsyncTask {
     if (Utils.isTenantComponentActive(tenant, TenantComponents.OCPI)) {
       try {
         // Get the OCPI Endpoint
-        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant.id, this.asyncTask.parameters.endpointID);
+        const ocpiEndpoint = await OCPIEndpointStorage.getOcpiEndpoint(tenant, this.asyncTask.parameters.endpointID);
         if (!ocpiEndpoint) {
           throw new Error(`Unknown OCPI Endpoint ID '${this.asyncTask.parameters.endpointID}'`);
         }

diff --git a/src/authorization/Authorizations.ts b/src/authorization/Authorizations.ts
@@ -54,11 +54,11 @@ export default class Authorizations {
   public static async canStartTransaction(loggedUser: UserToken, chargingStation: ChargingStation): Promise<boolean> {
     let context: AuthorizationContext;
     if (Utils.isComponentActiveFromToken(loggedUser, TenantComponents.ORGANIZATION)) {
-      if (!chargingStation || !chargingStation.siteArea || !chargingStation.siteArea.site) {
+      if (!chargingStation || !chargingStation.siteArea || !chargingStation.site) {
         return false;
       }
       context = {
-        site: chargingStation.siteArea.site.id,
+        site: chargingStation.site.id,
         sites: loggedUser.sites,
         sitesAdmin: loggedUser.sitesAdmin
       };
@@ -269,7 +269,7 @@ export default class Authorizations {
       context = {
         tagIDs: loggedUser.tagIDs,
         owner: loggedUser.id,
-        site: isOrgCompActive && chargingStation.siteArea ? chargingStation.siteArea.site.id : null,
+        site: isOrgCompActive ? chargingStation.siteID : null,
         sites: loggedUser.sites,
         sitesAdmin: loggedUser.sitesAdmin
       };
@@ -1068,9 +1068,8 @@ export default class Authorizations {
         });
       }
       // Site -----------------------------------------------------
-      chargingStation.siteArea.site = chargingStation.siteArea.site ??
-        (chargingStation.siteArea.siteID ? await SiteStorage.getSite(tenant, chargingStation.siteArea.siteID) : null);
-      if (!chargingStation.siteArea.site) {
+      chargingStation.site = await SiteStorage.getSite(tenant, chargingStation.siteID);
+      if (!chargingStation.site) {
         // Reject Site Not Found
         throw new BackendError({
           source: chargingStation.id,

diff --git a/src/authorization/AuthorizationsDefinition.ts b/src/authorization/AuthorizationsDefinition.ts
@@ -181,7 +181,7 @@ const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'inactive', 'public', 'chargingStationURL', 'issuer', 'maximumPower', 'excludeFromSmartCharging', 'lastReboot',
           'siteAreaID', 'siteArea.id', 'siteArea.name', 'siteArea.smartCharging', 'siteArea.siteID',
-          'siteArea.site.id', 'siteArea.site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
+          'site.id', 'site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
           'capabilities', 'endpoint', 'chargePointVendor', 'chargePointModel', 'ocppVersion', 'ocppProtocol', 'lastSeen',
           'firmwareVersion', 'currentIPAddress', 'ocppStandardParameters', 'ocppVendorParameters', 'connectors', 'chargePoints',
           'createdOn', 'chargeBoxSerialNumber', 'chargePointSerialNumber', 'powerLimitUnit'
@@ -471,7 +471,7 @@ const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'inactive', 'public', 'chargingStationURL', 'issuer', 'maximumPower', 'excludeFromSmartCharging', 'lastReboot',
           'siteAreaID', 'siteArea.id', 'siteArea.name', 'siteArea.smartCharging', 'siteArea.siteID',
-          'siteArea.site.id', 'siteArea.site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
+          'site.id', 'site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
           'capabilities', 'endpoint', 'chargePointVendor', 'chargePointModel', 'ocppVersion', 'ocppProtocol', 'lastSeen',
           'firmwareVersion', 'currentIPAddress', 'ocppStandardParameters', 'ocppVendorParameters', 'connectors', 'chargePoints',
           'createdOn', 'chargeBoxSerialNumber', 'chargePointSerialNumber', 'powerLimitUnit'
@@ -661,7 +661,7 @@ const AUTHORIZATION_DEFINITION: AuthorizationDefinition = {
         attributes: [
           'id', 'inactive', 'public', 'chargingStationURL', 'issuer', 'maximumPower', 'excludeFromSmartCharging', 'lastReboot',
           'siteAreaID', 'siteArea.id', 'siteArea.name', 'siteArea.smartCharging', 'siteArea.siteID',
-          'siteArea.site.id', 'siteArea.site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
+          'site.id', 'site.name', 'siteID', 'voltage', 'coordinates', 'forceInactive', 'manualConfiguration', 'firmwareUpdateStatus',
           'capabilities', 'endpoint', 'chargePointVendor', 'chargePointModel', 'ocppVersion', 'ocppProtocol', 'lastSeen',
           'firmwareVersion', 'currentIPAddress', 'ocppStandardParameters', 'ocppVendorParameters', 'connectors', 'chargePoints',
           'createdOn', 'chargeBoxSerialNumber', 'chargePointSerialNumber', 'powerLimitUnit'

diff --git a/src/client/ocpi/CpoOCPIClient.ts b/src/client/ocpi/CpoOCPIClient.ts
@@ -744,7 +744,7 @@ export default class CpoOCPIClient extends OCPIClient {
     }
     // Save
     const executionDurationSecs = (new Date().getTime() - startTime) / 1000;
-    await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant.id, this.ocpiEndpoint);
+    await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant, this.ocpiEndpoint);
     await Logging.logOcpiResult(this.tenant.id, ServerAction.OCPI_PATCH_STATUS,
       MODULE_NAME, 'sendEVSEStatuses', result,
       `{{inSuccess}} EVSE Status(es) were successfully patched in ${executionDurationSecs}s`,

diff --git a/src/client/ocpi/EmspOCPIClient.ts b/src/client/ocpi/EmspOCPIClient.ts
@@ -105,7 +105,7 @@ export default class EmspOCPIClient extends OCPIClient {
       };
     }
     // Save
-    await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant.id, this.ocpiEndpoint);
+    await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant, this.ocpiEndpoint);
     const executionDurationSecs = (new Date().getTime() - startTime) / 1000;
     await Logging.logOcpiResult(this.tenant.id, ServerAction.OCPI_PUSH_TOKENS,
       MODULE_NAME, 'sendTokens', result,
@@ -346,7 +346,7 @@ export default class EmspOCPIClient extends OCPIClient {
     const locationName = site.name + Constants.OCPI_SEPARATOR + location.id;
     // Handle Site Area
     const siteAreas = await SiteAreaStorage.getSiteAreas(this.tenant.id,
-      { siteIDs: [site.id], name: locationName, issuer: false },
+      { siteIDs: [site.id], name: locationName, issuer: false, withSite: true },
       Constants.DB_PARAMS_SINGLE_RECORD);
     let siteArea = !Utils.isEmptyArray(siteAreas.result) ? siteAreas.result[0] : null;
     if (!siteArea) {
@@ -402,8 +402,9 @@ export default class EmspOCPIClient extends OCPIClient {
         }
         // Update Charging Station
         const chargingStation = OCPIUtilsService.convertEvseToChargingStation(evse, location);
-        chargingStation.siteAreaID = siteArea.id;
+        chargingStation.companyID = siteArea.site?.companyID;
         chargingStation.siteID = siteArea.siteID;
+        chargingStation.siteAreaID = siteArea.id;
         await ChargingStationStorage.saveChargingStation(this.tenant.id, chargingStation);
         await ChargingStationStorage.saveChargingStationOcpiData(this.tenant.id, chargingStation.id, chargingStation.ocpiData);
         await Logging.logDebug({

diff --git a/src/client/ocpi/OCPIClient.ts b/src/client/ocpi/OCPIClient.ts
@@ -90,7 +90,7 @@ export default abstract class OCPIClient {
       await this.deleteCredentials();
       // Save endpoint
       this.ocpiEndpoint.status = OCPIRegistrationStatus.UNREGISTERED;
-      await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant.id, this.ocpiEndpoint);
+      await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant, this.ocpiEndpoint);
       // Send success
       unregisterResult.statusCode = StatusCodes.OK;
       unregisterResult.statusText = ReasonPhrases.OK;
@@ -140,7 +140,7 @@ export default abstract class OCPIClient {
       this.ocpiEndpoint.businessDetails = credential.business_details;
       // Save endpoint
       this.ocpiEndpoint.status = OCPIRegistrationStatus.REGISTERED;
-      await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant.id, this.ocpiEndpoint);
+      await OCPIEndpointStorage.saveOcpiEndpoint(this.tenant, this.ocpiEndpoint);
       // Send success
       registerResult.statusCode = StatusCodes.OK;
       registerResult.statusText = ReasonPhrases.OK;

diff --git a/src/client/ocpi/OCPIClientFactory.ts b/src/client/ocpi/OCPIClientFactory.ts
@@ -75,7 +75,7 @@ export default class OCPIClientFactory {
   }
 
   static async getAvailableOcpiClient(tenant: Tenant, ocpiRole: OCPIRole): Promise<CpoOCPIClient|EmspOCPIClient> {
-    const ocpiEndpoints = await OCPIEndpointStorage.getOcpiEndpoints(tenant.id, { role: ocpiRole }, Constants.DB_PARAMS_MAX_LIMIT);
+    const ocpiEndpoints = await OCPIEndpointStorage.getOcpiEndpoints(tenant, { role: ocpiRole }, Constants.DB_PARAMS_MAX_LIMIT);
     for (const ocpiEndpoint of ocpiEndpoints.result) {
       if (ocpiEndpoint.status === OCPIRegistrationStatus.REGISTERED) {
         const client = await OCPIClientFactory.getOcpiClient(tenant, ocpiEndpoint);
@@ -85,7 +85,7 @@ export default class OCPIClientFactory {
   }
 
   static async getChargingStationClient(tenant: Tenant, chargingStation: ChargingStation): Promise<OCPIChargingStationClient> {
-    const ocpiEndpoints = await OCPIEndpointStorage.getOcpiEndpoints(tenant.id, { role: OCPIRole.EMSP }, Constants.DB_PARAMS_MAX_LIMIT);
+    const ocpiEndpoints = await OCPIEndpointStorage.getOcpiEndpoints(tenant, { role: OCPIRole.EMSP }, Constants.DB_PARAMS_MAX_LIMIT);
     for (const ocpiEndpoint of ocpiEndpoints.result) {
       if (ocpiEndpoint.status === OCPIRegistrationStatus.REGISTERED) {
         const client = await OCPIClientFactory.getEmspOcpiClient(tenant, ocpiEndpoint);

diff --git a/src/client/oicp/CpoOICPClient.ts b/src/client/oicp/CpoOICPClient.ts
@@ -210,7 +210,7 @@ export default class CpoOICPClient extends OICPClient {
           do {
             // Get all charging stations from tenant
             chargingStations = (await ChargingStationStorage.getChargingStations(this.tenant.id,
-              { siteIDs: [site.id], public: true }, { skip: currentChargingStationSkip, limit: Constants.DB_RECORD_COUNT_DEFAULT })).result;
+              { siteIDs: [site.id], public: true, withSiteArea: true }, { skip: currentChargingStationSkip, limit: Constants.DB_RECORD_COUNT_DEFAULT })).result;
             if (!Utils.isEmptyArray(chargingStations)) {
               // Convert (public) charging stations to OICP EVSEs
               const evses = await OICPUtils.convertChargingStationsToEVSEs(this.tenant, site, chargingStations, options);
@@ -358,7 +358,7 @@ export default class CpoOICPClient extends OICPClient {
           do {
             // Get all charging stations from tenant
             chargingStations = (await ChargingStationStorage.getChargingStations(this.tenant.id,
-              { siteIDs: [site.id], public: true }, { skip: currentChargingStationSkip, limit: Constants.DB_RECORD_COUNT_DEFAULT })).result;
+              { siteIDs: [site.id], public: true, withSiteArea: true }, { skip: currentChargingStationSkip, limit: Constants.DB_RECORD_COUNT_DEFAULT })).result;
             if (!Utils.isEmptyArray(chargingStations)) {
               // Convert (public) charging stations to OICP EVSE Statuses
               const evseStatuses = OICPUtils.convertChargingStationsToEvseStatuses(chargingStations, options);

diff --git a/src/integration/refund/concur b/src/integration/refund/concur
diff --git a/src/integration/smart-charging/sap-smart-charging b/src/integration/smart-charging/sap-smart-charging
diff --git a/src/migration/MigrationHandler.ts b/src/migration/MigrationHandler.ts
@@ -1,3 +1,5 @@
+import AddCompanyIDToChargingStationsTask from './tasks/AddCompanyIDToChargingStationsTask';
+import AddCompanyIDToTransactionsTask from './tasks/AddCompanyIDToTransactionsTask';
 import Constants from '../utils/Constants';
 import { LockEntity } from '../types/Locking';
 import LockingManager from '../locking/LockingManager';
@@ -86,6 +88,8 @@ export default class MigrationHandler {
   private static createMigrationTasks(): MigrationTask[] {
     const currentMigrationTasks: MigrationTask[] = [];
     currentMigrationTasks.push(new RemoveDuplicateTagVisualIDsTask());
+    currentMigrationTasks.push(new AddCompanyIDToTransactionsTask());
+    currentMigrationTasks.push(new AddCompanyIDToChargingStationsTask());
     return currentMigrationTasks;
   }