From dcd574424b04075f1bd57b44c92e9201855c5a0e Mon Sep 17 00:00:00 2001
From: Sam Seed <sam.seed@softwire.com>
Date: Tue, 7 Mar 2023 11:04:15 +0000
Subject: [PATCH] feat: add postcode and location to fields which determine
 duplicates

---
 app/services/bulk_upload/lettings/year2022/row_parser.rb    | 6 ++++++
 .../bulk_upload/lettings/year2022/row_parser_spec.rb        | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb
index 5c811da7f..7932238f0 100644
--- a/app/services/bulk_upload/lettings/year2022/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb
@@ -450,6 +450,8 @@ private
       owning_organisation
       tcharge
       propcode
+      postcode_full
+      location
     ]
   end
 
@@ -715,6 +717,8 @@ private
     if log_already_exists?
       error_message = "This is a duplicate log"
 
+      errors.add(:field_5, error_message) # location
+
       errors.add(:field_12, error_message) # age1
       errors.add(:field_20, error_message) # sex1
       errors.add(:field_35, error_message) # ecstat1
@@ -726,6 +730,8 @@ private
       errors.add(:field_98, error_message) # startdate
 
       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
     end
   end
diff --git a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb
index 3fe08135f..44fa962b9 100644
--- a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb
+++ b/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"
 
             expected_errors = {
+              field_5: [error_message], # location
               field_12: [error_message], # age1
               field_20: [error_message], # sex1
               field_35: [error_message], # ecstat1
@@ -240,6 +241,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do
               field_97: [error_message], # startdate
               field_98: [error_message], # startdate
               field_100: [error_message], # propcode
+              field_108: [error_message], # postcode_full
+              field_109: [error_message], # postcode_full
               field_111: [error_message], # owning_organisation
             }
             expect(parser.errors.as_json).to eq(expected_errors)