From effe00f79f7ebe81b7bb2edb7fe367a2602945e3 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 21 Mar 2024 15:00:26 +0000 Subject: [PATCH] feat: add validate_address_fields to lettings for 2024 --- .../bulk_upload/lettings/year2024/row_parser.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index cbb7a1087..51c7da6a7 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -412,6 +412,7 @@ class BulkUpload::Lettings::Year2024::RowParser validate :validate_address_option_found, on: :after_log 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_incomplete_soft_validations, on: :after_log validate :validate_nationality, on: :after_log @@ -581,6 +582,18 @@ private end end + def validate_address_fields + if field_16.blank? || log.errors.attribute_names.include?(:uprn) + if field_17.blank? + errors.add(:field_17, I18n.t("validations.not_answered", question: "address line 1")) + end + + if field_19.blank? + errors.add(:field_19, I18n.t("validations.not_answered", question: "town or city")) + end + end + end + def validate_incomplete_soft_validations routed_to_soft_validation_questions = log.form.questions.filter { |q| q.type == "interruption_screen" && q.page.routed_to?(log, nil) }.compact routed_to_soft_validation_questions.each do |question|