From 417cf484b72f280bf40e62bd9d35edde7dc60003 Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Wed, 4 Nov 2026 01:08:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E4=B8=8B=E7=BA=BF=E6=97=A0=20?= =?UTF-8?q?UI=20=E5=85=A5=E5=8F=A3=E7=9A=84=E6=AD=BB=E7=AB=AF=E7=82=B9=20G?= =?UTF-8?q?ET/POST/DELETE=20/tags=20=E4=B8=8E=20POST=20/tasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 前端三处 grep 核实零调用:标签实际随 POST|PATCH /api/projects 的 tags 数组自动创建/复用 (_sync_tags),子任务随 POST /api/updates 的 task_name 自动创建/复用(同名复用)。 - 后端审计(独立子代理)交叉确认:这 4 个端点唯一消费者是测试本身 → 端点与测试同步改造: 标签同名共用一条记录、子任务经执行记录自动建/复用各有断言。 - schemas.TagIn 删除;SEGMENT_MENU 去掉 tags/tasks 两行。 - README API 速览同步:写明标签/子任务没有独立端点及其写入通道。 - pytest 84 passed(临时库) --- README.md | 4 +-- app/routers/projects.py | 48 ---------------------------------- app/schemas.py | 5 ---- app/security.py | 2 -- tests/test_periods_projects.py | 28 ++++++++++---------- 5 files changed, 16 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 85ac14c..e88bc14 100644 --- a/README.md +++ b/README.md @@ -623,9 +623,9 @@ GET /api/projects (?archived=false|true|all&category_id=&is POST /api/projects PATCH|DELETE /api/projects/{id} (owners/members 传人名数组,整体替换:不传=不改,传 []=清空;owners[0] 回写 owner 列) GET|POST /api/categories PATCH|DELETE /api/categories/{id} -GET|POST /api/tags DELETE /api/tags/{id} -POST /api/tasks 项目子任务 GET /api/updates?project_id=&period_id=|year&month&limit= + 标签与子任务没有独立端点:标签随 POST|PATCH /api/projects 的 tags 数组 + 自动创建 / 复用;子任务随 POST /api/updates 的 task_name 自动创建 / 复用 周期执行记录(月粒度含该月各周;范围内没有周期就返回空,不回落到最新周) POST /api/updates 写入口校验:项目/周期必须存在、状态合法、正文与摘要不能都空 PATCH|DELETE /api/updates/{id} diff --git a/app/routers/projects.py b/app/routers/projects.py index 1f78dd3..ea94a7a 100644 --- a/app/routers/projects.py +++ b/app/routers/projects.py @@ -23,7 +23,6 @@ from ..schemas import ( CategoryIn, ProjectIn, ProjectPatch, - TagIn, UpdateIn, UpdatePatch, ) @@ -286,33 +285,6 @@ def delete_category(cid: int, db: Session = Depends(get_db)): return {"ok": True} -@router.get("/tags") -def list_tags(db: Session = Depends(get_db)): - return [t.to_dict() for t in db.query(Tag).order_by(Tag.id).all()] - - -@router.post("/tags") -def create_tag(payload: TagIn, db: Session = Depends(get_db)): - t = db.query(Tag).filter(Tag.name == payload.name).one_or_none() - if t: - return t.to_dict() - t = Tag(name=payload.name, color=payload.color) - db.add(t) - db.commit() - db.refresh(t) - return t.to_dict() - - -@router.delete("/tags/{tid}") -def delete_tag(tid: int, db: Session = Depends(get_db)): - t = db.get(Tag, tid) - if not t: - raise HTTPException(404, "标记不存在") - db.delete(t) - db.commit() - return {"ok": True} - - # ---------------------------------------------------------------- 执行记录 @router.get("/updates") def list_updates( @@ -429,26 +401,6 @@ def delete_update(uid: int, db: Session = Depends(get_db)): return {"ok": True} -@router.post("/tasks") -def create_task(payload: dict, db: Session = Depends(get_db)): - """新增子任务。同名子任务直接复用,避免任务列表里出现重复条目。""" - pid = payload.get("project_id") - project = db.get(Project, pid) if pid else None - if project is None: - raise HTTPException(404, "项目不存在") - name = str(payload.get("name") or "").strip() - if not name: - raise HTTPException(400, "子任务名称不能为空") - existed = db.query(Task).filter(Task.project_id == project.id, Task.name == name).one_or_none() - if existed: - return existed.to_dict() - t = Task(project_id=project.id, name=name) - db.add(t) - db.commit() - db.refresh(t) - return t.to_dict() - - # ---------------------------------------------------------------- 设置 @router.get("/settings") def get_settings(db: Session = Depends(get_db)): diff --git a/app/schemas.py b/app/schemas.py index a1d8a01..3850c79 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -40,11 +40,6 @@ class CategoryIn(BaseModel): color: str = "#2563eb" -class TagIn(BaseModel): - name: str - color: str = "#6b7280" - - class PeriodIn(BaseModel): label: str kind: str = "week" diff --git a/app/security.py b/app/security.py index 715e91a..ea25946 100644 --- a/app/security.py +++ b/app/security.py @@ -52,9 +52,7 @@ SEGMENT_MENU = { "weekly": "board", "projects": "projects", "categories": "projects", - "tags": "projects", "updates": "projects", - "tasks": "projects", "custom": "custom", "staff": "staff", "ai": "intake", diff --git a/tests/test_periods_projects.py b/tests/test_periods_projects.py index 202eba0..6e65c89 100644 --- a/tests/test_periods_projects.py +++ b/tests/test_periods_projects.py @@ -118,12 +118,11 @@ def test_分类增删改(h): assert h.admin.delete("/api/categories/424242").status_code == 404 -def test_标签重复提交返回同一个(h): - t = h.admin.post("/api/tags", json={"name": "重点"}).json() - again = h.admin.post("/api/tags", json={"name": "重点"}).json() - assert t["id"] == again["id"] - assert h.admin.delete(f"/api/tags/{t['id']}").json() == {"ok": True} - assert h.admin.delete("/api/tags/424242").status_code == 404 +def test_同名标签多项目共用一条记录(h): + a = h.project("甲项目", tags=["重点"]) + b = h.project("乙项目", tags=["重点", "新客户"]) + assert a["tags"] and a["tags"][0]["id"] == b["tags"][0]["id"] # 同名标签不重复建 + assert len(b["tags"]) == 2 # ------------------------------------------------------------------ 项目 @@ -136,8 +135,7 @@ def test_项目字段与人员标签的写入(h): assert p["members"] == ["王五", "赵六"] assert {t["name"] for t in p["tags"]} == {"新客户", "重点"} assert p["category"]["name"] == "交付项目" and p["is_key"] and p["progress"] == 35 - # 标签是自动创建的,不用先建 - assert {t["name"] for t in h.admin.get("/api/tags").json()} >= {"新客户", "重点"} + # 标签随项目写入自动创建,没有独立的建标签入口 # 换负责人名单是整体替换 up = h.admin.patch(f"/api/projects/{p['id']}", json={"owners": ["李四"], "tags": []}) assert up.json()["owner"] == "李四" and up.json()["owners"] == ["李四"] and up.json()["tags"] == [] @@ -197,13 +195,13 @@ def test_按周与按月都能取到本周期数据(h): def test_执行记录的增改删(h): pid = h.today_period_id p = h.project("记录演练") - task = h.admin.post("/api/tasks", json={"project_id": p["id"], "name": "接口联调"}).json() - assert h.admin.post("/api/tasks", json={"project_id": p["id"], "name": "接口联调"}).json()["id"] == task["id"] - assert h.admin.post("/api/tasks", json={"name": "接口联调"}).status_code == 404 - assert h.admin.post("/api/tasks", json={"project_id": p["id"], "name": " "}).status_code == 400 - u = h.update(p["id"], pid, task_id=task["id"], content="联调过半", progress=60, + t0 = h.update(p["id"], pid, task_name="接口联调", content="联调启动") + assert t0["task_id"] # 写执行记录自动建子任务 + t1 = h.update(p["id"], pid, task_name="接口联调", content="再记一笔") + assert t1["task_id"] == t0["task_id"] # 同名子任务复用,不重复建 + u = h.update(p["id"], pid, task_id=t0["task_id"], content="联调过半", progress=60, status="at_risk", risk="等待接口文档", next_step="约对方对齐", owner="张三") - assert u["content"] == "联调过半" and u["status"] == "at_risk" and u["task_id"] == task["id"] + assert u["content"] == "联调过半" and u["status"] == "at_risk" and u["task_id"] == t0["task_id"] assert u["period_label"] or u["period_id"] == pid up = h.admin.patch(f"/api/updates/{u['id']}", json={"progress": 80, "status": "in_progress"}) assert up.json()["progress"] == 80 and up.json()["status"] == "in_progress" @@ -213,6 +211,8 @@ def test_执行记录的增改删(h): detail = h.admin.get(f"/api/projects/{p['id']}").json() assert detail["tasks"] and detail["updates"] assert h.admin.delete(f"/api/updates/{u['id']}").status_code == 200 + for extra in (t0, t1): # 前两步为建子任务写的记录也清掉 + assert h.admin.delete(f"/api/updates/{extra['id']}").status_code == 200 assert h.admin.get("/api/updates", params={"project_id": p["id"]}).json() == [] assert h.admin.delete(f"/api/updates/{u['id']}").status_code == 404