Fixes for allocating concurrency where it didn't calculate correctly

Author: matt-aitken

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx

@@ -301,8 +301,8 @@ function Upgradable({
 
   const allocatedInProject = Array.from(allocation.values()).reduce((e, acc) => e + acc, 0);
   const initialAllocationInProject = allocationTotal(environments);
-  const unallocated = extraConcurrency - allocatedInProject;
   const changeInAllocation = allocatedInProject - initialAllocationInProject;
+  const unallocated = extraUnallocatedConcurrency - changeInAllocation;
   const allocationModified = changeInAllocation !== 0;
 
   return (

apps/webapp/app/v3/services/allocateConcurrency.server.ts

@@ -38,9 +38,16 @@ export class AllocateConcurrencyService extends BaseService {
       };
     }
 
-    const totalExtra = environments.reduce((acc, e) => e.amount + acc, 0);
+    const previousExtra = result.environments.reduce(
+      (acc, e) => Math.max(0, e.maximumConcurrencyLimit - e.planConcurrencyLimit) + acc,
+      0
+    );
+    const newExtra = environments.reduce((acc, e) => e.amount + acc, 0);
+    const change = newExtra - previousExtra;
+
+    const totalExtra = result.extraAllocatedConcurrency + change;
 
-    if (totalExtra > result.extraUnallocatedConcurrency) {
+    if (change > result.extraUnallocatedConcurrency) {
       return {
         success: false,
         error: `You don't have enough unallocated concurrency available. You requested ${totalExtra} but only have ${result.extraUnallocatedConcurrency}.`,