feat: Enhance activity session metrics handling and CSV import logic
Deploy Development / deploy (push) Successful in 51s
Build Test / pytest-backend (push) Successful in 9s
Build Test / lint-backend (push) Successful in 0s
Build Test / build-frontend (push) Successful in 17s

- Updated the `ACTIVITY_SESSION_METRICS_EAV_AGENT_GUIDE` with new details on CSV import processes and EAV handling, improving documentation clarity.
- Refactored the `_import_activity` function to utilize `apply_activity_mapped_column_aliases`, ensuring proper mapping of training parameters and reducing redundancy.
- Introduced validation for numeric bounds in the `activity_csv_registry_updates_from_mapped` function, enhancing data integrity during CSV imports.
- Added new utility functions to manage column aliasing and streamline the upsert process for session metrics, preventing duplicate entries.
- Implemented unit tests to validate the new aliasing logic and ensure correct behavior during session metrics updates.
This commit is contained in:
Lars committed 2026-04-16 07:25:39 +02:00
1 parent ca8cee990b
commit cd29c7d433
7 files changed
+178 -59

No files matched your search

+43 -3
View File
@@ -241,6 +241,43 @@ def _coerce_raw_value_for_parameter(data_type: str, raw: Any) -> Any:
raise ValueError(data_type)
def apply_activity_mapped_column_aliases_from_schema(
mapped: Mapping[str, Any],
schema: Sequence[Dict[str, Any]],
) -> Dict[str, Any]:
"""
training_parameters.key weicht oft von activity_log-Spalte ab (z. B. avg_hr → hr_avg).
Kopiert Werte auf die Spalte, wenn die Spalte leer ist, damit CSV/Registry activity_log befüllt.
"""
m = dict(mapped)
for s in schema:
sf = s.get("source_field")
if not sf or not str(sf).strip():
continue
col = str(sf).strip()
pkey = s["key"]
if pkey == col:
continue
col_v = m.get(col)
if col_v is not None and col_v != "":
continue
pk_v = m.get(pkey)
if pk_v is None or pk_v == "":
continue
m[col] = pk_v
return m
def apply_activity_mapped_column_aliases(
cur,
mapped: Mapping[str, Any],
training_category: Optional[str],
training_type_id: Optional[int],
) -> Dict[str, Any]:
schema = resolve_activity_attribute_schema(cur, training_category, training_type_id)
return apply_activity_mapped_column_aliases_from_schema(mapped, schema)
def upsert_session_metrics_from_csv_mapped(
cur,
profile_id: str,
@@ -250,10 +287,10 @@ def upsert_session_metrics_from_csv_mapped(
training_type_id: Optional[int],
) -> None:
"""
EAV für Trainingsparameter aus CSV (nur Keys, die nicht im activity-Modul-Registry liegen).
EAV für Trainingsparameter aus CSV (nur Keys ohne activity_log-Spalte / ohne source_field).
Kernfelder (Datum, Start, Distanz, HF, …) schreibt der Executor nach activity_log;
hier keine doppelten EAV-Zeilen für dieselben Registry-Keys.
Parameter mit gesetztem source_field sind kanonisch in activity_log — kein EAV-Schreiben (vermeidet
Doppelung zu avg_hr vs. hr_avg o. Ä.). Keys im activity-CSV-Modul werden ebenfalls übersprungen.
"""
cur.execute(
"SELECT profile_id FROM activity_log WHERE id = %s",
@@ -274,6 +311,9 @@ def upsert_session_metrics_from_csv_mapped(
continue
if pkey in activity_registry_keys:
continue
sf_raw = spec.get("source_field")
if sf_raw is not None and str(sf_raw).strip():
continue
tid = spec["training_parameter_id"]
dt = spec["data_type"]
rules = _validation_rules_dict(spec["validation_rules"])