From d5e2a4f90d203531201e43661600eb0c1123a324 Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Tue, 16 Apr 2024 11:23:11 -0700
Subject: [PATCH] Remove expected value check from the
 _getAttributesToReportWithReportedValues

- Report the attribute only when the value has changed from the read cache.

- Fix logging for use cases where we didn't report since there was an expected value
or the attribute value didn't change from the read cache value.
---
 src/darwin/Framework/CHIP/MTRDevice.mm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 7c73524c963635..daf492a0220f7a 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -2343,24 +2343,25 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
 #endif
             }
 
-            // if expected values exists, purge and update read cache
-            NSArray * expectedValue = _expectedValueCache[attributePath];
-            if (expectedValue) {
-                previousValue = expectedValue[MTRDeviceExpectedValueFieldValueIndex];
-                _readCache[attributePath] = attributeDataValue;
-                shouldReportAttribute = NO;
-            } else if (readCacheValueChanged) {
-                // otherwise compare and update read cache
+            // Report the attribute if the attribute value is different from the read cache value.
+            if (readCacheValueChanged) {
                 previousValue = _readCache[attributePath];
-                _readCache[attributePath] = attributeDataValue;
                 shouldReportAttribute = YES;
             }
 
+            // Update the readCache with the attribute value.
+            _readCache[attributePath] = attributeDataValue;
+
             if (!shouldReportAttribute) {
+
+                NSArray * expectedValue = _expectedValueCache[attributePath];
+                // If an expected value exists, do not report the attribute during this time.
+                // When the expected value interval expires, the correct value will be reported.
                 if (expectedValue) {
-                    MTR_LOG_INFO("%@ report %@ value filtered - same as expected values", self, attributePath);
-                } else {
-                    MTR_LOG_INFO("%@ report %@ value filtered - same values as cache", self, attributePath);
+                    MTR_LOG_INFO("%@ report %@ value filtered - new expected value present. Do not report old value", self, attributePath);
+                } else
+                {
+                    MTR_LOG_INFO("%@ report %@ value filtered - same as read cache", self, attributePath);
                 }
             }