Stop incorrectly flagging door lock events as fabric-scoped. (#14582)
Fixes https://github.com/project-chip/connectedhomeip/issues/14365
Fixes https://github.com/project-chip/connectedhomeip/issues/14573
diff --git a/src/app/EventLogging.h b/src/app/EventLogging.h
index c85ad77..6b9f35b 100644
--- a/src/app/EventLogging.h
+++ b/src/app/EventLogging.h
@@ -61,14 +61,9 @@
* @param[out] aEventNumber The event Number if the event was written to the
* log, 0 otherwise. The Event number is expected to monotonically increase.
*
- * TODO: Revisit spec foc nullable fabric index in event.
- *
* @return CHIP_ERROR CHIP Error Code
*/
-template <typename T,
- std::enable_if_t<DataModel::IsFabricScoped<T>::value &&
- std::is_same<decltype(std::declval<T>().GetFabricIndex()), FabricIndex>::value,
- bool> = true>
+template <typename T, std::enable_if_t<DataModel::IsFabricScoped<T>::value, bool> = true>
CHIP_ERROR LogEvent(const T & aEventData, EndpointId aEndpoint, EventNumber & aEventNumber,
EventOptions::Type aUrgent = EventOptions::Type::kNotUrgent)
{
@@ -83,24 +78,6 @@
return logMgmt.LogEvent(&eventData, eventOptions, aEventNumber);
}
-template <typename T,
- std::enable_if_t<DataModel::IsFabricScoped<T>::value &&
- std::is_same<decltype(std::declval<T>().GetFabricIndex()), DataModel::Nullable<FabricIndex>>::value,
- bool> = true>
-CHIP_ERROR LogEvent(const T & aEventData, EndpointId aEndpoint, EventNumber & aEventNumber,
- EventOptions::Type aUrgent = EventOptions::Type::kNotUrgent)
-{
- EventLogger<T> eventData(aEventData);
- ConcreteEventPath path(aEndpoint, aEventData.GetClusterId(), aEventData.GetEventId());
- EventManagement & logMgmt = chip::app::EventManagement::GetInstance();
- EventOptions eventOptions;
- eventOptions.mUrgent = aUrgent;
- eventOptions.mPath = path;
- eventOptions.mPriority = aEventData.GetPriorityLevel();
- eventOptions.mFabricIndex = aEventData.GetFabricIndex().IsNull() ? kUndefinedFabricIndex : aEventData.GetFabricIndex().Value();
- return logMgmt.LogEvent(&eventData, eventOptions, aEventNumber);
-}
-
template <typename T, std::enable_if_t<!DataModel::IsFabricScoped<T>::value, bool> = true>
CHIP_ERROR LogEvent(const T & aEventData, EndpointId aEndpoint, EventNumber & aEventNumber,
EventOptions::Type aUrgent = EventOptions::Type::kNotUrgent)
