From 3339c744514a66bc4b1a0d63a3a81629d6b2c66b Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <nat.dean-lewis@softwire.com>
Date: Tue, 17 Feb 2026 11:52:32 +0000
Subject: [PATCH] CLDC-4140: update validator spec

---
 .../lettings/year2026/csv_parser.rb           |  2 +-
 .../lettings/year2026/row_parser.rb           | 22 ++++++-------------
 .../bulk_upload/lettings/validator_spec.rb    |  4 ++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2026/csv_parser.rb b/app/services/bulk_upload/lettings/year2026/csv_parser.rb
index 3e5933219..68e10c6a8 100644
--- a/app/services/bulk_upload/lettings/year2026/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/csv_parser.rb
@@ -4,7 +4,7 @@ class BulkUpload::Lettings::Year2026::CsvParser
   include CollectionTimeHelper
 
   # TODO: CLDC-4162: Update when 2026 format is known
-  FIELDS = 153
+  FIELDS = 145
   FORM_YEAR = 2026
 
   attr_reader :path
diff --git a/app/services/bulk_upload/lettings/year2026/row_parser.rb b/app/services/bulk_upload/lettings/year2026/row_parser.rb
index 9feada782..32d1cbf83 100644
--- a/app/services/bulk_upload/lettings/year2026/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/row_parser.rb
@@ -316,14 +316,6 @@ class BulkUpload::Lettings::Year2026::RowParser
   attribute :field_143, :string
   attribute :field_144, :integer
   attribute :field_145, :string
-  attribute :field_146, :integer
-  attribute :field_147, :string
-  attribute :field_148, :integer
-  attribute :field_149, :string
-  attribute :field_150, :integer
-  attribute :field_151, :string
-  attribute :field_152, :integer
-  attribute :field_153, :string
 
   validate :validate_valid_radio_option, on: :before_log
 
@@ -1521,31 +1513,31 @@ private
   end
 
   def person_2_present?
-    field_47.present? || field_48.present? || field_49.present? || field_131.present? || field_140.present? || field_141.present?
+    field_47.present? || field_48.present? || field_49.present? || field_132.present? || field_133.present?
   end
 
   def person_3_present?
-    field_51.present? || field_52.present? || field_53.present? || field_132.present? || field_142.present? || field_143.present?
+    field_51.present? || field_52.present? || field_53.present? || field_134.present? || field_135.present?
   end
 
   def person_4_present?
-    field_55.present? || field_56.present? || field_57.present? || field_133.present? || field_144.present? || field_145.present?
+    field_55.present? || field_56.present? || field_57.present? || field_136.present? || field_137.present?
   end
 
   def person_5_present?
-    field_59.present? || field_60.present? || field_61.present? || field_134.present? || field_146.present? || field_147.present?
+    field_59.present? || field_60.present? || field_61.present? || field_138.present? || field_139.present?
   end
 
   def person_6_present?
-    field_63.present? || field_64.present? || field_65.present? || field_135.present? || field_148.present? || field_149.present?
+    field_63.present? || field_64.present? || field_65.present? || field_140.present? || field_141.present?
   end
 
   def person_7_present?
-    field_67.present? || field_68.present? || field_69.present? || field_136.present? || field_150.present? || field_151.present?
+    field_67.present? || field_68.present? || field_69.present? || field_142.present? || field_143.present?
   end
 
   def person_8_present?
-    field_71.present? || field_72.present? || field_73.present? || field_137.present? || field_152.present? || field_153.present?
+    field_71.present? || field_72.present? || field_73.present? || field_144.present? || field_145.present?
   end
 
   def leftreg
diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index c053bb33d..b4d52d00b 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -190,8 +190,8 @@ RSpec.describe BulkUpload::Lettings::Validator do
           expect(error.tenant_code).to eql(log.tenancycode)
           expect(error.property_ref).to eql(log.propcode)
           expect(error.row).to eql("2")
-          expect(error.cell).to eql("DL2")
-          expect(error.col).to eql("DL")
+          expect(error.cell).to eql("DX2")
+          expect(error.col).to eql("DX")
         end
       end
     end