feat(csv-import): Enhance row aggregation and validation features
- Updated the aggregate_mapped_rows function to support multiple row policies, allowing for flexible handling of duplicate keys during CSV imports. - Introduced deduplication of identical rows before aggregation, improving data integrity. - Enhanced validation for multi_row_policy and dedupe_identical_rows in import_row_processing specifications. - Updated the AdminCsvTemplateEditorPage to include options for multi-row policies and deduplication settings, improving user experience in template management. - Added comprehensive tests to validate new aggregation behaviors and ensure correct error handling for multiple rows.
This commit is contained in:
1 parent
ad7aa2d255
commit
b7cd710c32
5 files changed
+327
-41
No files matched your search
@@ -221,9 +221,13 @@ def _import_nutrition(
|
||||
validate_import_row_processing("nutrition", spec, fm)
|
||||
except ValueError as e:
|
||||
raise ValueError(str(e)) from e
|
||||
merged_rows = aggregate_mapped_rows(mapped_rows, spec)
|
||||
merged_rows, agg_notes = aggregate_mapped_rows(mapped_rows, spec)
|
||||
error_details.extend(agg_notes)
|
||||
else:
|
||||
merged_rows = list(mapped_rows)
|
||||
agg_notes = []
|
||||
|
||||
skipped_groups = sum(n.get("rows_in_group", 0) for n in (agg_notes or []) if n.get("error") == "mehrere_zeilen_pro_schluessel")
|
||||
|
||||
inserted = 0
|
||||
updated = 0
|
||||
@@ -285,7 +289,7 @@ def _import_nutrition(
|
||||
"rows_total": rows_total,
|
||||
"inserted": inserted,
|
||||
"updated": updated,
|
||||
"skipped": 0,
|
||||
"skipped": skipped_groups,
|
||||
"new_entries": new_entries,
|
||||
}
|
||||
|
||||
@@ -329,9 +333,13 @@ def _import_weight(
|
||||
validate_import_row_processing("weight", spec, fm)
|
||||
except ValueError as e:
|
||||
raise ValueError(str(e)) from e
|
||||
merged_rows = aggregate_mapped_rows(mapped_rows, spec)
|
||||
merged_rows, agg_notes = aggregate_mapped_rows(mapped_rows, spec)
|
||||
error_details.extend(agg_notes)
|
||||
else:
|
||||
merged_rows = list(mapped_rows)
|
||||
agg_notes = []
|
||||
|
||||
skipped_groups = sum(n.get("rows_in_group", 0) for n in (agg_notes or []) if n.get("error") == "mehrere_zeilen_pro_schluessel")
|
||||
|
||||
inserted = 0
|
||||
updated = 0
|
||||
@@ -384,7 +392,7 @@ def _import_weight(
|
||||
"rows_total": rows_total,
|
||||
"inserted": inserted,
|
||||
"updated": updated,
|
||||
"skipped": 0,
|
||||
"skipped": skipped_groups,
|
||||
"new_entries": new_entries,
|
||||
}
|
||||
|
||||
@@ -555,13 +563,17 @@ def _import_vitals_baseline(
|
||||
validate_import_row_processing("vitals_baseline", spec, fm)
|
||||
except ValueError as e:
|
||||
raise ValueError(str(e)) from e
|
||||
merged_rows = aggregate_mapped_rows(mapped_rows, spec)
|
||||
merged_rows, agg_notes = aggregate_mapped_rows(mapped_rows, spec)
|
||||
error_details.extend(agg_notes)
|
||||
else:
|
||||
merged_rows = list(mapped_rows)
|
||||
agg_notes = []
|
||||
|
||||
skipped_merge = sum(n.get("rows_in_group", 0) for n in (agg_notes or []) if n.get("error") == "mehrere_zeilen_pro_schluessel")
|
||||
|
||||
inserted = 0
|
||||
updated = 0
|
||||
skipped = skipped_prefilter
|
||||
skipped = skipped_prefilter + skipped_merge
|
||||
for merged in merged_rows:
|
||||
d = coerce_date(merged.get("date"))
|
||||
if d is None:
|
||||
|
||||
Reference in new issue
Block a user