refactor: nest 2024 changes for future DRYness

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