Complete workplan state model cleanup

api/routers/flows.py

@@ -19,6 +19,7 @@ from api.models.contribution import Contribution
 from api.models.task import Task
 from api.models.workstream import Workstream
 from api.models.workstream_dependency import WorkstreamDependency
+from api.workplan_status import normalize_workstream_status
 
 router = APIRouter(prefix="/flows", tags=["flows"])
 
@@ -104,11 +105,12 @@ async def _flow_object(
 ) -> dict[str, Any]:
     entity = await _entity(entity_type, entity_id, session)
     status = _value(entity.status)
+    current_status = normalize_workstream_status(status) if entity_type == "workstream" else status
     obj: dict[str, Any] = {
         "id": str(entity.id),
-        "status": status,
-        "workstation": status,
-        "previous_workstation": status,
+        "status": current_status,
+        "workstation": current_status,
+        "previous_workstation": current_status,
     }
 
     if entity_type == "workstream":
@@ -127,7 +129,7 @@ async def _flow_object(
                 select(Workstream).where(Workstream.id.in_(dependency_ids))
             )).scalars().all())
             dependency_workstations = [
-                {"id": str(ws.id), "workstation": ws.status}
+                {"id": str(ws.id), "workstation": normalize_workstream_status(ws.status)}
                 for ws in dep_ws
             ]
         obj.update({