From f5afe6bfebc2fae4e0b8707df7d068910f9235b4 Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Wed, 25 Jan 2023 16:40:42 +0000 Subject: [PATCH] refactor: write method is_bedsit? on SalesLog --- app/models/sales_log.rb | 6 ++++++ app/models/validations/sales/property_validations.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 463381559..48fbf40b8 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -223,6 +223,12 @@ class SalesLog < Log type == 24 end + def is_bedsit? + return if proptype.nil? + + proptype == 2 + end + def shared_ownership_scheme? ownershipsch == 1 end diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb index 95e33148f..fbe582f10 100644 --- a/app/models/validations/sales/property_validations.rb +++ b/app/models/validations/sales/property_validations.rb @@ -9,9 +9,9 @@ module Validations::Sales::PropertyValidations end def validate_bedsit_number_of_beds(record) - return if record.proptype.blank? || record.beds.blank? + return if record.is_bedsit?.blank? || record.beds.blank? - if record.proptype == 2 && record.beds > 1 + if record.is_bedsit? && record.beds > 1 record.errors.add :proptype, I18n.t("validations.property.proptype.bedsits_have_max_one_bedroom") record.errors.add :beds, I18n.t("validations.property.beds.bedsits_have_max_one_bedroom") end