Merge pull request #2777 from sap-labs-france/Smart-Charging---remove…

…d-reset-static-limit-+-current-limit-bug Smart Charging - Remove static limit reset + fix current limit bug
sap-labs-france · Sep 3, 2021 · cc7cf82 · cc7cf82
2 parents 58d1cb7 + cc76544
commit cc7cf82
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/src/integration/charging-station-vendor/ChargingStationVendorIntegration.ts b/src/integration/charging-station-vendor/ChargingStationVendorIntegration.ts
@@ -304,34 +304,15 @@ export default abstract class ChargingStationVendorIntegration {
             });
             results.push(ret);
           }
-          // Reapply the current limitation
-          for (const chargePoint of chargingStation.chargePoints) {
-            await this.setStaticPowerLimitation(tenant, chargingStation, chargePoint,
-              this.getStaticPowerLimitation(chargingStation, chargePoint));
-          }
           return results;
         }
-        // Reapply the current limitation
-        if (result.status === OCPPClearChargingProfileStatus.ACCEPTED) {
-          for (const chargePoint of chargingStation.chargePoints) {
-            await this.setStaticPowerLimitation(tenant, chargingStation, chargePoint,
-              this.getStaticPowerLimitation(chargingStation, chargePoint));
-          }
-        }
         return result;
       }
       // Connector ID > 0
       // Clear the Profile
       const result = await chargingStationClient.clearChargingProfile({
         connectorId: chargingProfile.connectorID
       });
-      // Reapply the current limitation
-      if (result.status === OCPPClearChargingProfileStatus.ACCEPTED) {
-        for (const chargePoint of chargingStation.chargePoints) {
-          await this.setStaticPowerLimitation(tenant, chargingStation, chargePoint,
-            this.getStaticPowerLimitation(chargingStation, chargePoint));
-        }
-      }
       return result;
     } catch (error) {
       await Logging.logError({
@@ -654,6 +635,8 @@ export default abstract class ChargingStationVendorIntegration {
         if (moment(chargingSchedule.startSchedule).isAfter(now)) {
           chargingSchedule.startSchedule.setDate(currentDate.getDate() - 1);
         }
+      } else if (moment(chargingSchedule.startSchedule).isAfter(now)) {
+        return null;
       }
       // Check if the Charging Profile is active
       if (moment(chargingSchedule.startSchedule).add(chargingSchedule.duration, 's').isAfter(now)) {