Renaming dir 2/2
RENAME
src/integration/smart-charging-2/SmartChargingFactory.ts
src/integration/smart-charging/SmartChargingFactory.ts
RENAME
src/integration/smart-charging-2/SmartChargingIntegration.ts
src/integration/smart-charging/SmartChargingIntegration.ts
RENAME
src/integration/smart-charging-2/sap-smart-charging/SapSmartChargingIntegration.ts
src/integration/smart-charging/sap-smart-charging/SapSmartChargingIntegration.ts
MODIFY
src/scheduler/tasks/AssetGetConsumptionTask.ts
src/scheduler/tasks/AssetGetConsumptionTask.ts
import Consumption, { AbstractCurrentConsumption } from '../../types/Consumption';
+import Tenant, { TenantComponents } from '../../types/Tenant';
import Asset from '../../types/Asset';
import AssetFactory from '../../integration/asset/AssetFactory';
@@ -13,10 +14,8 @@ import OCPPUtils from '../../server/ocpp/utils/OCPPUtils';
import SchedulerTask from '../SchedulerTask';
import { ServerAction } from '../../types/Server';
import SiteArea from '../../types/SiteArea';
-import SmartChargingFactory from '../../integration/smart-charging-2/SmartChargingFactory';
+import SmartChargingFactory from '../../integration/smart-charging/SmartChargingFactory';
import { TaskConfig } from '../../types/TaskConfig';
-import Tenant, { TenantComponents } from '../../types/Tenant';
-
import Utils from '../../utils/Utils';
import moment from 'moment';

MODIFY
src/scheduler/tasks/CheckAndComputeSmartChargingTask.ts
src/scheduler/tasks/CheckAndComputeSmartChargingTask.ts
+import Tenant, { TenantComponents } from '../../types/Tenant';
+
import Constants from '../../utils/Constants';
import LockingHelper from '../../locking/LockingHelper';
import LockingManager from '../../locking/LockingManager';
@@ -5,9 +7,7 @@ import Logging from '../../utils/Logging';
import SchedulerTask from '../SchedulerTask';
import { ServerAction } from '../../types/Server';
import SiteAreaStorage from '../../storage/mongodb/SiteAreaStorage';
-import SmartChargingFactory from '../../integration/smart-charging-2/SmartChargingFactory';
-import Tenant, { TenantComponents } from '../../types/Tenant';
-
+import SmartChargingFactory from '../../integration/smart-charging/SmartChargingFactory';
import Utils from '../../utils/Utils';
const MODULE_NAME = 'CheckAndComputeSmartChargingTask';

MODIFY
src/server/ocpp/services/OCPPService.ts
src/server/ocpp/services/OCPPService.ts
@@ -35,7 +35,7 @@ import OICPClientFactory from '../../../client/oicp/OICPClientFactory';
import { OICPRole } from '../../../types/oicp/OICPRole';
import { ServerAction } from '../../../types/Server';
import SiteAreaStorage from '../../../storage/mongodb/SiteAreaStorage';
-import SmartChargingFactory from '../../../integration/smart-charging-2/SmartChargingFactory';
+import SmartChargingFactory from '../../../integration/smart-charging/SmartChargingFactory';
import Tag from '../../../types/Tag';
import TenantStorage from '../../../storage/mongodb/TenantStorage';
import TransactionStorage from '../../../storage/mongodb/TransactionStorage';

MODIFY
src/server/rest/v1/service/SiteAreaService.ts
src/server/rest/v1/service/SiteAreaService.ts
@@ -18,7 +18,7 @@ import SiteArea from '../../../../types/SiteArea';
import { SiteAreaDataResult } from '../../../../types/DataResult';
import SiteAreaSecurity from './security/SiteAreaSecurity';
import SiteAreaStorage from '../../../../storage/mongodb/SiteAreaStorage';
-import SmartChargingFactory from '../../../../integration/smart-charging-2/SmartChargingFactory';
+import SmartChargingFactory from '../../../../integration/smart-charging/SmartChargingFactory';
import { TenantComponents } from '../../../../types/Tenant';
import TenantStorage from '../../../../storage/mongodb/TenantStorage';
import Utils from '../../../../utils/Utils';

MODIFY
test/api/SmartChargingTest.ts
test/api/SmartChargingTest.ts
@@ -19,8 +19,8 @@ import MongoDBStorage from '../../src/storage/mongodb/MongoDBStorage';
import { ServerAction } from '../../src/types/Server';
import SiteAreaContext from './context/SiteAreaContext';
import SiteContext from './context/SiteContext';
-import SmartChargingFactory from '../integration/smart-charging-2/SmartChargingFactory';
-import SmartChargingIntegration from '../integration/smart-charging-2/SmartChargingIntegration';
+import SmartChargingFactory from '../integration/smart-charging/SmartChargingFactory';
+import SmartChargingIntegration from '../integration/smart-charging/SmartChargingIntegration';
import TenantContext from './context/TenantContext';
import Utils from '../../src/utils/Utils';
import chaiSubset from 'chai-subset';

Renaming dir 2/2