From 53fc4f265ee5b3f915a8c048502a31d2bf91967e Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 7 Jun 2023 12:47:05 +0100 Subject: [PATCH] refactor: simplify --- app/services/bulk_upload/lettings/year2022/row_parser.rb | 6 ++---- app/services/bulk_upload/lettings/year2023/row_parser.rb | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 9d355293e..61604b54d 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -684,10 +684,8 @@ private end def validate_reasonable_preference_homeless - if field_69 == 1 - if homeless == 1 && field_70 == 1 - errors.add(:field_70, I18n.t("validations.household.reasonpref.not_homeless")) - end + if field_69 == 1 && homeless == 1 && field_70 == 1 + errors.add(:field_70, I18n.t("validations.household.reasonpref.not_homeless")) end end diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 21a84a07f..92ff7d93b 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -619,10 +619,8 @@ private end def validate_reasonable_preference_homeless - if field_110 == 1 - if field_105 == 1 && field_111 == 1 - errors.add(:field_111, I18n.t("validations.household.reasonpref.not_homeless")) - end + if field_110 == 1 && field_105 == 1 && field_111 == 1 + errors.add(:field_111, I18n.t("validations.household.reasonpref.not_homeless")) end end