From af9c3718d56c8601537222f4fdacaa2f9c5df9f0 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 24 Jan 2024 13:58:41 +0000 Subject: [PATCH] Only add charges to duplciate hash if they exist --- app/services/bulk_upload/lettings/year2024/row_parser.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index 5920de677..983968e47 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -460,7 +460,7 @@ class BulkUpload::Lettings::Year2024::RowParser end def spreadsheet_duplicate_hash - attributes.slice( + hash = attributes.slice( "field_1", # owning org "field_8", # startdate "field_9", # startdate @@ -472,7 +472,12 @@ class BulkUpload::Lettings::Year2024::RowParser "field_42", # age1 "field_43", # sex1 "field_46", # ecstat1 - ).merge({ "tcharge" => [field_125, field_126, field_127, field_128].sum }) + ) + if [field_125, field_126, field_127, field_128].all?(&:present?) + hash.merge({ "tcharge" => [field_125, field_126, field_127, field_128].sum }) + else + hash + end end def add_duplicate_found_in_spreadsheet_errors