feat(KR): 行动挂KR完成 — action_plans.kr_id字段+API+前端目标/KR选择+KR中文名自动填+地图krs端点
- action_plans表加kr_id字段(关联krs.id),create/update/list支持kr_id读写
- 创建行动选KR时自动继承objective_id;列表附kr_title
- 前端行动方案库加'所属目标/KR'两级联动选择,选中KR自动带出KPI
- OKR详情页KR卡片下显示达成行动列表(O→KR→行动三层)
- MapCanvasDialogs onKpiChange选中KPI自动填kr.name=kpi.kpi_name(中文)
- 编辑回填英文code KR名转中文显示兜底
- maps.py 新增GET /{map_id}/krs端点(MapReview战略回顾会KR进度)
- 数据修复: krs表9条英文code title→中文名(按kpi_definitions映射)
- 数据迁移: 高置信行动挂KR(费用率→kr10,应收→kr14); 地图32空KR清理
- okr list的kr_summary补metric_kpi_id(前端联动用)
- 新增6个kr_id测试(test_action_plans),全量547通过
This commit is contained in:
@@ -6,7 +6,32 @@ from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
from datetime import datetime, timedelta
|
||||
from tests.conftest import create_test_user, get_token_for_user, auth_header, create_test_kpi
|
||||
from app.models import ActionPlan
|
||||
from app.models import ActionPlan, Objective, KR
|
||||
|
||||
|
||||
def create_test_objective_kr(db: Session, **kwargs):
|
||||
"""创建测试目标+KR(行动挂KR 2026-08-27)"""
|
||||
obj = Objective(
|
||||
entity_id=kwargs.get("entity_id", 1),
|
||||
title=kwargs.get("objective_title", "测试目标"),
|
||||
quarter="2026Q3",
|
||||
status="active",
|
||||
)
|
||||
db.add(obj)
|
||||
db.commit()
|
||||
db.refresh(obj)
|
||||
kr = KR(
|
||||
entity_id=kwargs.get("entity_id", 1),
|
||||
objective_id=obj.id,
|
||||
title=kwargs.get("kr_title", "测试KR"),
|
||||
operator=">=",
|
||||
weight=50,
|
||||
target_value=100,
|
||||
)
|
||||
db.add(kr)
|
||||
db.commit()
|
||||
db.refresh(kr)
|
||||
return obj, kr
|
||||
|
||||
|
||||
def create_test_plan(db: Session, **kwargs) -> ActionPlan:
|
||||
@@ -109,7 +134,7 @@ class TestActionPlans:
|
||||
assert data["data"][0]["title"] == "进行中"
|
||||
|
||||
def test_filter_by_keyword(self, client: TestClient, db: Session):
|
||||
"""关键词搜索"""
|
||||
"""关键词搜索:keyword 应过滤 title(期望行为,2026-08-27 TDD示范)"""
|
||||
user = create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
@@ -119,8 +144,9 @@ class TestActionPlans:
|
||||
resp = client.get("/api/cma/action-plans?keyword=营收", headers=auth_header(token))
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
# API当前未实现keyword过滤,返回全部2条
|
||||
assert len(data["data"]) == 2
|
||||
# 期望行为:keyword 过滤生效,只返回标题含"营收"的1条
|
||||
assert len(data["data"]) == 1
|
||||
assert data["data"][0]["title"] == "提升营收计划"
|
||||
|
||||
def test_update_plan(self, client: TestClient, db: Session):
|
||||
"""更新行动计划"""
|
||||
@@ -226,3 +252,90 @@ class TestActionPlans:
|
||||
assert data["pending"] == 1
|
||||
assert data["in_progress"] == 1
|
||||
assert data["completed"] == 1
|
||||
|
||||
# ── 行动挂KR (2026-08-27) ──
|
||||
|
||||
def test_create_plan_with_kr_id(self, client: TestClient, db: Session):
|
||||
"""创建行动时挂KR:返回kr_id,objective_id从KR自动继承"""
|
||||
create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
obj, kr = create_test_objective_kr(db)
|
||||
|
||||
resp = client.post(
|
||||
"/api/cma/action-plans",
|
||||
headers=auth_header(token),
|
||||
json={
|
||||
"title": "降低费用率行动",
|
||||
"kpi_id": kpi.id,
|
||||
"kr_id": kr.id,
|
||||
"assignee": "张三",
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["kr_id"] == kr.id
|
||||
# 未显式传objective_id时从KR继承
|
||||
assert data["objective_id"] == obj.id
|
||||
|
||||
def test_create_plan_kr_not_found(self, client: TestClient, db: Session):
|
||||
"""kr_id不存在 → 404"""
|
||||
create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
|
||||
resp = client.post(
|
||||
"/api/cma/action-plans",
|
||||
headers=auth_header(token),
|
||||
json={"title": "行动", "kpi_id": kpi.id, "kr_id": 99999},
|
||||
)
|
||||
assert resp.status_code == 404
|
||||
|
||||
def test_list_includes_kr_title(self, client: TestClient, db: Session):
|
||||
"""列表返回kr_title"""
|
||||
create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
obj, kr = create_test_objective_kr(db)
|
||||
create_test_plan(db, kpi_id=kpi.id, kr_id=kr.id, title="挂KR的行动")
|
||||
|
||||
resp = client.get("/api/cma/action-plans", headers=auth_header(token))
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()["data"]
|
||||
item = data[0]
|
||||
assert item["kr_id"] == kr.id
|
||||
assert item["kr_title"] == "测试KR"
|
||||
|
||||
def test_update_plan_kr_id(self, client: TestClient, db: Session):
|
||||
"""更新行动可改挂KR"""
|
||||
create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
obj1, kr1 = create_test_objective_kr(db, kr_title="KR一")
|
||||
obj2, kr2 = create_test_objective_kr(db, kr_title="KR二")
|
||||
plan = create_test_plan(db, kpi_id=kpi.id, kr_id=kr1.id, title="行动")
|
||||
|
||||
resp = client.put(
|
||||
f"/api/cma/action-plans/{plan.id}",
|
||||
headers=auth_header(token),
|
||||
json={"kr_id": kr2.id},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["kr_id"] == kr2.id
|
||||
|
||||
def test_update_plan_kr_clear(self, client: TestClient, db: Session):
|
||||
"""更新行动可置空kr_id"""
|
||||
create_test_user(db)
|
||||
token = get_token_for_user(client)
|
||||
kpi = create_test_kpi(db)
|
||||
obj, kr = create_test_objective_kr(db)
|
||||
plan = create_test_plan(db, kpi_id=kpi.id, kr_id=kr.id, title="行动")
|
||||
|
||||
resp = client.put(
|
||||
f"/api/cma/action-plans/{plan.id}",
|
||||
headers=auth_header(token),
|
||||
json={"kr_id": None},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["kr_id"] is None
|
||||
|
||||
Reference in New Issue
Block a user