Browse Source

feat: only add mortgageuesd error to relevant mortgageused field

pull/2311/head
natdeanlewissoftwire 2 years ago
parent
commit
fea30d9074
  1. 8
      app/services/bulk_upload/sales/year2023/row_parser.rb
  2. 8
      app/services/bulk_upload/sales/year2024/row_parser.rb

8
app/services/bulk_upload/sales/year2023/row_parser.rb

@ -754,7 +754,7 @@ private
stairbought: %i[field_88], stairbought: %i[field_88],
stairowned: %i[field_89], stairowned: %i[field_89],
socprevten: %i[field_102], socprevten: %i[field_102],
mortgageused: %i[field_105 field_119 field_128], mortgageused: [mortgageused_field],
soctenant: %i[field_99], soctenant: %i[field_99],
uprn: %i[field_19], uprn: %i[field_19],
@ -1103,6 +1103,12 @@ private
return field_128 if outright_sale? return field_128 if outright_sale?
end end
def mortgageused_field
return :field_105 if shared_ownership?
return :field_119 if discounted_ownership?
return :field_128 if outright_sale?
end
def owning_organisation def owning_organisation
@owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1) @owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1)
end end

8
app/services/bulk_upload/sales/year2024/row_parser.rb

@ -760,7 +760,7 @@ private
stairbought: %i[field_87], stairbought: %i[field_87],
stairowned: %i[field_88], stairowned: %i[field_88],
socprevten: %i[field_100], socprevten: %i[field_100],
mortgageused: %i[field_103 field_117 field_126], mortgageused: [mortgageused_field],
uprn: %i[field_22], uprn: %i[field_22],
address_line1: %i[field_23], address_line1: %i[field_23],
@ -1116,6 +1116,12 @@ private
return field_126 if outright_sale? return field_126 if outright_sale?
end end
def mortgageused_field
return :field_103 if shared_ownership?
return :field_117 if discounted_ownership?
return :field_126 if outright_sale?
end
def owning_organisation def owning_organisation
@owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1) @owning_organisation ||= Organisation.find_by_id_on_multiple_fields(field_1)
end end

Loading…
Cancel
Save