feat: add reference values snapshot endpoints and data layer functions
- Introduced `get_profile_reference_values_current_snapshot` and `get_profile_reference_values_recent_snapshot` functions to retrieve current and recent reference values for profiles. - Updated the placeholder resolver to include new placeholders for current and recent reference values. - Added new API endpoints for fetching current and recent reference values snapshots. - Enhanced the frontend API utility to support the new snapshot endpoints. - Improved unit tests to validate the new data layer functions and their behavior.
This commit is contained in:
1 parent
df0165bee3
commit
42ae796448
7 files changed
+359
-1
No files matched your search
@@ -9,11 +9,34 @@ Dates are normalized to ISO strings; Decimals to float — suitable for JSON/API
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
from typing import Any, Optional
|
||||
|
||||
from db import get_cursor, get_db, r2d
|
||||
|
||||
# Spalten des Messwerts (ohne Typ-Metadaten) für Snapshot-Payloads / Platzhalter-JSON
|
||||
_REFERENCE_ENTRY_KEYS = frozenset(
|
||||
{
|
||||
"id",
|
||||
"profile_id",
|
||||
"reference_value_type_id",
|
||||
"effective_date",
|
||||
"value_numeric",
|
||||
"value_text",
|
||||
"unit",
|
||||
"source",
|
||||
"confidence",
|
||||
"method",
|
||||
"notes",
|
||||
"extra",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
"type_key",
|
||||
"type_label",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def normalize_reference_row(d: Optional[dict[str, Any]]) -> dict[str, Any]:
|
||||
"""Normalize DB row dict for JSON (dates → ISO, Decimal → float)."""
|
||||
@@ -177,3 +200,173 @@ def get_profile_reference_values_summary(profile_id: str) -> dict[str, Any]:
|
||||
|
||||
tiles = build_summary_tiles_from_ranked_rows(raw_rows)
|
||||
return {"tiles": tiles}
|
||||
|
||||
|
||||
def _entry_dict_from_ranked_row(d: dict[str, Any]) -> dict[str, Any]:
|
||||
"""Eintragsfelder inkl. type_key/type_label für KI-Kontext."""
|
||||
out = {k: d[k] for k in _REFERENCE_ENTRY_KEYS if k in d}
|
||||
return normalize_reference_row(out)
|
||||
|
||||
|
||||
def get_profile_reference_values_current_snapshot(profile_id: str) -> dict[str, Any]:
|
||||
"""
|
||||
Layer 1: Alle **aktuellen** Referenzwerte (jüngster Eintrag pro aktivem Typ), Katalog-Sortierung.
|
||||
|
||||
Struktur: ``items`` = Liste mit ``type_key``, ``type_label``, ``value_data_type``,
|
||||
``type_sort_order``, ``latest`` (vollständiger Eintrag).
|
||||
"""
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""
|
||||
WITH ranked AS (
|
||||
SELECT
|
||||
v.id,
|
||||
v.profile_id,
|
||||
v.reference_value_type_id,
|
||||
v.effective_date,
|
||||
v.value_numeric,
|
||||
v.value_text,
|
||||
v.unit,
|
||||
v.source,
|
||||
v.confidence,
|
||||
v.method,
|
||||
v.notes,
|
||||
v.extra,
|
||||
v.created_at,
|
||||
v.updated_at,
|
||||
rt.key AS type_key,
|
||||
rt.label AS type_label,
|
||||
rt.sort_order AS type_sort_order,
|
||||
rt.value_data_type,
|
||||
ROW_NUMBER() OVER (
|
||||
PARTITION BY v.reference_value_type_id
|
||||
ORDER BY v.effective_date DESC, v.created_at DESC
|
||||
) AS rn
|
||||
FROM profile_reference_values v
|
||||
JOIN reference_value_types rt ON rt.id = v.reference_value_type_id
|
||||
WHERE v.profile_id = %s AND rt.active = TRUE
|
||||
)
|
||||
SELECT * FROM ranked WHERE rn = 1
|
||||
ORDER BY type_sort_order ASC, type_key ASC
|
||||
""",
|
||||
(profile_id,),
|
||||
)
|
||||
raw_rows = [r2d(r) for r in cur.fetchall()]
|
||||
|
||||
items: list[dict[str, Any]] = []
|
||||
for row in raw_rows:
|
||||
row.pop("rn", None)
|
||||
vdt = (row.get("value_data_type") or "decimal").strip().lower()
|
||||
latest = _entry_dict_from_ranked_row(row)
|
||||
items.append(
|
||||
{
|
||||
"type_key": row.get("type_key"),
|
||||
"type_label": row.get("type_label"),
|
||||
"value_data_type": vdt,
|
||||
"type_sort_order": int(row.get("type_sort_order") or 0),
|
||||
"latest": latest,
|
||||
}
|
||||
)
|
||||
|
||||
return {
|
||||
"schema": "profile_reference_values_current_v1",
|
||||
"count": len(items),
|
||||
"items": items,
|
||||
}
|
||||
|
||||
|
||||
def get_profile_reference_values_recent_snapshot(
|
||||
profile_id: str,
|
||||
*,
|
||||
limit_per_type: int = 5,
|
||||
date_from: Optional[date | str] = None,
|
||||
date_to: Optional[date | str] = None,
|
||||
) -> dict[str, Any]:
|
||||
"""
|
||||
Layer 1: Pro Referenztyp die **letzten N** Einträge (neueste zuerst), optional nach
|
||||
``effective_date`` gefiltert.
|
||||
|
||||
``date_from`` / ``date_to``: inclusive; als ``date`` oder ISO-``YYYY-MM-DD``-String.
|
||||
"""
|
||||
lim = max(1, min(int(limit_per_type), 50))
|
||||
|
||||
df = date_from
|
||||
dt = date_to
|
||||
if isinstance(df, str) and df.strip():
|
||||
df = date.fromisoformat(df.strip())
|
||||
elif df is not None and not isinstance(df, date):
|
||||
df = None
|
||||
if isinstance(dt, str) and dt.strip():
|
||||
dt = date.fromisoformat(dt.strip())
|
||||
elif dt is not None and not isinstance(dt, date):
|
||||
dt = None
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""
|
||||
WITH filtered AS (
|
||||
SELECT
|
||||
v.id,
|
||||
v.profile_id,
|
||||
v.reference_value_type_id,
|
||||
v.effective_date,
|
||||
v.value_numeric,
|
||||
v.value_text,
|
||||
v.unit,
|
||||
v.source,
|
||||
v.confidence,
|
||||
v.method,
|
||||
v.notes,
|
||||
v.extra,
|
||||
v.created_at,
|
||||
v.updated_at,
|
||||
rt.key AS type_key,
|
||||
rt.label AS type_label,
|
||||
rt.sort_order AS type_sort_order,
|
||||
rt.value_data_type
|
||||
FROM profile_reference_values v
|
||||
JOIN reference_value_types rt ON rt.id = v.reference_value_type_id
|
||||
WHERE v.profile_id = %s
|
||||
AND rt.active = TRUE
|
||||
AND (%s::date IS NULL OR v.effective_date >= %s::date)
|
||||
AND (%s::date IS NULL OR v.effective_date <= %s::date)
|
||||
),
|
||||
ranked AS (
|
||||
SELECT
|
||||
f.*,
|
||||
ROW_NUMBER() OVER (
|
||||
PARTITION BY f.reference_value_type_id
|
||||
ORDER BY f.effective_date DESC, f.created_at DESC
|
||||
) AS rn
|
||||
FROM filtered f
|
||||
)
|
||||
SELECT * FROM ranked WHERE rn <= %s
|
||||
ORDER BY type_sort_order ASC, type_key ASC, rn ASC
|
||||
""",
|
||||
(profile_id, df, df, dt, dt, lim),
|
||||
)
|
||||
raw_rows = [r2d(r) for r in cur.fetchall()]
|
||||
|
||||
by_type: dict[str, list[dict[str, Any]]] = {}
|
||||
type_order: list[str] = []
|
||||
seen: set[str] = set()
|
||||
|
||||
for row in raw_rows:
|
||||
row.pop("rn", None)
|
||||
tk = row.get("type_key") or ""
|
||||
if tk not in seen:
|
||||
seen.add(tk)
|
||||
type_order.append(tk)
|
||||
entry = _entry_dict_from_ranked_row(row)
|
||||
by_type.setdefault(tk, []).append(entry)
|
||||
|
||||
return {
|
||||
"schema": "profile_reference_values_recent_v1",
|
||||
"limit_per_type": lim,
|
||||
"date_from": df.isoformat() if isinstance(df, date) else None,
|
||||
"date_to": dt.isoformat() if isinstance(dt, date) else None,
|
||||
"ordered_type_keys": type_order,
|
||||
"by_type_key": by_type,
|
||||
}
|
||||
Reference in new issue
Block a user