Fix: accept task_code/milestone_code as identifiers, add /config/status endpoint
- All /tasks/{task_id} endpoints now accept both numeric id and task_code string
- All /milestones/{milestone_id} endpoints (misc.py) now accept both numeric id and milestone_code
- Added _resolve_task() and _resolve_milestone() helpers
- GET /config/status reads initialization state from config volume (no wizard dependency)
- MilestoneResponse schema now includes milestone_code field
- Comments and worklog endpoints also accept task_code
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"},
|
||||
@@ -187,18 +200,13 @@ def list_tasks(
|
||||
|
||||
|
||||
@router.get("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
||||
def get_task(task_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")
|
||||
return task
|
||||
def get_task(task_id: str, db: Session = Depends(get_db)):
|
||||
return _resolve_task(db, task_id)
|
||||
|
||||
|
||||
@router.patch("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
||||
def update_task(task_id: int, task_update: schemas.TaskUpdate, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
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 = _resolve_task(db, task_id)
|
||||
|
||||
# P5.7: status-based edit restrictions
|
||||
current_status = task.status.value if hasattr(task.status, 'value') else task.status
|
||||
@@ -272,10 +280,8 @@ def update_task(task_id: int, task_update: schemas.TaskUpdate, db: Session = Dep
|
||||
|
||||
|
||||
@router.delete("/tasks/{task_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_task(task_id: int, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
def delete_task(task_id: str, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
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)
|
||||
@@ -291,7 +297,7 @@ class TransitionBody(BaseModel):
|
||||
|
||||
@router.post("/tasks/{task_id}/transition", response_model=schemas.TaskResponse)
|
||||
def transition_task(
|
||||
task_id: int,
|
||||
task_id: str,
|
||||
new_status: str,
|
||||
bg: BackgroundTasks,
|
||||
body: TransitionBody = None,
|
||||
@@ -301,9 +307,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 = db.query(Task).filter(Task.id == task_id).first()
|
||||
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
|
||||
@@ -391,10 +395,8 @@ def transition_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")
|
||||
@@ -410,10 +412,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("")
|
||||
@@ -423,10 +423,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