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:
@@ -51,8 +51,16 @@ def create_comment(comment: schemas.CommentCreate, db: Session = Depends(get_db)
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/tasks/{task_id}/comments", response_model=List[schemas.CommentResponse])
|
@router.get("/tasks/{task_id}/comments", response_model=List[schemas.CommentResponse])
|
||||||
def list_comments(task_id: int, db: Session = Depends(get_db)):
|
def list_comments(task_id: str, db: Session = Depends(get_db)):
|
||||||
return db.query(models.Comment).filter(models.Comment.task_id == task_id).all()
|
"""List comments 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(models.Comment).filter(models.Comment.task_id == tid).all()
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/comments/{comment_id}", response_model=schemas.CommentResponse)
|
@router.patch("/comments/{comment_id}", response_model=schemas.CommentResponse)
|
||||||
|
|||||||
@@ -28,6 +28,19 @@ from app.schemas import schemas
|
|||||||
router = APIRouter()
|
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 ============
|
# ============ API Keys ============
|
||||||
|
|
||||||
class APIKeyCreate(BaseModel):
|
class APIKeyCreate(BaseModel):
|
||||||
@@ -146,18 +159,13 @@ def list_milestones(project_id: int = None, status_filter: str = None, db: Sessi
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
@router.get("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
||||||
def get_milestone(milestone_id: int, db: Session = Depends(get_db)):
|
def get_milestone(milestone_id: str, db: Session = Depends(get_db)):
|
||||||
ms = db.query(MilestoneModel).filter(MilestoneModel.id == milestone_id).first()
|
return _resolve_milestone(db, milestone_id)
|
||||||
if not ms:
|
|
||||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
|
||||||
return ms
|
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
@router.patch("/milestones/{milestone_id}", response_model=schemas.MilestoneResponse, tags=["Milestones"])
|
||||||
def update_milestone(milestone_id: int, ms_update: schemas.MilestoneUpdate, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user_or_apikey)):
|
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 = db.query(MilestoneModel).filter(MilestoneModel.id == milestone_id).first()
|
ms = _resolve_milestone(db, milestone_id)
|
||||||
if not ms:
|
|
||||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
|
||||||
ensure_can_edit_milestone(db, current_user.id, ms)
|
ensure_can_edit_milestone(db, current_user.id, ms)
|
||||||
for field, value in ms_update.model_dump(exclude_unset=True).items():
|
for field, value in ms_update.model_dump(exclude_unset=True).items():
|
||||||
setattr(ms, field, value)
|
setattr(ms, field, value)
|
||||||
@@ -167,21 +175,17 @@ def update_milestone(milestone_id: int, ms_update: schemas.MilestoneUpdate, db:
|
|||||||
|
|
||||||
|
|
||||||
@router.delete("/milestones/{milestone_id}", status_code=status.HTTP_204_NO_CONTENT, tags=["Milestones"])
|
@router.delete("/milestones/{milestone_id}", status_code=status.HTTP_204_NO_CONTENT, tags=["Milestones"])
|
||||||
def delete_milestone(milestone_id: int, db: Session = Depends(get_db)):
|
def delete_milestone(milestone_id: str, db: Session = Depends(get_db)):
|
||||||
ms = db.query(MilestoneModel).filter(MilestoneModel.id == milestone_id).first()
|
ms = _resolve_milestone(db, milestone_id)
|
||||||
if not ms:
|
|
||||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
|
||||||
db.delete(ms)
|
db.delete(ms)
|
||||||
db.commit()
|
db.commit()
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@router.get("/milestones/{milestone_id}/progress", tags=["Milestones"])
|
@router.get("/milestones/{milestone_id}/progress", tags=["Milestones"])
|
||||||
def milestone_progress(milestone_id: int, db: Session = Depends(get_db)):
|
def milestone_progress(milestone_id: str, db: Session = Depends(get_db)):
|
||||||
ms = db.query(MilestoneModel).filter(MilestoneModel.id == milestone_id).first()
|
ms = _resolve_milestone(db, milestone_id)
|
||||||
if not ms:
|
tasks = db.query(Task).filter(Task.milestone_id == ms.id).all()
|
||||||
raise HTTPException(status_code=404, detail="Milestone not found")
|
|
||||||
tasks = db.query(Task).filter(Task.milestone_id == milestone_id).all()
|
|
||||||
total = len(tasks)
|
total = len(tasks)
|
||||||
done = sum(1 for t in tasks if t.status == TaskStatus.CLOSED)
|
done = sum(1 for t in tasks if t.status == TaskStatus.CLOSED)
|
||||||
|
|
||||||
@@ -193,7 +197,7 @@ def milestone_progress(milestone_id: int, db: Session = Depends(get_db)):
|
|||||||
time_progress = min(100, max(0, (elapsed / total_duration * 100)))
|
time_progress = min(100, max(0, (elapsed / total_duration * 100)))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"milestone_id": milestone_id,
|
"milestone_id": ms.id,
|
||||||
"title": ms.title,
|
"title": ms.title,
|
||||||
"total": total,
|
"total": total,
|
||||||
"total_tasks": total,
|
"total_tasks": total,
|
||||||
@@ -311,18 +315,34 @@ def create_worklog(wl: WorkLogCreate, db: Session = Depends(get_db)):
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/tasks/{task_id}/worklogs", response_model=List[WorkLogResponse], tags=["Time Tracking"])
|
@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)):
|
def list_task_worklogs(task_id: str, db: Session = Depends(get_db)):
|
||||||
return db.query(WorkLog).filter(WorkLog.task_id == task_id).order_by(WorkLog.logged_date.desc()).all()
|
"""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"])
|
@router.get("/tasks/{task_id}/worklogs/summary", tags=["Time Tracking"])
|
||||||
def task_worklog_summary(task_id: int, db: Session = Depends(get_db)):
|
def task_worklog_summary(task_id: str, db: Session = Depends(get_db)):
|
||||||
task = db.query(Task).filter(Task.id == task_id).first()
|
"""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:
|
if not task:
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
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
|
total = db.query(sqlfunc.sum(WorkLog.hours)).filter(WorkLog.task_id == tid).scalar() or 0
|
||||||
count = db.query(WorkLog).filter(WorkLog.task_id == task_id).count()
|
count = db.query(WorkLog).filter(WorkLog.task_id == tid).count()
|
||||||
return {"task_id": task_id, "total_hours": round(total, 2), "log_count": 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"])
|
@router.delete("/worklogs/{worklog_id}", status_code=status.HTTP_204_NO_CONTENT, tags=["Time Tracking"])
|
||||||
|
|||||||
@@ -20,6 +20,19 @@ from app.services.dependency_check import check_task_deps
|
|||||||
|
|
||||||
router = APIRouter(tags=["Tasks"])
|
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) ----
|
# ---- State-machine: valid transitions (P5.1-P5.6) ----
|
||||||
VALID_TRANSITIONS: dict[str, set[str]] = {
|
VALID_TRANSITIONS: dict[str, set[str]] = {
|
||||||
"pending": {"open", "closed"},
|
"pending": {"open", "closed"},
|
||||||
@@ -187,18 +200,13 @@ def list_tasks(
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
@router.get("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
||||||
def get_task(task_id: int, db: Session = Depends(get_db)):
|
def get_task(task_id: str, db: Session = Depends(get_db)):
|
||||||
task = db.query(Task).filter(Task.id == task_id).first()
|
return _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
return task
|
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/tasks/{task_id}", response_model=schemas.TaskResponse)
|
@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)):
|
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 = db.query(Task).filter(Task.id == task_id).first()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
|
|
||||||
# P5.7: status-based edit restrictions
|
# P5.7: status-based edit restrictions
|
||||||
current_status = task.status.value if hasattr(task.status, 'value') else task.status
|
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)
|
@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)):
|
def delete_task(task_id: str, 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()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
check_project_role(db, current_user.id, task.project_id, min_role="mgr")
|
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})
|
log_activity(db, "task.deleted", "task", task.id, current_user.id, {"title": task.title})
|
||||||
db.delete(task)
|
db.delete(task)
|
||||||
@@ -291,7 +297,7 @@ class TransitionBody(BaseModel):
|
|||||||
|
|
||||||
@router.post("/tasks/{task_id}/transition", response_model=schemas.TaskResponse)
|
@router.post("/tasks/{task_id}/transition", response_model=schemas.TaskResponse)
|
||||||
def transition_task(
|
def transition_task(
|
||||||
task_id: int,
|
task_id: str,
|
||||||
new_status: str,
|
new_status: str,
|
||||||
bg: BackgroundTasks,
|
bg: BackgroundTasks,
|
||||||
body: TransitionBody = None,
|
body: TransitionBody = None,
|
||||||
@@ -301,9 +307,7 @@ def transition_task(
|
|||||||
valid_statuses = [s.value for s in TaskStatus]
|
valid_statuses = [s.value for s in TaskStatus]
|
||||||
if new_status not in valid_statuses:
|
if new_status not in valid_statuses:
|
||||||
raise HTTPException(status_code=400, detail=f"Invalid status. Must be one of: {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()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
old_status = task.status.value if hasattr(task.status, 'value') else task.status
|
old_status = task.status.value if hasattr(task.status, 'value') else task.status
|
||||||
|
|
||||||
# P5.1: enforce state-machine
|
# P5.1: enforce state-machine
|
||||||
@@ -391,10 +395,8 @@ def transition_task(
|
|||||||
# ---- Assignment ----
|
# ---- Assignment ----
|
||||||
|
|
||||||
@router.post("/tasks/{task_id}/assign")
|
@router.post("/tasks/{task_id}/assign")
|
||||||
def assign_task(task_id: int, assignee_id: int, db: Session = Depends(get_db)):
|
def assign_task(task_id: str, assignee_id: int, db: Session = Depends(get_db)):
|
||||||
task = db.query(Task).filter(Task.id == task_id).first()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
user = db.query(models.User).filter(models.User.id == assignee_id).first()
|
user = db.query(models.User).filter(models.User.id == assignee_id).first()
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
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 ----
|
# ---- Tags ----
|
||||||
|
|
||||||
@router.post("/tasks/{task_id}/tags")
|
@router.post("/tasks/{task_id}/tags")
|
||||||
def add_tag(task_id: int, tag: str, db: Session = Depends(get_db)):
|
def add_tag(task_id: str, tag: str, db: Session = Depends(get_db)):
|
||||||
task = db.query(Task).filter(Task.id == task_id).first()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
current = set(task.tags.split(",")) if task.tags else set()
|
current = set(task.tags.split(",")) if task.tags else set()
|
||||||
current.add(tag.strip())
|
current.add(tag.strip())
|
||||||
current.discard("")
|
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")
|
@router.delete("/tasks/{task_id}/tags")
|
||||||
def remove_tag(task_id: int, tag: str, db: Session = Depends(get_db)):
|
def remove_tag(task_id: str, tag: str, db: Session = Depends(get_db)):
|
||||||
task = db.query(Task).filter(Task.id == task_id).first()
|
task = _resolve_task(db, task_id)
|
||||||
if not task:
|
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
|
||||||
current = set(task.tags.split(",")) if task.tags else set()
|
current = set(task.tags.split(",")) if task.tags else set()
|
||||||
current.discard(tag.strip())
|
current.discard(tag.strip())
|
||||||
current.discard("")
|
current.discard("")
|
||||||
|
|||||||
20
app/main.py
20
app/main.py
@@ -26,6 +26,26 @@ def health_check():
|
|||||||
def version():
|
def version():
|
||||||
return {"name": "HarborForge", "version": "0.3.0", "description": "Agent/人类协同任务管理平台"}
|
return {"name": "HarborForge", "version": "0.3.0", "description": "Agent/人类协同任务管理平台"}
|
||||||
|
|
||||||
|
@app.get("/config/status", tags=["System"])
|
||||||
|
def config_status():
|
||||||
|
"""Check if HarborForge has been initialized (reads from config volume).
|
||||||
|
Frontend uses this instead of contacting the wizard directly."""
|
||||||
|
import os, json
|
||||||
|
config_dir = os.getenv("CONFIG_DIR", "/config")
|
||||||
|
config_file = os.getenv("CONFIG_FILE", "harborforge.json")
|
||||||
|
config_path = os.path.join(config_dir, config_file)
|
||||||
|
if not os.path.exists(config_path):
|
||||||
|
return {"initialized": False}
|
||||||
|
try:
|
||||||
|
with open(config_path, "r") as f:
|
||||||
|
cfg = json.load(f)
|
||||||
|
return {
|
||||||
|
"initialized": cfg.get("initialized", False),
|
||||||
|
"backend_url": cfg.get("backend_url"),
|
||||||
|
}
|
||||||
|
except Exception:
|
||||||
|
return {"initialized": False}
|
||||||
|
|
||||||
# Register routers
|
# Register routers
|
||||||
from app.api.routers.auth import router as auth_router
|
from app.api.routers.auth import router as auth_router
|
||||||
from app.api.routers.tasks import router as tasks_router
|
from app.api.routers.tasks import router as tasks_router
|
||||||
|
|||||||
@@ -240,6 +240,7 @@ class MilestoneUpdate(BaseModel):
|
|||||||
|
|
||||||
class MilestoneResponse(MilestoneBase):
|
class MilestoneResponse(MilestoneBase):
|
||||||
id: int
|
id: int
|
||||||
|
milestone_code: Optional[str] = None
|
||||||
project_id: int
|
project_id: int
|
||||||
created_by_id: Optional[int] = None
|
created_by_id: Optional[int] = None
|
||||||
started_at: Optional[datetime] = None
|
started_at: Optional[datetime] = None
|
||||||
|
|||||||
Reference in New Issue
Block a user