- Enhanced the `merge_column_backed_and_eav_metrics` function to ensure that when both legacy columns and EAV values are present, the legacy column takes precedence. - Revised documentation in `ACTIVITY_PRODUCTION_ARCHITECTURE_AND_PHASES.md` and `ACTIVITY_SCALAR_KANON_TABLE.md` to reflect the new reading logic and clarify the handling of metrics. - Updated the `activity_data_canon.py` to specify the new merge behavior, ensuring consistency in data retrieval. - Added unit tests to validate the new logic, confirming that legacy columns are preferred when available.
62 lines
2.3 KiB
Python
62 lines
2.3 KiB
Python
"""
|
|
Kanonische Aufteilung activity_log vs. EAV für Aktivitätssessions.
|
|
|
|
- **Kern / Mapping-Ziele für activity_log:** ausschließlich die Keys aus
|
|
``csv_parser.module_registry.MODULE_DEFINITIONS["activity"].fields`` (keine zweite hartcodierte Liste).
|
|
- **Alle anderen Attribute:** ``training_parameters`` + Attributprofil (Kategorie/Typ) → EAV;
|
|
Lesefallback für bekannte Legacy-Spalten siehe unten.
|
|
|
|
Normative Doku: .claude/docs/technical/ACTIVITY_PRODUCTION_ARCHITECTURE_AND_PHASES.md,
|
|
ACTIVITY_SCALAR_KANON_TABLE.md
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import Dict, Final
|
|
|
|
from csv_parser.module_registry import get_module_definition
|
|
|
|
|
|
def get_activity_module_registry_field_keys() -> frozenset[str]:
|
|
"""Keys des Universal-CSV-Moduls ``activity`` (= feste activity_log-Kernfelder / Mapping-Ziele)."""
|
|
mod = get_module_definition("activity")
|
|
if not mod:
|
|
return frozenset()
|
|
return frozenset((mod.get("fields") or {}).keys())
|
|
|
|
|
|
# Gleiche Menge wie ``MODULE_DEFINITIONS["activity"].fields`` — zur Laufzeit aus der Registry abgeleitet.
|
|
ACTIVITY_MODULE_REGISTRY_FIELD_KEYS: Final[frozenset[str]] = get_activity_module_registry_field_keys()
|
|
|
|
# Teil-UPDATEs (Import): alle Kernfelder außer ``date`` (Identität / Duplikat-Key).
|
|
ACTIVITY_LOG_PATCHABLE_COLUMNS: Final[frozenset[str]] = ACTIVITY_MODULE_REGISTRY_FIELD_KEYS - {"date"}
|
|
|
|
# Parameter-Keys (training_parameters.key), die primär in EAV geführt werden; source_field nach Migration 057 NULL.
|
|
# Lesen (Merge): activity_log-Legacy-Spalte schlägt EAV, wenn beide befüllt; sonst EAV.
|
|
ACTIVITY_EAV_PRIMARY_PARAMETER_KEYS: Final[frozenset[str]] = frozenset(
|
|
{
|
|
"min_hr",
|
|
"pace_min_per_km",
|
|
"cadence",
|
|
"avg_power",
|
|
"elevation_gain",
|
|
"temperature_celsius",
|
|
"humidity_percent",
|
|
"avg_hr_percent",
|
|
"kcal_per_km",
|
|
}
|
|
)
|
|
|
|
# Spaltenname activity_log für Legacy-Merge (Vorrang vor EAV bei gesetztem Spaltenwert).
|
|
ACTIVITY_LOG_LEGACY_COLUMN_FOR_EAV_PRIMARY_PARAM: Final[Dict[str, str]] = {
|
|
"min_hr": "hr_min",
|
|
"pace_min_per_km": "pace_min_per_km",
|
|
"cadence": "cadence",
|
|
"avg_power": "avg_power",
|
|
"elevation_gain": "elevation_gain",
|
|
"temperature_celsius": "temperature_celsius",
|
|
"humidity_percent": "humidity_percent",
|
|
"avg_hr_percent": "avg_hr_percent",
|
|
"kcal_per_km": "kcal_per_km",
|
|
}
|
|
|