fix(A1): Übungen an Stufen binden, Gates entkoppeln, Tages-Abschluss
Deploy Development / deploy (push) Successful in 49s
Test Suite / pytest-backend (push) Failing after 4m46s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Test Suite / lint-backend (push) Successful in 2s
Test Suite / compose-smoke (push) Has been skipped
Deploy Development / deploy (push) Successful in 49s
Test Suite / pytest-backend (push) Failing after 4m46s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Test Suite / lint-backend (push) Successful in 2s
Test Suite / compose-smoke (push) Has been skipped
Activity Set pro Stufe statt Gate-Titel-Recurring; Single-Active-Stufe bei Reopen; Complete heute schliesst Next Action; Heute-Panel fuer alle Uebungen der aktiven Stufe. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
b7d88ce24a
commit
19e962d8ec
17 files changed
+620
-209
No files matched your search
@@ -65,7 +65,8 @@ def get_starter_preview(
|
||||
{"kind": "maturity_stage", "title": "Stufe 2 — Aufbau", "status": "planned"},
|
||||
{"kind": "maturity_stage", "title": "Stufe 3 — Ziel", "status": "planned"},
|
||||
{"kind": "project", "title": "Training"},
|
||||
{"kind": "recurring", "title": "Tägliche Übung"},
|
||||
{"kind": "recurring", "title": "Vorbeuge-Dehnung"},
|
||||
{"kind": "recurring", "title": "Hüftöffner (Schmetterling)"},
|
||||
]
|
||||
elif archetype_key == "initiative.linear_project":
|
||||
items = [
|
||||
@@ -185,7 +186,6 @@ def _apply_a1(
|
||||
user_id: Optional[str],
|
||||
) -> dict[str, list[str]]:
|
||||
from services.projects import create_project, list_projects_for_initiative
|
||||
from services.recurring import create_recurring_element, list_recurring_for_initiative
|
||||
from services.roadmap import create_roadmap_item
|
||||
|
||||
roadmap_ids: list[str] = []
|
||||
@@ -194,6 +194,7 @@ def _apply_a1(
|
||||
("Stufe 2 — Aufbau", "planned"),
|
||||
("Stufe 3 — Ziel", "planned"),
|
||||
]
|
||||
stage_items: list[dict[str, Any]] = []
|
||||
for index, (title, status) in enumerate(stage_defs):
|
||||
item = create_roadmap_item(
|
||||
tenant_id=tenant_id,
|
||||
@@ -205,6 +206,7 @@ def _apply_a1(
|
||||
user_id=user_id,
|
||||
)
|
||||
roadmap_ids.append(item["id"])
|
||||
stage_items.append(item)
|
||||
|
||||
projects = list_projects_for_initiative(tenant_id=tenant_id, initiative_id=initiative_id)
|
||||
if not _find_by_title(projects, "Training"):
|
||||
@@ -217,19 +219,20 @@ def _apply_a1(
|
||||
user_id=user_id,
|
||||
)
|
||||
|
||||
recurring = list_recurring_for_initiative(tenant_id=tenant_id, initiative_id=initiative_id)
|
||||
if not _find_by_title(recurring, "Tägliche Übung"):
|
||||
create_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
title="Tägliche Übung",
|
||||
description="Regelmäßige Übung für die aktuelle Reifegrad-Stufe",
|
||||
interval_days=1,
|
||||
next_due_at=datetime.now(timezone.utc),
|
||||
user_id=user_id,
|
||||
)
|
||||
from services.maturity_practice import seed_practices_for_stage
|
||||
|
||||
return {"roadmap_items": roadmap_ids, "projects": ["Training"], "recurring": ["Tägliche Übung"]}
|
||||
exercises = seed_practices_for_stage(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
stage=stage_items[0],
|
||||
user_id=user_id,
|
||||
)
|
||||
|
||||
return {
|
||||
"roadmap_items": roadmap_ids,
|
||||
"projects": ["Training"],
|
||||
"recurring": [e["title"] for e in exercises],
|
||||
}
|
||||
|
||||
|
||||
def _apply_a2(
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from datetime import datetime, time, timedelta, timezone
|
||||
from typing import Any, Literal, Optional
|
||||
|
||||
from psycopg2.extras import RealDictCursor
|
||||
@@ -86,6 +86,23 @@ def ensure_open_instance(
|
||||
return row
|
||||
|
||||
|
||||
def _next_due_at(*, now: datetime, interval_days: int | None) -> datetime:
|
||||
days = max(int(interval_days or 1), 1)
|
||||
next_date = now.date() + timedelta(days=days)
|
||||
return datetime.combine(next_date, time.min, tzinfo=timezone.utc)
|
||||
|
||||
|
||||
def _parse_due(value: Any) -> Optional[datetime]:
|
||||
if value is None:
|
||||
return None
|
||||
if isinstance(value, datetime):
|
||||
return value if value.tzinfo else value.replace(tzinfo=timezone.utc)
|
||||
try:
|
||||
return datetime.fromisoformat(str(value).replace("Z", "+00:00"))
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
|
||||
def complete_open_instance(
|
||||
*,
|
||||
tenant_id: str,
|
||||
@@ -144,7 +161,7 @@ def complete_open_instance(
|
||||
conn.close()
|
||||
|
||||
interval = recurring.get("interval_days") or 1
|
||||
next_due = now + timedelta(days=int(interval))
|
||||
next_due = _next_due_at(now=now, interval_days=interval)
|
||||
|
||||
update_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
@@ -153,12 +170,6 @@ def complete_open_instance(
|
||||
next_due_at=next_due,
|
||||
)
|
||||
|
||||
next_instance = ensure_open_instance(
|
||||
tenant_id=tenant_id,
|
||||
recurring_element_id=recurring_element_id,
|
||||
due_at=next_due,
|
||||
)
|
||||
|
||||
log_audit(
|
||||
"cadence_instance.completed",
|
||||
user_id=user_id,
|
||||
@@ -175,7 +186,7 @@ def complete_open_instance(
|
||||
)
|
||||
return {
|
||||
"completed_instance": completed,
|
||||
"next_instance": next_instance,
|
||||
"next_due_at": next_due.isoformat(),
|
||||
"recurring": updated_recurring,
|
||||
}
|
||||
|
||||
@@ -186,6 +197,7 @@ def attach_open_instances_to_recurring_list(
|
||||
if not items:
|
||||
return items
|
||||
ids = [item["id"] for item in items]
|
||||
now = datetime.now(timezone.utc)
|
||||
conn = get_connection()
|
||||
try:
|
||||
with conn.cursor(cursor_factory=RealDictCursor) as cur:
|
||||
@@ -203,17 +215,51 @@ def attach_open_instances_to_recurring_list(
|
||||
str(row["recurring_element_id"]): _serialize_row(dict(row))
|
||||
for row in cur.fetchall()
|
||||
}
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT DISTINCT ON (recurring_element_id)
|
||||
recurring_element_id, measurement_note, completed_at
|
||||
FROM cadence_instances
|
||||
WHERE tenant_id = %s
|
||||
AND recurring_element_id = ANY(%s::uuid[])
|
||||
AND status = 'completed'
|
||||
AND completed_at >= CURRENT_DATE
|
||||
ORDER BY recurring_element_id, completed_at DESC
|
||||
""",
|
||||
(tenant_id, ids),
|
||||
)
|
||||
completed_today = {
|
||||
str(row["recurring_element_id"]): {
|
||||
"measurement_note": row.get("measurement_note") or "",
|
||||
"completed_at": row["completed_at"].isoformat()
|
||||
if row.get("completed_at")
|
||||
else None,
|
||||
}
|
||||
for row in cur.fetchall()
|
||||
}
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
enriched = []
|
||||
for item in items:
|
||||
copy = dict(item)
|
||||
today = completed_today.get(item["id"])
|
||||
copy["today_completed"] = today is not None
|
||||
copy["today_measurement_note"] = today.get("measurement_note", "") if today else ""
|
||||
|
||||
open_inst = by_recurring.get(item["id"])
|
||||
if not open_inst and item.get("status") == "active":
|
||||
next_due = _parse_due(item.get("next_due_at"))
|
||||
due_now = next_due is None or next_due <= now
|
||||
if (
|
||||
not open_inst
|
||||
and item.get("status") == "active"
|
||||
and due_now
|
||||
and not copy["today_completed"]
|
||||
):
|
||||
open_inst = ensure_open_instance(
|
||||
tenant_id=tenant_id,
|
||||
recurring_element_id=item["id"],
|
||||
due_at=next_due or now,
|
||||
)
|
||||
copy["open_cadence_instance"] = open_inst
|
||||
enriched.append(copy)
|
||||
|
||||
@@ -0,0 +1,191 @@
|
||||
"""A1 — Stage-bound practice exercises (Activity Set)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Optional
|
||||
|
||||
from services.recurring import (
|
||||
create_recurring_element,
|
||||
list_recurring_for_initiative,
|
||||
update_recurring_element,
|
||||
)
|
||||
|
||||
# Starter exercise sets per stage title (Spagat reference path).
|
||||
STAGE_PRACTICE_SETS: dict[str, list[tuple[str, str]]] = {
|
||||
"Stufe 1 — Basis": [
|
||||
("Vorbeuge-Dehnung", "Täglich 3×30 Sek. — Hüfte und Beinrückseite"),
|
||||
("Hüftöffner (Schmetterling)", "Täglich sitzend, leichter Druck"),
|
||||
],
|
||||
"Stufe 2 — Aufbau": [
|
||||
("Seitlicher Spagat — links", "Täglich halten, optional Messwert (Grad)"),
|
||||
("Seitlicher Spagat — rechts", "Täglich halten, optional Messwert (Grad)"),
|
||||
("Aktive Vorbeuge", "Täglich 3× kurz halten"),
|
||||
],
|
||||
"Stufe 3 — Ziel": [
|
||||
("Voller Spagat", "Täglich Zielposition — Messwert dokumentieren"),
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
def get_active_maturity_stage(
|
||||
*, tenant_id: str, initiative_id: str
|
||||
) -> Optional[dict[str, Any]]:
|
||||
from services.roadmap import list_roadmap_items_for_initiative
|
||||
|
||||
stages = [
|
||||
item
|
||||
for item in list_roadmap_items_for_initiative(
|
||||
tenant_id=tenant_id, initiative_id=initiative_id
|
||||
)
|
||||
if item.get("item_type") == "maturity_stage" and item.get("status") == "active"
|
||||
]
|
||||
if not stages:
|
||||
return None
|
||||
stages.sort(key=lambda s: (s.get("sort_order", 0), s.get("title", "")))
|
||||
return stages[0]
|
||||
|
||||
|
||||
def enforce_single_active_maturity_stage(
|
||||
cur,
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
keep_active_id: str,
|
||||
) -> None:
|
||||
"""At most one maturity_stage may be active."""
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE roadmap_items
|
||||
SET status = 'planned', updated_at = NOW()
|
||||
WHERE tenant_id = %s
|
||||
AND initiative_id = %s
|
||||
AND item_type = 'maturity_stage'
|
||||
AND status IN ('active', 'at_risk')
|
||||
AND id != %s
|
||||
""",
|
||||
(tenant_id, initiative_id, keep_active_id),
|
||||
)
|
||||
|
||||
|
||||
def list_practices_for_stage(
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
stage_id: str,
|
||||
) -> list[dict[str, Any]]:
|
||||
items = list_recurring_for_initiative(
|
||||
tenant_id=tenant_id, initiative_id=initiative_id
|
||||
)
|
||||
return [
|
||||
item
|
||||
for item in items
|
||||
if item.get("roadmap_item_id") == stage_id
|
||||
]
|
||||
|
||||
|
||||
def pause_all_practices(
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
user_id: Optional[str] = None,
|
||||
) -> list[str]:
|
||||
paused: list[str] = []
|
||||
for item in list_recurring_for_initiative(
|
||||
tenant_id=tenant_id, initiative_id=initiative_id
|
||||
):
|
||||
if item.get("status") == "active":
|
||||
update_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
recurring_id=item["id"],
|
||||
status="paused",
|
||||
user_id=user_id,
|
||||
)
|
||||
paused.append(item["title"])
|
||||
return paused
|
||||
|
||||
|
||||
def seed_practices_for_stage(
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
stage: dict[str, Any],
|
||||
user_id: Optional[str] = None,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Idempotent: create missing exercises for a stage; activate existing."""
|
||||
stage_id = stage["id"]
|
||||
stage_title = stage.get("title") or ""
|
||||
defs = STAGE_PRACTICE_SETS.get(stage_title)
|
||||
if not defs:
|
||||
defs = [
|
||||
(
|
||||
f"Übung — {stage_title}",
|
||||
f"Tägliche Routine für {stage_title}",
|
||||
)
|
||||
]
|
||||
|
||||
existing = list_practices_for_stage(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
stage_id=stage_id,
|
||||
)
|
||||
existing_by_title = {item["title"]: item for item in existing}
|
||||
created: list[dict[str, Any]] = []
|
||||
now = datetime.now(timezone.utc)
|
||||
|
||||
for title, description in defs:
|
||||
if title in existing_by_title:
|
||||
item = existing_by_title[title]
|
||||
if item.get("status") != "active":
|
||||
updated = update_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
recurring_id=item["id"],
|
||||
status="active",
|
||||
next_due_at=now,
|
||||
user_id=user_id,
|
||||
)
|
||||
if updated:
|
||||
created.append(updated)
|
||||
else:
|
||||
created.append(item)
|
||||
continue
|
||||
|
||||
row = create_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
title=title,
|
||||
description=description,
|
||||
status="active",
|
||||
interval_days=1,
|
||||
next_due_at=now,
|
||||
roadmap_item_id=stage_id,
|
||||
user_id=user_id,
|
||||
)
|
||||
created.append(row)
|
||||
|
||||
return created
|
||||
|
||||
|
||||
def activate_stage_practice_set(
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
stage: dict[str, Any],
|
||||
user_id: Optional[str] = None,
|
||||
) -> dict[str, Any]:
|
||||
paused = pause_all_practices(
|
||||
tenant_id=tenant_id, initiative_id=initiative_id, user_id=user_id
|
||||
)
|
||||
exercises = seed_practices_for_stage(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
stage=stage,
|
||||
user_id=user_id,
|
||||
)
|
||||
return {
|
||||
"stage_id": stage["id"],
|
||||
"stage_title": stage.get("title"),
|
||||
"paused_practices": paused,
|
||||
"active_practices": [e["title"] for e in exercises],
|
||||
"practice_ids": [e["id"] for e in exercises],
|
||||
}
|
||||
@@ -2,15 +2,10 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Optional
|
||||
|
||||
from services.recurring import (
|
||||
create_recurring_element,
|
||||
list_recurring_for_initiative,
|
||||
update_recurring_element,
|
||||
)
|
||||
from services.roadmap import get_roadmap_item, list_roadmap_items_for_initiative, update_roadmap_item
|
||||
from services.maturity_practice import activate_stage_practice_set
|
||||
from services.roadmap import get_roadmap_item, list_roadmap_items_for_initiative
|
||||
|
||||
|
||||
def on_maturity_stage_reached(
|
||||
@@ -20,7 +15,7 @@ def on_maturity_stage_reached(
|
||||
reached_item_id: str,
|
||||
user_id: Optional[str] = None,
|
||||
) -> Optional[dict[str, Any]]:
|
||||
"""Pause old routines, activate next stage, seed new routine for next stage."""
|
||||
"""Pause old routines, activate next stage, seed exercise set for next stage."""
|
||||
item = get_roadmap_item(tenant_id=tenant_id, item_id=reached_item_id)
|
||||
if not item or item.get("item_type") != "maturity_stage":
|
||||
return None
|
||||
@@ -47,41 +42,50 @@ def on_maturity_stage_reached(
|
||||
next_stage = stage
|
||||
break
|
||||
|
||||
paused: list[str] = []
|
||||
for recurring in list_recurring_for_initiative(
|
||||
tenant_id=tenant_id, initiative_id=initiative_id
|
||||
):
|
||||
if recurring.get("status") == "active":
|
||||
update_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
recurring_id=recurring["id"],
|
||||
status="paused",
|
||||
user_id=user_id,
|
||||
)
|
||||
paused.append(recurring["title"])
|
||||
|
||||
created_recurring = None
|
||||
practice_transition = None
|
||||
if next_stage:
|
||||
from services.roadmap import update_roadmap_item
|
||||
|
||||
update_roadmap_item(
|
||||
tenant_id=tenant_id,
|
||||
item_id=next_stage["id"],
|
||||
status="active",
|
||||
user_id=user_id,
|
||||
)
|
||||
created_recurring = create_recurring_element(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
title=f"Übung — {next_stage['title']}",
|
||||
description=f"Routine für {next_stage['title']} (automatisch nach Stufenübergang)",
|
||||
status="active",
|
||||
interval_days=1,
|
||||
next_due_at=datetime.now(timezone.utc),
|
||||
user_id=user_id,
|
||||
)
|
||||
next_stage = get_roadmap_item(tenant_id=tenant_id, item_id=next_stage["id"])
|
||||
if next_stage:
|
||||
practice_transition = activate_stage_practice_set(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
stage=next_stage,
|
||||
user_id=user_id,
|
||||
)
|
||||
|
||||
return {
|
||||
"reached_stage_id": reached_item_id,
|
||||
"next_stage_id": next_stage["id"] if next_stage else None,
|
||||
"paused_recurring": paused,
|
||||
"new_recurring_id": created_recurring["id"] if created_recurring else None,
|
||||
"paused_recurring": (practice_transition or {}).get("paused_practices", []),
|
||||
"new_recurring_id": (
|
||||
(practice_transition or {}).get("practice_ids") or [None]
|
||||
)[0],
|
||||
"active_practices": (practice_transition or {}).get("active_practices", []),
|
||||
}
|
||||
|
||||
|
||||
def on_maturity_stage_reopened(
|
||||
*,
|
||||
tenant_id: str,
|
||||
initiative_id: str,
|
||||
stage_id: str,
|
||||
user_id: Optional[str] = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Re-enable exercise set for reopened stage; pause others."""
|
||||
stage = get_roadmap_item(tenant_id=tenant_id, item_id=stage_id)
|
||||
if not stage:
|
||||
return {"stage_id": stage_id, "active_practices": []}
|
||||
return activate_stage_practice_set(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=initiative_id,
|
||||
stage=stage,
|
||||
user_id=user_id,
|
||||
)
|
||||
@@ -16,14 +16,14 @@ RecurringStatus = Literal["active", "paused", "ended"]
|
||||
RECURRING_STATUSES = frozenset({"active", "paused", "ended"})
|
||||
|
||||
_RECURRING_COLUMNS = """
|
||||
id, tenant_id, initiative_id, title, description, status,
|
||||
id, tenant_id, initiative_id, roadmap_item_id, title, description, status,
|
||||
interval_days, next_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"):
|
||||
for key in ("id", "tenant_id", "initiative_id", "roadmap_item_id"):
|
||||
if result.get(key):
|
||||
result[key] = str(result[key])
|
||||
for ts_key in ("created_at", "updated_at", "next_due_at"):
|
||||
@@ -46,6 +46,7 @@ def create_recurring_element(
|
||||
status: RecurringStatus = "active",
|
||||
interval_days: Optional[int] = None,
|
||||
next_due_at: Optional[datetime] = None,
|
||||
roadmap_item_id: Optional[str] = None,
|
||||
user_id: Optional[str] = None,
|
||||
) -> dict[str, Any]:
|
||||
title = title.strip()
|
||||
@@ -63,15 +64,16 @@ def create_recurring_element(
|
||||
cur.execute(
|
||||
f"""
|
||||
INSERT INTO recurring_elements (
|
||||
tenant_id, initiative_id, title, description, status,
|
||||
tenant_id, initiative_id, roadmap_item_id, title, description, status,
|
||||
interval_days, next_due_at
|
||||
)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
RETURNING {_RECURRING_COLUMNS}
|
||||
""",
|
||||
(
|
||||
tenant_id,
|
||||
initiative_id,
|
||||
roadmap_item_id,
|
||||
title,
|
||||
description,
|
||||
status,
|
||||
@@ -162,6 +164,8 @@ def update_recurring_element(
|
||||
clear_interval_days: bool = False,
|
||||
next_due_at: Optional[datetime] = None,
|
||||
clear_next_due_at: bool = False,
|
||||
roadmap_item_id: Optional[str] = None,
|
||||
clear_roadmap_item_id: bool = False,
|
||||
) -> Optional[dict[str, Any]]:
|
||||
existing = get_recurring_element(tenant_id=tenant_id, recurring_id=recurring_id)
|
||||
if not existing:
|
||||
@@ -196,6 +200,11 @@ def update_recurring_element(
|
||||
elif next_due_at is not None:
|
||||
updates.append("next_due_at = %s")
|
||||
params.append(next_due_at)
|
||||
if clear_roadmap_item_id:
|
||||
updates.append("roadmap_item_id = NULL")
|
||||
elif roadmap_item_id is not None:
|
||||
updates.append("roadmap_item_id = %s")
|
||||
params.append(roadmap_item_id)
|
||||
|
||||
if not updates:
|
||||
return existing
|
||||
|
||||
@@ -383,6 +383,15 @@ def update_roadmap_item(
|
||||
conn = get_connection()
|
||||
try:
|
||||
with conn.cursor(cursor_factory=RealDictCursor) as cur:
|
||||
if status == "active" and existing.get("item_type") == "maturity_stage":
|
||||
from services.maturity_practice import enforce_single_active_maturity_stage
|
||||
|
||||
enforce_single_active_maturity_stage(
|
||||
cur,
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=str(existing["initiative_id"]),
|
||||
keep_active_id=item_id,
|
||||
)
|
||||
cur.execute(
|
||||
f"""
|
||||
UPDATE roadmap_items
|
||||
@@ -760,6 +769,15 @@ def reopen_roadmap_item(
|
||||
conn = get_connection()
|
||||
try:
|
||||
with conn.cursor(cursor_factory=RealDictCursor) as cur:
|
||||
if item.get("item_type") == "maturity_stage":
|
||||
from services.maturity_practice import enforce_single_active_maturity_stage
|
||||
|
||||
enforce_single_active_maturity_stage(
|
||||
cur,
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=str(item["initiative_id"]),
|
||||
keep_active_id=item_id,
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE roadmap_items
|
||||
@@ -783,6 +801,16 @@ def reopen_roadmap_item(
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
if row.get("item_type") == "maturity_stage":
|
||||
from services.maturity_stage_transition import on_maturity_stage_reopened
|
||||
|
||||
row["maturity_practice"] = on_maturity_stage_reopened(
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=str(item["initiative_id"]),
|
||||
stage_id=item_id,
|
||||
user_id=user_id,
|
||||
)
|
||||
|
||||
log_audit(
|
||||
"roadmap_item.reopened",
|
||||
user_id=user_id,
|
||||
|
||||
@@ -73,6 +73,15 @@ def _reopen_item_if_reached(
|
||||
) -> None:
|
||||
if item["status"] != "reached":
|
||||
return
|
||||
if item.get("item_type") == "maturity_stage":
|
||||
from services.maturity_practice import enforce_single_active_maturity_stage
|
||||
|
||||
enforce_single_active_maturity_stage(
|
||||
cur,
|
||||
tenant_id=tenant_id,
|
||||
initiative_id=str(item["initiative_id"]),
|
||||
keep_active_id=item["id"],
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE roadmap_items
|
||||
|
||||
Reference in new issue
Block a user