Fix choosing transinion bug

Michail-Antropov · Michail-Antropov · commit cd4e4beba14b · 2024-08-02T14:17:44.000+03:00
Fix epoch value is not round on midnight bug
diff --git a/examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h b/examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h
@@ -59,12 +59,8 @@ class CalendarProviderInstance : public CalendarProvider
 
 private:
     // Attributes contaners allocated memory
-    DataModel::Nullable<uint32_t> mStartDate;
-
     DataModel::List<Structs::CalendarPeriodStruct::Type> mCalendarPeriods;
     DataModel::List<Structs::DayStruct::Type> mSpecialDays;
-    DataModel::Nullable<Structs::PeakPeriodStruct::Type> mCurrentPeak;
-    DataModel::Nullable<Structs::PeakPeriodStruct::Type> mNextPeak;
 
     void JsonToCalendarPeriodStruct(Json::Value & root, Structs::CalendarPeriodStruct::Type & value);
     void JsonToDayStruct(Json::Value & root, Structs::DayStruct::Type & value);
diff --git a/examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp b/examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp
@@ -95,7 +95,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
     DataModel::Nullable<uint32_t> calendarID;
     DataModel::Nullable<uint32_t> providerID;
     DataModel::Nullable<uint32_t> eventID;
+    DataModel::Nullable<uint32_t> startDate;
     Structs::PeakPeriodStruct::Type peak;
+    DataModel::Nullable<Structs::PeakPeriodStruct::Type> currentPeak;
+    DataModel::Nullable<Structs::PeakPeriodStruct::Type> nextPeak;
+
 
     if (root.isMember("Features"))
     {
@@ -155,11 +159,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
             value = root.get("StartDate", Json::Value());
             if (value.isUInt() && value.asUInt() < static_cast<uint32_t>(-1))
             {
-                mStartDate.SetNonNull(value.asUInt());
+                startDate.SetNonNull(value.asUInt());
             }
             else
             {
-                mStartDate.SetNull();
+                startDate.SetNull();
             }
         }
 
@@ -172,7 +176,7 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
                 JsonToCalendarPeriodStructList(value, mCalendarPeriods);
             }
         }
-        SetCalendarPeriod(mStartDate, mCalendarPeriods);
+        SetCalendarPeriod(startDate, mCalendarPeriods);
     }
 
     if (root.isMember("SpecialDays"))
@@ -194,11 +198,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
             if (!value.empty())
             {
                 JsonToPeakPeriodStruct(value, peak);
-                mCurrentPeak.SetNonNull(peak);
+                currentPeak.SetNonNull(peak);
             }
             else
             {
-                mCurrentPeak.SetNull();
+                currentPeak.SetNull();
             }
         }
 
@@ -208,15 +212,15 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
             if (!value.empty())
             {
                 JsonToPeakPeriodStruct(value, peak);
-                mNextPeak.SetNonNull(peak);
+                nextPeak.SetNonNull(peak);
             }
             else
             {
-                mNextPeak.SetNull();
+                nextPeak.SetNull();
             }
         }
 
-        SetPeakPeriods(mCurrentPeak, mNextPeak);
+        SetPeakPeriods(currentPeak, nextPeak);
     }
 
     if (root.isMember("EventID"))
@@ -256,26 +260,27 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
 
     ParceDay(date, year, month, dayOfMonth, dayOfWeek);
 
-    for (auto & day : mSpecialDays)
+    for (auto & day : GetSpecialDays())
     {
         if (day.date.HasValue())
         {
-            dt = static_cast<uint32_t>(day.date.Value() - (day.date.Value() % kSecInOneDay));
+            dt = static_cast<uint32_t>(day.date.ValueOr(0) - (day.date.ValueOr(0) % kSecInOneDay));
             if (dt == date)
             {
                 return day;
             }
         }
     }
 
-    if (mStartDate.ValueOr(0) > date)
+    if (GetStartDate().ValueOr(0) > date)
     {
         return result;
     }
 
-    for (auto & period : mCalendarPeriods)
+    for (auto & period : GetCalendarPeriods())
     {
-        if (period.startDate.ValueOr(0) > date)
+        dt = static_cast<uint32_t>(period.startDate.ValueOr(0) - (period.startDate.ValueOr(0) % kSecInOneDay));
+        if (dt > date)
         {
             break;
         }
@@ -294,7 +299,7 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         }
         else // loop calendar
         {
-            uint32_t index = static_cast<uint32_t>((date - period.startDate.ValueOr(0)) / kSecondsPerDay % period.days.size());
+            uint32_t index = static_cast<uint32_t>((date - dt) / kSecondsPerDay % period.days.size());
             result = period.days[index];
         }
     }
@@ -356,7 +361,7 @@ void CalendarProviderInstance::JsonToPeakPeriodStruct(Json::Value & root, Struct
     }
 
     t = root.get("PeakPeriod", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() < static_cast<uint16_t>(-1))
+    if (!t.empty() && t.isUInt() && t.asUInt() <= static_cast<uint16_t>(-1))
     {
         value.peakPeriod = static_cast<uint16_t>(t.asUInt());
     }
@@ -416,7 +421,7 @@ void CalendarProviderInstance::JsonToTransitionStructList(Json::Value & root,
         Json::Value v = root[i];
 
         Json::Value t = v.get("TransitionTime", Json::Value());
-        if (!t.empty() && t.isUInt() && t.asUInt() < static_cast<uint16_t>(-1))
+        if (!t.empty() && t.isUInt() && t.asUInt() <= static_cast<uint16_t>(-1))
         {
             value[i].transitionTime = static_cast<uint16_t>(t.asUInt());
         }
diff --git a/src/app/clusters/energy-calendar-server/energy-calendar-server.cpp b/src/app/clusters/energy-calendar-server/energy-calendar-server.cpp
@@ -330,6 +330,9 @@ bool CalendarProvider::CheckDay(const Structs::DayStruct::Type & day)
     
     VerifyOrReturnLogSend((day.transitions.size() > 0 && day.transitions.size() <= 48), mEndpoint,
         "Day transinions list must have from 1 to 48 records");
+
+    VerifyOrReturnLogSend((day.transitions[0].transitionTime == 0), mEndpoint,
+        "Fisrt Day transinion must have transitionTime = 0");
     
     uint32_t time = 0;
     for (auto & transition : day.transitions)
@@ -436,33 +439,38 @@ CalendarProvider * EnergyCalendarServer::GetProvider(EndpointId ep)
 DataModel::Nullable<Structs::TransitionStruct::Type> EnergyCalendarServer::GetTransition(EndpointId ep)
 {
     CalendarProvider * provider = GetProvider(ep);
-    if (provider == nullptr || provider->GetCurrentDay().IsNull())
+    if (provider == nullptr)
     {
         return DataModel::Nullable<Structs::TransitionStruct::Type>();
     }
 
-    Structs::DayStruct::Type & currentDay = provider->GetCurrentDay().Value();
+    DataModel::Nullable<Structs::DayStruct::Type> currentDay = provider->GetCurrentDay();
+    if (currentDay.IsNull())
+    {
+        return DataModel::Nullable<Structs::TransitionStruct::Type>();
+    }
 
     uint32_t time = GetCurrentTime();
 
-    auto transition       = currentDay.transitions.begin();
     uint32_t next_tr_time = kSecInOneDay;
 
     const Structs::TransitionStruct::Type * current = nullptr;
 
-    while (transition != currentDay.transitions.end())
+    for (auto & transition : currentDay.Value().transitions)
     {
-        auto tr_time = transition->transitionTime;
+        auto tr_time = transition.transitionTime;
         if (tr_time <= time && (current == nullptr || current->transitionTime < tr_time))
         {
-            current = transition;
+            current = &transition;
         }
         if ((time > tr_time) && (time < next_tr_time))
         {
             next_tr_time = time;
         }
     }
-    return DataModel::Nullable<Structs::TransitionStruct::Type>(*current);
+
+    return current ? DataModel::Nullable<Structs::TransitionStruct::Type>(*current)
+                   : DataModel::Nullable<Structs::TransitionStruct::Type>();
 }
 
 // AttributeAccessInterface

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`95`	`95`	`DataModel::Nullable<uint32_t> calendarID;`
`96`	`96`	`DataModel::Nullable<uint32_t> providerID;`
`97`	`97`	`DataModel::Nullable<uint32_t> eventID;`
	`98`	`+ DataModel::Nullable<uint32_t> startDate;`
`98`	`99`	`Structs::PeakPeriodStruct::Type peak;`
	`100`	`+ DataModel::Nullable<Structs::PeakPeriodStruct::Type> currentPeak;`
	`101`	`+ DataModel::Nullable<Structs::PeakPeriodStruct::Type> nextPeak;`
	`102`	`+`
`99`	`103`
`100`	`104`	`if (root.isMember("Features"))`
`101`	`105`	`{`
`@@ -155,11 +159,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`155`	`159`	`value = root.get("StartDate", Json::Value());`
`156`	`160`	`if (value.isUInt() && value.asUInt() < static_cast<uint32_t>(-1))`
`157`	`161`	`{`
`158`		`- mStartDate.SetNonNull(value.asUInt());`
	`162`	`+ startDate.SetNonNull(value.asUInt());`
`159`	`163`	`}`
`160`	`164`	`else`
`161`	`165`	`{`
`162`		`- mStartDate.SetNull();`
	`166`	`+ startDate.SetNull();`
`163`	`167`	`}`
`164`	`168`	`}`
`165`	`169`
`@@ -172,7 +176,7 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`172`	`176`	`JsonToCalendarPeriodStructList(value, mCalendarPeriods);`
`173`	`177`	`}`
`174`	`178`	`}`
`175`		`- SetCalendarPeriod(mStartDate, mCalendarPeriods);`
	`179`	`+ SetCalendarPeriod(startDate, mCalendarPeriods);`
`176`	`180`	`}`
`177`	`181`
`178`	`182`	`if (root.isMember("SpecialDays"))`
`@@ -194,11 +198,11 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`194`	`198`	`if (!value.empty())`
`195`	`199`	`{`
`196`	`200`	`JsonToPeakPeriodStruct(value, peak);`
`197`		`- mCurrentPeak.SetNonNull(peak);`
	`201`	`+ currentPeak.SetNonNull(peak);`
`198`	`202`	`}`
`199`	`203`	`else`
`200`	`204`	`{`
`201`		`- mCurrentPeak.SetNull();`
	`205`	`+ currentPeak.SetNull();`
`202`	`206`	`}`
`203`	`207`	`}`
`204`	`208`
`@@ -208,15 +212,15 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`208`	`212`	`if (!value.empty())`
`209`	`213`	`{`
`210`	`214`	`JsonToPeakPeriodStruct(value, peak);`
`211`		`- mNextPeak.SetNonNull(peak);`
	`215`	`+ nextPeak.SetNonNull(peak);`
`212`	`216`	`}`
`213`	`217`	`else`
`214`	`218`	`{`
`215`		`- mNextPeak.SetNull();`
	`219`	`+ nextPeak.SetNull();`
`216`	`220`	`}`
`217`	`221`	`}`
`218`	`222`
`219`		`- SetPeakPeriods(mCurrentPeak, mNextPeak);`
	`223`	`+ SetPeakPeriods(currentPeak, nextPeak);`
`220`	`224`	`}`
`221`	`225`
`222`	`226`	`if (root.isMember("EventID"))`
`@@ -256,26 +260,27 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u`
`256`	`260`
`257`	`261`	`ParceDay(date, year, month, dayOfMonth, dayOfWeek);`
`258`	`262`
`259`		`- for (auto & day : mSpecialDays)`
	`263`	`+ for (auto & day : GetSpecialDays())`
`260`	`264`	`{`
`261`	`265`	`if (day.date.HasValue())`
`262`	`266`	`{`
`263`		`- dt = static_cast<uint32_t>(day.date.Value() - (day.date.Value() % kSecInOneDay));`
	`267`	`+ dt = static_cast<uint32_t>(day.date.ValueOr(0) - (day.date.ValueOr(0) % kSecInOneDay));`
`264`	`268`	`if (dt == date)`
`265`	`269`	`{`
`266`	`270`	`return day;`
`267`	`271`	`}`
`268`	`272`	`}`
`269`	`273`	`}`
`270`	`274`
`271`		`- if (mStartDate.ValueOr(0) > date)`
	`275`	`+ if (GetStartDate().ValueOr(0) > date)`
`272`	`276`	`{`
`273`	`277`	`return result;`
`274`	`278`	`}`
`275`	`279`
`276`		`- for (auto & period : mCalendarPeriods)`
	`280`	`+ for (auto & period : GetCalendarPeriods())`
`277`	`281`	`{`
`278`		`- if (period.startDate.ValueOr(0) > date)`
	`282`	`+ dt = static_cast<uint32_t>(period.startDate.ValueOr(0) - (period.startDate.ValueOr(0) % kSecInOneDay));`
	`283`	`+ if (dt > date)`
`279`	`284`	`{`
`280`	`285`	`break;`
`281`	`286`	`}`
`@@ -294,7 +299,7 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u`
`294`	`299`	`}`
`295`	`300`	`else // loop calendar`
`296`	`301`	`{`
`297`		`- uint32_t index = static_cast<uint32_t>((date - period.startDate.ValueOr(0)) / kSecondsPerDay % period.days.size());`
	`302`	`+ uint32_t index = static_cast<uint32_t>((date - dt) / kSecondsPerDay % period.days.size());`
`298`	`303`	`result = period.days[index];`
`299`	`304`	`}`
`300`	`305`	`}`
`@@ -356,7 +361,7 @@ void CalendarProviderInstance::JsonToPeakPeriodStruct(Json::Value & root, Struct`
`356`	`361`	`}`
`357`	`362`
`358`	`363`	`t = root.get("PeakPeriod", Json::Value());`
`359`		`- if (!t.empty() && t.isUInt() && t.asUInt() < static_cast<uint16_t>(-1))`
	`364`	`+ if (!t.empty() && t.isUInt() && t.asUInt() <= static_cast<uint16_t>(-1))`
`360`	`365`	`{`
`361`	`366`	`value.peakPeriod = static_cast<uint16_t>(t.asUInt());`
`362`	`367`	`}`
`@@ -416,7 +421,7 @@ void CalendarProviderInstance::JsonToTransitionStructList(Json::Value & root,`
`416`	`421`	`Json::Value v = root[i];`
`417`	`422`
`418`	`423`	`Json::Value t = v.get("TransitionTime", Json::Value());`
`419`		`- if (!t.empty() && t.isUInt() && t.asUInt() < static_cast<uint16_t>(-1))`
	`424`	`+ if (!t.empty() && t.isUInt() && t.asUInt() <= static_cast<uint16_t>(-1))`
`420`	`425`	`{`
`421`	`426`	`value[i].transitionTime = static_cast<uint16_t>(t.asUInt());`
`422`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,9 @@ bool CalendarProvider::CheckDay(const Structs::DayStruct::Type & day)`
`330`	`330`
`331`	`331`	`VerifyOrReturnLogSend((day.transitions.size() > 0 && day.transitions.size() <= 48), mEndpoint,`
`332`	`332`	`"Day transinions list must have from 1 to 48 records");`
	`333`	`+`
	`334`	`+ VerifyOrReturnLogSend((day.transitions[0].transitionTime == 0), mEndpoint,`
	`335`	`+ "Fisrt Day transinion must have transitionTime = 0");`
`333`	`336`
`334`	`337`	`uint32_t time = 0;`
`335`	`338`	`for (auto & transition : day.transitions)`
`@@ -436,33 +439,38 @@ CalendarProvider * EnergyCalendarServer::GetProvider(EndpointId ep)`
`436`	`439`	`DataModel::Nullable<Structs::TransitionStruct::Type> EnergyCalendarServer::GetTransition(EndpointId ep)`
`437`	`440`	`{`
`438`	`441`	`CalendarProvider * provider = GetProvider(ep);`
`439`		`- if (provider == nullptr \|\| provider->GetCurrentDay().IsNull())`
	`442`	`+ if (provider == nullptr)`
`440`	`443`	`{`
`441`	`444`	`return DataModel::Nullable<Structs::TransitionStruct::Type>();`
`442`	`445`	`}`
`443`	`446`
`444`		`- Structs::DayStruct::Type & currentDay = provider->GetCurrentDay().Value();`
	`447`	`+ DataModel::Nullable<Structs::DayStruct::Type> currentDay = provider->GetCurrentDay();`
	`448`	`+ if (currentDay.IsNull())`
	`449`	`+ {`
	`450`	`+ return DataModel::Nullable<Structs::TransitionStruct::Type>();`
	`451`	`+ }`
`445`	`452`
`446`	`453`	`uint32_t time = GetCurrentTime();`
`447`	`454`
`448`		`- auto transition = currentDay.transitions.begin();`
`449`	`455`	`uint32_t next_tr_time = kSecInOneDay;`
`450`	`456`
`451`	`457`	`const Structs::TransitionStruct::Type * current = nullptr;`
`452`	`458`
`453`		`- while (transition != currentDay.transitions.end())`
	`459`	`+ for (auto & transition : currentDay.Value().transitions)`
`454`	`460`	`{`
`455`		`- auto tr_time = transition->transitionTime;`
	`461`	`+ auto tr_time = transition.transitionTime;`
`456`	`462`	`if (tr_time <= time && (current == nullptr \|\| current->transitionTime < tr_time))`
`457`	`463`	`{`
`458`		`- current = transition;`
	`464`	`+ current = &transition;`
`459`	`465`	`}`
`460`	`466`	`if ((time > tr_time) && (time < next_tr_time))`
`461`	`467`	`{`
`462`	`468`	`next_tr_time = time;`
`463`	`469`	`}`
`464`	`470`	`}`
`465`		`- return DataModel::Nullable<Structs::TransitionStruct::Type>(*current);`
	`471`	`+`
	`472`	`+ return current ? DataModel::Nullable<Structs::TransitionStruct::Type>(*current)`
	`473`	`+ : DataModel::Nullable<Structs::TransitionStruct::Type>();`
`466`	`474`	`}`
`467`	`475`
`468`	`476`	`// AttributeAccessInterface`