AP1.6: Plan/Ist-Verknuepfung und Journey-Timeline.
Deploy Development / deploy (push) Failing after 37s
Test Suite / pytest-backend (push) Successful in 1m41s
Test Suite / lint-backend (push) Successful in 1s
Test Suite / compose-smoke (push) Has been skipped
Test Suite / k6 /api/health Baseline (push) Successful in 18s
Test Suite / playwright-smoke (push) Successful in 13s

Backlog, Actions, Projects und Tasks koennen Gates zugeordnet werden; Gate-Beitragsliste und chronologische Journey machen Plan/Ist nachvollziehbar.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
LarsandCursor committed 2026-07-06 08:43:11 +02:00
1 parent 4ca0a2c460
commit 7e4936a2e4
29 files changed
+1072 -40

No files matched your search

+41 -5
View File
@@ -9,6 +9,7 @@ from psycopg2.extras import RealDictCursor
from db import get_connection
from services.audit import log_audit
from services.initiatives import PRIORITIES, get_initiative
from services.plan_ist import validate_roadmap_item_in_initiative
from services.projects import project_is_leaf
ActionStatus = Literal[
@@ -23,14 +24,14 @@ OPEN_ACTION_STATUSES = frozenset(
)
_ACTION_COLUMNS = """
id, tenant_id, initiative_id, project_id, title, description,
id, tenant_id, initiative_id, project_id, roadmap_item_id, title, description,
status, priority, due_at, created_at, updated_at
"""
def _serialize_row(row: dict[str, Any]) -> dict[str, Any]:
result = dict(row)
for key in ("id", "tenant_id", "initiative_id", "project_id", "owner_actor_id"):
for key in ("id", "tenant_id", "initiative_id", "project_id", "roadmap_item_id", "owner_actor_id"):
if result.get(key):
result[key] = str(result[key])
if result.get("created_at"):
@@ -135,6 +136,7 @@ def create_action(
priority: str = "normal",
due_at: Optional[Any] = None,
project_id: Optional[str] = None,
roadmap_item_id: Optional[str] = None,
assigned_actor_ids: Optional[list[str]] = None,
user_id: Optional[str] = None,
) -> dict[str, Any]:
@@ -157,16 +159,32 @@ def create_action(
conn = get_connection()
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
validate_roadmap_item_in_initiative(
cur,
tenant_id=tenant_id,
initiative_id=initiative_id,
roadmap_item_id=roadmap_item_id,
)
cur.execute(
f"""
INSERT INTO actions (
tenant_id, initiative_id, project_id, title, description,
tenant_id, initiative_id, project_id, roadmap_item_id, title, description,
status, priority, due_at
)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
RETURNING {_ACTION_COLUMNS}
""",
(tenant_id, initiative_id, project_id, title, description, status, priority, due_at),
(
tenant_id,
initiative_id,
project_id,
roadmap_item_id,
title,
description,
status,
priority,
due_at,
),
)
row = _serialize_row(dict(cur.fetchone()))
for actor_id in assigned_actor_ids:
@@ -254,6 +272,8 @@ def update_action(
clear_due_at: bool = False,
project_id: Optional[str] = None,
clear_project: bool = False,
roadmap_item_id: Optional[str] = None,
clear_roadmap_item: bool = False,
) -> Optional[dict[str, Any]]:
existing = get_action(tenant_id=tenant_id, action_id=action_id)
if not existing:
@@ -295,6 +315,22 @@ def update_action(
)
updates.append("project_id = %s")
params.append(project_id)
if clear_roadmap_item:
updates.append("roadmap_item_id = NULL")
elif roadmap_item_id is not None:
conn = get_connection()
try:
with conn.cursor() as cur:
validate_roadmap_item_in_initiative(
cur,
tenant_id=tenant_id,
initiative_id=existing["initiative_id"],
roadmap_item_id=roadmap_item_id,
)
finally:
conn.close()
updates.append("roadmap_item_id = %s")
params.append(roadmap_item_id)
if not updates:
return existing
+45 -17
View File
@@ -10,15 +10,21 @@ from db import get_connection
from services.actions import create_action
from services.audit import log_audit
from services.initiatives import PRIORITIES, get_initiative
from services.plan_ist import validate_roadmap_item_in_initiative
BacklogStatus = Literal["new", "triaged", "accepted", "rejected", "converted"]
BACKLOG_STATUSES = frozenset({"new", "triaged", "accepted", "rejected", "converted"})
_BACKLOG_COLUMNS = """
id, tenant_id, initiative_id, title, description, status,
priority, roadmap_item_id, converted_action_id, created_at, updated_at
"""
def _serialize_row(row: dict[str, Any]) -> dict[str, Any]:
result = dict(row)
for key in ("id", "tenant_id", "initiative_id", "converted_action_id"):
for key in ("id", "tenant_id", "initiative_id", "converted_action_id", "roadmap_item_id"):
if result.get(key):
result[key] = str(result[key])
if result.get("created_at"):
@@ -46,6 +52,7 @@ def create_backlog_item(
description: str = "",
status: BacklogStatus = "new",
priority: str = "normal",
roadmap_item_id: Optional[str] = None,
user_id: Optional[str] = None,
) -> dict[str, Any]:
title = title.strip()
@@ -59,16 +66,22 @@ def create_backlog_item(
conn = get_connection()
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
validate_roadmap_item_in_initiative(
cur,
tenant_id=tenant_id,
initiative_id=initiative_id,
roadmap_item_id=roadmap_item_id,
)
cur.execute(
"""
f"""
INSERT INTO backlog_items (
tenant_id, initiative_id, title, description, status, priority
tenant_id, initiative_id, title, description, status, priority,
roadmap_item_id
)
VALUES (%s, %s, %s, %s, %s, %s)
RETURNING id, tenant_id, initiative_id, title, description, status,
priority, converted_action_id, created_at, updated_at
VALUES (%s, %s, %s, %s, %s, %s, %s)
RETURNING {_BACKLOG_COLUMNS}
""",
(tenant_id, initiative_id, title, description, status, priority),
(tenant_id, initiative_id, title, description, status, priority, roadmap_item_id),
)
row = _serialize_row(dict(cur.fetchone()))
conn.commit()
@@ -92,9 +105,8 @@ def list_backlog_for_initiative(*, tenant_id: str, initiative_id: str) -> list[d
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
cur.execute(
"""
SELECT id, tenant_id, initiative_id, title, description, status,
priority, converted_action_id, created_at, updated_at
f"""
SELECT {_BACKLOG_COLUMNS}
FROM backlog_items
WHERE tenant_id = %s AND initiative_id = %s
ORDER BY updated_at DESC, title
@@ -111,9 +123,8 @@ def get_backlog_item(*, tenant_id: str, backlog_item_id: str) -> Optional[dict[s
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
cur.execute(
"""
SELECT id, tenant_id, initiative_id, title, description, status,
priority, converted_action_id, created_at, updated_at
f"""
SELECT {_BACKLOG_COLUMNS}
FROM backlog_items
WHERE id = %s AND tenant_id = %s
""",
@@ -134,6 +145,8 @@ def update_backlog_item(
description: Optional[str] = None,
status: Optional[BacklogStatus] = None,
priority: Optional[str] = None,
roadmap_item_id: Optional[str] = None,
clear_roadmap_item: bool = False,
) -> Optional[dict[str, Any]]:
existing = get_backlog_item(tenant_id=tenant_id, backlog_item_id=backlog_item_id)
if not existing:
@@ -162,6 +175,22 @@ def update_backlog_item(
_validate_priority(priority)
updates.append("priority = %s")
params.append(priority)
if clear_roadmap_item:
updates.append("roadmap_item_id = NULL")
elif roadmap_item_id is not None:
conn = get_connection()
try:
with conn.cursor() as cur:
validate_roadmap_item_in_initiative(
cur,
tenant_id=tenant_id,
initiative_id=existing["initiative_id"],
roadmap_item_id=roadmap_item_id,
)
finally:
conn.close()
updates.append("roadmap_item_id = %s")
params.append(roadmap_item_id)
if not updates:
return existing
@@ -177,8 +206,7 @@ def update_backlog_item(
UPDATE backlog_items
SET {", ".join(updates)}
WHERE id = %s AND tenant_id = %s
RETURNING id, tenant_id, initiative_id, title, description, status,
priority, converted_action_id, created_at, updated_at
RETURNING {_BACKLOG_COLUMNS}
""",
params,
)
@@ -259,6 +287,7 @@ def convert_backlog_to_action(
title=existing["title"],
description=existing["description"] or "",
priority=existing["priority"],
roadmap_item_id=existing.get("roadmap_item_id"),
assigned_actor_ids=assigned_actor_ids or [],
user_id=user_id,
)
@@ -273,8 +302,7 @@ def convert_backlog_to_action(
converted_action_id = %s,
updated_at = NOW()
WHERE id = %s AND tenant_id = %s
RETURNING id, tenant_id, initiative_id, title, description, status,
priority, converted_action_id, created_at, updated_at
RETURNING {_BACKLOG_COLUMNS}
""",
(action["id"], backlog_item_id, tenant_id),
)
+322
View File
@@ -0,0 +1,322 @@
"""Plan/Ist-Verknüpfung — Gates, Journey, Beiträge (AP1.6)."""
from __future__ import annotations
from typing import Any, Literal, Optional
from psycopg2.extras import RealDictCursor
from db import get_connection
from services.initiatives import get_initiative
JourneyEventKind = Literal[
"decision",
"review",
"evidence",
"action",
"backlog",
"gate",
]
def validate_roadmap_item_in_initiative(
cur,
*,
tenant_id: str,
initiative_id: str,
roadmap_item_id: Optional[str],
) -> None:
if not roadmap_item_id:
return
cur.execute(
"""
SELECT 1 FROM roadmap_items ri
JOIN roadmaps r ON r.id = ri.roadmap_id AND r.tenant_id = ri.tenant_id
WHERE ri.id = %s AND ri.tenant_id = %s AND r.initiative_id = %s
""",
(roadmap_item_id, tenant_id, initiative_id),
)
if not cur.fetchone():
raise ValueError("Gate gehört nicht zu diesem Vorhaben")
def _iso(value: Any) -> Optional[str]:
if not value:
return None
return value.isoformat() if hasattr(value, "isoformat") else str(value)
def list_gate_contributions(
*, tenant_id: str, roadmap_item_id: str
) -> dict[str, Any]:
conn = get_connection()
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
cur.execute(
"""
SELECT ri.id, ri.title, ri.status, r.initiative_id
FROM roadmap_items ri
JOIN roadmaps r ON r.id = ri.roadmap_id AND r.tenant_id = ri.tenant_id
WHERE ri.id = %s AND ri.tenant_id = %s
""",
(roadmap_item_id, tenant_id),
)
gate = cur.fetchone()
if not gate:
raise ValueError("Gate nicht gefunden")
initiative_id = str(gate["initiative_id"])
cur.execute(
"""
SELECT id, title, status, priority, converted_action_id
FROM backlog_items
WHERE tenant_id = %s AND initiative_id = %s AND roadmap_item_id = %s
ORDER BY updated_at DESC
""",
(tenant_id, initiative_id, roadmap_item_id),
)
backlog = [dict(r) for r in cur.fetchall()]
cur.execute(
"""
SELECT id, title, status, priority, project_id
FROM actions
WHERE tenant_id = %s AND initiative_id = %s AND roadmap_item_id = %s
ORDER BY updated_at DESC
""",
(tenant_id, initiative_id, roadmap_item_id),
)
actions = [dict(r) for r in cur.fetchall()]
cur.execute(
"""
SELECT id, title, status, parent_project_id
FROM projects
WHERE tenant_id = %s AND initiative_id = %s AND roadmap_item_id = %s
ORDER BY updated_at DESC
""",
(tenant_id, initiative_id, roadmap_item_id),
)
projects = [dict(r) for r in cur.fetchall()]
cur.execute(
"""
SELECT t.id, t.title, t.status, t.action_id, a.title AS action_title
FROM tasks t
JOIN actions a ON a.id = t.action_id AND a.tenant_id = t.tenant_id
WHERE t.tenant_id = %s AND a.initiative_id = %s AND t.roadmap_item_id = %s
ORDER BY t.updated_at DESC
""",
(tenant_id, initiative_id, roadmap_item_id),
)
tasks = [dict(r) for r in cur.fetchall()]
finally:
conn.close()
def _ids(rows: list[dict]) -> list[dict[str, Any]]:
out = []
for row in rows:
item = dict(row)
for key in item:
if item[key] is not None and key.endswith("_id"):
item[key] = str(item[key])
out.append(item)
return out
return {
"roadmap_item_id": roadmap_item_id,
"initiative_id": initiative_id,
"gate_title": gate["title"],
"gate_status": gate["status"],
"backlog_items": _ids(backlog),
"actions": _ids(actions),
"projects": _ids(projects),
"tasks": _ids(tasks),
"counts": {
"backlog": len(backlog),
"actions": len(actions),
"projects": len(projects),
"tasks": len(tasks),
"total": len(backlog) + len(actions) + len(projects) + len(tasks),
},
}
def list_journey_events(*, tenant_id: str, initiative_id: str) -> list[dict[str, Any]]:
if not get_initiative(tenant_id=tenant_id, initiative_id=initiative_id):
raise ValueError("Initiative nicht gefunden")
events: list[dict[str, Any]] = []
conn = get_connection()
try:
with conn.cursor(cursor_factory=RealDictCursor) as cur:
cur.execute(
"""
SELECT id, title, status, outcome, created_at, updated_at
FROM decisions
WHERE tenant_id = %s AND initiative_id = %s
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
events.append(
{
"kind": "decision",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": row["outcome"] or row["status"],
"occurred_at": _iso(row["updated_at"] or row["created_at"]),
"roadmap_item_id": None,
}
)
cur.execute(
"""
SELECT id, title, status, summary, created_at, updated_at, milestone_id, roadmap_item_id
FROM reviews
WHERE tenant_id = %s AND initiative_id = %s
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
rid = row.get("roadmap_item_id") or row.get("milestone_id")
events.append(
{
"kind": "review",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": row["summary"] or row["status"],
"occurred_at": _iso(row["updated_at"] or row["created_at"]),
"roadmap_item_id": str(rid) if rid else None,
}
)
cur.execute(
"""
SELECT id, title, status, description, created_at, updated_at,
roadmap_item_id, action_id
FROM evidence
WHERE tenant_id = %s AND initiative_id = %s
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
events.append(
{
"kind": "evidence",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": row["description"] or row["status"],
"occurred_at": _iso(row["updated_at"] or row["created_at"]),
"roadmap_item_id": (
str(row["roadmap_item_id"]) if row.get("roadmap_item_id") else None
),
"action_id": str(row["action_id"]) if row.get("action_id") else None,
}
)
cur.execute(
"""
SELECT id, title, status, created_at, updated_at, roadmap_item_id, project_id
FROM actions
WHERE tenant_id = %s AND initiative_id = %s
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
events.append(
{
"kind": "action",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": f"Arbeitspaket — {row['status']}",
"occurred_at": _iso(row["created_at"]),
"roadmap_item_id": (
str(row["roadmap_item_id"]) if row.get("roadmap_item_id") else None
),
"project_id": str(row["project_id"]) if row.get("project_id") else None,
}
)
if row["status"] in ("done", "discarded") and row["updated_at"] != row["created_at"]:
events.append(
{
"kind": "action",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": f"Arbeitspaket abgeschlossen — {row['status']}",
"occurred_at": _iso(row["updated_at"]),
"roadmap_item_id": (
str(row["roadmap_item_id"])
if row.get("roadmap_item_id")
else None
),
"project_id": (
str(row["project_id"]) if row.get("project_id") else None
),
}
)
cur.execute(
"""
SELECT id, title, status, created_at, updated_at, roadmap_item_id, converted_action_id
FROM backlog_items
WHERE tenant_id = %s AND initiative_id = %s
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
if row["status"] == "converted":
events.append(
{
"kind": "backlog",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": "Backlog → Arbeitspaket committet",
"occurred_at": _iso(row["updated_at"]),
"roadmap_item_id": (
str(row["roadmap_item_id"])
if row.get("roadmap_item_id")
else None
),
"action_id": (
str(row["converted_action_id"])
if row.get("converted_action_id")
else None
),
}
)
cur.execute(
"""
SELECT ri.id, ri.title, ri.status, ri.updated_at, ri.created_at
FROM roadmap_items ri
JOIN roadmaps r ON r.id = ri.roadmap_id AND r.tenant_id = ri.tenant_id
WHERE ri.tenant_id = %s AND r.initiative_id = %s
AND ri.status IN ('reached', 'moved', 'discarded', 'at_risk')
""",
(tenant_id, initiative_id),
)
for row in cur.fetchall():
events.append(
{
"kind": "gate",
"entity_id": str(row["id"]),
"title": row["title"],
"status": row["status"],
"summary": f"Zielzustand — {row['status']}",
"occurred_at": _iso(row["updated_at"] or row["created_at"]),
"roadmap_item_id": str(row["id"]),
}
)
finally:
conn.close()
events = [e for e in events if e.get("occurred_at")]
events.sort(key=lambda e: e["occurred_at"], reverse=True)
return events