From c326d7b3c593668bf60771ec5c374d506703879d Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Mon, 30 Jan 2023 16:04:46 +0000 Subject: [PATCH] feat: make is_bedsit and validate_bedsit_number_of_beds more readable --- app/models/sales_log.rb | 2 -- app/models/validations/sales/property_validations.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 48fbf40b8..add706f7c 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -224,8 +224,6 @@ class SalesLog < Log end def is_bedsit? - return if proptype.nil? - proptype == 2 end diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb index fbe582f10..83f86ec8f 100644 --- a/app/models/validations/sales/property_validations.rb +++ b/app/models/validations/sales/property_validations.rb @@ -9,7 +9,7 @@ module Validations::Sales::PropertyValidations end def validate_bedsit_number_of_beds(record) - return if record.is_bedsit?.blank? || record.beds.blank? + return unless record.proptype.present? && record.beds.present? if record.is_bedsit? && record.beds > 1 record.errors.add :proptype, I18n.t("validations.property.proptype.bedsits_have_max_one_bedroom")