From 44ca119bc5cf29c943b5c0a73cd59387ae88de31 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:22:34 +0000 Subject: [PATCH] Check correct benefits value in the validation --- app/models/validations/financial_validations.rb | 4 ++-- .../validations/financial_validations_spec.rb | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/validations/financial_validations.rb b/app/models/validations/financial_validations.rb index 19209f2d8..7fad004ec 100644 --- a/app/models/validations/financial_validations.rb +++ b/app/models/validations/financial_validations.rb @@ -11,14 +11,14 @@ module Validations::FinancialValidations end end - EMPLOYED_STATUSES = [1, 0].freeze + EMPLOYED_STATUSES = [1, 2].freeze def validate_net_income_uc_proportion(record) (1..8).any? do |n| economic_status = record["ecstat#{n}"] is_employed = EMPLOYED_STATUSES.include?(economic_status) relationship = record["relat#{n}"] is_partner_or_main = relationship == "P" || (relationship.nil? && economic_status.present?) - if is_employed && is_partner_or_main && record.benefits&.zero? + if is_employed && is_partner_or_main && record.benefits == 1 record.errors.add :benefits, I18n.t("validations.lettings.financial.benefits.part_or_full_time") end end diff --git a/spec/models/validations/financial_validations_spec.rb b/spec/models/validations/financial_validations_spec.rb index a2d51f7f9..282e050a2 100644 --- a/spec/models/validations/financial_validations_spec.rb +++ b/spec/models/validations/financial_validations_spec.rb @@ -36,36 +36,36 @@ RSpec.describe Validations::FinancialValidations do describe "benefits proportion validations" do context "when the proportion is all" do it "validates that the lead tenant is not in full time employment" do - record.benefits = 0 + record.benefits = 1 record.ecstat1 = 1 financial_validator.validate_net_income_uc_proportion(record) expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time")) end it "validates that the lead tenant is not in part time employment" do - record.benefits = 0 - record.ecstat1 = 0 + record.benefits = 1 + record.ecstat1 = 2 financial_validator.validate_net_income_uc_proportion(record) expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time")) end it "expects that the lead tenant is not in full-time or part-time employment" do - record.benefits = 0 + record.benefits = 1 record.ecstat1 = 4 financial_validator.validate_net_income_uc_proportion(record) expect(record.errors["benefits"]).to be_empty end it "validates that the tenant’s partner is not in full time employment" do - record.benefits = 0 - record.ecstat2 = 0 + record.benefits = 1 + record.ecstat2 = 2 record.relat2 = "P" financial_validator.validate_net_income_uc_proportion(record) expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time")) end it "expects that the tenant’s partner is not in full-time or part-time employment" do - record.benefits = 0 + record.benefits = 1 record.ecstat2 = 4 record.relat2 = "P" financial_validator.validate_net_income_uc_proportion(record)