From e52e639faff5c383a85a9a96bd83198e55ad5442 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 16 Apr 2025 18:47:23 +0100
Subject: [PATCH] Add validation message for missing charge fields in bulk
 upload

---
 app/services/bulk_upload/lettings/year2024/row_parser.rb    | 6 ++----
 app/services/bulk_upload/lettings/year2025/row_parser.rb    | 6 ++----
 config/locales/validations/lettings/2024/bulk_upload.en.yml | 1 +
 config/locales/validations/lettings/2025/bulk_upload.en.yml | 1 +
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index 3d36e743e..5016ebc8b 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -937,10 +937,8 @@ private
       errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: charge))
     end
 
-    other_charge_fields.each do |field, _charge|
-      blank_charge_fields.each do |_blank_field, blank_charge|
-        errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: blank_charge))
-      end
+    other_charge_fields.each_key do |field|
+      errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
     end
   end
 
diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb
index 485446f0b..89a8cca38 100644
--- a/app/services/bulk_upload/lettings/year2025/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb
@@ -936,10 +936,8 @@ private
       errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: charge))
     end
 
-    other_charge_fields.each do |field, _charge|
-      blank_charge_fields.each do |_blank_field, blank_charge|
-        errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: blank_charge))
-      end
+    other_charge_fields.each_key do |field|
+      errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
     end
   end
 
diff --git a/config/locales/validations/lettings/2024/bulk_upload.en.yml b/config/locales/validations/lettings/2024/bulk_upload.en.yml
index 7431b074a..0413972f7 100644
--- a/config/locales/validations/lettings/2024/bulk_upload.en.yml
+++ b/config/locales/validations/lettings/2024/bulk_upload.en.yml
@@ -58,6 +58,7 @@ en:
             invalid: "Select a valid nationality."
           charges:
             missing_charges: "Please enter the %{sentence_fragment}. If there is no %{sentence_fragment}, please enter '0'."
+            related_to_missing_charge: "You must enter all these fields: basic rent, service charge, personal service charge and support charge. Please enter ‘0' for any types of charges that you don’t issue."
           reasonpref:
             conflict:
               dont_know: "You cannot select 'Don't know' if any of the other reasonable preference reasons are also selected."
diff --git a/config/locales/validations/lettings/2025/bulk_upload.en.yml b/config/locales/validations/lettings/2025/bulk_upload.en.yml
index 28866de21..500dbdaa9 100644
--- a/config/locales/validations/lettings/2025/bulk_upload.en.yml
+++ b/config/locales/validations/lettings/2025/bulk_upload.en.yml
@@ -58,6 +58,7 @@ en:
             invalid: "Select a valid nationality."
           charges:
             missing_charges: "Please enter the %{sentence_fragment}. If there is no %{sentence_fragment}, please enter '0'."
+            related_to_missing_charge: "You must enter all these fields: basic rent, service charge, personal service charge and support charge. Please enter ‘0' for any types of charges that you don’t issue."
           reasonpref:
             conflict:
               dont_know: "You cannot select 'Don't know' if any of the other reasonable preference reasons are also selected."