Merge branch 'main' into CLDC-2010-discounted-income-soft-max

# Conflicts:
#	app/models/sales_log.rb

app/controllers/merge_requests_controller.rb

@@ -9,6 +9,7 @@ class MergeRequestsController < ApplicationController
     new_organisation_name
     new_organisation_address
     new_organisation_telephone_number
+    new_organisation_type
     merge_date
   ]
   before_action :authenticate_user!
@@ -19,6 +20,7 @@ class MergeRequestsController < ApplicationController
   def new_organisation_name; end
   def new_organisation_address; end
   def new_organisation_telephone_number; end
+  def new_organisation_type; end
   def merge_date; end
 
   def create
@@ -83,6 +85,8 @@ private
       new_organisation_address_merge_request_path(@merge_request)
     when "new_organisation_address"
       new_organisation_telephone_number_merge_request_path(@merge_request)
+    when "new_organisation_telephone_number"
+      new_organisation_type_merge_request_path(@merge_request)
     end
   end
 
@@ -115,6 +119,7 @@ private
       :new_organisation_address_line1,
       :new_organisation_address_line2,
       :new_organisation_postcode,
+      :new_organisation_telephone_number,
     )
 
     if merge_params[:requesting_organisation_id].present? && (current_user.data_coordinator? || current_user.data_provider?)
@@ -150,6 +155,8 @@ private
       end
     when "new_organisation_name"
       @merge_request.errors.add(:new_organisation_name, :blank) if merge_request_params[:new_organisation_name].blank?
+    when "new_organisation_telephone_number"
+      @merge_request.errors.add(:new_organisation_telephone_number, :blank) if merge_request_params[:new_organisation_telephone_number].blank?
     end
   end
 

app/helpers/logs_helper.rb

@@ -47,4 +47,10 @@ module LogsHelper
     when :sales then sales_logs_csv_download_organisation_path(organisation, search:, codes_only:)
     end
   end
+
+  def pluralize_logs_and_errors_warning(log_count, error_count)
+    is_or_are = log_count == 1 ? "is" : "are"
+    need_or_needs = error_count == 1 ? "needs" : "need"
+    "There #{is_or_are} #{pluralize(log_count, 'log')} in this bulk upload with #{pluralize(error_count, 'error')} that still #{need_or_needs} to be fixed after upload."
+  end
 end

app/mailers/bulk_upload_mailer.rb

@@ -27,9 +27,9 @@ class BulkUploadMailer < NotifyMailer
 
   def send_bulk_upload_complete_mail(user:, bulk_upload:)
     url = if bulk_upload.lettings?
-            lettings_logs_url
+            lettings_logs_url("[years][]" => "", "[status][]" => "", user: :all, organisation_select: :all)
           else
-            sales_logs_url
+            sales_logs_url("[years][]" => "", "[status][]" => "", user: :all)
           end
 
     n_logs = pluralize(bulk_upload.logs.count, "log")

app/models/derived_variables/lettings_log_variables.rb

@@ -76,8 +76,8 @@ module DerivedVariables::LettingsLogVariables
       self.voiddate = startdate
       self.unitletas = form.start_date.year >= 2023 ? UNITLETAS_MAPPING_23_24[rent_type] : UNITLETAS_MAPPING[rent_type]
       if is_general_needs?
-        self.prevten = 32 if managing_organisation&.provider_type == "PRP"
+        self.prevten = 32 if owning_organisation&.provider_type == "PRP"
-        self.prevten = 30 if managing_organisation&.provider_type == "LA"
+        self.prevten = 30 if owning_organisation&.provider_type == "LA"
       end
     end
 

app/models/form/lettings/pages/referral.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::Referral < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "referral"
-    @depends_on = [{ "managing_organisation_provider_type" => "LA", "needstype" => 1, "renewal" => 0 }]
+    @depends_on = [{ "owning_organisation_provider_type" => "LA", "needstype" => 1, "renewal" => 0 }]
   end
 
   def questions

app/models/form/lettings/pages/referral_prp.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::ReferralPrp < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "referral_prp"
-    @depends_on = [{ "managing_organisation_provider_type" => "PRP", "needstype" => 1, "renewal" => 0 }]
+    @depends_on = [{ "owning_organisation_provider_type" => "PRP", "needstype" => 1, "renewal" => 0 }]
   end
 
   def questions

app/models/form/lettings/pages/referral_supported_housing.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::ReferralSupportedHousing < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "referral_supported_housing"
-    @depends_on = [{ "managing_organisation_provider_type" => "LA", "needstype" => 2, "renewal" => 0 }]
+    @depends_on = [{ "owning_organisation_provider_type" => "LA", "needstype" => 2, "renewal" => 0 }]
   end
 
   def questions

app/models/form/lettings/pages/referral_supported_housing_prp.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::ReferralSupportedHousingPrp < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "referral_supported_housing_prp"
-    @depends_on = [{ "managing_organisation_provider_type" => "PRP", "needstype" => 2, "renewal" => 0 }]
+    @depends_on = [{ "owning_organisation_provider_type" => "PRP", "needstype" => 2, "renewal" => 0 }]
   end
 
   def questions

app/models/lettings_log.rb

@@ -493,8 +493,8 @@ class LettingsLog < Log
     update(unresolved: false)
   end
 
-  def managing_organisation_provider_type
+  def owning_organisation_provider_type
-    managing_organisation&.provider_type
+    owning_organisation&.provider_type
   end
 
   def reset_created_by!
@@ -529,6 +529,16 @@ class LettingsLog < Log
     is_carehome == 1
   end
 
+  def blank_compound_invalid_non_setup_fields!
+    super
+
+    self.postcode_known = nil if errors.attribute_names.include? :postcode_full
+
+    if errors.of_kind?(:earnings, :under_hard_min)
+      self.incfreq = nil
+    end
+  end
+
 private
 
   def reset_invalid_unresolved_log_fields!

app/models/log.rb

@@ -98,10 +98,18 @@ class Log < ApplicationRecord
   def blank_invalid_non_setup_fields!
     setup_ids = form.setup_sections.flat_map(&:subsections).flat_map(&:questions).map(&:id)
 
-    errors.each do |error|
+    2.times do
-      next if setup_ids.include?(error.attribute.to_s)
+      next if valid?
 
-      public_send("#{error.attribute}=", nil)
+      errors.each do |error|
+        next if setup_ids.include?(error.attribute.to_s)
+
+        public_send("#{error.attribute}=", nil)
+      end
+
+      blank_compound_invalid_non_setup_fields!
+
+      errors.clear
     end
   end
 
@@ -136,6 +144,20 @@ class Log < ApplicationRecord
     format_as_currency(field_value)
   end
 
+  def blank_compound_invalid_non_setup_fields!
+    self.ppcodenk = nil if errors.attribute_names.include? :ppostcode_full
+
+    if errors.of_kind?(:uprn, :uprn_error)
+      self.uprn_known = nil
+      self.uprn_confirmed = nil
+      self.address_line1 = nil
+      self.address_line2 = nil
+      self.town_or_city = nil
+      self.postcode_full = nil
+      self.county = nil
+    end
+  end
+
   def creation_method
     bulk_upload_id ? "bulk upload" : "single log"
   end

app/models/sales_log.rb

@@ -2,7 +2,6 @@ class SalesLogValidator < ActiveModel::Validator
   include Validations::Sales::SetupValidations
   include Validations::Sales::HouseholdValidations
   include Validations::Sales::PropertyValidations
-  include Validations::SharedValidations
   include Validations::Sales::FinancialValidations
   include Validations::Sales::SaleInformationValidations
   include Validations::SharedValidations
@@ -393,4 +392,10 @@ class SalesLog < Log
 
     buyer_1_income + buyer_2_income
   end
+
+  def blank_compound_invalid_non_setup_fields!
+    super
+
+    self.pcodenk = nil if errors.attribute_names.include? :postcode_full
+  end
 end

app/models/validations/financial_validations.rb

@@ -5,7 +5,8 @@ module Validations::FinancialValidations
   # or 'validate_' to run on submit as well
   def validate_outstanding_rent_amount(record)
     if !record.has_housing_benefit_rent_shortfall? && record.tshortfall.present?
-      record.errors.add :tshortfall, :no_outstanding_charges, message: I18n.t("validations.financial.tshortfall.outstanding_amount_not_required")
+      record.errors.add :tshortfall, :no_outstanding_charges, message: I18n.t("validations.financial.tshortfall.outstanding_amount_not_expected")
+      record.errors.add :hbrentshortfall, :no_outstanding_charges, message: I18n.t("validations.financial.hbrentshortfall.outstanding_amount_not_expected")
     end
   end
 

app/services/bulk_upload/lettings/validator.rb

@@ -44,6 +44,11 @@ class BulkUpload::Lettings::Validator
     return false if any_setup_errors?
     return false if row_parsers.any?(&:block_log_creation?)
     return false if any_logs_already_exist? && FeatureToggle.bulk_upload_duplicate_log_check_enabled?
+
+    row_parsers.each do |row_parser|
+      row_parser.log.blank_invalid_non_setup_fields!
+    end
+
     return false if any_logs_invalid?
 
     true

app/services/bulk_upload/processor.rb

@@ -14,14 +14,13 @@ class BulkUpload::Processor
 
     if validator.any_setup_errors?
       send_setup_errors_mail
+
     elsif validator.create_logs?
       create_logs
 
       if created_logs_but_incompleted?
         send_how_fix_upload_mail
-      end
+      elsif created_logs_and_all_completed?
-
-      if created_logs_and_all_completed?
         bulk_upload.unpend
         send_success_mail
       end

app/services/bulk_upload/sales/validator.rb

@@ -38,7 +38,13 @@ class BulkUpload::Sales::Validator
     return false if any_setup_errors?
     return false if row_parsers.any?(&:block_log_creation?)
 
-    row_parsers.all? { |row_parser| row_parser.log.valid? }
+    row_parsers.each do |row_parser|
+      row_parser.log.blank_invalid_non_setup_fields!
+    end
+
+    return false if any_logs_invalid?
+
+    true
   end
 
   def any_setup_errors?
@@ -51,6 +57,10 @@ class BulkUpload::Sales::Validator
 
 private
 
+  def any_logs_invalid?
+    row_parsers.any? { |row_parser| row_parser.log.invalid? }
+  end
+
   def csv_parser
     @csv_parser ||= case bulk_upload.year
                     when 2022

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

@@ -339,6 +339,10 @@ class BulkUpload::Sales::Year2022::RowParser
 
 private
 
+  def buyer_not_interviewed?
+    field_6 == 1
+  end
+
   def shared_ownership?
     field_113 == 1
   end
@@ -478,7 +482,7 @@ private
     attributes["purchid"] = field_1
     attributes["saledate"] = saledate
 
-    attributes["noint"] = 2 if field_6 == 1
+    attributes["noint"] = field_6
 
     attributes["details_known_2"] = details_known?(2)
     attributes["details_known_3"] = details_known?(3)
@@ -517,7 +521,7 @@ private
     attributes["relat5"] = field_22
     attributes["relat6"] = field_23
 
-    attributes["ecstat1"] = field_24
+    attributes["ecstat1"] = buyer_not_interviewed? && field_24.blank? ? 10 : field_24
     attributes["ecstat2"] = field_25
     attributes["ecstat3"] = field_26
     attributes["ecstat4"] = field_27
@@ -526,18 +530,18 @@ private
 
     attributes["ethnic_group"] = ethnic_group_from_ethnic
     attributes["ethnic"] = field_30
-    attributes["national"] = field_31
+    attributes["national"] = buyer_not_interviewed? && field_31.blank? ? 13 : field_31
-    attributes["income1nk"] = field_32.present? ? 0 : 1
+    attributes["income1nk"] = income1nk
     attributes["income1"] = field_32
     attributes["income2nk"] = field_33.present? ? 0 : 1
     attributes["income2"] = field_33
-    attributes["inc1mort"] = field_34
+    attributes["inc1mort"] = buyer_not_interviewed? && field_32.blank? ? 2 : field_34
     attributes["inc2mort"] = field_35
-    attributes["savingsnk"] = field_36.present? ? 0 : 1
+    attributes["savingsnk"] = savingsnk
     attributes["savings"] = field_36
-    attributes["prevown"] = field_37
+    attributes["prevown"] = buyer_not_interviewed? && field_37.blank? ? 3 : field_37
 
-    attributes["prevten"] = field_39
+    attributes["prevten"] = buyer_not_interviewed? && field_39.blank? ? 0 : field_39
     attributes["prevloc"] = field_40
     attributes["previous_la_known"] = previous_la_known
     attributes["ppcodenk"] = field_43
@@ -549,8 +553,8 @@ private
     attributes["pregother"] = field_47
     attributes["pregblank"] = 1 if [field_44, field_45, field_46, field_47].all?(&:blank?)
 
-    attributes["disabled"] = field_48
+    attributes["disabled"] = buyer_not_interviewed? && field_48.blank? ? 3 : field_48
-    attributes["wheel"] = field_49
+    attributes["wheel"] = buyer_not_interviewed? && field_49.blank? ? 3 : field_49
     attributes["beds"] = field_50
     attributes["proptype"] = field_51
     attributes["builtype"] = field_52
@@ -620,6 +624,22 @@ private
     attributes
   end
 
+  def income1nk
+    if field_32.present?
+      0
+    else
+      buyer_not_interviewed? ? 1 : nil
+    end
+  end
+
+  def savingsnk
+    if field_36.present?
+      0
+    else
+      buyer_not_interviewed? ? 1 : nil
+    end
+  end
+
   def saledate
     Date.new(field_4 + 2000, field_3, field_2) if field_2.present? && field_3.present? && field_4.present?
   rescue Date::Error
@@ -686,21 +706,23 @@ private
   end
 
   def ethnic_group_from_ethnic
-    return nil if field_30.blank?
+    if field_30.blank?
-
+      buyer_not_interviewed? ? 17 : nil
-    case field_30
+    else
-    when 1, 2, 3, 18
+      case field_30
-      0
+      when 1, 2, 3, 18
-    when 4, 5, 6, 7
+        0
-      1
+      when 4, 5, 6, 7
-    when 8, 9, 10, 11, 15
+        1
-      2
+      when 8, 9, 10, 11, 15
-    when 12, 13, 14
+        2
-      3
+      when 12, 13, 14
-    when 16, 19
+        3
-      4
+      when 16, 19
-    when 17
+        4
-      17
+      when 17
+        17
+      end
     end
   end
 

app/views/bulk_upload_lettings_resume/confirm.html.erb

@@ -7,7 +7,7 @@
     <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
 
-    <p class="govuk-body">There are <%= pluralize(@bulk_upload.logs.count, "log") %> in this bulk upload with <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> that still need to be fixed after upload.</p>
+    <p class="govuk-body"><%= pluralize_logs_and_errors_warning(@bulk_upload.logs.count, @bulk_upload.bulk_upload_errors.count) %> </p>
 
     <%= govuk_warning_text(icon_fallback_text: "Danger") do %>
       You can not delete logs once you create them

app/views/merge_requests/new_organisation_telephone_number.html.erb

@@ -3,3 +3,18 @@
   <% content_for :title, title %>
   <%= govuk_back_link href: new_organisation_address_merge_request_path(@merge_request) %>
 <% end %>
+
+<%= form_with model: @merge_request, url: merge_request_path, method: :patch do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <h2 class="govuk-heading-l">What is <%= @merge_request.new_organisation_name.possessive %> telephone number?</h2>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+      <%= f.govuk_text_field :new_organisation_telephone_number, label: nil, width: "two-thirds" %>
+      <%= f.hidden_field :page, value: "new_organisation_telephone_number" %>
+      <div class="govuk-button-group">
+        <%= f.govuk_submit %>
+      </div>
+    </div>
+  </div>
+<% end %>

app/views/merge_requests/new_organisation_type.html.erb

@@ -0,0 +1,5 @@
+<% content_for :before_content do %>
+  <% title = "New organisation type" %>
+  <% content_for :title, title %>
+  <%= govuk_back_link href: new_organisation_telephone_number_merge_request_path(@merge_request) %>
+<% end %>

config/forms/2022_2023.json

@@ -7010,7 +7010,7 @@
               },
               "depends_on": [
                 {
-                  "managing_organisation_provider_type": "LA",
+                  "owning_organisation_provider_type": "LA",
                   "needstype": 1,
                   "renewal": 0
                 }
@@ -7067,7 +7067,7 @@
               },
               "depends_on": [
                 {
-                  "managing_organisation_provider_type": "PRP",
+                  "owning_organisation_provider_type": "PRP",
                   "needstype": 1,
                   "renewal": 0
                 }
@@ -7124,7 +7124,7 @@
               },
               "depends_on": [
                 {
-                  "managing_organisation_provider_type": "LA",
+                  "owning_organisation_provider_type": "LA",
                   "needstype": 2,
                   "renewal": 0
                 }
@@ -7184,7 +7184,7 @@
               },
               "depends_on": [
                 {
-                  "managing_organisation_provider_type": "PRP",
+                  "owning_organisation_provider_type": "PRP",
                   "needstype": 2,
                   "renewal": 0
                 }

config/locales/en.yml

@@ -135,7 +135,8 @@ en:
             new_organisation_name:
               blank: "Enter an organisation name"
               invalid: "An organisation with this name already exists"
-
+            new_organisation_telephone_number:
+              blank: "Enter a valid telephone number"
 
 
   validations:
@@ -256,10 +257,11 @@ en:
 
     financial:
       tshortfall:
-        outstanding_amount_not_required: "You cannot answer the outstanding amount question if you don’t have outstanding rent or charges"
+        outstanding_amount_not_expected: "You cannot answer the outstanding amount question if you don’t have outstanding rent or charges"
         more_than_rent: "Enter a value less less than the basic rent amount"
         must_be_positive: "Enter a value over £0.01 as you told us there is an outstanding amount"
       hbrentshortfall:
+        outstanding_amount_not_expected: "Answer must be ‘yes’ as you have answered the outstanding amount question"
         outstanding_no_benefits: "Answer cannot be ‘yes’ to outstanding amount for basic rent or charges if tenant does not receive housing benefit or Universal Credit or you‘re not sure"
       benefits:
         part_or_full_time: "Answer cannot be ‘all’ for income from Universal Credit, state pensions or benefits if the tenant or their partner works part-time or full-time"

config/routes.rb

@@ -144,6 +144,7 @@ Rails.application.routes.draw do
       get "new-organisation-name"
       get "new-organisation-address"
       get "new-organisation-telephone-number"
+      get "new-organisation-type"
       get "merge-date"
     end
   end

db/migrate/20230505105327_add_new_organisation_telephone_number_to_merge_request.rb

@@ -0,0 +1,5 @@
+class AddNewOrganisationTelephoneNumberToMergeRequest < ActiveRecord::Migration[7.0]
+  def change
+    add_column :merge_requests, :new_organisation_telephone_number, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_05_04_111352) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_05_105327) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -375,6 +375,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_04_111352) do
     t.string "new_organisation_address_line1"
     t.string "new_organisation_address_line2"
     t.string "new_organisation_postcode"
+    t.string "new_organisation_telephone_number"
   end
 
   create_table "organisation_relationships", force: :cascade do |t|

spec/mailers/bulk_upload_mailer_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe BulkUploadMailer do
           filename: bulk_upload.filename,
           upload_timestamp: bulk_upload.created_at.to_fs(:govuk_date_and_time),
           success_description: "The lettings 2022/23 data you uploaded has been checked. The 0 logs you uploaded are now complete.",
-          logs_link: lettings_logs_url,
+          logs_link: lettings_logs_url("[years][]" => "", "[status][]" => "", user: :all, organisation_select: :all),
         },
       )
 

spec/models/validations/financial_validations_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe Validations::FinancialValidations do
         record.tshortfall = 99
         financial_validator.validate_outstanding_rent_amount(record)
         expect(record.errors["tshortfall"])
-          .to include(match I18n.t("validations.financial.tshortfall.outstanding_amount_not_required"))
+          .to include(match I18n.t("validations.financial.tshortfall.outstanding_amount_not_expected"))
       end
     end
 

spec/requests/merge_requests_controller_spec.rb

@@ -473,7 +473,7 @@ RSpec.describe MergeRequestsController, type: :request do
         end
       end
 
-      describe "#new_organsation_name" do
+      describe "#new_organisation_name" do
         let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, new_absorbing_organisation: true) }
 
         context "when viewing the new organisation name page" do
@@ -554,7 +554,7 @@ RSpec.describe MergeRequestsController, type: :request do
         end
       end
 
-      describe "#new_organsation_address" do
+      describe "#new_organisation_address" do
         let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, new_organisation_name: "New name", new_absorbing_organisation: true) }
 
         context "when viewing the new organisation name page" do
@@ -594,19 +594,19 @@ RSpec.describe MergeRequestsController, type: :request do
             expect(response).to redirect_to(new_organisation_telephone_number_merge_request_path(merge_request))
           end
 
-          it "updates new organisation address line 1 to correct addess line" do
+          it "updates new organisation address line 1 to correct address line" do
             expect { request }.to change {
               merge_request.reload.new_organisation_address_line1
             }.from(nil).to("first address line")
           end
 
-          it "updates new organisation address line 2 to correct addess line" do
+          it "updates new organisation address line 2 to correct address line" do
             expect { request }.to change {
               merge_request.reload.new_organisation_address_line2
             }.from(nil).to("second address line")
           end
 
-          it "updates new organisation postcode to correct addess line" do
+          it "updates new organisation postcode to correct address line" do
             expect { request }.to change {
               merge_request.reload.new_organisation_postcode
             }.from(nil).to("new postcode")
@@ -633,6 +633,64 @@ RSpec.describe MergeRequestsController, type: :request do
           end
         end
       end
+
+      describe "#new_organisation_telephone_number" do
+        let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, new_organisation_name: "New name", new_absorbing_organisation: true) }
+
+        context "when viewing the new organisation telephone number page" do
+          before do
+            get "/merge-request/#{merge_request.id}/new-organisation-telephone-number", headers:
+          end
+
+          it "displays the correct question" do
+            expect(page).to have_content("What is New name’s telephone number?")
+          end
+
+          it "has the correct back button" do
+            expect(page).to have_link("Back", href: new_organisation_address_merge_request_path(merge_request))
+          end
+        end
+
+        context "when updating the new organisation telephone number" do
+          let(:params) do
+            { merge_request: { new_organisation_telephone_number: "1234", page: "new_organisation_telephone_number" } }
+          end
+
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "redirects to new organisation type path" do
+            request
+            expect(response).to redirect_to(new_organisation_type_merge_request_path(merge_request))
+          end
+
+          it "updates new organisation name to the correct telephone number" do
+            expect { request }.to change {
+              merge_request.reload.new_organisation_telephone_number
+            }.from(nil).to("1234")
+          end
+        end
+
+        context "when the new organisation telephone number is not answered" do
+          let(:params) do
+            { merge_request: { new_organisation_telephone_number: nil, page: "new_organisation_telephone_number" } }
+          end
+
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "renders the error" do
+            request
+            expect(page).to have_content("Enter a valid telephone number")
+          end
+
+          it "does not update the organisation telephone number" do
+            expect { request }.not_to(change { merge_request.reload.attributes })
+          end
+        end
+      end
     end
   end
 

spec/services/bulk_upload/lettings/log_creator_spec.rb

@@ -82,6 +82,36 @@ RSpec.describe BulkUpload::Lettings::LogCreator do
       end
     end
 
+    context "when a valid csv with row with compound errors on non setup field" do
+      let(:file) { Tempfile.new }
+      let(:path) { file.path }
+      let(:log) do
+        build(
+          :lettings_log,
+          :completed,
+          earnings: 0,
+          incfreq: 1,
+        )
+      end
+
+      before do
+        file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row)
+        file.rewind
+      end
+
+      it "creates the log" do
+        expect { service.call }.to change(LettingsLog, :count).by(1)
+      end
+
+      it "blanks invalid fields" do
+        service.call
+
+        record = LettingsLog.last
+        expect(record.earnings).to be_blank
+        expect(record.incfreq).to be_blank
+      end
+    end
+
     context "when pre-creating logs" do
       subject(:service) { described_class.new(bulk_upload:, path:) }
 

spec/services/bulk_upload/sales/log_creator_spec.rb

@@ -75,6 +75,41 @@ RSpec.describe BulkUpload::Sales::LogCreator do
       end
     end
 
+    context "when a valid csv with row with compound errors on non setup field" do
+      let(:file) { Tempfile.new }
+      let(:path) { file.path }
+      let(:log) do
+        build(
+          :sales_log,
+          :completed,
+          ownershipsch: 2,
+          pcodenk: 0,
+          ppcodenk: 0,
+          postcode_full: "AA11AA",
+          ppostcode_full: "BB22BB",
+        )
+      end
+
+      before do
+        file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2022_csv_row)
+        file.rewind
+      end
+
+      it "creates the log" do
+        expect { service.call }.to change(SalesLog, :count).by(1)
+      end
+
+      it "blanks invalid field" do
+        service.call
+
+        record = SalesLog.last
+        expect(record.pcodenk).to be_blank
+        expect(record.postcode_full).to be_blank
+        expect(record.ppcodenk).to be_blank
+        expect(record.ppostcode_full).to be_blank
+      end
+    end
+
     context "when pre-creating logs" do
       subject(:service) { described_class.new(bulk_upload:, path:) }
 

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

@@ -540,4 +540,46 @@ RSpec.describe BulkUpload::Sales::Year2022::RowParser do
       end
     end
   end
+
+  describe "inferences" do
+    context "when buyer not interviewed and optional values nil" do
+      let(:attributes) { valid_attributes.merge(field_6: "1", field_24: nil, field_30: nil, field_31: nil, field_32: nil, field_34: nil, field_36: nil, field_37: nil, field_39: nil, field_48: nil, field_49: nil) }
+
+      it "infers correctly" do
+        log = parser.log
+        expect(log["noint"]).to eq(1)
+        expect(log["ecstat1"]).to eq(10)
+        expect(log["ethnic"]).to eq(nil)
+        expect(log["ethnic_group"]).to eq(17)
+        expect(log["national"]).to eq(13)
+        expect(log["income1nk"]).to eq(1)
+        expect(log["inc1mort"]).to eq(2)
+        expect(log["savingsnk"]).to eq(1)
+        expect(log["prevown"]).to eq(3)
+        expect(log["prevten"]).to eq(0)
+        expect(log["disabled"]).to eq(3)
+        expect(log["wheel"]).to eq(3)
+      end
+    end
+
+    context "when buyer not interviewed and optional values present" do
+      let(:attributes) { valid_attributes.merge(field_6: "1", field_24: "1", field_30: "1", field_31: "1", field_32: "1", field_34: "1", field_36: "1", field_37: "1", field_39: "1", field_48: "1", field_49: "1") }
+
+      it "does not override variables correctly" do
+        log = parser.log
+        expect(log["noint"]).to eq(1)
+        expect(log["ecstat1"]).to eq(1)
+        expect(log["ethnic"]).to eq(1)
+        expect(log["ethnic_group"]).to eq(0)
+        expect(log["national"]).to eq(1)
+        expect(log["income1nk"]).to eq(0)
+        expect(log["inc1mort"]).to eq(1)
+        expect(log["savingsnk"]).to eq(0)
+        expect(log["prevown"]).to eq(1)
+        expect(log["prevten"]).to eq(1)
+        expect(log["disabled"]).to eq(1)
+        expect(log["wheel"]).to eq(1)
+      end
+    end
+  end
 end