From f287890d37668ea55a2b6fd17ec3d956c054a927 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 7 Feb 2024 08:52:01 +0000 Subject: [PATCH] refactor: nest 2024 changes for future DRYness --- .../derived_variables/lettings_log_variables.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index 949c6ff2b..337cfed75 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -82,8 +82,10 @@ module DerivedVariables::LettingsLogVariables self.prevten = 30 if owning_organisation&.provider_type == "LA" end end - if is_bedsit? && form.start_year_after_2024? - self.beds = 1 + if form.start_year_after_2024? + if is_bedsit? + self.beds = 1 + end end child_under_16_constraints! @@ -171,8 +173,10 @@ private self.wchair = nil self.location_id = nil end - if unittype_gn_changed? && unittype_gn_was == 2 && form.start_year_after_2024? - self.beds = nil + if form.start_year_after_2024? + if unittype_gn_changed? && unittype_gn_was == 2 + self.beds = nil + end end end