Fix UpdateToBatchedCodeflowSubscriptionFails test validation logic

Copilot · premun · Copilot · commit f1de6bec76f2 · 2025-08-28T07:52:25.000Z
Co-authored-by: premun &lt;7013027+premun@users.noreply.github.com&gt;
diff --git a/src/ProductConstructionService/ProductConstructionService.Api/Api/v2020_02_20/Controllers/SubscriptionsController.cs b/src/ProductConstructionService/ProductConstructionService.Api/Api/v2020_02_20/Controllers/SubscriptionsController.cs
@@ -171,6 +171,16 @@ public async Task<IActionResult> UpdateSubscription(Guid id, [FromBody] Subscrip
             return NotFound();
         }
 
+        // Check if the update would result in an invalid batched codeflow subscription
+        // Calculate the final state considering both current subscription state and update values
+        bool finalSourceEnabled = update.SourceEnabled ?? subscription.SourceEnabled;
+        bool finalBatchable = update.Policy?.Batchable ?? subscription.PolicyObject.Batchable;
+        
+        if (finalSourceEnabled && finalBatchable)
+        {
+            return BadRequest(new ApiError("The request is invalid. Batched codeflow subscriptions are not supported."));
+        }
+
         var doUpdate = false;
 
         if (!string.IsNullOrEmpty(update.SourceRepository))
@@ -228,11 +238,6 @@ public async Task<IActionResult> UpdateSubscription(Guid id, [FromBody] Subscrip
             return BadRequest(new ApiError("The request is invalid. Only one of source or target directory can be set"));
         }
 
-        if (update.Policy != null && update.Policy.Batchable && update.SourceEnabled == true)
-        {
-            return BadRequest(new ApiError("The request is invalid. Batched codeflow subscriptions are not supported."));
-        }
-
         if (update.SourceDirectory != subscription.SourceDirectory)
         {
             subscription.SourceDirectory = update.SourceDirectory;
