Merge pull request #92 from c-jimenez/fix/composite_schedule

Fix/composite schedule

Author: c-jimenez

src/chargepoint/smartcharging/SmartChargingManager.cpp

@@ -375,7 +375,8 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::GetCompositeSched
 
         // Compute periods
         std::vector<Period> periods;
-        DateTime            now = DateTime::now();
+        bool                error = false;
+        DateTime            now   = DateTime::now();
         for (auto& profile_list : profile_lists)
         {
             unsigned int stack_level = std::numeric_limits<unsigned int>::max();
@@ -390,11 +391,11 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::GetCompositeSched
                     stack_level                         = profile.second.stackLevel;
                     if (periods.empty())
                     {
-                        break;
+                        error = true;
                     }
                 }
             }
-            if (periods.empty())
+            if (error)
             {
                 break;
             }
@@ -407,15 +408,16 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::GetCompositeSched
         // Get local limitations
         ChargingProfile local_profile;
         local_profile.chargingProfileId      = 0;
-        local_profile.chargingProfileKind    = ChargingProfileKindType::Relative;
+        local_profile.chargingProfileKind    = ChargingProfileKindType::Absolute;
         local_profile.chargingProfilePurpose = ChargingProfilePurposeType::TxDefaultProfile;
         local_profile.stackLevel             = 0;
         if (m_events_handler.getLocalLimitationsSchedule(request.connectorId, request.duration, local_profile.chargingSchedule) &&
             !local_profile.chargingSchedule.chargingSchedulePeriod.empty())
         {
-            // Ensure profile is relative with the requested duration
+            // Ensure profile is absolute with the requested duration
             local_profile.chargingSchedule.startSchedule.clear();
-            local_profile.chargingSchedule.duration = request.duration;
+            local_profile.chargingSchedule.startSchedule = now;
+            local_profile.chargingSchedule.duration      = request.duration;
 
             // Merge periods
             std::vector<Period> local_periods = getProfilePeriods(connector, local_profile, now, request.duration);

tests/chargepoint/smartcharging/test_composite_schedule3.cpp

@@ -323,6 +323,80 @@ TEST_SUITE("Get composite schedule - multiple OCPP profiles")
         CHECK_EQ(schedule.chargingSchedulePeriod[4].numberPhases.value(), 1);
     }
 
+    TEST_CASE("1 profile (relative) + local limitations - charging")
+    {
+        SmartChargingManager smartcharging_mgr(
+            stack_config, ocpp_config, database, event_handler, timer_pool, worker_pool, connectors, msgs_converter, msg_dispatcher);
+        clearAllProfiles(smartcharging_mgr);
+
+        DateTime now = DateTime::now();
+
+        Connector* connector         = connectors.getConnector(1);
+        connector->transaction_id    = 1;
+        connector->transaction_start = DateTime(now.timestamp() - 100);
+
+        ChargingProfile profile1;
+        profile1.chargingProfileId      = 1;
+        profile1.stackLevel             = 5;
+        profile1.chargingProfilePurpose = ChargingProfilePurposeType::TxDefaultProfile;
+        profile1.chargingProfileKind    = ChargingProfileKindType::Relative;
+
+        ChargingSchedulePeriod charging_period;
+        charging_period.limit        = 16.f;
+        charging_period.startPeriod  = 0;
+        charging_period.numberPhases = 1;
+        profile1.chargingSchedule.chargingSchedulePeriod.push_back(charging_period);
+        charging_period.limit        = 10.f;
+        charging_period.startPeriod  = 1000;
+        charging_period.numberPhases = 2;
+        profile1.chargingSchedule.chargingSchedulePeriod.push_back(charging_period);
+        charging_period.limit        = 32.f;
+        charging_period.startPeriod  = 1700;
+        charging_period.numberPhases = 3;
+        profile1.chargingSchedule.chargingSchedulePeriod.push_back(charging_period);
+        profile1.chargingSchedule.chargingRateUnit = ChargingRateUnitType::A;
+        profile1.chargingSchedule.startSchedule    = DateTime(now.timestamp() + 300);
+        CHECK(installProfile(1, profile1, smartcharging_mgr));
+
+        ChargingSchedule& local_schedule = event_handler.schedule;
+        local_schedule.chargingSchedulePeriod.clear();
+        charging_period.limit        = 8.f;
+        charging_period.startPeriod  = 0;
+        charging_period.numberPhases = 2;
+        local_schedule.chargingSchedulePeriod.push_back(charging_period);
+        charging_period.limit        = 20.f;
+        charging_period.startPeriod  = 200;
+        charging_period.numberPhases = 3;
+        local_schedule.chargingSchedulePeriod.push_back(charging_period);
+        charging_period.limit        = 18.f;
+        charging_period.startPeriod  = 1400;
+        charging_period.numberPhases = 3;
+        local_schedule.chargingSchedulePeriod.push_back(charging_period);
+        local_schedule.chargingRateUnit = ChargingRateUnitType::A;
+
+        ChargingSchedule schedule;
+        CHECK(getCompositeSchedule(1, 3600, ChargingRateUnitType::A, schedule, smartcharging_mgr));
+
+        CHECK_EQ(schedule.duration, 3600);
+        CHECK_EQ(schedule.chargingRateUnit, ChargingRateUnitType::A);
+        CHECK_GE(schedule.startSchedule.value(), now);
+        CHECK_LE(schedule.startSchedule.value(), DateTime(now.timestamp() + 1));
+        CHECK_EQ(schedule.chargingSchedulePeriod.size(), 4);
+
+        CHECK_EQ(schedule.chargingSchedulePeriod[0].startPeriod, 0);
+        CHECK_EQ(schedule.chargingSchedulePeriod[0].limit, 8.f);
+        CHECK_EQ(schedule.chargingSchedulePeriod[0].numberPhases.value(), 2);
+        CHECK_EQ(schedule.chargingSchedulePeriod[1].startPeriod, 200);
+        CHECK_EQ(schedule.chargingSchedulePeriod[1].limit, 16.f);
+        CHECK_EQ(schedule.chargingSchedulePeriod[1].numberPhases.value(), 1);
+        CHECK_EQ(schedule.chargingSchedulePeriod[2].startPeriod, 900);
+        CHECK_EQ(schedule.chargingSchedulePeriod[2].limit, 10.f);
+        CHECK_EQ(schedule.chargingSchedulePeriod[2].numberPhases.value(), 2);
+        CHECK_EQ(schedule.chargingSchedulePeriod[3].startPeriod, 1600);
+        CHECK_EQ(schedule.chargingSchedulePeriod[3].limit, 18.f);
+        CHECK_EQ(schedule.chargingSchedulePeriod[3].numberPhases.value(), 3);
+    }
+
     TEST_CASE("Cleanup")
     {
         CHECK(database.close());