fix(api): update state conflict (#2800)

idagelic · web-flow · commit 3a84c8d65226 · 2025-11-05T13:04:07.000+01:00
Signed-off-by: Ivan Dagelic &lt;dagelic.ivan@gmail.com&gt;
diff --git a/apps/api/src/sandbox/services/sandbox.service.ts b/apps/api/src/sandbox/services/sandbox.service.ts
@@ -1229,13 +1229,15 @@ export class SandboxService {
       throw new BadRequestError('Sandbox is not in a valid state to be updated')
     }
 
+    const oldState = sandbox.state
+    const oldDesiredState = sandbox.desiredState
     sandbox.state = newState
     //  we need to update the desired state to match the new state
     const desiredState = this.getExpectedDesiredStateForState(newState)
     if (desiredState) {
       sandbox.desiredState = desiredState
     }
-    await this.sandboxRepository.saveWhere(sandbox, { pending: false, state: sandbox.state })
+    await this.sandboxRepository.saveWhere(sandbox, { pending: false, state: oldState, desiredState: oldDesiredState })
   }
 
   @OnEvent(WarmPoolEvents.TOPUP_REQUESTED)

Original file line number	Diff line number	Diff line change
`@@ -1229,13 +1229,15 @@ export class SandboxService {`
`1229`	`1229`	`throw new BadRequestError('Sandbox is not in a valid state to be updated')`
`1230`	`1230`	`}`
`1231`	`1231`
	`1232`	`+ const oldState = sandbox.state`
	`1233`	`+ const oldDesiredState = sandbox.desiredState`
`1232`	`1234`	`sandbox.state = newState`
`1233`	`1235`	`// we need to update the desired state to match the new state`
`1234`	`1236`	`const desiredState = this.getExpectedDesiredStateForState(newState)`
`1235`	`1237`	`if (desiredState) {`
`1236`	`1238`	`sandbox.desiredState = desiredState`
`1237`	`1239`	`}`
`1238`		`- await this.sandboxRepository.saveWhere(sandbox, { pending: false, state: sandbox.state })`
	`1240`	`+ await this.sandboxRepository.saveWhere(sandbox, { pending: false, state: oldState, desiredState: oldDesiredState })`
`1239`	`1241`	`}`
`1240`	`1242`
`1241`	`1243`	`@OnEvent(WarmPoolEvents.TOPUP_REQUESTED)`