Browse Source

feat: nil protection

pull/959/head
natdeanlewissoftwire 3 years ago
parent
commit
2a6052a45b
  1. 12
      app/models/lettings_log.rb
  2. 6
      app/models/validations/financial_validations.rb
  3. 12
      app/models/validations/soft_validations.rb

12
app/models/lettings_log.rb

@ -436,7 +436,11 @@ class LettingsLog < Log
end
def soft_min_for_period
beds = needstype == 2 ? 0 : [self.beds, 4].min
beds = if needstype == 2
0
else
self.beds.nil? ? nil : [self.beds, 4].min
end
la = if needstype == 2
defined?(self.location.location_code) ? self.location.location_code : nil
else
@ -448,7 +452,11 @@ class LettingsLog < Log
end
def soft_max_for_period
beds = needstype == 2 ? 0 : [self.beds, 4].min
beds = if needstype == 2
0
else
self.beds.nil? ? nil : [self.beds, 4].min
end
la = if needstype == 2
defined?(self.location.location_code) ? self.location.location_code : nil
else

6
app/models/validations/financial_validations.rb

@ -182,7 +182,11 @@ private
collection_year = record.collection_start_year
beds = record.needstype == 2 ? 0 : [record.beds, 4].min
beds = if record.needstype == 2
0
else
record.beds.nil? ? nil : [record.beds, 4].min
end
la = if record.needstype == 2
defined?(record.location.location_code) ? record.location.location_code : nil
else

12
app/models/validations/soft_validations.rb

@ -28,7 +28,11 @@ module Validations::SoftValidations
def rent_in_soft_min_range?
return unless brent && weekly_value(brent) && startdate
beds = needstype == 2 ? 0 : [self.beds, 4].min
beds = if needstype == 2
0
else
self.beds.nil? ? nil : [self.beds, 4].min
end
la = if needstype == 2
defined?(self.location.location_code) ? self.location.location_code : nil
else
@ -42,7 +46,11 @@ module Validations::SoftValidations
def rent_in_soft_max_range?
return unless brent && weekly_value(brent) && startdate
beds = needstype == 2 ? 0 : [self.beds, 4].min
beds = if needstype == 2
0
else
self.beds.nil? ? nil : [self.beds, 4].min
end
la = if needstype == 2
defined?(self.location.location_code) ? self.location.location_code : nil
else

Loading…
Cancel
Save