CLDC-3522: Correct logic around BU address search and address not found errors (#2476)

* CLDC-3522: Correct logic around BU address search and address not found errors

* Fix lint errors

app/services/bulk_upload/lettings/year2024/row_parser.rb

@@ -424,10 +424,10 @@ class BulkUpload::Lettings::Year2024::RowParser
   validate :validate_assigned_to_exists, on: :after_log
   validate :validate_assigned_to_related, on: :after_log
   validate :validate_all_charges_given, on: :after_log, if: proc { is_carehome.zero? }
-  validate :validate_address_option_found, on: :after_log
 
+  validate :validate_address_option_found, on: :after_log, unless: -> { supported_housing? }
   validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log, unless: -> { supported_housing? }
-  validate :validate_address_fields, on: :after_log
+  validate :validate_address_fields, on: :after_log, unless: -> { supported_housing? }
 
   validate :validate_incomplete_soft_validations, on: :after_log
   validate :validate_nationality, on: :after_log
@@ -584,19 +584,23 @@ private
   end
 
   def validate_uprn_exists_if_any_key_address_fields_are_blank
-    if field_16.blank? && (field_17.blank? || field_19.blank?)
+    if field_16.blank? && !key_address_fields_provided?
       errors.add(:field_16, I18n.t("validations.not_answered", question: "UPRN"))
     end
   end
 
   def validate_address_option_found
-    if log.uprn_selection.nil? && field_16.blank? && (field_17.present? || field_19.present?)
+    if log.uprn.nil? && field_16.blank? && key_address_fields_provided?
       %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
         errors.add(field, I18n.t("validations.no_address_found"))
       end
     end
   end
 
+  def key_address_fields_provided?
+    field_17.present? && field_19.present? && field_21.present? && field_22.present?
+  end
+
   def validate_address_fields
     if field_16.blank? || log.errors.attribute_names.include?(:uprn)
       if field_17.blank?
@@ -606,6 +610,14 @@ private
       if field_19.blank?
         errors.add(:field_19, I18n.t("validations.not_answered", question: "town or city"))
       end
+
+      if field_21.blank?
+        errors.add(:field_21, I18n.t("validations.not_answered", question: "part 1 of postcode"))
+      end
+
+      if field_22.blank?
+        errors.add(:field_22, I18n.t("validations.not_answered", question: "part 2 of postcode"))
+      end
     end
   end
 
@@ -1299,7 +1311,7 @@ private
     attributes["address_line1_input"] = address_line1_input
     attributes["postcode_full_input"] = postcode_full
     attributes["postcode_full_as_entered"] = postcode_full
-    attributes["select_best_address_match"] = true if field_16.blank?
+    attributes["select_best_address_match"] = true if field_16.blank? && !supported_housing?
 
     attributes
   end

app/services/bulk_upload/sales/year2024/row_parser.rb

@@ -597,19 +597,23 @@ private
   end
 
   def validate_uprn_exists_if_any_key_address_fields_are_blank
-    if field_22.blank? && (field_23.blank? || field_25.blank?)
+    if field_22.blank? && !key_address_fields_provided?
       errors.add(:field_22, I18n.t("validations.not_answered", question: "UPRN"))
     end
   end
 
   def validate_address_option_found
-    if log.uprn_selection.nil? && field_22.blank? && (field_23.present? || field_25.present?)
+    if log.uprn.nil? && field_22.blank? && key_address_fields_provided?
       %i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
         errors.add(field, I18n.t("validations.no_address_found"))
       end
     end
   end
 
+  def key_address_fields_provided?
+    field_23.present? && field_25.present? && field_27.present? && field_28.present?
+  end
+
   def validate_address_fields
     if field_22.blank? || log.errors.attribute_names.include?(:uprn)
       if field_23.blank?
@@ -619,6 +623,14 @@ private
       if field_25.blank?
         errors.add(:field_25, I18n.t("validations.not_answered", question: "town or city"))
       end
+
+      if field_27.blank?
+        errors.add(:field_27, I18n.t("validations.not_answered", question: "part 1 of postcode"))
+      end
+
+      if field_28.blank?
+        errors.add(:field_28, I18n.t("validations.not_answered", question: "part 2 of postcode"))
+      end
     end
   end
 

spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb

@@ -104,8 +104,6 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
       "POSTCODE": "SE2 6RT"
 
          }}]}', headers: {})
-
-      parser.valid?
     end
 
     describe "#valid?" do
@@ -121,6 +119,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_130: 2 } }
 
         it "does not add keep adding errors to the pile" do
+          parser.valid?
           expect { parser.valid? }.not_to change(parser.errors, :count)
         end
       end
@@ -261,6 +260,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           end
 
           xit "instantiates a log with everything completed", aggregate_failures: true do
+            parser.valid?
+
             questions = parser.send(:questions).reject do |q|
               parser.send(:log).optional_fields.include?(q.id) || q.completed?(parser.send(:log))
             end
@@ -270,18 +271,6 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           end
 
           context "when a general needs log already exists in the db" do
-            let(:attributes) do
-              valid_attributes.merge({ field_4: "1",
-                                       field_11: "0",
-                                       field_1: owning_org.old_visible_id,
-                                       field_123: 1,
-                                       field_125: 250,
-                                       field_126: 50,
-                                       field_127: 50,
-                                       field_128: 50,
-                                       field_13: "tenant_code" })
-            end
-
             before do
               parser.log.save!
               parser.instance_variable_set(:@valid, nil)
@@ -321,17 +310,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           end
 
           context "when a general needs log already exists in the db but has a different tcharge" do
-            let(:attributes) do
+            let(:attributes) { valid_attributes.merge({ field_13: "tenant_code" }) }
-              valid_attributes.merge({ field_4: "1",
-                                       field_11: "0",
-                                       field_1: owning_org.old_visible_id,
-                                       field_123: 1,
-                                       field_125: 250,
-                                       field_126: 50,
-                                       field_127: 50,
-                                       field_128: 50,
-                                       field_13: "tenant_code" })
-            end
 
             before do
               parser.log.save!
@@ -340,39 +319,13 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
               parser.instance_variable_set(:@valid, nil)
             end
 
-            it "is not a valid row" do
+            it "is a valid row (and not a duplicate)" do
-              expect(parser).not_to be_valid
+              expect(parser).to be_valid
-            end
-
-            it "adds an error to all (and only) the fields used to determine duplicates" do
-              parser.valid?
-
-              error_message = "This is a duplicate log"
-
-              [
-                :field_1, # owning_organisation
-                :field_8, # startdate
-                :field_9, # startdate
-                :field_10, # startdate
-                :field_13, # tenancycode
-                :field_21, # postcode_full
-                :field_22, # postcode_full
-                :field_23, # postcode_full
-                :field_42, # age1
-                :field_43, # sex1
-                :field_46, # ecstat1
-                :field_125, # brent
-                :field_126, # scharge
-                :field_127, # pscharge
-                :field_128, # supcharg
-              ].each do |field|
-                expect(parser.errors[field]).not_to include(error_message)
-              end
             end
           end
 
           context "when a supported housing log already exists in the db" do
-            let(:attributes) { { bulk_upload:, field_4: "2" } }
+            let(:attributes) { valid_attributes.merge({ field_4: "2", field_5: "S#{scheme.id}", field_6: location.old_visible_id, field_41: 3, field_122: 0 }) }
 
             before do
               parser.log.save!
@@ -793,6 +746,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { valid_attributes.merge({ field_15: nil }) }
 
           it "cannot be nulled" do
+            parser.valid?
             expect(parser.errors[:field_15]).to eq(["You must answer tenant has seen the privacy notice"])
           end
         end
@@ -823,6 +777,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
       let(:attributes) { { bulk_upload:, field_13: "123" } }
 
       it "has errors on setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_10 field_11 field_15 field_2 field_4 field_7 field_8 field_9])
@@ -834,6 +790,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_3: "", field_4: 1 } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
 
@@ -850,6 +807,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_3: "idonotexist@example.com" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_present
         end
       end
@@ -860,10 +818,12 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email, field_2: managing_org.old_visible_id } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_present
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -874,6 +834,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email, field_2: managing_org.old_visible_id } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
 
@@ -892,6 +853,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email.upcase!, field_2: managing_org.old_visible_id } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
       end
@@ -902,6 +864,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email, field_2: managing_org.old_visible_id } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
       end
@@ -912,6 +875,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_4: "2", field_11: "1", field_5: nil, field_6: nil } }
 
         it "cannot be nulled" do
+          parser.valid?
           expect(parser.errors[:field_5]).to eq(["You must answer scheme code"])
           expect(parser.errors[:field_6]).to eq(["You must answer location code"])
         end
@@ -921,6 +885,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_4: "1", field_11: "0", field_5: nil, field_6: nil } }
 
         it "can be nulled" do
+          parser.valid?
           expect(parser.errors[:field_5]).to be_blank
           expect(parser.errors[:field_6]).to be_blank
         end
@@ -1031,6 +996,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { { bulk_upload:, field_98: "50", field_7: "1" } }
 
           it "is permitted" do
+            parser.valid?
             expect(parser.errors[:field_98]).to be_blank
           end
         end
@@ -1039,6 +1005,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { { bulk_upload:, field_98: "51", field_7: "1" } }
 
           it "is permitted" do
+            parser.valid?
             expect(parser.errors[:field_98]).to be_blank
           end
         end
@@ -1047,6 +1014,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { { bulk_upload:, field_98: "52", field_7: "1" } }
 
           it "is permitted" do
+            parser.valid?
             expect(parser.errors[:field_98]).to be_blank
           end
         end
@@ -1055,6 +1023,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { { bulk_upload:, field_98: "53", field_7: "1" } }
 
           it "is permitted" do
+            parser.valid?
             expect(parser.errors[:field_98]).to be_blank
           end
         end
@@ -1063,6 +1032,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           let(:attributes) { { bulk_upload:, field_98: "1", field_7: "1" } }
 
           it "is not permitted" do
+            parser.valid?
             expect(parser.errors[:field_98]).to include('The reason for leaving must be "End of social or private sector tenancy - no fault", "End of social or private sector tenancy - evicted due to anti-social behaviour (ASB)", "End of social or private sector tenancy - evicted due to rent arrears" or "End of social or private sector tenancy - evicted for any other reason"')
           end
         end
@@ -1072,6 +1042,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_98: "7" }) }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_98]).to include("Enter a valid value for What is the tenant’s main reason for the household leaving their last settled home?")
         end
       end
@@ -1082,6 +1053,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_79: "1" } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_79]).to be_blank
           expect(parser.errors[:field_80]).to be_blank
           expect(parser.errors[:field_81]).to be_blank
@@ -1092,6 +1064,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_79: "1", field_80: "1" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_79]).to be_present
           expect(parser.errors[:field_80]).to be_present
         end
@@ -1103,6 +1076,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_83: "1", field_82: "1" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_83]).to be_present
         end
       end
@@ -1113,6 +1087,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_84: "1", field_82: "1" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_84]).to be_present
         end
       end
@@ -1123,6 +1098,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_83: "1", field_84: "1" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_83]).to be_present
           expect(parser.errors[:field_84]).to be_present
         end
@@ -1134,6 +1110,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_79: nil, field_80: nil, field_81: nil, field_82: nil, field_83: nil, field_84: nil }) }
 
         it "adds errors to correct fields" do
+          parser.valid?
           expect(parser.errors[:field_79]).to be_present
           expect(parser.errors[:field_80]).to be_present
           expect(parser.errors[:field_81]).to be_present
@@ -1146,6 +1123,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_79: "1", field_82: nil }) }
 
         it "sets other disabled access needs as no" do
+          parser.valid?
           expect(parser.errors[:field_79]).to be_blank
           expect(parser.errors[:field_82]).to be_blank
           expect(parser.log.housingneeds_other).to eq(0)
@@ -1158,6 +1136,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_85: "2", field_86: "1", field_87: "1", field_88: "1" } }
 
         it "errors added to correct fields" do
+          parser.valid?
           expect(parser.errors[:field_86]).to be_present
           expect(parser.errors[:field_87]).to be_present
           expect(parser.errors[:field_88]).to be_present
@@ -1175,6 +1154,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_85: "1", field_86: nil, field_87: nil, field_88: nil, field_89: nil, field_90: nil, field_91: nil, field_92: nil, field_93: nil, field_94: nil, field_95: nil } }
 
         it "errors added to correct fields" do
+          parser.valid?
           expect(parser.errors[:field_86]).to be_present
           expect(parser.errors[:field_87]).to be_present
           expect(parser.errors[:field_88]).to be_present
@@ -1199,6 +1179,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           end
 
           it "adds an error to #{field}" do
+            parser.valid?
             expect(parser.errors[field]).to be_present
           end
         end
@@ -1210,6 +1191,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_106: "1", field_107: nil, field_108: nil, field_109: nil, field_110: nil, field_111: nil } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_107]).to be_present
           expect(parser.errors[:field_108]).to be_present
           expect(parser.errors[:field_109]).to be_present
@@ -1224,6 +1206,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_116: "3", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_116]).to be_present
         end
       end
@@ -1232,6 +1215,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_116: "4", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "1" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_116]).to be_present
         end
       end
@@ -1242,6 +1226,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_116: "4", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_116]).to be_blank
         end
       end
@@ -1251,6 +1236,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_116: "4", field_4: "2" } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_116]).to be_blank
         end
       end
@@ -1261,6 +1247,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_11: "0", field_8: nil, field_9: nil, field_10: nil } }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_8]).to be_present
           expect(parser.errors[:field_9]).to be_present
           expect(parser.errors[:field_10]).to be_present
@@ -1271,6 +1258,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_10: "2023" } }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_10]).to include("Tenancy start year must be 2 digits")
         end
       end
@@ -1289,6 +1277,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:bulk_upload) { create(:bulk_upload, :lettings, user:, year: 2022) }
 
         it "does not return errors" do
+          parser.valid?
           expect(parser.errors[:field_8]).not_to be_present
           expect(parser.errors[:field_9]).not_to be_present
           expect(parser.errors[:field_10]).not_to be_present
@@ -1307,6 +1296,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:bulk_upload) { create(:bulk_upload, :lettings, user:, year: 2023) }
 
         it "returns setup errors" do
+          parser.valid?
           expect(parser.errors.where(:field_8, category: :setup)).to be_present
           expect(parser.errors.where(:field_9, category: :setup)).to be_present
           expect(parser.errors.where(:field_10, category: :setup)).to be_present
@@ -1319,10 +1309,12 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: "", field_4: 1 } }
 
         it "is not permitted as setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation"])
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1331,12 +1323,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: "donotexist" } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code is incorrect")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1347,12 +1342,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code provided is for an organisation that does not own stock")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1363,12 +1361,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: unaffiliated_org.old_visible_id } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("You do not have permission to add logs for this owning organisation")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1424,12 +1425,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_2: "", field_4: 1 } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("You must answer managing organisation")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1438,12 +1442,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_2: "donotexist" } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("The managing organisation code is incorrect")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1454,12 +1461,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: unaffiliated_org.old_visible_id } }
 
         it "is not permitted as setup error" do
+          parser.valid?
+
           setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
 
           expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("This managing organisation does not have a relationship with the owning organisation")
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -1470,6 +1480,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_4: nil, field_13: "123" } }
 
         it "is reported as a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql(["You must answer needs type"])
         end
       end
@@ -1480,6 +1491,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_7: "" } }
 
         it "has setup errors on the field" do
+          parser.valid?
           expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to eql(["You must answer property renewal"])
         end
       end
@@ -1488,88 +1500,149 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_7: "101" }) }
 
         it "adds a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to include("Enter a valid value for Is this letting a renewal?")
         end
       end
     end
 
-    describe "#field_16" do # UPRN
+    describe "UPRN and address fields" do
-      context "when over 12 characters" do
+      context "with a general needs log" do
-        let(:attributes) { setup_section_params.merge({ field_16: "1234567890123" }) }
+        context "when a valid UPRN is given" do
+          context "and address fields are not given" do
+            let(:attributes) { setup_section_params.merge({ field_4: 1, field_16: "123456789012" }) }
 
-        it "adds an appropriate error" do
+            it "does not add errors" do
-          expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less"])
+              parser.valid?
+              %i[field_16 field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+                expect(parser.errors[field]).to be_empty
+              end
+            end
+          end
         end
-      end
 
-      context "when neither UPRN nor address fields are given" do
+        context "when an invalid UPRN is given" do
-        let(:attributes) { setup_section_params }
+          context "and address fields are not given" do
+            let(:attributes) { setup_section_params.merge({ field_4: 1, field_16: "1234567890123" }) }
 
-        it "adds appropriate errors" do
+            it "adds an appropriate error to the UPRN field" do
-          expect(parser.errors[:field_16]).to eql(["You must answer UPRN"])
+              parser.valid?
-          expect(parser.errors[:field_17]).to eql(["You must answer address line 1"])
+              expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less"])
-          expect(parser.errors[:field_19]).to eql(["You must answer town or city"])
+            end
-        end
-      end
 
-      context "when neither UPRN nor address fields are given for a supported housing record" do
+            it "adds errors to missing key address fields" do
-        let(:bulk_upload) { create(:bulk_upload, :lettings, user:, needstype: 2) }
+              parser.valid?
-        let(:attributes) do
+              expect(parser.errors[:field_17]).to eql(["You must answer address line 1"])
-          { bulk_upload:,
+              expect(parser.errors[:field_19]).to eql(["You must answer town or city"])
-            field_5: "S#{scheme.id}",
+              expect(parser.errors[:field_21]).to eql(["You must answer part 1 of postcode"])
-            field_4: "2",
+              expect(parser.errors[:field_22]).to eql(["You must answer part 2 of postcode"])
-            field_11: "1",
+            end
-            field_6: location.old_visible_id,
+          end
-            field_1: "1" }
-        end
 
-        it "does not add UPRN errors (but still adds missing address errors)" do
+          context "and address fields are given" do
-          expect(parser.errors[:field_16]).to be_empty
+            let(:attributes) { setup_section_params.merge({ field_4: 1, field_16: "1234567890123", field_17: "address line 1", field_19: "town or city", field_21: "AA1", field_22: "1AA" }) }
-          expect(parser.errors[:field_17]).to eql(["You must answer address line 1"])
-          expect(parser.errors[:field_19]).to eql(["You must answer town or city"])
-        end
-      end
 
-      context "when UPRN is given but address fields are not" do
+            it "adds an error to the UPRN field only" do
-        let(:attributes) do
+              parser.valid?
-          {
+              expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less"])
-            bulk_upload:,
+              %i[field_17 field_19 field_21 field_22].each do |field|
-            field_16: "123456789012",
+                expect(parser.errors[field]).to be_empty
-          }
+              end
-        end
+            end
 
-        it "doesn't add an error" do
+            it "does not do an address search" do
-          expect(parser.errors[:field_16]).to be_empty
+              parser.valid?
+              expect(a_request(:any, /api\.os\.uk\/search\/places\/v1\/find/)).not_to have_been_made
+            end
+          end
         end
-      end
 
-      context "when address is given but UPRN is not" do
+        context "when no UPRN is given" do
-        let(:attributes) do
+          context "and no address fields are given" do
-          {
+            let(:attributes) { setup_section_params.merge({ field_4: 1 }) }
-            bulk_upload:,
-            field_17: "1 Example Rd",
-            field_19: "Example Town/City",
-          }
-        end
 
-        it "doesn't add an error" do
+            it "adds appropriate errors to UPRN and key address fields" do
-          expect(parser.errors[:field_16]).to be_empty
+              parser.valid?
-        end
+              expect(parser.errors[:field_16]).to eql(["You must answer UPRN"])
-      end
+              expect(parser.errors[:field_17]).to eql(["You must answer address line 1"])
-    end
+              expect(parser.errors[:field_19]).to eql(["You must answer town or city"])
+              expect(parser.errors[:field_21]).to eql(["You must answer part 1 of postcode"])
+              expect(parser.errors[:field_22]).to eql(["You must answer part 2 of postcode"])
+            end
+          end
 
-    describe "address fields" do
+          context "and some key address field is missing" do
-      context "when no address can be found" do
+            let(:attributes) { setup_section_params.merge({ field_4: 1, field_19: "town or city", field_21: "AA1", field_22: "1AA" }) }
-        before do
+
-          stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+            it "adds errors to UPRN and the missing key address field" do
-            .to_return(status: 200, body: nil, headers: {})
+              parser.valid?
+              expect(parser.errors[:field_16]).to eql(["You must answer UPRN"])
+              expect(parser.errors[:field_17]).to eql(["You must answer address line 1"])
+              expect(parser.errors[:field_19]).to be_empty
+              expect(parser.errors[:field_21]).to be_empty
+              expect(parser.errors[:field_22]).to be_empty
+            end
+          end
+
+          context "and all key address fields are present" do
+            let(:attributes) { setup_section_params.merge({ field_4: 1, field_16: nil, field_17: "address line 1", field_19: "town or city", field_21: "AA1", field_22: "1AA" }) }
+
+            context "and an address can be found with a high enough match rating" do
+              before do
+                stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                  .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.7, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {})
+              end
+
+              it "does not add errors" do
+                parser.valid?
+                %i[field_16 field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+                  expect(parser.errors[field]).to be_empty
+                end
+              end
+            end
+
+            context "when no address can be found" do
+              before do
+                stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                  .to_return(status: 200, body: { results: [] }.to_json, headers: {})
+              end
+
+              it "adds address not found errors to address fields only" do
+                parser.valid?
+                expect(parser.errors[:field_16]).to be_empty
+                %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+                  expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+                end
+              end
+            end
+
+            context "when no address has a high enough match rating" do
+              before do
+                stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                  .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.6, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {})
+              end
+
+              it "adds address not found errors to address fields only" do
+                parser.valid?
+                expect(parser.errors[:field_16]).to be_empty
+                %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+                  expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+                end
+              end
+            end
+          end
         end
+      end
 
-        let(:attributes) { setup_section_params.merge({ field_16: nil, field_17: "address line 1", field_19: "town or city" }) }
+      context "with a supported housing log" do
+        context "when neither UPRN nor address fields are provided" do
+          let(:attributes) { setup_section_params.merge({ field_4: 2, field_5: "S#{scheme.id}", field_6: location.old_visible_id, field_16: nil, field_17: nil, field_19: nil, field_21: nil, field_22: nil }) }
 
-        it "adds an appropriate error" do
+          it "does not add missing field errors" do
-          %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+            parser.valid?
-            expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+            %i[field_16 field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
+              expect(parser.errors[field]).to be_empty
+            end
           end
         end
       end
@@ -1580,6 +1653,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_25: "4" }) }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_25]).to be_present
         end
       end
@@ -1590,10 +1664,12 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_27: nil }) }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_27]).to be_present
         end
 
         it "populates with correct error message" do
+          parser.valid?
           expect(parser.errors[:field_27]).to eql(["You must answer type of building"])
         end
       end
@@ -1604,6 +1680,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_48: "", field_49: "F" }) }
 
         it "returns an error" do
+          parser.valid?
           expect(parser.errors[:field_48]).to be_present
         end
       end
@@ -1686,9 +1763,12 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_45: "123123" }) }
 
         it "is correctly set" do
-          parser.log.save!
           expect(parser.log.nationality_all).to be(nil)
           expect(parser.log.nationality_all_group).to be(nil)
+        end
+
+        it "adds an error to field_45" do
+          parser.valid?
           expect(parser.errors["field_45"]).to include("Select a valid nationality")
         end
       end
@@ -1699,11 +1779,13 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_42: 22, field_46: 5 }) }
 
         it "adds an error to the relevant fields" do
+          parser.valid?
           expect(parser.errors.where(:field_42, category: :soft_validation)).to be_present
           expect(parser.errors.where(:field_46, category: :soft_validation)).to be_present
         end
 
         it "populates with correct error message" do
+          parser.valid?
           expect(parser.errors.where(:field_42, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
           expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
         end
@@ -1713,11 +1795,13 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_78: "1", field_43: "M", field_49: "M", field_53: "M" }) }
 
         it "adds errors to fields that are routed to" do
+          parser.valid?
           expect(parser.errors.where(:field_49, category: :soft_validation)).to be_present
           expect(parser.errors.where(:field_53, category: :soft_validation)).to be_present
         end
 
         it "does not add errors to fields that are not routed to" do
+          parser.valid?
           expect(parser.errors.where(:field_57, category: :soft_validation)).not_to be_present
           expect(parser.errors.where(:field_61, category: :soft_validation)).not_to be_present
         end
@@ -1727,10 +1811,12 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_125: 120, field_126: 120, field_127: 120, field_128: 120, field_123: 1, field_29: 1, field_4: 1, field_11: "1", field_23: "E09000008" }) }
 
         it "adds an error to the relevant fields" do
+          parser.valid?
           expect(parser.errors.where(:field_125, category: :soft_validation)).to be_present
         end
 
         it "populates with correct error message" do
+          parser.valid?
           expect(parser.errors.where(:field_125, category: :soft_validation).count).to be(1)
           expect(parser.errors.where(:field_125, category: :soft_validation).first.message).to eql("You told us the rent is £120.00 every week. This is higher than we would expect.")
         end

spec/services/bulk_upload/sales/year2024/row_parser_spec.rb

@@ -245,8 +245,6 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
 
       stub_request(:get, /api\.os\.uk/)
         .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.9, BUILDING_NAME: "result address line 1", POST_TOWN: "result town or city", POSTCODE: "AA1 1AA", UPRN: "12345" } }] }.to_json, headers: {})
-
-      parser.valid?
     end
 
     describe "#valid?" do
@@ -262,6 +260,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_8: 2 } }
 
         it "does not add keep adding errors to the pile" do
+          parser.valid?
           expect { parser.valid? }.not_to change(parser.errors, :count)
         end
       end
@@ -274,6 +273,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         end
 
         it "instantiates a log with everything completed", aggregate_failures: true do
+          parser.valid?
+
           questions = parser.send(:questions).reject do |q|
             parser.send(:log).optional_fields.include?(q.id) || q.completed?(parser.send(:log))
           end
@@ -313,6 +314,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_17 field_18 field_2 field_4 field_5 field_6 field_8])
@@ -329,6 +332,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_15 field_17 field_18 field_2 field_4 field_5 field_6 field_9])
@@ -347,6 +352,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_16 field_17 field_18 field_2 field_4 field_5 field_6])
@@ -364,6 +371,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_10 field_15 field_17 field_18 field_2 field_4 field_5 field_6])
@@ -381,6 +390,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_17 field_18 field_2 field_4 field_5 field_6 field_8])
@@ -397,6 +408,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_11 field_13 field_14 field_17 field_18 field_2 field_4 field_5 field_6])
@@ -415,6 +428,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "has errors on correct setup fields" do
+        parser.valid?
+
         errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort
 
         expect(errors).to eql(%i[field_1 field_12 field_14 field_15 field_17 field_18 field_2 field_4 field_5 field_6])
@@ -426,10 +441,12 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_1: nil) }
 
         it "is not permitted as setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation"])
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -438,10 +455,12 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: "donotexist" } }
 
         it "is not permitted as a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["The owning organisation code is incorrect"])
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -452,10 +471,12 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: unaffiliated_org.old_visible_id } }
 
         it "is not permitted as setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You do not have permission to add logs for this owning organisation"])
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -529,14 +550,17 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(bulk_upload:, field_3: nil) }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
 
         it "sets assigned to to bulk upload user" do
+          parser.valid?
           expect(parser.log.assigned_to).to eq(bulk_upload.user)
         end
 
         it "sets created by to bulk upload user" do
+          parser.valid?
           expect(parser.log.created_by).to eq(bulk_upload.user)
         end
       end
@@ -545,6 +569,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_3: "idonotexist@example.com" } }
 
         it "is not permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_present
         end
       end
@@ -555,10 +580,12 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email } }
 
         it "is not permitted as a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_3, category: :setup)).to be_present
         end
 
         it "blocks log creation" do
+          parser.valid?
           expect(parser).to be_block_log_creation
         end
       end
@@ -569,14 +596,17 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
 
         it "sets assigned to to the user" do
+          parser.valid?
           expect(parser.log.assigned_to).to eq(other_user)
         end
 
         it "sets created by to bulk upload user" do
+          parser.valid?
           expect(parser.log.created_by).to eq(bulk_upload.user)
         end
       end
@@ -587,6 +617,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email.upcase! } }
 
         it "is permitted" do
+          parser.valid?
           expect(parser.errors[:field_3]).to be_blank
         end
       end
@@ -597,6 +628,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_4: nil, field_5: nil, field_6: nil }) }
 
         it "returns them as setup errors" do
+          parser.valid?
           expect(parser.errors.where(:field_4, category: :setup)).to be_present
           expect(parser.errors.where(:field_5, category: :setup)).to be_present
           expect(parser.errors.where(:field_6, category: :setup)).to be_present
@@ -607,6 +639,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_4: "1", field_5: "1", field_6: nil }) }
 
         it "returns an error only on blank field as setup error" do
+          parser.valid?
           expect(parser.errors[:field_4]).to be_blank
           expect(parser.errors[:field_5]).to be_blank
           expect(parser.errors.where(:field_6, category: :setup)).to be_present
@@ -617,6 +650,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ bulk_upload:, field_6: "2023" }) }
 
         it "returns a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to include("Sale completion year must be 2 digits")
         end
       end
@@ -641,6 +675,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2024) }
 
         it "does not return errors" do
+          parser.valid?
           expect(parser.errors[:field_4]).not_to be_present
           expect(parser.errors[:field_5]).not_to be_present
           expect(parser.errors[:field_6]).not_to be_present
@@ -659,6 +694,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2023) }
 
         it "returns setup errors" do
+          parser.valid?
           expect(parser.errors.where(:field_4, category: :setup)).to be_present
           expect(parser.errors.where(:field_5, category: :setup)).to be_present
           expect(parser.errors.where(:field_6, category: :setup)).to be_present
@@ -736,6 +772,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_8: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_8, category: :setup)).to be_present
         end
       end
@@ -746,6 +783,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_9: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_9, category: :setup)).to be_present
         end
       end
@@ -756,6 +794,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_10: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_10, category: :setup)).to be_present
         end
       end
@@ -766,6 +805,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_8: "2", field_116: "71" }) }
 
         it "returns correct error" do
+          parser.valid?
           expect(parser.errors.where(:field_116).map(&:message)).to include("Percentage discount must be between 0% and 70%")
         end
       end
@@ -774,6 +814,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_8: "2", field_116: "70" }) }
 
         it "does not return error" do
+          parser.valid?
           expect(parser.errors.where(:field_116)).not_to be_present
         end
       end
@@ -782,6 +823,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_8: "2", field_116: "-1" }) }
 
         it "returns correct error" do
+          parser.valid?
           expect(parser.errors.where(:field_116).map(&:message)).to include("Percentage discount must be between 0% and 70%")
         end
       end
@@ -792,6 +834,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_11: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_11, category: :setup)).to be_present
         end
       end
@@ -802,6 +845,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_11: "12", field_12: nil }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_12, category: :setup)).to be_present
         end
       end
@@ -812,6 +856,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_8: "3", field_13: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_13).map(&:message)).to include("Enter a valid value for is the buyer a company?")
           expect(parser.errors.where(:field_13, category: :setup)).to be_present
         end
@@ -823,6 +868,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_8: "3", field_14: "100" }) }
 
         it "returns setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_14).map(&:message)).to eql(["Enter a valid value for will the buyers live in the property?"])
           expect(parser.errors.where(:field_14, category: :setup)).to be_present
         end
@@ -834,6 +880,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_15: "100" }) }
 
         it "returns a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_15, category: :setup)).to be_present
         end
       end
@@ -844,96 +891,138 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_15: "1", field_16: "100" }) }
 
         it "returns a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_16, category: :setup)).to be_present
         end
       end
     end
 
-    describe "#field_22" do # UPRN
+    describe "UPRN and address fields" do
-      context "when UPRN known and lookup found" do
+      context "when a valid UPRN is given" do
         let(:attributes) { setup_section_params.merge({ field_22: "12" }) }
 
-        it "is valid" do
+        it "does not add errors" do
-          expect(parser.errors[:field_22]).to be_blank
+          parser.valid?
+          %i[field_22 field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
+            expect(parser.errors[field]).to be_empty
+          end
         end
 
-        it "sets UPRN and UPRN known" do
+        it "sets UPRN, UPRN known, and UPRN confirmed" do
           expect(parser.log.uprn).to eq("12")
           expect(parser.log.uprn_known).to eq(1)
           expect(parser.log.uprn_confirmed).to eq(1)
         end
       end
 
-      context "when UPRN not known but address known" do
+      context "when an invalid UPRN is given" do
-        let(:attributes) { setup_section_params.merge({ field_22: nil, field_23: "some street", field_25: "some town", field_27: "EC1N", field_28: "2TD" }) }
+        context "and address fields are not given" do
+          let(:attributes) { setup_section_params.merge({ field_22: "1234567890123" }) }
+
+          it "adds an appropriate error to the UPRN field" do
+            parser.valid?
+            expect(parser.errors[:field_22]).to eql(["UPRN must be 12 digits or less"])
+          end
 
-        it "is valid" do
+          it "adds errors to missing key address fields" do
-          expect(parser.errors[:field_22]).to be_blank
+            parser.valid?
+            expect(parser.errors[:field_23]).to eql(["You must answer address line 1"])
+            expect(parser.errors[:field_25]).to eql(["You must answer town or city"])
+            expect(parser.errors[:field_27]).to eql(["You must answer part 1 of postcode"])
+            expect(parser.errors[:field_28]).to eql(["You must answer part 2 of postcode"])
+          end
         end
-      end
 
-      context "when neither UPRN or address known" do
+        context "and address fields are given" do
-        let(:attributes) { setup_section_params.merge({ field_22: nil, field_23: nil, field_25: nil, field_27: nil, field_28: nil }) }
+          let(:attributes) { setup_section_params.merge({ field_22: "1234567890123", field_23: "address line 1", field_25: "town or city", field_27: "AA1", field_28: "1AA" }) }
 
-        it "is not valid" do
+          it "adds an error to the UPRN field only" do
-          expect(parser.errors[:field_22]).to be_present
+            parser.valid?
+            expect(parser.errors[:field_22]).to eql(["UPRN must be 12 digits or less"])
+            %i[field_23 field_25 field_27 field_28].each do |field|
+              expect(parser.errors[field]).to be_empty
+            end
+          end
+
+          it "does not do an address search" do
+            parser.valid?
+            expect(a_request(:any, /api\.os\.uk\/search\/places\/v1\/find/)).not_to have_been_made
+          end
         end
       end
 
-      context "when UPRN entered but no lookup found" do
+      context "when no UPRN is given" do
-        let(:attributes) { setup_section_params.merge({ field_22: "1234567890123" }) }
+        context "and no address fields are given" do
+          let(:attributes) { setup_section_params }
 
-        it "is not valid" do
+          it "adds appropriate errors to UPRN and key address fields" do
-          expect(parser.errors[:field_22]).to be_present
+            parser.valid?
+            expect(parser.errors[:field_22]).to eql(["You must answer UPRN"])
+            expect(parser.errors[:field_23]).to eql(["You must answer address line 1"])
+            expect(parser.errors[:field_25]).to eql(["You must answer town or city"])
+            expect(parser.errors[:field_27]).to eql(["You must answer part 1 of postcode"])
+            expect(parser.errors[:field_28]).to eql(["You must answer part 2 of postcode"])
+          end
         end
-      end
-    end
 
-    [
+        context "and some key address field is missing" do
-      { field: :field_23, name: "address line 1" },
+          let(:attributes) { setup_section_params.merge({ field_25: "town or city", field_27: "AA1", field_28: "1AA" }) }
-      { field: :field_25, name: "town or city" },
+
-    ].each do |data|
+          it "adds errors to UPRN and the missing key address field" do
-      describe "##{data[:field]} (#{data[:name]})" do
+            parser.valid?
-        context "when UPRN present" do
+            expect(parser.errors[:field_22]).to eql(["You must answer UPRN"])
-          context "when UPRN valid" do
+            expect(parser.errors[:field_23]).to eql(["You must answer address line 1"])
-            let(:attributes) { setup_section_params.merge({ field_22: "12", data[:field] => nil }) }
+            expect(parser.errors[:field_25]).to be_empty
-
+            expect(parser.errors[:field_27]).to be_empty
-            it "can be blank" do
+            expect(parser.errors[:field_28]).to be_empty
-              expect(parser.errors[data[:field]]).to be_blank
-            end
           end
+        end
 
-          context "when UPRN invalid" do
+        context "and all key address fields are present" do
-            let(:attributes) { setup_section_params.merge({ field_22: "1234567890123", data[:field] => nil }) }
+          let(:attributes) { setup_section_params.merge({ field_22: nil, field_23: "address line 1", field_25: "town or city", field_27: "AA1", field_28: "1AA" }) }
 
-            it "cannot be blank" do
+          context "and an address can be found with a high enough match rating" do
-              expect(parser.errors[data[:field]]).to be_present
+            before do
+              stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.7, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {})
+            end
+
+            it "does not add errors" do
+              parser.valid?
+              %i[field_22 field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
+                expect(parser.errors[field]).to be_empty
+              end
             end
           end
-        end
 
-        context "when UPRN not present" do
+          context "when no address can be found" do
-          let(:attributes) { setup_section_params.merge({ field_22: nil, data[:field] => nil }) }
+            before do
+              stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                .to_return(status: 200, body: { results: [] }.to_json, headers: {})
+            end
 
-          it "cannot be blank" do
+            it "adds address not found errors to address fields only" do
-            expect(parser.errors[data[:field]]).to be_present
+              parser.valid?
+              expect(parser.errors[:field_22]).to be_empty
+              %i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
+                expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+              end
+            end
           end
-        end
-      end
-    end
 
-    describe "address fields" do
+          context "when no address has a high enough match rating" do
-      context "when no address can be found" do
+            before do
-        before do
+              stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
-          stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/)
+                .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.6, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {})
-            .to_return(status: 200, body: nil, headers: {})
+            end
-        end
-
-        let(:attributes) { setup_section_params.merge({ field_22: nil, field_23: "address line 1", field_25: "town or city" }) }
 
-        it "adds an appropriate error" do
+            it "adds address not found errors to address fields only" do
-          %i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
+              parser.valid?
-            expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+              expect(parser.errors[:field_22]).to be_empty
+              %i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
+                expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+              end
+            end
           end
         end
       end
@@ -944,6 +1033,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
 
       context "when not answered" do
         it "returns a setup error" do
+          parser.valid?
           expect(parser.errors.where(:field_18, category: :setup)).to be_present
         end
       end
@@ -1032,6 +1122,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_38: nil, field_42: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 2 cannot have a working situation of child under 16"
           expect(parser.errors[:field_42]).to include validation_message
         end
@@ -1041,6 +1133,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_38: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 2’s age must be between 16 and 110"
           expect(parser.errors[:field_38]).to include validation_message
         end
@@ -1050,6 +1144,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_38: "17", field_42: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 2's age cannot be 16 or over if their working situation is child under 16"
           expect(parser.errors[:field_42]).to include validation_message
           expect(parser.errors[:field_38]).to include validation_message
@@ -1060,6 +1156,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_15: 2, field_38: "10", field_42: "9" }) }
 
         it "does not add errors to their age and ecstat fields" do
+          parser.valid?
           expect(parser.errors[:field_38]).to be_empty
           expect(parser.errors[:field_42]).to be_empty
         end
@@ -1071,6 +1168,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_31: nil, field_35: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 1 cannot have a working situation of child under 16"
           expect(parser.errors[:field_35]).to include validation_message
         end
@@ -1080,6 +1179,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_31: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 1’s age must be between 16 and 110"
           expect(parser.errors[:field_31]).to include validation_message
         end
@@ -1089,6 +1190,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_31: "17", field_35: "9" }) }
 
         it "a custom validation is applied" do
+          parser.valid?
+
           validation_message = "Buyer 1's age cannot be 16 or over if their working situation is child under 16"
           expect(parser.errors[:field_35]).to include validation_message
           expect(parser.errors[:field_31]).to include validation_message
@@ -1101,6 +1204,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_36: "3" }) }
 
         it "is not valid" do
+          parser.valid?
           expect(parser.errors).to include(:field_36)
         end
       end
@@ -1122,7 +1226,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           let(:attributes) { empty_organisation_params.merge({ field_number => 1 }) }
 
           it "does not set pregblank field" do
-            attributes[:field_number] = 1
+            attributes[field_number] = 1
             expect(parser.log.pregblank).to be(0)
           end
         end
@@ -1134,7 +1238,9 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_103: "4") }
 
         it "returns correct errors" do
+          parser.valid?
           expect(parser.errors[:field_103]).to include("Enter a valid value for Was a mortgage used for the purchase of this property? - Shared ownership")
+
           parser.log.blank_invalid_non_setup_fields!
           parser.log.save!
           expect(parser.log.mortgageused).to be_nil
@@ -1145,7 +1251,9 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_103: "3", field_86: "1", field_87: "50", field_88: "99", field_109: nil) }
 
         it "returns correct errors" do
+          parser.valid?
           expect(parser.errors[:field_103]).to include("The percentage owned has to be 100% if the mortgage used is 'Don’t know'")
+
           parser.log.blank_invalid_non_setup_fields!
           parser.log.save!
           expect(parser.log.mortgageused).to be_nil
@@ -1156,6 +1264,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_103: "3", field_86: "1", field_87: "50", field_88: nil, field_109: nil) }
 
         it "does not add errors" do
+          parser.valid?
           expect(parser.errors[:field_103]).to be_empty
           expect(parser.errors[:field_103]).to be_empty
         end
@@ -1166,7 +1275,9 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           let(:attributes) { setup_section_params.merge(field_103: "3", field_86: "2", field_87: "50", field_88: nil, field_109: nil) }
 
           it "returns correct errors" do
+            parser.valid?
             expect(parser.errors[:field_103]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+
             parser.log.blank_invalid_non_setup_fields!
             parser.log.save!
             expect(parser.log.mortgageused).to be_nil
@@ -1177,7 +1288,9 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           let(:attributes) { setup_section_params.merge(field_103: "3", field_86: "2", field_87: "50", field_88: "100", field_109: nil) }
 
           it "returns correct errors" do
+            parser.valid?
             expect(parser.errors[:field_103]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+
             parser.log.blank_invalid_non_setup_fields!
             parser.log.save!
             expect(parser.log.mortgageused).to be_nil
@@ -1189,6 +1302,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_103: "3", field_86: "1", field_87: "50", field_88: "100", field_109: nil) }
 
         it "does not add errors and sets mortgage used to 3" do
+          parser.valid?
           expect(parser.log.mortgageused).to be(3)
           expect(parser.log.stairowned).to be(100)
           expect(parser.log.deposit).to be(nil)
@@ -1201,10 +1315,12 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_9: "30", field_103: "1", field_104: "10000", field_109: "5000", field_101: "30000", field_102: "28", field_86: "2") }
 
         it "does not add a BU error on type (because it's a setup field and would block log creation)" do
+          parser.valid?
           expect(parser.errors[:field_9]).to be_empty
         end
 
         it "includes errors on other related fields" do
+          parser.valid?
           expect(parser.errors[:field_104]).to include("The mortgage and deposit added together is £15,000.00. The value multiplied by the percentage bought is £8,400.00. These figures should be the same.")
           expect(parser.errors[:field_109]).to include("The mortgage and deposit added together is £15,000.00. The value multiplied by the percentage bought is £8,400.00. These figures should be the same.")
           expect(parser.errors[:field_101]).to include("The mortgage and deposit added together is £15,000.00. The value multiplied by the percentage bought is £8,400.00. These figures should be the same.")
@@ -1212,6 +1328,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         end
 
         it "does not add errors to other ownership type fields" do
+          parser.valid?
           expect(parser.errors[:field_117]).to be_empty
           expect(parser.errors[:field_126]).to be_empty
           expect(parser.errors[:field_118]).to be_empty
@@ -1228,7 +1345,9 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       let(:attributes) { valid_attributes.merge({ field_8: "2", field_10: "9", field_117: "3" }) }
 
       it "does not allow 3 (don't know) as an option for discounted ownership" do
+        parser.valid?
         expect(parser.errors[:field_117]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+
         parser.log.blank_invalid_non_setup_fields!
         parser.log.save!
         expect(parser.log.mortgageused).to be_nil
@@ -1238,6 +1357,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge(field_114: 100, field_123: 100, field_8: 2, field_10: 9, field_117: 2, field_116: 10) }
 
         it "only adds errors to the discounted ownership field" do
+          parser.valid?
           expect(parser.errors[:field_103]).to be_empty
           expect(parser.errors[:field_117]).to include("The mortgage, deposit, and grant when added together is £100.00, and the purchase price times by the discount is £90.00. These figures should be the same")
           expect(parser.errors[:field_126]).to be_empty
@@ -1249,9 +1369,11 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       let(:attributes) { valid_attributes.merge({ field_8: "3", field_11: "10", field_126: "3", field_13: "2" }) }
 
       it "allows 3 (don't know) as an option for outright sale" do
+        parser.valid?
         expect(parser.errors[:field_126]).to be_empty
         expect(parser.errors[:field_103]).to be_empty
         expect(parser.errors[:field_117]).to be_empty
+
         parser.log.blank_invalid_non_setup_fields!
         parser.log.save!
         expect(parser.log.mortgageused).to eq(3)
@@ -1263,11 +1385,13 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
         let(:attributes) { valid_attributes.merge({ field_31: 22, field_35: 5 }) }
 
         it "adds an error to the relevant fields" do
+          parser.valid?
           expect(parser.errors.where(:field_31, category: :soft_validation)).to be_present
           expect(parser.errors.where(:field_35, category: :soft_validation)).to be_present
         end
 
         it "populates with correct error message" do
+          parser.valid?
           expect(parser.errors.where(:field_31, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
           expect(parser.errors.where(:field_35, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
         end