Revert type DayStruct.Date to epoch

Author: Michail-Antropov

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -4513,15 +4513,8 @@ cluster EnergyCalendar = 154 {
     optional AuxiliaryLoadBitmap auxiliaryLoad = 3;
   }
 
-  struct DateStruct {
-    nullable int8u year = 0;
-    nullable int8u month = 1;
-    nullable int8u day = 2;
-    nullable int8u dayOfWeek = 3;
-  }
-
   struct DayStruct {
-    optional DateStruct date = 0;
+    optional epoch_s date = 0;
     optional TransitionDayOfWeekBitmap daysOfWeek = 1;
     TransitionStruct transitions[] = 2;
     optional int32u calendarID = 3;
@@ -6798,13 +6791,6 @@ cluster MeterIdentification = 2822 {
     kPowerThreshold = 0x1;
   }
 
-  struct DateStruct {
-    nullable int8u year = 0;
-    nullable int8u month = 1;
-    nullable int8u day = 2;
-    nullable int8u dayOfWeek = 3;
-  }
-
   readonly attribute nullable MeterTypeEnum meterType = 0;
   readonly attribute nullable char_string<16> utilityName = 1;
   readonly attribute nullable char_string<16> pointOfDelivery = 2;

examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h

@@ -67,7 +67,6 @@ class CalendarProviderInstance : public CalendarProvider
     DataModel::Nullable<Structs::PeakPeriodStruct::Type> mNextPeak;
 
     void JsonToCalendarPeriodStruct(Json::Value & root, Structs::CalendarPeriodStruct::Type & value);
-    void JsonToDateStruct(Json::Value & root, Structs::DateStruct::Type & value);
     void JsonToDayStruct(Json::Value & root, Structs::DayStruct::Type & value);
     void JsonToPeakPeriodStruct(Json::Value & root, Structs::PeakPeriodStruct::Type & value);
 

examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp

@@ -30,7 +30,7 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::EnergyCalendar;
 using namespace chip::app::Clusters::EnergyCalendar::Attributes;
 
-constexpr uint32_t kOneDay = 24 * 60 * 60;
+constexpr uint32_t kSecInOneDay = 60 * 60 * 24;
 
 static void ParceDay(uint32_t date, uint16_t & year, uint8_t & month, uint8_t & dayOfMonth, uint8_t & weekDay)
 {
@@ -247,7 +247,7 @@ void chip::app::Clusters::EnergyCalendar::CalendarProviderInstance::ErrorMessage
 DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(uint32_t date)
 {
     DataModel::Nullable<Structs::DayStruct::Type> result = std::nullopt;
-    Structs::DateStruct::Type dt;
+    uint32_t dt;
 
     uint16_t year;
     uint8_t month;
@@ -260,16 +260,11 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
     {
         if (day.date.HasValue())
         {
-            dt = day.date.Value();
-            if (!dt.year.IsNull() && dt.year.Value() != (uint8_t)(year - 1900))
-                continue;
-            if (!dt.month.IsNull() && dt.month.Value() != month)
-                continue;
-            if (!dt.day.IsNull() && dt.day.Value() != dayOfMonth)
-                continue;
-            if (!dt.dayOfWeek.IsNull() && dt.dayOfWeek.Value() != dayOfWeek)
-                continue;
-            return day;
+            dt = static_cast<uint32_t>(day.date.Value() - (day.date.Value() % kSecInOneDay));
+            if (dt == date)
+            {
+                return day;
+            }
         }
     }
 
@@ -304,7 +299,7 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         }
     }
 
-        return result;
+    return result;
 }
 
 void CalendarProviderInstance::JsonToCalendarPeriodStruct(Json::Value & root, Structs::CalendarPeriodStruct::Type & value)
@@ -323,41 +318,12 @@ void CalendarProviderInstance::JsonToCalendarPeriodStruct(Json::Value & root, St
     }
 }
 
-void CalendarProviderInstance::JsonToDateStruct(Json::Value & root, Structs::DateStruct::Type & value)
-{
-    Json::Value t = root.get("Year", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() <= 0xff)
-    {
-        value.year.SetNonNull(t.asUInt());
-    }
-
-    t = root.get("Month", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 12)
-    {
-        value.month.SetNonNull(t.asUInt());
-    }
-
-    t = root.get("Day", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 31)
-    {
-        value.day.SetNonNull(t.asUInt());
-    }
-
-    t = root.get("DayOfWeek", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 7)
-    {
-        value.dayOfWeek.SetNonNull(t.asUInt());
-    }
-}
-
 void CalendarProviderInstance::JsonToDayStruct(Json::Value & root, Structs::DayStruct::Type & value)
 {
     Json::Value t = root.get("Date", Json::Value());
-    if (!t.empty())
+    if (!t.empty() && t.isUInt())
     {
-        Structs::DateStruct::Type date;
-        JsonToDateStruct(t, date);
-        value.date.SetValue(date);
+        value.date.SetValue(t.asUInt());
     }
 
     t = root.get("DaysOfWeek", Json::Value());

src/app/clusters/energy-calendar-server/energy-calendar-server.cpp

@@ -304,7 +304,6 @@ bool CalendarProvider::CheckPeriods(DataModel::List<Structs::CalendarPeriodStruc
 bool CalendarProvider::CheckSpecialDays(DataModel::List<Structs::DayStruct::Type> & specialDays)
 {
     uint32_t epoch = 0;
-    uint32_t dt;
 
     VerifyOrReturnLogSend(specialDays.size() <= 50, mEndpoint, "Special Days list size must be no more 50");
     for (auto & day : specialDays)
@@ -313,20 +312,12 @@ bool CalendarProvider::CheckSpecialDays(DataModel::List<Structs::DayStruct::Type
         VerifyOrReturnLogSend(!day.calendarID.HasValue(), mEndpoint, "Day in Special Days cannot have CalendarID value");
 
         VerifyOrReturnLogSend(day.date.HasValue(), mEndpoint, "Day in Special Days must have Date value");
-        
-        Structs::DateStruct::Type date = day.date.Value();
-        VerifyOrReturnLogSend(!date.year.IsNull(), mEndpoint, "Day in Special Days must have Year value");
-        VerifyOrReturnLogSend(!date.month.IsNull(), mEndpoint, "Day in Special Days must have Month value");
-        VerifyOrReturnLogSend(!date.day.IsNull(), mEndpoint, "Day in Special Days must have Day value");
-        VerifyOrReturnLogSend(date.dayOfWeek.IsNull(), mEndpoint, "Day in Special Days must have not DayOfWeek value");
-
-        CalendarToChipEpochTime(date.year.Value(), date.month.Value(), date.day.Value(), 0, 0, 0, dt);
-        VerifyOrReturnLogSend(dt > epoch, mEndpoint, "Days in Special Days must be order");
+        VerifyOrReturnLogSend(day.date.Value() > epoch, mEndpoint, "Days in Special Days must be order");
         if(!CheckDay(day))
         {
             return false;
         }
-        epoch = dt;
+        epoch = day.date.Value();
     }
 
     return true;

src/app/zap-templates/zcl/data-model/chip/energy-calendar-cluster.xml

@@ -55,7 +55,7 @@ limitations under the License.
 
   <struct name="DayStruct" apiMaturity="provisional">
     <cluster code="0x009A"/>
-    <item fieldId="0" name="Date" type="DateStruct" optional="true"/>
+    <item fieldId="0" name="Date" type="epoch_s" optional="true"/>
     <item fieldId="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap" optional="true" min="0x00" max="0x7F"/>
     <item fieldId="2" name="Transitions" array="true" type="TransitionStruct" length="48" minLength="1"/>
     <item fieldId="3" name="CalendarID" type="int32u" optional="true"/>

src/app/zap-templates/zcl/data-model/chip/global-structs.xml

@@ -31,15 +31,4 @@ TODO: Make these structures global rather than defining them for each cluster.
     <item fieldId="1" name="FloorNumber"     type="int16s"                   isNullable="true"  optional="false"/>
     <item fieldId="2" name="AreaType"        type="AreaTypeTag"              isNullable="true"  optional="false"/>
   </struct>
-
-  <struct name="DateStruct">
-    <cluster code="0x009A"/> <!-- Energy Calendar  -->
-    <cluster code="0x0B06"/> <!-- Energy Calendar  -->
-    <!-- <cluster code="0xXXXX"/> Other cluster, using Date type -->
-
-    <item fieldId="0" name="Year"      type="int8u"                  isNullable="true" optional="false"/>
-    <item fieldId="1" name="Month"     type="int8u" min="1" max="12" isNullable="true" optional="false"/>
-    <item fieldId="2" name="Day"       type="int8u" min="1" max="31" isNullable="true" optional="false"/>
-    <item fieldId="3" name="DayOfWeek" type="int8u" min="1" max="7"  isNullable="true" optional="false"/>
-  </struct>
 </configurator>

src/controller/data_model/controller-clusters.matter

@@ -5045,15 +5045,8 @@ cluster EnergyCalendar = 154 {
     optional AuxiliaryLoadBitmap auxiliaryLoad = 3;
   }
 
-  struct DateStruct {
-    nullable int8u year = 0;
-    nullable int8u month = 1;
-    nullable int8u day = 2;
-    nullable int8u dayOfWeek = 3;
-  }
-
   struct DayStruct {
-    optional DateStruct date = 0;
+    optional epoch_s date = 0;
     optional TransitionDayOfWeekBitmap daysOfWeek = 1;
     TransitionStruct transitions[] = 2;
     optional int32u calendarID = 3;
@@ -9387,13 +9380,6 @@ cluster MeterIdentification = 2822 {
     kPowerThreshold = 0x1;
   }
 
-  struct DateStruct {
-    nullable int8u year = 0;
-    nullable int8u month = 1;
-    nullable int8u day = 2;
-    nullable int8u dayOfWeek = 3;
-  }
-
   readonly attribute nullable MeterTypeEnum meterType = 0;
   readonly attribute nullable char_string<16> utilityName = 1;
   readonly attribute nullable char_string<16> pointOfDelivery = 2;