Fix: accept project_code as identifier in project endpoints

- Add _resolve_project() helper to resolve by id or project_code
- Update all /projects/{project_id} endpoints to accept string identifier
- Use project.id for database queries after resolution
This commit is contained in:
zhi
2026-03-22 10:40:13 +00:00
parent 8b357aabc4
commit 05d5a2e823

View File

@@ -15,6 +15,19 @@ from app.api.rbac import check_project_role, check_permission, ensure_can_edit_p
router = APIRouter(prefix="/projects", tags=["Projects"]) router = APIRouter(prefix="/projects", tags=["Projects"])
def _resolve_project(db: Session, identifier: str) -> models.Project:
"""Resolve a project by numeric id or project_code string.
Raises 404 if not found."""
try:
pid = int(identifier)
project = db.query(models.Project).filter(models.Project.id == pid).first()
except (ValueError, TypeError):
project = db.query(models.Project).filter(models.Project.project_code == identifier).first()
if not project:
raise HTTPException(status_code=404, detail="Project not found")
return _resolve_project(db, project_id)
def _validate_project_links(db, codes: list[str] | None, self_code: str | None = None) -> list[str] | None: def _validate_project_links(db, codes: list[str] | None, self_code: str | None = None) -> list[str] | None:
if not codes: if not codes:
return None return None
@@ -183,16 +196,13 @@ def list_projects(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)
@router.get("/{project_id}", response_model=schemas.ProjectResponse) @router.get("/{project_id}", response_model=schemas.ProjectResponse)
def get_project(project_id: int, db: Session = Depends(get_db)): def get_project(project_id: str, db: Session = Depends(get_db)):
project = db.query(models.Project).filter(models.Project.id == project_id).first() return _resolve_project(db, project_id)
if not project:
raise HTTPException(status_code=404, detail="Project not found")
return project
@router.patch("/{project_id}", response_model=schemas.ProjectResponse) @router.patch("/{project_id}", response_model=schemas.ProjectResponse)
def update_project( def update_project(
project_id: int, project_id: str,
project_update: schemas.ProjectUpdate, project_update: schemas.ProjectUpdate,
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: models.User = Depends(get_current_user_or_apikey), current_user: models.User = Depends(get_current_user_or_apikey),
@@ -215,26 +225,25 @@ def update_project(
setattr(project, field, value) setattr(project, field, value)
db.commit() db.commit()
db.refresh(project) db.refresh(project)
return project return _resolve_project(db, project_id)
@router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT) @router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_project( def delete_project(
project_id: int, project_id: str,
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: models.User = Depends(get_current_user_or_apikey), current_user: models.User = Depends(get_current_user_or_apikey),
): ):
check_project_role(db, current_user.id, project_id, min_role="admin") project = _resolve_project(db, project_id)
project = db.query(models.Project).filter(models.Project.id == project_id).first() check_project_role(db, current_user.id, project.id, min_role="admin")
if not project:
raise HTTPException(status_code=404, detail="Project not found")
project_code = project.project_code project_code = project.project_code
project_id_val = project.id
# Delete milestones and their tasks # Delete milestones and their tasks
from app.models.milestone import Milestone from app.models.milestone import Milestone
from app.models.task import Task from app.models.task import Task
milestones = db.query(Milestone).filter(Milestone.project_id == project_id).all() milestones = db.query(Milestone).filter(Milestone.project_id == project_id_val).all()
for ms in milestones: for ms in milestones:
tasks = db.query(Task).filter(Task.milestone_id == ms.id).all() tasks = db.query(Task).filter(Task.milestone_id == ms.id).all()
for task in tasks: for task in tasks:
@@ -242,7 +251,7 @@ def delete_project(
db.delete(ms) db.delete(ms)
# Delete project members # Delete project members
members = db.query(models.ProjectMember).filter(models.ProjectMember.project_id == project_id).all() members = db.query(models.ProjectMember).filter(models.ProjectMember.project_id == project.id).all()
for m in members: for m in members:
db.delete(m) db.delete(m)
@@ -269,27 +278,25 @@ def delete_project(
@router.post("/{project_id}/members", response_model=schemas.ProjectMemberResponse, status_code=status.HTTP_201_CREATED) @router.post("/{project_id}/members", response_model=schemas.ProjectMemberResponse, status_code=status.HTTP_201_CREATED)
def add_project_member( def add_project_member(
project_id: int, project_id: str,
member: schemas.ProjectMemberCreate, member: schemas.ProjectMemberCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: models.User = Depends(get_current_user_or_apikey), current_user: models.User = Depends(get_current_user_or_apikey),
): ):
check_project_role(db, current_user.id, project_id, min_role="mgr") project = _resolve_project(db, project_id)
project = db.query(models.Project).filter(models.Project.id == project_id).first() check_project_role(db, current_user.id, project.id, min_role="mgr")
if not project:
raise HTTPException(status_code=404, detail="Project not found")
user = db.query(models.User).filter(models.User.id == member.user_id).first() user = db.query(models.User).filter(models.User.id == member.user_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")
existing = db.query(models.ProjectMember).filter( existing = db.query(models.ProjectMember).filter(
models.ProjectMember.project_id == project_id, models.ProjectMember.user_id == member.user_id models.ProjectMember.project_id == project.id, models.ProjectMember.user_id == member.user_id
).first() ).first()
if existing: if existing:
raise HTTPException(status_code=400, detail="User already a member") raise HTTPException(status_code=400, detail="User already a member")
# Convert role name to role_id # Convert role name to role_id
role = db.query(Role).filter(Role.name == member.role).first() role = db.query(Role).filter(Role.name == member.role).first()
role_id = role.id if role else None role_id = role.id if role else None
db_member = models.ProjectMember(project_id=project_id, user_id=member.user_id, role_id=role_id) db_member = models.ProjectMember(project_id=project.id, user_id=member.user_id, role_id=role_id)
db.add(db_member) db.add(db_member)
db.commit() db.commit()
db.refresh(db_member) db.refresh(db_member)
@@ -308,7 +315,7 @@ def add_project_member(
@router.get("/{project_id}/members", response_model=List[schemas.ProjectMemberResponse]) @router.get("/{project_id}/members", response_model=List[schemas.ProjectMemberResponse])
def list_project_members(project_id: int, db: Session = Depends(get_db)): def list_project_members(project_id: int, db: Session = Depends(get_db)):
members = db.query(models.ProjectMember).filter(models.ProjectMember.project_id == project_id).all() members = db.query(models.ProjectMember).filter(models.ProjectMember.project_id == project.id).all()
result = [] result = []
for m in members: for m in members:
role_name = "developer" role_name = "developer"
@@ -327,7 +334,7 @@ def list_project_members(project_id: int, db: Session = Depends(get_db)):
@router.delete("/{project_id}/members/{user_id}", status_code=status.HTTP_204_NO_CONTENT) @router.delete("/{project_id}/members/{user_id}", status_code=status.HTTP_204_NO_CONTENT)
def remove_project_member( def remove_project_member(
project_id: int, project_id: str,
user_id: int, user_id: int,
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: models.User = Depends(get_current_user_or_apikey), current_user: models.User = Depends(get_current_user_or_apikey),