diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 1452a1d35..791a8a67f 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -383,11 +383,12 @@ class CaseLog < ApplicationRecord end def retirement_age_for_person(person_num) - gender = public_send("sex#{person_num}".to_sym) + gender = public_send("sex#{person_num}".to_sym) return unless gender + RETIREMENT_AGES[gender] end - + private PIO = Postcodes::IO.new diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb index a2d8c13a0..406476050 100644 --- a/app/models/validations/soft_validations.rb +++ b/app/models/validations/soft_validations.rb @@ -69,6 +69,7 @@ private economic_status = public_send("ecstat#{person_num}") gender = public_send("sex#{person_num}") return unless age && economic_status && gender + %w[M X].include?(gender) && !tenant_is_retired?(economic_status) && age > 67 || gender == "F" && !tenant_is_retired?(economic_status) && age > 60 end diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index 95118e164..4a8bc8677 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -1956,4 +1956,4 @@ RSpec.describe CaseLog do end end end -end \ No newline at end of file +end