From 7861082a02f370d809c3275a2b1cf97cf898a11e Mon Sep 17 00:00:00 2001 From: GotthardG <51994228+GotthardG@users.noreply.github.com> Date: Tue, 14 Jan 2025 22:18:14 +0100 Subject: [PATCH] Set default values for empty "priority" column in spreadsheets. Added logic to assign a default value of 1 to empty "priority" fields in the spreadsheet service. Adjusted the router to correctly track columns explicitly marked as defaulted. --- backend/app/routers/spreadsheet.py | 3 ++- backend/app/services/spreadsheet_service.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/app/routers/spreadsheet.py b/backend/app/routers/spreadsheet.py index 295a90d..c2629f5 100644 --- a/backend/app/routers/spreadsheet.py +++ b/backend/app/routers/spreadsheet.py @@ -163,7 +163,8 @@ async def upload_file(file: UploadFile = File(...)): "default_set": [ col_name for col_name in row.get("corrected_columns", []) - if row.get("default_set", False) and col_name == "directory" + if row.get("default_set", False) + and col_name in row.get("defaulted_columns", []) ], # Specify which keys are explicitly `default_set` } for row in updated_raw_data diff --git a/backend/app/services/spreadsheet_service.py b/backend/app/services/spreadsheet_service.py index 0a70bc1..c3a43fa 100644 --- a/backend/app/services/spreadsheet_service.py +++ b/backend/app/services/spreadsheet_service.py @@ -68,14 +68,16 @@ class SampleSpreadsheetImporter: Tracks corrections and defaults applied separately. """ default_applied = False - # If the value is None or empty string if value is None or (isinstance(value, str) and value.strip() == ""): if column_name == "directory": logger.warning("Directory value is empty. Assigning default value.") default_applied = True return "{sgPuck}/{sgPosition}", default_applied - + elif column_name == "priority": + logger.warning("Priority value is empty. Assigning default value.") + default_applied = True + return 1, default_applied return None, default_applied # Clean up the value