transition period
MODIFY
src/server/ocpi/ocpi-services-impl/ocpi-2.1.1/OCPIUtilsService.ts
src/server/ocpi/ocpi-services-impl/ocpi-2.1.1/OCPIUtilsService.ts
@@ -936,27 +936,7 @@ export default class OCPIUtilsService {
private static buildTariffID(tenant: Tenant, chargingStation: ChargingStation, connector: Connector): string {
const defaultTariff = 'Default';
- // Connector?
- if (connector.tariffID) {
- return connector.tariffID;
- }
- // Charging Station?
- if (chargingStation.tariffID) {
- return chargingStation.tariffID;
- }
- // Site Area?
- if (chargingStation.siteArea && chargingStation.siteArea.tariffID) {
- return chargingStation.siteArea.tariffID;
- }
- // Site?
- if (chargingStation.site && chargingStation.site.tariffID) {
- chargingStation.site.tariffID;
- }
- // Tenant?
- // TODO: Get TariffID from SettingStorage (pending prerequisite PR).
- // Default.
- return defaultTariff;
- // OLD rules (for setting them into the proper objects)
+ // OLD rules (give time to customers to maintain their corresponding objects)
switch (tenant?.id) {
// Station-e
case '60633bb1834fed0016310189':
@@ -1039,6 +1019,23 @@ export default class OCPIUtilsService {
case '60b9f4336493830016c9a68c':
return 'Tarif_Standard';
}
+ // Connector?
+ if (connector.tariffID) {
+ return connector.tariffID;
+ }
+ // Charging Station?
+ if (chargingStation.tariffID) {
+ return chargingStation.tariffID;
+ }
+ // Site Area?
+ if (chargingStation.siteArea?.tariffID) {
+ return chargingStation.siteArea.tariffID;
+ }
+ // Site?
+ if (chargingStation.site?.tariffID) {
+ chargingStation.site.tariffID;
+ }
+ // Default.
return defaultTariff;
}

transition period