fixup! Convert branch state management to jobs

Author: mxsrc

src/api/organization/project/branch/__init__.py

@@ -97,6 +97,7 @@
     _CONTROL_TO_POWER_STATE,
     _CONTROL_TRANSITION_INITIAL,
     dispatch_control,
+    perform_control,
 )
 from .resize_tasks import dispatch_resize
 from .tasks import task_api
@@ -287,6 +288,12 @@ async def refresh_branch_status(branch_id: Identifier) -> BranchServiceStatus:
 
 
 async def _refresh_branch_status(branch: Branch) -> BranchServiceStatus:
+    if branch.control_task_id is not None:
+        result = perform_control.AsyncResult(str(branch.control_task_id))
+        action = (result.kwargs or {}).get("action")
+        if action in _CONTROL_TRANSITION_INITIAL:
+            return _CONTROL_TRANSITION_INITIAL[action]
+
     current_status = _parse_branch_status(branch.status)
     status = deployment_status(branch.id)
 
@@ -1932,19 +1939,16 @@ async def control_branch(
 ):
     action = request.scope["route"].name.split(":")[-1]
     assert action in _CONTROL_TO_POWER_STATE
-    branch_in_session = await session.merge(branch)
-    await _set_branch_status(session, branch_in_session, _CONTROL_TRANSITION_INITIAL[action])
-
-    task_id = dispatch_control(str(branch_in_session.id), action)
-    branch_in_session.control_task_id = task_id
+    task_id = dispatch_control(str(branch.id), action)
+    branch.control_task_id = task_id
     await session.commit()
 
     task_url = url_path_for(
         request,
         "organizations:projects:branch:tasks:detail",
         organization_id=await organization.awaitable_attrs.id,
         project_id=await project.awaitable_attrs.id,
-        branch_id=await branch_in_session.awaitable_attrs.id,
+        branch_id=await branch.awaitable_attrs.id,
         task_id=task_id,
     )
     return Response(status_code=202, headers={"Location": task_url})