revert: Wiederherstellung Codezustand von ca8cee9 (ohne Branch-Historie zu überschreiben)
Deploy Development / deploy (push) Successful in 53s
Build Test / pytest-backend (push) Successful in 5s
Build Test / lint-backend (push) Successful in 0s
Build Test / build-frontend (push) Successful in 16s

Reverts cd29c7d..026c51b per git revert. Alle zwischenliegenden Commits bleiben in Gitea sichtbar; der Arbeitsbaum entspricht wieder dem Stand von ca8cee9.

Made-with: Cursor
This commit is contained in:
Lars committed 2026-04-16 11:59:23 +02:00
1 parent 026c51b6b5
commit 06f83e2ffc
10 files changed
+117 -503

No files matched your search

@@ -7,14 +7,10 @@ import pytest
from data_layer.activity_session_metrics import (
ActivitySessionMetricsError,
apply_activity_mapped_column_aliases_from_schema,
enrich_sessions_with_metrics,
merge_column_backed_and_eav_metrics,
merge_parameter_schema_rows,
replace_activity_session_metrics,
resolve_activity_attribute_schema,
resolve_activity_attribute_schema_for_csv_import,
upsert_session_metrics_from_csv_mapped,
_row_value_tuple,
_validate_single_value,
)
@@ -293,205 +289,6 @@ def test_merge_keeps_eav_only_keys():
assert out[0]["key"] == "custom_param"
def test_apply_mapped_aliases_copies_avg_hr_to_hr_avg():
schema = [
{
"key": "avg_hr",
"training_parameter_id": 1,
"source_field": "hr_avg",
"data_type": "integer",
"unit": "bpm",
"validation_rules": {},
}
]
out = apply_activity_mapped_column_aliases_from_schema({"avg_hr": 118}, schema)
assert out["avg_hr"] == 118
assert out["hr_avg"] == 118
def test_apply_mapped_aliases_does_not_overwrite_existing_column():
schema = [
{
"key": "avg_hr",
"training_parameter_id": 1,
"source_field": "hr_avg",
"data_type": "integer",
"unit": "bpm",
"validation_rules": {},
}
]
out = apply_activity_mapped_column_aliases_from_schema({"avg_hr": 999, "hr_avg": 120}, schema)
assert out["hr_avg"] == 120
@patch("data_layer.activity_session_metrics.resolve_activity_attribute_schema", return_value=[])
def test_resolve_csv_import_adds_mapped_keys_from_training_parameters(mock_resolve):
"""Ohne Kategorie/Typ-Profil: gemappte Keys aus training_parameters ergänzen."""
class Cur:
def __init__(self):
self.sql = ""
def execute(self, sql, params=None):
self.sql = sql
self.params = params
def fetchone(self):
if "training_parameters" in self.sql:
return {
"id": 7,
"key": "cadence",
"name_de": "Kadenz",
"name_en": "Cadence",
"param_category": "physical",
"data_type": "integer",
"unit": "rpm",
"validation_rules": {},
"source_field": None,
}
return None
cur = Cur()
out = resolve_activity_attribute_schema_for_csv_import(cur, None, None, {"cadence": 90})
assert len(out) == 1
assert out[0]["key"] == "cadence"
assert out[0]["training_parameter_id"] == 7
mock_resolve.assert_called_once_with(cur, None, None)
@patch("data_layer.activity_session_metrics.resolve_activity_attribute_schema", return_value=[])
def test_upsert_csv_inserts_eav_when_only_mapped_training_parameter(mock_resolve):
class Cur:
def __init__(self):
self.asm_inserts = 0
self.sql = ""
def execute(self, sql, params=None):
self.sql = sql
self.params = params
if "INSERT INTO activity_session_metrics" in sql:
self.asm_inserts += 1
def fetchone(self):
if "activity_log" in self.sql:
return {"profile_id": "00000000-0000-0000-0000-000000000001"}
if "training_parameters" in self.sql:
return {
"id": 7,
"key": "cadence",
"name_de": "K",
"name_en": "K",
"param_category": "physical",
"data_type": "integer",
"unit": None,
"validation_rules": {"min": 0, "max": 300},
"source_field": None,
}
return None
cur = Cur()
upsert_session_metrics_from_csv_mapped(
cur,
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000002",
{"cadence": 90},
None,
None,
)
assert cur.asm_inserts == 1
@patch("data_layer.activity_session_metrics.resolve_activity_attribute_schema")
def test_upsert_csv_skips_parameter_with_source_field(mock_schema):
"""Kein INSERT in activity_session_metrics für Spalten-Parameter (avg_hr → hr_avg)."""
mock_schema.return_value = [
{
"key": "avg_hr",
"training_parameter_id": 42,
"data_type": "integer",
"validation_rules": {"min": 30, "max": 220},
"source_field": "hr_avg",
}
]
class Cur:
def __init__(self):
self.asm_inserts = 0
def execute(self, sql, params=None):
if "INSERT INTO activity_session_metrics" in sql:
self.asm_inserts += 1
def fetchone(self):
return {"profile_id": "00000000-0000-0000-0000-000000000001"}
cur = Cur()
upsert_session_metrics_from_csv_mapped(
cur,
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000002",
{"avg_hr": 130},
"cardio",
1,
)
assert cur.asm_inserts == 0
@patch("data_layer.activity_session_metrics.fetch_activity_session_metrics")
@patch("data_layer.activity_session_metrics.resolve_activity_attribute_schema")
def test_replace_metrics_skips_column_backed_kcal(mock_schema, mock_fetch):
"""PUT /metrics: keine EAV-Zeile für kcal_active (liegt in activity_log)."""
pid = str(uuid.uuid4())
eid = str(uuid.uuid4())
mock_schema.return_value = [
{
"training_parameter_id": 1,
"key": "kcal_active",
"data_type": "float",
"validation_rules": {},
"source_field": "kcal_active",
"required": False,
},
{
"training_parameter_id": 2,
"key": "custom_reps",
"data_type": "integer",
"validation_rules": {"min": 0},
"source_field": None,
"required": False,
},
]
mock_fetch.return_value = []
class Cur:
def __init__(self):
self.asm_inserts = 0
def execute(self, sql, params=None):
if "INSERT INTO activity_session_metrics" in sql:
self.asm_inserts += 1
def fetchone(self):
return {
"profile_id": pid,
"training_category": "strength",
"training_type_id": 1,
}
cur = Cur()
replace_activity_session_metrics(
cur,
pid,
eid,
[
{"parameter_key": "kcal_active", "value": 450.0},
{"parameter_key": "custom_reps", "value": 12},
],
)
assert cur.asm_inserts == 1
mock_fetch.assert_called_once_with(cur, eid)
def test_merge_eav_primary_falls_back_to_legacy_hr_min_column():
"""Kanon: min_hr ohne source_field / ohne EAV — Lesefallback Spalte hr_min."""
schema = [
@@ -508,18 +305,3 @@ def test_merge_eav_primary_falls_back_to_legacy_hr_min_column():
assert len(out) == 1
assert out[0]["key"] == "min_hr"
assert out[0]["value"] == 88
def test_activity_module_registry_field_keys_match_csv_module_definition():
"""Phase A: Kanon-Spine = module_registry „activity“.fields (keine zweite Liste)."""
from csv_parser.module_registry import get_module_definition
from data_layer.activity_data_canon import (
ACTIVITY_MODULE_REGISTRY_FIELD_KEYS,
get_activity_module_registry_field_keys,
)
mod = get_module_definition("activity")
assert mod is not None
expected = frozenset((mod.get("fields") or {}).keys())
assert get_activity_module_registry_field_keys() == expected
assert ACTIVITY_MODULE_REGISTRY_FIELD_KEYS == expected