From d1a12ea2a8071de0f5ac67420ec7a0736b51b545 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 31 Mar 2023 11:53:53 +0100 Subject: [PATCH] Set housingneeds to yes if field 59 is 0 --- .../bulk_upload/lettings/year2022/row_parser.rb | 6 +++--- .../lettings/year2022/row_parser_spec.rb | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 13e2f9d02..3036f9c50 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -544,7 +544,7 @@ private end def validate_only_one_housing_needs_type - if [field_55, field_56, field_57].compact.count > 1 + if [field_55, field_56, field_57].count(1) > 1 errors.add(:field_55, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) errors.add(:field_56, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) errors.add(:field_57, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) @@ -1240,8 +1240,8 @@ private 2 elsif field_60 == 1 3 - else - 2 + elsif field_59&.zero? + 1 end end diff --git a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb index a03516852..3cd5772a2 100644 --- a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb @@ -97,6 +97,12 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do field_118: "2", + field_55: "1", + field_56: "0", + field_57: "0", + field_58: "1", + field_59: "0", + field_66: "5", field_67: "2", field_52: "31", @@ -1414,6 +1420,16 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do expect(parser.log.housingneeds).to eq(3) end end + + context "when housingneeds are given" do + let(:attributes) { { bulk_upload:, field_59: "0", field_57: "1", field_58: "1" } } + + it "sets correct housingneeds" do + expect(parser.log.housingneeds).to eq(1) + expect(parser.log.housingneeds_type).to eq(2) + expect(parser.log.housingneeds_other).to eq(1) + end + end end describe "#housingneeds_type" do