From dfa5d8cada791fd7e02302520cae3c227b6fa9fc Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Wed, 24 May 2023 15:16:19 +0100
Subject: [PATCH] update error message

---
 .../bulk_upload/lettings/year2022/row_parser.rb       |  2 +-
 .../bulk_upload/lettings/year2023/row_parser.rb       |  2 +-
 app/services/bulk_upload/sales/year2022/row_parser.rb |  2 +-
 app/services/bulk_upload/sales/year2023/row_parser.rb |  2 +-
 config/locales/en.yml                                 | 11 +++++++++--
 spec/services/bulk_upload/lettings/validator_spec.rb  |  2 +-
 spec/services/bulk_upload/sales/validator_spec.rb     |  2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb
index 922dc8be1..b79447b67 100644
--- a/app/services/bulk_upload/lettings/year2022/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb
@@ -457,7 +457,7 @@ class BulkUpload::Lettings::Year2022::RowParser
 
   def add_duplicate_found_in_spreadsheet_errors
     spreadsheet_duplicate_hash.each_key do |field|
-      errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
+      errors.add(field, :spreadsheet_dupe, category: :setup)
     end
   end
 
diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb
index ff095fbda..225c45b4f 100644
--- a/app/services/bulk_upload/lettings/year2023/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb
@@ -474,7 +474,7 @@ class BulkUpload::Lettings::Year2023::RowParser
 
   def add_duplicate_found_in_spreadsheet_errors
     spreadsheet_duplicate_hash.each_key do |field|
-      errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
+      errors.add(field, :spreadsheet_dupe, category: :setup)
     end
   end
 
diff --git a/app/services/bulk_upload/sales/year2022/row_parser.rb b/app/services/bulk_upload/sales/year2022/row_parser.rb
index 2900c5ad1..498a855a6 100644
--- a/app/services/bulk_upload/sales/year2022/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2022/row_parser.rb
@@ -428,7 +428,7 @@ class BulkUpload::Sales::Year2022::RowParser
 
   def add_duplicate_found_in_spreadsheet_errors
     spreadsheet_duplicate_hash.each_key do |field|
-      errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
+      errors.add(field, :spreadsheet_dupe, category: :setup)
     end
   end
 
diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb
index e2c6a2c89..4e1bce1c3 100644
--- a/app/services/bulk_upload/sales/year2023/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2023/row_parser.rb
@@ -550,7 +550,7 @@ class BulkUpload::Sales::Year2023::RowParser
 
   def add_duplicate_found_in_spreadsheet_errors
     spreadsheet_duplicate_hash.each_key do |field|
-      errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
+      errors.add(field, :spreadsheet_dupe, category: :setup)
     end
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 64bc5687f..be50d9849 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -41,10 +41,17 @@ en:
   activemodel:
     errors:
       models:
-        bulk_upload/sales/year2022/row_parser:
+        bulk_upload/row_parser: &bulk_upload__row_parser__base
           inclusion: Enter a valid value for %{question}
+          spreadsheet_dupe: This is a duplicate of a log in your file
+        bulk_upload/lettings/year2022/row_parser:
+          <<: *bulk_upload__row_parser__base
+        bulk_upload/lettings/year2023/row_parser:
+          <<: *bulk_upload__row_parser__base
+        bulk_upload/sales/year2022/row_parser:
+          <<: *bulk_upload__row_parser__base
         bulk_upload/sales/year2023/row_parser:
-          inclusion: Enter a valid value for %{question}
+          <<: *bulk_upload__row_parser__base
         bulk_upload/lettings/validator:
           attributes:
             base:
diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index cbada52af..c543d6df9 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -270,7 +270,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
       end
 
       it "creates errors" do
-        expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "Duplicate row found in spreadsheet"), :count).by(24)
+        expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file"), :count).by(24)
       end
     end
 
diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb
index 0a10d1b52..354ab4327 100644
--- a/spec/services/bulk_upload/sales/validator_spec.rb
+++ b/spec/services/bulk_upload/sales/validator_spec.rb
@@ -96,7 +96,7 @@ RSpec.describe BulkUpload::Sales::Validator do
       end
 
       it "creates errors" do
-        expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "Duplicate row found in spreadsheet"), :count).by(20)
+        expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file"), :count).by(20)
       end
     end
   end