From 28c320f9f5514c43443a23ab41c767d063e7428c Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Thu, 5 May 2022 17:15:02 +0100
Subject: [PATCH] check if tshortfall is overridden

---
 app/services/imports/case_logs_import_service.rb | 2 +-
 app/services/imports/import_service.rb           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/services/imports/case_logs_import_service.rb b/app/services/imports/case_logs_import_service.rb
index 5999fb053..066c55798 100644
--- a/app/services/imports/case_logs_import_service.rb
+++ b/app/services/imports/case_logs_import_service.rb
@@ -516,7 +516,7 @@ module Imports
 
     def tshortfall(xml_doc, attributes)
       shortfall = safe_string_as_decimal(xml_doc, "Q18dyes")
-      return 0 if shortfall.blank? && attributes["hbrentshortfall"] == 1
+      return 0 if shortfall.blank? && attributes["hbrentshortfall"] == 1 && overridden?(xml_doc, "xmlns", "Q18dyes")
 
       shortfall
     end
diff --git a/app/services/imports/import_service.rb b/app/services/imports/import_service.rb
index 3f319b358..664790055 100644
--- a/app/services/imports/import_service.rb
+++ b/app/services/imports/import_service.rb
@@ -22,6 +22,10 @@ module Imports
       xml_document.at_xpath("//#{namespace}:#{field}")&.text
     end
 
+    def overridden?(xml_document, namespace, field)
+      xml_document.at_xpath("//#{namespace}:#{field}").attributes["override-field"].value
+    end
+
     def to_boolean(input_string)
       input_string == "true"
     end