From 1135d14e317c2b9f23dafa24b350e757f1eeadae Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Thu, 23 Apr 2026 10:26:15 +0100 Subject: [PATCH] CLDC-3315: Add dynamic error fields for type --- app/services/bulk_upload/sales/year2025/row_parser.rb | 9 ++++++++- app/services/bulk_upload/sales/year2026/row_parser.rb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb index 849f37a21..a8d4a3dfd 100644 --- a/app/services/bulk_upload/sales/year2025/row_parser.rb +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -781,7 +781,7 @@ private postcode_full: %i[field_21 field_22], wchair: %i[field_27], - type: %i[field_9 field_11 field_8], + type: type_fields, resale: %i[field_78], hodate: %i[field_80 field_81 field_82], @@ -1209,6 +1209,13 @@ private field_109 if staircasing? end + def type_fields + return %i[field_8 field_9] if shared_ownership? + return %i[field_8 field_11] if discounted_ownership? + + %i[field_9 field_11 field_8] + end + def value_fields return [:field_86] if shared_ownership_initial_purchase? return [:field_113] if discounted_ownership? diff --git a/app/services/bulk_upload/sales/year2026/row_parser.rb b/app/services/bulk_upload/sales/year2026/row_parser.rb index f9a3d5242..f79e43f87 100644 --- a/app/services/bulk_upload/sales/year2026/row_parser.rb +++ b/app/services/bulk_upload/sales/year2026/row_parser.rb @@ -836,7 +836,7 @@ private postcode_full: %i[field_21 field_22], wchair: %i[field_28], - type: %i[field_9 field_11 field_8], + type: type_fields, resale: %i[field_91], hodate: %i[field_93 field_94 field_95], @@ -1342,6 +1342,13 @@ private field_122 if staircasing? end + def type_fields + return %i[field_8 field_9] if shared_ownership? + return %i[field_8 field_11] if discounted_ownership? + + %i[field_9 field_11 field_8] + end + def value_fields return [:field_99] if shared_ownership_initial_purchase? return [:field_128] if discounted_ownership?