baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor validations

pull/1501/head
Kat 3 years ago
parent
a344240137
commit
064fbbd59f
1 changed files with 9 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      app/services/bulk_upload/lettings/year2022/row_parser.rb

22
app/services/bulk_upload/lettings/year2022/row_parser.rb
Unescape View File

@ -533,29 +533,25 @@ private
def validate_dont_know_disabled_needs_conjunction def validate_dont_know_disabled_needs_conjunction
if field_60 == 1 && [field_55, field_56, field_57, field_58].count(1).positive? if field_60 == 1 && [field_55, field_56, field_57, field_58].count(1).positive?
errors.add(:field_60, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) %i[field_60 field_55 field_56 field_57 field_58].each do |field|
errors.add(:field_55, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_55 == 1 errors.add(field, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if send(field) == 1
errors.add(:field_56, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_56 == 1 end
errors.add(:field_57, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_57 == 1
errors.add(:field_58, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_58 == 1
end end
end end
def validate_no_disabled_needs_conjunction def validate_no_disabled_needs_conjunction
if field_59 == 1 && [field_55, field_56, field_57, field_58].count(1).positive? if field_59 == 1 && [field_55, field_56, field_57, field_58].count(1).positive?
errors.add(:field_59, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) %i[field_59 field_55 field_56 field_57 field_58].each do |field|
errors.add(:field_55, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_55 == 1 errors.add(field, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if send(field) == 1
errors.add(:field_56, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_56 == 1 end
errors.add(:field_57, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_57 == 1
errors.add(:field_58, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_58 == 1
end end
end end
def validate_only_one_housing_needs_type def validate_only_one_housing_needs_type
if [field_55, field_56, field_57].count(1) > 1 if [field_55, field_56, field_57].count(1) > 1
errors.add(:field_55, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_55 == 1 %i[field_55 field_56 field_57].each do |field|
errors.add(:field_56, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_56 == 1 errors.add(field, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if send(field) == 1
errors.add(:field_57, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_57 == 1 end
end end
end end

Write Preview
Loading…
Cancel
Save