fix: project create schema - owner_name auto-fill from owner_id, sub/related projects as list
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
"""Projects router with RBAC."""
|
||||
import json
|
||||
import re
|
||||
from typing import List
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
@@ -12,6 +13,25 @@ from app.api.rbac import check_project_role
|
||||
|
||||
router = APIRouter(prefix="/projects", tags=["Projects"])
|
||||
|
||||
|
||||
def _validate_project_links(db, codes: list[str] | None, self_code: str | None = None) -> list[str] | None:
|
||||
if not codes:
|
||||
return None
|
||||
# dedupe preserve order
|
||||
seen = set()
|
||||
ordered = []
|
||||
for c in codes:
|
||||
if c and c not in seen:
|
||||
ordered.append(c)
|
||||
seen.add(c)
|
||||
if self_code and self_code in seen:
|
||||
raise HTTPException(status_code=400, detail='Project cannot link to itself')
|
||||
existing = {p.project_code for p in db.query(models.Project).filter(models.Project.project_code.in_(ordered)).all()}
|
||||
missing = [c for c in ordered if c not in existing]
|
||||
if missing:
|
||||
raise HTTPException(status_code=400, detail=f'Unknown project codes: {", ".join(missing)}')
|
||||
return ordered
|
||||
|
||||
WORD_SEGMENT_RE = re.compile(r"[A-Za-z]+")
|
||||
CAMEL_RE = re.compile(r"[A-Z]+(?=[A-Z][a-z])|[A-Z]?[a-z]+|[A-Z]+")
|
||||
|
||||
@@ -119,8 +139,28 @@ def _generate_project_code(db, name: str) -> str:
|
||||
|
||||
@router.post("", response_model=schemas.ProjectResponse, status_code=status.HTTP_201_CREATED)
|
||||
def create_project(project: schemas.ProjectCreate, db: Session = Depends(get_db)):
|
||||
# Auto-fill owner_name from owner_id
|
||||
user = db.query(models.User).filter(models.User.id == project.owner_id).first()
|
||||
if not user:
|
||||
raise HTTPException(status_code=400, detail="Invalid owner_id: user not found")
|
||||
payload = project.model_dump()
|
||||
payload["owner_name"] = payload.get("owner_name") or user.username
|
||||
payload["project_code"] = _generate_project_code(db, project.name)
|
||||
|
||||
# Validate and serialize sub_projects
|
||||
sub_codes = payload.get("sub_projects")
|
||||
if sub_codes:
|
||||
payload["sub_projects"] = json.dumps(_validate_project_links(db, sub_codes, payload["project_code"]))
|
||||
else:
|
||||
payload["sub_projects"] = None
|
||||
|
||||
# Validate and serialize related_projects
|
||||
related_codes = payload.get("related_projects")
|
||||
if related_codes:
|
||||
payload["related_projects"] = json.dumps(_validate_project_links(db, related_codes, payload["project_code"]))
|
||||
else:
|
||||
payload["related_projects"] = None
|
||||
|
||||
db_project = models.Project(**payload)
|
||||
db.add(db_project)
|
||||
db.commit()
|
||||
@@ -156,7 +196,17 @@ def update_project(
|
||||
project = db.query(models.Project).filter(models.Project.id == project_id).first()
|
||||
if not project:
|
||||
raise HTTPException(status_code=404, detail="Project not found")
|
||||
for field, value in project_update.model_dump(exclude_unset=True).items():
|
||||
update_data = project_update.model_dump(exclude_unset=True)
|
||||
update_data.pop("name", None)
|
||||
if "sub_projects" in update_data and update_data["sub_projects"]:
|
||||
update_data["sub_projects"] = json.dumps(update_data["sub_projects"])
|
||||
elif "sub_projects" in update_data:
|
||||
update_data["sub_projects"] = None
|
||||
if "related_projects" in update_data and update_data["related_projects"]:
|
||||
update_data["related_projects"] = json.dumps(update_data["related_projects"])
|
||||
elif "related_projects" in update_data:
|
||||
update_data["related_projects"] = None
|
||||
for field, value in update_data.items():
|
||||
setattr(project, field, value)
|
||||
db.commit()
|
||||
db.refresh(project)
|
||||
|
||||
Reference in New Issue
Block a user