Only commit presets if all attribute precommits were successful

Author: hasty

src/app/clusters/thermostat-server/thermostat-server-atomic.cpp

@@ -417,7 +417,6 @@ void ThermostatAttrAccess::BeginAtomicWrite(CommandHandler * commandObj, const C
                 // Add to the maximum timeout
                 maximumTimeout += attributeTimeout.value();
             }
-
             break;
         }
     }
@@ -509,14 +508,6 @@ void ThermostatAttrAccess::CommitAtomicWrite(CommandHandler * commandObj, const
         {
         case Presets::Id:
             statusCode = PrecommitPresets(endpoint);
-            if (statusCode == Status::Success)
-            {
-                CHIP_ERROR err = delegate->CommitPendingPresets();
-                if (err != CHIP_NO_ERROR)
-                {
-                    statusCode = Status::InvalidInState;
-                }
-            }
             break;
         case Schedules::Id:
             statusCode = Status::Success;
@@ -532,6 +523,35 @@ void ThermostatAttrAccess::CommitAtomicWrite(CommandHandler * commandObj, const
         }
     }
 
+    if (status == Status::Success)
+    {
+        for (size_t i = 0; i < attributeStatuses.AllocatedSize(); ++i)
+        {
+            auto & attributeStatus = attributeStatuses[i];
+            auto statusCode        = Status::Success;
+            switch (attributeStatus.attributeID)
+            {
+            case Presets::Id:
+                CHIP_ERROR err = delegate->CommitPendingPresets();
+                if (err != CHIP_NO_ERROR)
+                {
+                    statusCode = Status::InvalidInState;
+                }
+                break;
+            case Schedules::Id:
+                break;
+            default:
+                commandObj->AddStatus(commandPath, Status::InvalidInState);
+                return;
+            }
+            attributeStatus.statusCode = to_underlying(statusCode);
+            if (statusCode != Status::Success)
+            {
+                status = Status::Failure;
+            }
+        }
+    }
+
     ResetAtomicWrite(endpoint);
     SendAtomicResponse(commandObj, commandPath, status, attributeStatuses);
 }