Merge fix/three-bugs-2026-03-22: accept task_code/milestone_code as identifiers, add /config/status endpoint
This commit is contained in:
@@ -20,6 +20,19 @@ from app.services.dependency_check import check_task_deps
|
||||
|
||||
router = APIRouter(tags=["Tasks"])
|
||||
|
||||
|
||||
def _resolve_task(db: Session, identifier: str) -> Task:
|
||||
"""Resolve a task by numeric id or task_code string.
|
||||
Raises 404 if not found."""
|
||||
try:
|
||||
task_id = int(identifier)
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
except (ValueError, TypeError):
|
||||
task = db.query(Task).filter(Task.task_code == identifier).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
return task
|
||||
|
||||
# ---- State-machine: valid transitions (P5.1-P5.6) ----
|
||||
VALID_TRANSITIONS: dict[str, set[str]] = {
|
||||
"pending": {"open", "closed"},
|
||||
@@ -304,17 +317,13 @@ def search_tasks_alias(
|
||||
|
||||
@router.get("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
||||
def get_task(task_id: str, db: Session = Depends(get_db)):
|
||||
task = _find_task_by_id_or_code(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
task = _resolve_task(db, task_id)
|
||||
return _serialize_task(db, task)
|
||||
|
||||
|
||||
@router.patch("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
||||
def update_task(task_id: str, task_update: schemas.TaskUpdate, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
task = _find_task_by_id_or_code(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
task = _resolve_task(db, task_id)
|
||||
|
||||
# P5.7: status-based edit restrictions
|
||||
current_status = task.status.value if hasattr(task.status, 'value') else task.status
|
||||
@@ -403,9 +412,7 @@ def update_task(task_id: str, task_update: schemas.TaskUpdate, db: Session = Dep
|
||||
|
||||
@router.delete("/tasks/{task_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_task(task_id: str, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
task = _find_task_by_id_or_code(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
task = _resolve_task(db, task_id)
|
||||
check_project_role(db, current_user.id, task.project_id, min_role="mgr")
|
||||
log_activity(db, "task.deleted", "task", task.id, current_user.id, {"title": task.title})
|
||||
db.delete(task)
|
||||
@@ -433,9 +440,7 @@ def transition_task(
|
||||
valid_statuses = [s.value for s in TaskStatus]
|
||||
if new_status not in valid_statuses:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid status. Must be one of: {valid_statuses}")
|
||||
task = _find_task_by_id_or_code(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
task = _resolve_task(db, task_id)
|
||||
old_status = task.status.value if hasattr(task.status, 'value') else task.status
|
||||
|
||||
# P5.1: enforce state-machine
|
||||
@@ -556,10 +561,8 @@ def take_task(
|
||||
# ---- Assignment ----
|
||||
|
||||
@router.post("/tasks/{task_id}/assign")
|
||||
def assign_task(task_id: int, assignee_id: int, db: Session = Depends(get_db)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
def assign_task(task_id: str, assignee_id: int, db: Session = Depends(get_db)):
|
||||
task = _resolve_task(db, task_id)
|
||||
user = db.query(models.User).filter(models.User.id == assignee_id).first()
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
@@ -575,10 +578,8 @@ def assign_task(task_id: int, assignee_id: int, db: Session = Depends(get_db)):
|
||||
# ---- Tags ----
|
||||
|
||||
@router.post("/tasks/{task_id}/tags")
|
||||
def add_tag(task_id: int, tag: str, db: Session = Depends(get_db)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
def add_tag(task_id: str, tag: str, db: Session = Depends(get_db)):
|
||||
task = _resolve_task(db, task_id)
|
||||
current = set(task.tags.split(",")) if task.tags else set()
|
||||
current.add(tag.strip())
|
||||
current.discard("")
|
||||
@@ -588,10 +589,8 @@ def add_tag(task_id: int, tag: str, db: Session = Depends(get_db)):
|
||||
|
||||
|
||||
@router.delete("/tasks/{task_id}/tags")
|
||||
def remove_tag(task_id: int, tag: str, db: Session = Depends(get_db)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
def remove_tag(task_id: str, tag: str, db: Session = Depends(get_db)):
|
||||
task = _resolve_task(db, task_id)
|
||||
current = set(task.tags.split(",")) if task.tags else set()
|
||||
current.discard(tag.strip())
|
||||
current.discard("")
|
||||
|
||||
Reference in New Issue
Block a user