From e4a528c699312768e38e7e79aade3f7e2f7cc2d0 Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Thu, 23 Apr 2026 10:26:15 +0100 Subject: [PATCH 1/2] 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 fac377138..fb7b0faf4 100644 --- a/app/services/bulk_upload/sales/year2025/row_parser.rb +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -763,7 +763,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], @@ -1191,6 +1191,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 08668d278..f16fc9bca 100644 --- a/app/services/bulk_upload/sales/year2026/row_parser.rb +++ b/app/services/bulk_upload/sales/year2026/row_parser.rb @@ -817,7 +817,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], @@ -1323,6 +1323,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? From 2fe038c9f7876038e22ac5071ae61ad29ed55abe Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Thu, 23 Apr 2026 17:47:55 +0100 Subject: [PATCH 2/2] CLDC-4395: Rename type_fields to sale_type_fields --- app/services/bulk_upload/sales/year2025/row_parser.rb | 4 ++-- app/services/bulk_upload/sales/year2026/row_parser.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb index fb7b0faf4..f88af9ad4 100644 --- a/app/services/bulk_upload/sales/year2025/row_parser.rb +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -763,7 +763,7 @@ private postcode_full: %i[field_21 field_22], wchair: %i[field_27], - type: type_fields, + type: sale_type_fields, resale: %i[field_78], hodate: %i[field_80 field_81 field_82], @@ -1191,7 +1191,7 @@ private field_109 if staircasing? end - def type_fields + def sale_type_fields return %i[field_8 field_9] if shared_ownership? return %i[field_8 field_11] 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 f16fc9bca..a02eeb249 100644 --- a/app/services/bulk_upload/sales/year2026/row_parser.rb +++ b/app/services/bulk_upload/sales/year2026/row_parser.rb @@ -817,7 +817,7 @@ private postcode_full: %i[field_21 field_22], wchair: %i[field_28], - type: type_fields, + type: sale_type_fields, resale: %i[field_91], hodate: %i[field_93 field_94 field_95], @@ -1323,7 +1323,7 @@ private field_122 if staircasing? end - def type_fields + def sale_type_fields return %i[field_8 field_9] if shared_ownership? return %i[field_8 field_11] if discounted_ownership?