Browse Source

Extract charges attributes into a variable

pull/1605/head
Kat 3 years ago
parent
commit
dcf46cffa5
  1. 18
      app/services/imports/lettings_logs_import_service.rb

18
app/services/imports/lettings_logs_import_service.rb

@ -284,12 +284,14 @@ module Imports
end
def rescue_validation_or_raise(lettings_log, attributes, previous_status, exception)
charges_attributes = %w[brent scharge pscharge supcharg tcharge]
# Blank out all invalid fields for in-progress logs
if %w[saved submitted-invalid].include?(previous_status)
lettings_log.errors.each do |error|
@logger.warn("Log #{lettings_log.old_id}: Removing field #{error.attribute} from log triggering validation: #{error.type}")
attributes.delete(error.attribute.to_s)
%w[brent scharge pscharge supcharg tcharge].each { |attribute| attributes.delete(attribute) } if error.attribute == :tcharge
charges_attributes.each { |attribute| attributes.delete(attribute) } if error.attribute == :tcharge
end
@logs_overridden << lettings_log.old_id
return save_lettings_log(attributes, previous_status)
@ -307,16 +309,16 @@ module Imports
%i[earnings over_hard_max] => %w[ecstat1],
%i[tshortfall no_outstanding_charges] => %w[tshortfall hbrentshortfall],
%i[beds outside_the_range] => %w[beds],
%i[tcharge complete_1_of_3] => %w[brent scharge pscharge supcharg tcharge],
%i[scharge under_min] => %w[brent scharge pscharge supcharg tcharge],
%i[tcharge complete_1_of_3] => charges_attributes,
%i[scharge under_min] => charges_attributes,
%i[tshortfall must_be_positive] => %w[tshortfall tshortfall_known],
%i[referral referral_invalid] => %w[referral],
%i[pscharge outside_the_range] => %w[brent scharge pscharge supcharg tcharge],
%i[supcharg outside_the_range] => %w[brent scharge pscharge supcharg tcharge],
%i[scharge outside_the_range] => %w[brent scharge pscharge supcharg tcharge],
%i[pscharge outside_the_range] => charges_attributes,
%i[supcharg outside_the_range] => charges_attributes,
%i[scharge outside_the_range] => charges_attributes,
%i[location_id not_active] => %w[location_id scheme_id],
%i[tcharge under_10] => %w[brent scharge pscharge supcharg tcharge],
%i[brent over_hard_max] => %w[brent scharge pscharge supcharg tcharge],
%i[tcharge under_10] => charges_attributes,
%i[brent over_hard_max] => charges_attributes,
}
(2..8).each do |person|

Loading…
Cancel
Save