Move the constraint check for number of presets not to exceed the num…

…ber of presets supported from the atomic write commit command handling to the write request

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

@@ -933,6 +933,26 @@ CHIP_ERROR ThermostatAttrAccess::AppendPendingPreset(Thermostat::Delegate * dele
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
 
+    uint8_t totalCount = CountNumberOfPendingPresets(delegate);
+
+    uint8_t numberOfPresetsSupported = delegate->GetNumberOfPresets();
+
+    if (numberOfPresetsSupported == 0)
+    {
+        ChipLogError(Zcl, "AppendPendingPreset: Failed to get NumberOfPresets");
+        return CHIP_IM_GLOBAL_STATUS(InvalidInState);
+    }
+
+    // If the expected length of the presets attribute with the applied changes exceeds the total number of presets supported,
+    // return RESOURCE_EXHAUSTED. Note that the changes are not yet applied.
+    if (numberOfPresetsSupported > 0 && totalCount > numberOfPresetsSupported)
+    {
+        return CHIP_IM_GLOBAL_STATUS(ResourceExhausted);
+    }
+
+    // TODO #34556 : Check if the number of presets for each presetScenario exceeds the max number of presets supported for that
+    // scenario. We plan to support only one preset for each presetScenario for our use cases so defer this for re-evaluation.
+
     return delegate->AppendToPendingPresetList(preset);
 }
 
@@ -1517,26 +1537,6 @@ imcode commitPresets(Delegate * delegate, EndpointId endpoint)
         }
     }
 
-    uint8_t totalCount = CountNumberOfPendingPresets(delegate);
-
-    uint8_t numberOfPresetsSupported = delegate->GetNumberOfPresets();
-
-    if (numberOfPresetsSupported == 0)
-    {
-        ChipLogError(Zcl, "emberAfThermostatClusterCommitPresetsSchedulesRequestCallback: Failed to get NumberOfPresets");
-        return imcode::InvalidInState;
-    }
-
-    // If the expected length of the presets attribute with the applied changes exceeds the total number of presets supported,
-    // return RESOURCE_EXHAUSTED. Note that the changes are not yet applied.
-    if (numberOfPresetsSupported > 0 && totalCount > numberOfPresetsSupported)
-    {
-        return imcode::ResourceExhausted;
-    }
-
-    // TODO: Check if the number of presets for each presetScenario exceeds the max number of presets supported for that
-    // scenario. We plan to support only one preset for each presetScenario for our use cases so defer this for re-evaluation.
-
     // Call the delegate API to apply the pending presets to the presets attribute and update it.
     err = delegate->ApplyPendingPresets();