refactor(csv-import): Enhance nutrition data processing and template rendering
- Updated the nutrition import logic to utilize a new row processing specification, improving data aggregation and validation. - Refactored the template rendering process in the workflow executor to use Jinja2's Environment with ChainableUndefined for better handling of missing attributes. - Added backward-compatible shortcuts for accessing decision signals in node contexts, enhancing flexibility in template usage. - Introduced import row processing options in CSV templates, allowing for more customizable data handling during imports.
This commit is contained in:
1 parent
8b67f7ab55
commit
c0fcdea1fe
9 files changed
+357
-22
No files matched your search
@@ -176,3 +176,42 @@ def test_run_universal_import_activity_garmin_time_plus_date_columns(monkeypatch
|
||||
for _sql, params in cur.executes
|
||||
if params
|
||||
)
|
||||
|
||||
|
||||
def test_run_universal_import_nutrition_two_rows_same_day_aggregates_to_one_row():
|
||||
"""Modul-Default: mehrere CSV-Zeilen pro Tag → Summe, ein nutrition_log-Eintrag."""
|
||||
text = (
|
||||
"Date,Kalorien,Protein,Fett,KH\n"
|
||||
"2024-01-15,500,10,20,30\n"
|
||||
"2024-01-15,300,5,10,15\n"
|
||||
)
|
||||
mapping = {
|
||||
"delimiter": ",",
|
||||
"has_header": True,
|
||||
"field_mappings": {
|
||||
"Date": "date",
|
||||
"Kalorien": "kcal",
|
||||
"Protein": "protein_g",
|
||||
"Fett": "fat_g",
|
||||
"KH": "carbs_g",
|
||||
},
|
||||
"type_conversions": {
|
||||
"date": {"type": "date", "format": "yyyy-mm-dd", "flexible": True},
|
||||
"kcal": {"type": "float", "decimal_separator": ".", "flexible": True},
|
||||
"protein_g": {"type": "float", "decimal_separator": ".", "flexible": True},
|
||||
"fat_g": {"type": "float", "decimal_separator": ".", "flexible": True},
|
||||
"carbs_g": {"type": "float", "decimal_separator": ".", "flexible": True},
|
||||
},
|
||||
}
|
||||
cur = _SeqCursor([None])
|
||||
out = run_universal_csv_import(cur, PID, "nutrition", text, "n.csv", mapping)
|
||||
assert out["rows_total"] == 2
|
||||
assert out["rows_imported"] == 1
|
||||
insert_sqls = [q for q in cur.executes if "INSERT INTO nutrition_log" in q[0]]
|
||||
assert len(insert_sqls) == 1
|
||||
params = insert_sqls[0][1]
|
||||
# (eid, profile_id, iso, kcal, prot, fat, carbs)
|
||||
assert params[3] == 800.0
|
||||
assert params[4] == 15.0
|
||||
assert params[5] == 30.0
|
||||
assert params[6] == 45.0
|
||||
Reference in new issue
Block a user