Browse Source

feat: add postcode and location to fields which determine duplicates

pull/1334/head
Sam Seed 3 years ago committed by Phil Lee
parent
commit
dcd574424b
  1. 6
      app/services/bulk_upload/lettings/year2022/row_parser.rb
  2. 3
      spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb

6
app/services/bulk_upload/lettings/year2022/row_parser.rb

@ -450,6 +450,8 @@ private
owning_organisation owning_organisation
tcharge tcharge
propcode propcode
postcode_full
location
] ]
end end
@ -715,6 +717,8 @@ private
if log_already_exists? if log_already_exists?
error_message = "This is a duplicate log" error_message = "This is a duplicate log"
errors.add(:field_5, error_message) # location
errors.add(:field_12, error_message) # age1 errors.add(:field_12, error_message) # age1
errors.add(:field_20, error_message) # sex1 errors.add(:field_20, error_message) # sex1
errors.add(:field_35, error_message) # ecstat1 errors.add(:field_35, error_message) # ecstat1
@ -726,6 +730,8 @@ private
errors.add(:field_98, error_message) # startdate errors.add(:field_98, error_message) # startdate
errors.add(:field_100, error_message) # propcode errors.add(:field_100, error_message) # propcode
errors.add(:field_108, error_message) # postcode_full
errors.add(:field_109, error_message) # postcode_full
errors.add(:field_111, error_message) # owning_organisation errors.add(:field_111, error_message) # owning_organisation
end end
end end

3
spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb

@ -232,6 +232,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do
error_message = "This is a duplicate log" error_message = "This is a duplicate log"
expected_errors = { expected_errors = {
field_5: [error_message], # location
field_12: [error_message], # age1 field_12: [error_message], # age1
field_20: [error_message], # sex1 field_20: [error_message], # sex1
field_35: [error_message], # ecstat1 field_35: [error_message], # ecstat1
@ -240,6 +241,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do
field_97: [error_message], # startdate field_97: [error_message], # startdate
field_98: [error_message], # startdate field_98: [error_message], # startdate
field_100: [error_message], # propcode field_100: [error_message], # propcode
field_108: [error_message], # postcode_full
field_109: [error_message], # postcode_full
field_111: [error_message], # owning_organisation field_111: [error_message], # owning_organisation
} }
expect(parser.errors.as_json).to eq(expected_errors) expect(parser.errors.as_json).to eq(expected_errors)

Loading…
Cancel
Save