Merge fix/three-bugs-2026-03-22: accept task_code/milestone_code as identifiers, add /config/status endpoint
This commit is contained in:
@@ -28,6 +28,19 @@ from app.schemas import schemas
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def _resolve_milestone(db: Session, identifier: str) -> MilestoneModel:
|
||||
"""Resolve a milestone by numeric id or milestone_code string.
|
||||
Raises 404 if not found."""
|
||||
try:
|
||||
ms_id = int(identifier)
|
||||
ms = db.query(MilestoneModel).filter(MilestoneModel.id == ms_id).first()
|
||||
except (ValueError, TypeError):
|
||||
ms = db.query(MilestoneModel).filter(MilestoneModel.milestone_code == identifier).first()
|
||||
if not ms:
|
||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
||||
return ms
|
||||
|
||||
|
||||
# ============ API Keys ============
|
||||
|
||||
class APIKeyCreate(BaseModel):
|
||||
@@ -170,17 +183,12 @@ def _find_milestone_by_id_or_code(db, identifier) -> MilestoneModel | None:
|
||||
|
||||
@router.get("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
||||
def get_milestone(milestone_id: str, db: Session = Depends(get_db)):
|
||||
ms = _find_milestone_by_id_or_code(db, milestone_id)
|
||||
if not ms:
|
||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
||||
return ms
|
||||
return _resolve_milestone(db, milestone_id)
|
||||
|
||||
|
||||
@router.patch("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
||||
def update_milestone(milestone_id: str, ms_update: schemas.MilestoneUpdate, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
||||
ms = _find_milestone_by_id_or_code(db, milestone_id)
|
||||
if not ms:
|
||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
||||
ms = _resolve_milestone(db, milestone_id)
|
||||
ensure_can_edit_milestone(db, current_user.id, ms)
|
||||
for field, value in ms_update.model_dump(exclude_unset=True).items():
|
||||
setattr(ms, field, value)
|
||||
@@ -191,9 +199,7 @@ def update_milestone(milestone_id: str, ms_update: schemas.MilestoneUpdate, db:
|
||||
|
||||
@router.delete("/milestones/{milestone_id}", status_code=status.HTTP_204_NO_CONTENT, tags=["Milestones"])
|
||||
def delete_milestone(milestone_id: str, db: Session = Depends(get_db)):
|
||||
ms = _find_milestone_by_id_or_code(db, milestone_id)
|
||||
if not ms:
|
||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
||||
ms = _resolve_milestone(db, milestone_id)
|
||||
db.delete(ms)
|
||||
db.commit()
|
||||
return None
|
||||
@@ -201,10 +207,8 @@ def delete_milestone(milestone_id: str, db: Session = Depends(get_db)):
|
||||
|
||||
@router.get("/milestones/{milestone_id}/progress", tags=["Milestones"])
|
||||
def milestone_progress(milestone_id: str, db: Session = Depends(get_db)):
|
||||
ms = _find_milestone_by_id_or_code(db, milestone_id)
|
||||
if not ms:
|
||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
||||
tasks = db.query(Task).filter(Task.milestone_id == milestone_id).all()
|
||||
ms = _resolve_milestone(db, milestone_id)
|
||||
tasks = db.query(Task).filter(Task.milestone_id == ms.id).all()
|
||||
total = len(tasks)
|
||||
done = sum(1 for t in tasks if t.status == TaskStatus.CLOSED)
|
||||
|
||||
@@ -216,7 +220,7 @@ def milestone_progress(milestone_id: str, db: Session = Depends(get_db)):
|
||||
time_progress = min(100, max(0, (elapsed / total_duration * 100)))
|
||||
|
||||
return {
|
||||
"milestone_id": milestone_id,
|
||||
"milestone_id": ms.id,
|
||||
"title": ms.title,
|
||||
"total": total,
|
||||
"total_tasks": total,
|
||||
@@ -334,18 +338,34 @@ def create_worklog(wl: WorkLogCreate, db: Session = Depends(get_db)):
|
||||
|
||||
|
||||
@router.get("/tasks/{task_id}/worklogs", response_model=List[WorkLogResponse], tags=["Time Tracking"])
|
||||
def list_task_worklogs(task_id: int, db: Session = Depends(get_db)):
|
||||
return db.query(WorkLog).filter(WorkLog.task_id == task_id).order_by(WorkLog.logged_date.desc()).all()
|
||||
def list_task_worklogs(task_id: str, db: Session = Depends(get_db)):
|
||||
"""List worklogs for a task. task_id can be numeric id or task_code."""
|
||||
try:
|
||||
tid = int(task_id)
|
||||
except (ValueError, TypeError):
|
||||
task = db.query(Task).filter(Task.task_code == task_id).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
tid = task.id
|
||||
return db.query(WorkLog).filter(WorkLog.task_id == tid).order_by(WorkLog.logged_date.desc()).all()
|
||||
|
||||
|
||||
@router.get("/tasks/{task_id}/worklogs/summary", tags=["Time Tracking"])
|
||||
def task_worklog_summary(task_id: int, db: Session = Depends(get_db)):
|
||||
task = db.query(Task).filter(Task.id == task_id).first()
|
||||
def task_worklog_summary(task_id: str, db: Session = Depends(get_db)):
|
||||
"""Worklog summary for a task. task_id can be numeric id or task_code."""
|
||||
try:
|
||||
tid = int(task_id)
|
||||
except (ValueError, TypeError):
|
||||
t = db.query(Task).filter(Task.task_code == task_id).first()
|
||||
if not t:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
tid = t.id
|
||||
task = db.query(Task).filter(Task.id == tid).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
total = db.query(sqlfunc.sum(WorkLog.hours)).filter(WorkLog.task_id == task_id).scalar() or 0
|
||||
count = db.query(WorkLog).filter(WorkLog.task_id == task_id).count()
|
||||
return {"task_id": task_id, "total_hours": round(total, 2), "log_count": count}
|
||||
total = db.query(sqlfunc.sum(WorkLog.hours)).filter(WorkLog.task_id == tid).scalar() or 0
|
||||
count = db.query(WorkLog).filter(WorkLog.task_id == tid).count()
|
||||
return {"task_id": tid, "total_hours": round(total, 2), "log_count": count}
|
||||
|
||||
|
||||
@router.delete("/worklogs/{worklog_id}", status_code=status.HTTP_204_NO_CONTENT, tags=["Time Tracking"])
|
||||
|
||||
Reference in New Issue
Block a user