From fea30d9074ca4f9b622bc52f8b7aef075d44c43c Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 13 Mar 2024 15:45:13 +0000 Subject: [PATCH] feat: only add mortgageuesd error to relevant mortgageused field --- app/services/bulk_upload/sales/year2023/row_parser.rb | 8 +++++++- app/services/bulk_upload/sales/year2024/row_parser.rb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 506bc7456..158efec57 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -754,7 +754,7 @@ private stairbought: %i[field_88], stairowned: %i[field_89], socprevten: %i[field_102], - mortgageused: %i[field_105 field_119 field_128], + mortgageused: [mortgageused_field], soctenant: %i[field_99], uprn: %i[field_19], @@ -1103,6 +1103,12 @@ private return field_128 if outright_sale? end + def mortgageused_field + return :field_105 if shared_ownership? + return :field_119 if discounted_ownership? + return :field_128 if outright_sale? + end + def owning_organisation @owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1) end diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index 7a1481300..682464331 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -760,7 +760,7 @@ private stairbought: %i[field_87], stairowned: %i[field_88], socprevten: %i[field_100], - mortgageused: %i[field_103 field_117 field_126], + mortgageused: [mortgageused_field], uprn: %i[field_22], address_line1: %i[field_23], @@ -1116,6 +1116,12 @@ private return field_126 if outright_sale? end + def mortgageused_field + return :field_103 if shared_ownership? + return :field_117 if discounted_ownership? + return :field_126 if outright_sale? + end + def owning_organisation @owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1) end