Close lifecycle transition helper workplan

api/routers/tasks.py

@@ -10,7 +10,7 @@ from api.models.task import Task, TaskStatus
 from api.models.token_event import TokenEvent
 from api.models.workstream import Workstream
 from api.schemas.task import TaskCreate, TaskRead, TaskUpdate
-from api.services.lifecycle import activate_parent_for_task_start, status_value
+from api.services.lifecycle import status_value, transition_task_status
 
 router = APIRouter(prefix="/tasks", tags=["tasks"])
 
@@ -52,10 +52,11 @@ async def create_task(
     session.add(task)
     if status_value(task.status) == "in_progress":
         ws = await session.get(Workstream, task.workstream_id)
-        activate_parent_for_task_start(
-            previous_task_status="todo",
-            new_task_status=task.status,
+        transition_task_status(
+            task,
+            task.status,
             parent_workstream=ws,
+            previous_task_status="todo",
         )
     await session.commit()
     await session.refresh(task)
@@ -100,17 +101,18 @@ async def update_task(
     update_data = body.model_dump(exclude_unset=True)
     token_data = {k: update_data.pop(k) for k in list(update_data.keys()) if k in token_field_names}
     suppress_token_event = bool(token_data.pop("suppress_token_event", False))
-    status_update = update_data.get("status")
+    status_update = update_data.pop("status", None)
     new_status = status_value(status_update) if status_update is not None else None
 
     for field, value in update_data.items():
         setattr(task, field, value)
     if new_status is not None:
         ws = await session.get(Workstream, task.workstream_id)
-        activate_parent_for_task_start(
-            previous_task_status=previous_status,
-            new_task_status=new_status,
+        transition_task_status(
+            task,
+            status_update,
             parent_workstream=ws,
+            previous_task_status=previous_status,
         )
     await session.commit()
     await session.refresh(task)
@@ -196,7 +198,7 @@ async def cancel_task(
     task = await session.get(Task, task_id)
     if task is None:
         raise HTTPException(status_code=404, detail="Task not found")
-    task.status = TaskStatus.cancelled
+    transition_task_status(task, TaskStatus.cancelled)
     await session.commit()
     await session.refresh(task)
     return task